From 0f70bb5e95342e1c88e16b4c12609cd45dd1b103 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 21 五月 2021 14:27:47 +0800
Subject: [PATCH] add bhomebus api
---
src/api/area.ts | 4
src/api/camera.ts | 19 +++---
src/pages/cameraAccess/components/LinkageRule.vue | 29 ++++-----
src/components/treeMenu/jsTree/tree.vue | 15 ++--
src/pages/cameraAccess/index/App.vue | 12 ++--
src/api/system.ts | 4
src/pages/cameraAccess/index/VideoManage.vue | 24 ++++----
src/pages/gb28181/index/api.ts | 4
src/pages/cameraAccess/components/CameraInfo.vue | 1
src/pages/cameraAccess/components/SceneRule.vue | 10 +-
10 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/src/api/area.ts b/src/api/area.ts
index 79fd2d0..64aa691 100644
--- a/src/api/area.ts
+++ b/src/api/area.ts
@@ -11,7 +11,7 @@
export const getGB28181CameraTree = (query: any) => {
return request({
- url: "/data/api-v/area/gb28181Tree",
+ url: "/data/api-v/gb28181/tree",
method: "get",
params: query
});
@@ -51,7 +51,7 @@
export const refreshGB28181Tree = () => {
return request({
- url: "/data/api-v/area/gb28181RefreshTree",
+ url: "/data/api-v/gb28181/treeRefresh",
method: "post",
});
};
diff --git a/src/api/camera.ts b/src/api/camera.ts
index e830ecf..701661f 100644
--- a/src/api/camera.ts
+++ b/src/api/camera.ts
@@ -27,8 +27,9 @@
export const getCameraInfo = (id: string) => {
return request({
- url: "/data/api-v/camera/show/" + id,
- method: "get"
+ url: "/data/api-v/camera/show",
+ method: "get",
+ params: { cid: id }
});
};
@@ -156,7 +157,7 @@
})
}
//鍒犻櫎(灞曞尯)
-export const delArea = (data:any) => {
+export const delArea = (data: any) => {
return request({
url: "/data/api-v/acp/delete",
method: "post",
@@ -165,7 +166,7 @@
}
//淇濆瓨鍖哄煙缂栬緫
-export const saveAreaInfo = (data:any) => {
+export const saveAreaInfo = (data: any) => {
return request({
url: "/data/api-v/acp/save",
method: "post",
@@ -174,7 +175,7 @@
}
//鑾峰彇鎽勫儚鏈虹殑鍧愭爣鏍囧畾淇℃伅
-export const getCameraMarks = (query:any) => {
+export const getCameraMarks = (query: any) => {
return request({
url: '/data/api-v/camera/coord',
method: "get",
@@ -183,7 +184,7 @@
}
//鏇存柊鎽勫儚鏈虹殑鍧愭爣鏍囧畾淇℃伅
-export const updateCameraMarks = (data:any) => {
+export const updateCameraMarks = (data: any) => {
return request({
url: '/data/api-v/camera/updateCoord',
method: 'post',
@@ -192,7 +193,7 @@
}
//淇濆瓨鎽勫儚鏈哄垎缁�
-export const saveCameraGroupInfo = (data:any) => {
+export const saveCameraGroupInfo = (data: any) => {
return request({
url: '/data/api-v/camera/group/save',
method: 'post',
@@ -208,9 +209,9 @@
})
}
-export const delCameraGroup = (groupId:string)=>{
+export const delCameraGroup = (groupId: string) => {
return request({
- url:'/data/api-v/camera/group/del?groupId='+groupId,
+ url: '/data/api-v/camera/group/del?groupId=' + groupId,
method: 'post'
})
}
diff --git a/src/api/system.ts b/src/api/system.ts
index d5c56cb..87afa00 100644
--- a/src/api/system.ts
+++ b/src/api/system.ts
@@ -24,7 +24,7 @@
export const getGB28181Config = () => {
return request({
- url: "/data/api-v/sysset/gb28181ConfigShow",
+ url: "/data/api-v/gb28181/configShow",
method: "get"
});
};
@@ -47,7 +47,7 @@
export const saveGB28181Config = (query: any) => {
return request({
- url: "/data/api-v/sysset/gb28181ConfEdit",
+ url: "/data/api-v/gb28181/configEdit",
method: "post",
data: query
});
diff --git a/src/components/treeMenu/jsTree/tree.vue b/src/components/treeMenu/jsTree/tree.vue
index fc05e29..81f2d1a 100644
--- a/src/components/treeMenu/jsTree/tree.vue
+++ b/src/components/treeMenu/jsTree/tree.vue
@@ -62,7 +62,7 @@
childrenFieldName: { type: String, default: "children" },
itemEvents: {
type: Object,
- default: function() {
+ default: function () {
return {};
}
},
@@ -152,29 +152,29 @@
item
);
let self = this;
- node.addBefore = function(data, selectedNode) {
+ node.addBefore = function (data, selectedNode) {
let newItem = self.initializeDataItem(data);
let index = selectedNode.parentItem.findIndex(t => t.id === node.id);
selectedNode.parentItem.splice(index, 0, newItem);
};
- node.addAfter = function(data, selectedNode) {
+ node.addAfter = function (data, selectedNode) {
let newItem = self.initializeDataItem(data);
let index =
selectedNode.parentItem.findIndex(t => t.id === node.id) + 1;
selectedNode.parentItem.splice(index, 0, newItem);
};
- node.addChild = function(data) {
+ node.addChild = function (data) {
let newItem = self.initializeDataItem(data);
node.opened = true;
node[self.childrenFieldName].push(newItem);
};
- node.openChildren = function() {
+ node.openChildren = function () {
node.opened = true;
self.handleRecursionNodeChildren(node, node => {
node.opened = true;
});
};
- node.closeChildren = function() {
+ node.closeChildren = function () {
node.opened = false;
self.handleRecursionNodeChildren(node, node => {
node.opened = false;
@@ -229,7 +229,7 @@
oriNode.model.selected = true;
},
handleBatchSelectItems(oriNode, oriItem) {
- console.log('oriNode, oriItem',oriNode, oriItem)
+ console.log('oriNode, oriItem', oriNode, oriItem)
this.handleRecursionNodeChilds(oriNode, node => {
if (!!node.model) {
if (!!node.model.disabled) return;
@@ -335,7 +335,6 @@
this.initializeData(this.data);
},
mounted() {
- debugger
if (this.async) {
this.$set(this.data, 0, this.initializeLoading());
this.handleAsyncLoad(this.data, this);
diff --git a/src/pages/cameraAccess/components/CameraInfo.vue b/src/pages/cameraAccess/components/CameraInfo.vue
index 66c4a0d..4f16b77 100644
--- a/src/pages/cameraAccess/components/CameraInfo.vue
+++ b/src/pages/cameraAccess/components/CameraInfo.vue
@@ -258,6 +258,7 @@
document.addEventListener("visibilitychange", () => {
this.visibilitychange();
});
+ debugger
this.getSounds();
this.eventAudio.addEventListener("ended", () => {
diff --git a/src/pages/cameraAccess/components/LinkageRule.vue b/src/pages/cameraAccess/components/LinkageRule.vue
index 57a7fa9..accc45d 100644
--- a/src/pages/cameraAccess/components/LinkageRule.vue
+++ b/src/pages/cameraAccess/components/LinkageRule.vue
@@ -17,8 +17,8 @@
/>
</div>
</div>
- </div> -->
- <div class="top" >
+ </div>-->
+ <div class="top">
<p class="task-css">
<b style="font-size: 14px; line-height: 18px;">鍦烘櫙</b>
</p>
@@ -36,7 +36,7 @@
:ShowLocalVedio="cameraType === 'dataStack'"
v-if="showSysInfo"
style="margin-top:-10px"
- /> -->
+ />-->
</div>
</div>
</div>
@@ -237,9 +237,9 @@
}
this.swipercanvasData = swipers;
},
- refresh(url,id) {
- this.swipercanvasData.forEach(data=>{
- if(data.cameraId == id){
+ refresh(url, id) {
+ this.swipercanvasData.forEach(data => {
+ if (data.cameraId == id) {
data.baseImg = url;
}
})
@@ -305,9 +305,9 @@
//height: 100%;
//padding: 13px 0 20px;
position: relative;
- .devide{
+ .devide {
height: 10px;
- background: #E9EBF2;
+ background: #e9ebf2;
}
.top {
width: 100%;
@@ -405,14 +405,14 @@
float: right;
width: 54%;
height: 144px;
- .card-box{
- width: 54%!important;
+ .card-box {
+ width: 54% !important;
}
- .eCharts-box{
+ .eCharts-box {
width: 45%;
- canvas{
- width: 98%!important;
- }
+ canvas {
+ width: 98% !important;
+ }
}
}
.task-css {
@@ -577,7 +577,6 @@
.add-btn:hover {
color: #2249b4;
}
-
}
</style>
<style lang="scss" scoped>
diff --git a/src/pages/cameraAccess/components/SceneRule.vue b/src/pages/cameraAccess/components/SceneRule.vue
index ecf6db6..d6e5bf8 100644
--- a/src/pages/cameraAccess/components/SceneRule.vue
+++ b/src/pages/cameraAccess/components/SceneRule.vue
@@ -242,11 +242,11 @@
}
},
methods: {
- getSoundById(id){
- if(id){
- let sound = this.soundList.find(item=>item.id == id);
+ getSoundById(id) {
+ if (id) {
+ let sound = this.soundList.find(item => item.id == id);
return sound.name
- }else{
+ } else {
return ''
}
},
@@ -439,7 +439,7 @@
.catch(() => { });
},
cellStyle(obj) {
- if (obj.column.label == '绛栫暐'||obj.column.label == '浜嬩欢澹伴煶') {
+ if (obj.column.label == '绛栫暐' || obj.column.label == '浜嬩欢澹伴煶') {
return 'text-align:left;padding-left:8px;'
}
}
diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue
index d18f4ca..f2f8d5e 100644
--- a/src/pages/cameraAccess/index/App.vue
+++ b/src/pages/cameraAccess/index/App.vue
@@ -25,17 +25,17 @@
RightSide
},
computed: {
- app () {
+ app() {
return this.getUrlKey() !== null ? "DataStack" : "Camera"
}
},
- data () {
+ data() {
return {
leftWith: 0,
screenHeight: 0
}
},
- mounted () {
+ mounted() {
this.screenHeight = document.documentElement.clientHeight;
window.onresize = () => {
return (() => {
@@ -47,10 +47,10 @@
this.TreeDataPool.readonly = false;
this.TreeDataPool.gbReadonly = false;
this.DataStackPool.readonly = false;
-
+ debugger
},
methods: {
- getUrlKey () {
+ getUrlKey() {
let name = "dataStack"
return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
}
@@ -134,7 +134,7 @@
}
.resize-bar:hover ~ .resize-line::after,
.resize-bar:active ~ .resize-line::after {
- content: '';
+ content: "";
position: absolute;
width: 16px;
height: 16px;
diff --git a/src/pages/cameraAccess/index/VideoManage.vue b/src/pages/cameraAccess/index/VideoManage.vue
index c5b7296..30e097d 100644
--- a/src/pages/cameraAccess/index/VideoManage.vue
+++ b/src/pages/cameraAccess/index/VideoManage.vue
@@ -65,7 +65,7 @@
DataStackInfo,
SeparateRules,
LinkageRule },
- data () {
+ data() {
return {
activeName: "camera-info",
buttonAuthority: sessionStorage.getItem("buttonAuthoritys") || [],
@@ -73,7 +73,7 @@
};
},
computed: {
- isAdmin () {
+ isAdmin() {
if (
sessionStorage.getItem("userInfo") &&
sessionStorage.getItem("userInfo") !== ""
@@ -84,7 +84,7 @@
return false;
},
- firstLabeName () {
+ firstLabeName() {
return this.TreeDataPool.treeActiveName === "camera" ? "鎽勫儚鏈轰俊鎭�" : "鏁版嵁鏍堜俊鎭�"
}
},
@@ -106,7 +106,7 @@
}
},
"TreeDataPool.selectedNodes": {
- handler (nodes) {
+ handler(nodes) {
if (this.activeName == "linkage-rule") {
this.$refs.linkRule.initCameraData();
}
@@ -114,7 +114,7 @@
deep: true
},
"DataStackPool.selectedDir": {
- handler (node, oldNode) {
+ handler(node, oldNode) {
if (this.TreeDataPool.treeActiveName !== 'dataStack') {
return
}
@@ -130,7 +130,7 @@
},
},
- created () {
+ created() {
if (this.TreeDataPool.treeActiveName == 'camera') {
if (this.isShow('cameraAccess:cameraInfo')) {
this.activeName = "camera-info"
@@ -154,11 +154,11 @@
this.selectedNodes = [];
this.VideoManageData.init();
},
- beforeDestroy () {
+ beforeDestroy() {
clearInterval(this.intervalTimer);
//this.TreeDataPool.treeActiveName = "camera";
},
- mounted () {
+ mounted() {
this.$nextTick(() => {
bus.$on("addCameraOnTree", node => {
this.handAddDevice(node);
@@ -176,24 +176,24 @@
}, 10000)
},
methods: {
- isShow (authority) {
+ isShow(authority) {
return this.isAdmin || this.buttonAuthority.indexOf("," + authority + ",") > -1
},
- handAddDevice (node) {
+ handAddDevice(node) {
let _this = this;
setTimeout(() => {
_this.$refs.cameraInfo.addDevice(node);
_this.activeName = "camera-info";
}, 100);
},
- handAddDIr (node) {
+ handAddDIr(node) {
let _this = this;
setTimeout(() => {
_this.$refs.dataStackInfo.addDir(node);
_this.activeName = "camera-info";
}, 100);
},
- handleClick (tab, event) {
+ handleClick(tab, event) {
this.TreeDataPool.multiple = tab.name === "linkage-rule";
if (tab.name === "camera-info") {
if (this.TreeDataPool.treeActiveName == 'camera') {
diff --git a/src/pages/gb28181/index/api.ts b/src/pages/gb28181/index/api.ts
index 37da6af..7528dc7 100644
--- a/src/pages/gb28181/index/api.ts
+++ b/src/pages/gb28181/index/api.ts
@@ -2,7 +2,7 @@
export const getGB28181Config = () => {
return request({
- url: "/data/api-v/sysset/gb28181ConfigShow",
+ url: "/data/api-v/gb28181/configShow",
method: "get"
});
};
@@ -10,7 +10,7 @@
export const saveGB28181Config = (query: any) => {
return request({
- url: "/data/api-v/sysset/gb28181ConfEdit",
+ url: "/data/api-v/gb28181/configEdit",
method: "post",
data: query
});
--
Gitblit v1.8.0