diff --git a/src/views/monitor/videos/index.vue b/src/views/monitor/videos/index.vue index 4bc0348..480e171 100644 --- a/src/views/monitor/videos/index.vue +++ b/src/views/monitor/videos/index.vue @@ -6,8 +6,8 @@
- - + + 多屏展示 @@ -26,9 +26,8 @@
-
- +
-
@@ -400,6 +398,10 @@ export default { } console.log(this.dzwl_list) }) + + getStatusCount({ deviceType: null, statusType: null, ckId: item }).then(res => { + this.statusData = res.data + }) }, bodyCloseMenus() { this.active = -1 @@ -640,26 +642,30 @@ export default { } }, init() { - getOtherList({ type: 1 }).then((res) => { - if (res.code == 200) { - this.zc_list = res.data - } - }) - getOtherList({ type: 2 }).then((res) => { - if (res.code == 200) { - this.dzwl_list = res.data - } - console.log(this.dzwl_list) - }) - getStatusCount({ deviceType: null, statusType: null }).then(res => { - this.statusData = res.data - }) getWareHouseList().then(res => { - console.log(res) if (res.code == 200) { this.ckList = res.data + this.ckId = res.data[0].sid } + getOtherList({ type: 1, ckId: this.ckId }).then((res) => { + if (res.code == 200) { + this.zc_list = res.data + } + }) + getOtherList({ type: 2, ckId: this.ckId }).then((res) => { + if (res.code == 200) { + this.dzwl_list = res.data + } + console.log(this.dzwl_list) + }) + + getStatusCount({ deviceType: null, statusType: null, ckId: this.ckId }).then(res => { + this.statusData = res.data + }) }) + + + }, // 序号 indexMethod(index) { diff --git a/src/views/shebeitaizhang/shebeitaizhangAdd.vue b/src/views/shebeitaizhang/shebeitaizhangAdd.vue index 3681dec..787bd08 100644 --- a/src/views/shebeitaizhang/shebeitaizhangAdd.vue +++ b/src/views/shebeitaizhang/shebeitaizhangAdd.vue @@ -118,7 +118,7 @@ - diff --git a/src/views/shebeitaizhang/shebeitaizhangList.vue b/src/views/shebeitaizhang/shebeitaizhangList.vue index 0b429e2..13b087f 100644 --- a/src/views/shebeitaizhang/shebeitaizhangList.vue +++ b/src/views/shebeitaizhang/shebeitaizhangList.vue @@ -39,7 +39,7 @@ - + @@ -309,7 +309,7 @@ export default { }, getCkTitle(item) { for (var i = 0; i < this.ckList.length; i++) { - if (this.ckList[i].id == item) { + if (this.ckList[i].sid == item) { return this.ckList[i].name } } @@ -414,6 +414,7 @@ export default { getDevicePage(this.listQuery).then((response) => { this.listLoading = false if (response.code == '200') { + console.log("jddkz",response) this.list = response.data.records this.listQuery.total = response.data.total } else { diff --git a/src/views/zhiwujiance/zhiwujianceList.vue b/src/views/zhiwujiance/zhiwujianceList.vue index 3173eef..7f43785 100644 --- a/src/views/zhiwujiance/zhiwujianceList.vue +++ b/src/views/zhiwujiance/zhiwujianceList.vue @@ -18,7 +18,7 @@ --> - + @@ -332,7 +332,6 @@ export default { }, init() { getWareHouseList().then(res => { - console.log(res) if (res.code == 200) { this.ckList = res.data }