From ce9480505931499a7fda66b4822e92eab1f71ff5 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Thu, 13 Jul 2023 14:26:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/carouselChart.vue | 1 + .../photographicDevice/index.vue | 4 +-- .../userEquipment/lineInformation/index.vue | 6 ++-- .../userEquipment/towerInformation/index.vue | 4 +-- src/views/realTimeMonitor/index.vue | 33 +++++++++++++++++-- 5 files changed, 39 insertions(+), 9 deletions(-) diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index a756ff7..4407390 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -462,6 +462,7 @@ export default { flex-direction: column; height: calc(100% - 0px); box-sizing: border-box; + .showPic { position: fixed; background-color: rgba(0, 0, 0, 0.5); diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index 1947423..ec31492 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -85,7 +85,7 @@ min-width="120" > @@ -97,7 +97,7 @@ min-width="150" > diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue index 2be454b..9271f3d 100644 --- a/src/views/management/userEquipment/lineInformation/index.vue +++ b/src/views/management/userEquipment/lineInformation/index.vue @@ -140,9 +140,9 @@ export default { that.onSubmit(); // 触发事件 } }; - console.log(this.$route.query); - this.formdata.search = this.$route.query.lineName; - console.log(this.formdata.search); + // console.log(this.$route.query); + // this.formdata.search = this.$route.query.lineName; + // console.log(this.formdata.search); }, mounted() { this.lineList(); diff --git a/src/views/management/userEquipment/towerInformation/index.vue b/src/views/management/userEquipment/towerInformation/index.vue index 798dfd5..cf130f4 100644 --- a/src/views/management/userEquipment/towerInformation/index.vue +++ b/src/views/management/userEquipment/towerInformation/index.vue @@ -48,7 +48,7 @@ show-overflow-tooltip > @@ -60,7 +60,7 @@ > -->
+
+ + {{ towertitle }} + {{ + address + }} + +

{{ cmdid }}

-

{{ address }}

+

日历快速查询

@@ -275,6 +283,7 @@ export default { newTermId: "", zzstatus: "", address: "", + towertitle: "", }; }, watch: { @@ -354,7 +363,8 @@ export default { if (this.lineTreeData[0].list[0].list.length > 0) { this.currentNodekey = this.lineTreeData[0].list[0].list[0].id; //第一个数据 this.newTermId = this.lineTreeData[0].list[0].list[0].id; - + this.towertitle = this.lineTreeData[0].list[0].list[0].name; + this.address = this.lineTreeData[0].list[0].list[0].address; this.cmdid = this.lineTreeData[0].list[0].list[0].cmdid; this.zzstatus = this.lineTreeData[0].list[0].list[0].onlinestatus; console.log(this.zzstatus); @@ -381,6 +391,7 @@ export default { this.channelId = data.id; //获取当前点击的id this.cmdid = data.cmdid; this.address = data.address; + this.towertitle = data.name; this.newTermId = data.id; //获取当前点击的id console.log(data); this.channelValue = []; @@ -944,6 +955,24 @@ export default { .el-loading-mask { background-color: rgba(255, 255, 255, 0.6) !important; } + .title { + height: 32px; + padding-left: 12px; + line-height: 32px; + color: #fff; + font-size: 12px; + background-color: #169e8cb0; + .el-breadcrumb { + line-height: 32px; + color: #fff !important; + font-size: 12px; + height: 32px; + .el-breadcrumb__inner, + .el-breadcrumb__separator { + color: #fff !important; + } + } + } } .totalPic { width: 100%;