From 29d7a0b0343ad7dba2ea3753412af0673d7d2610 Mon Sep 17 00:00:00 2001 From: yjl <1490736767@qq.com> Date: Tue, 14 Feb 2023 14:45:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E5=BB=BA=E5=9B=9B?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=EF=BC=88=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/companyFront/project/overview.vue | 26 ++++++++++++++----- .../fourEngin/command/rightThree.vue | 4 +-- .../fourEngin/command/rightTwo.vue | 4 +-- .../projectAdmin/fourEngin/progress/uav.vue | 1 + .../fourEngin/quality/centerBottom.vue | 2 +- .../fourEngin/quality/rightBottom.vue | 2 +- .../fourEngin/sourse/leftCenter.vue | 2 +- .../projectAdmin/fourEngin/sourse/leftTop.vue | 6 ++++- .../fourEngin/sourse/rightTop.vue | 2 +- .../informatioBroadcast/broadcast.vue | 13 ++++++++-- 10 files changed, 45 insertions(+), 17 deletions(-) diff --git a/src/views/companyFront/project/overview.vue b/src/views/companyFront/project/overview.vue index 9c3017cc..1a0c6551 100644 --- a/src/views/companyFront/project/overview.vue +++ b/src/views/companyFront/project/overview.vue @@ -906,30 +906,44 @@ export default { // }, 1000) // }) }, - //地图跳转到下一级 + // 地图跳转到下一级 mapJumpToNext(index) { + console.log("test1"); var _this = this; - console.log("mapJumpToNext",_this.mapData[index].list); if (_this.mapData[index].list) { + console.log("test2"); var json = { sn: _this.mapData[index].companySn, name: _this.mapData[index].name, }; + _this.backArr.forEach(element=>{ + if(element.name==json.name){ + return + } + }) _this.backArr.push(json); _this.$store.commit("setMapBackArr", _this.backArr); _this.showMapDialog = false; + _this.initData() } else { - //这里的4指除去总公司外的层级数 - // if (_this.mapData[index].projectName && _this.backArr.length < 3) { - if (_this.mapData[index].projectName && _this.backArr.length < 4) { + console.log("test3"); + if (_this.mapData[index].projectName && _this.backArr.length < 3) { + console.log("test4"); var json = { sn: _this.mapData[index].projectSn, name: _this.mapData[index].name, }; + _this.backArr.forEach(element=>{ + if(element.name==json.name){ + return + } + }) _this.backArr.push(json); _this.$store.commit("setMapBackArr", _this.backArr); _this.showMapDialog = false; - console.log('执行888'); + _this.initData() + } else { + _this.$message("该区域下没有数据！"); } } }, diff --git a/src/views/projectAdmin/fourEngin/command/rightThree.vue b/src/views/projectAdmin/fourEngin/command/rightThree.vue index 70ea70e0..08b23c72 100644 --- a/src/views/projectAdmin/fourEngin/command/rightThree.vue +++ b/src/views/projectAdmin/fourEngin/command/rightThree.vue @@ -12,11 +12,11 @@ :color="['#6EE4F0', '#E7622A']" :data="[ { - value: 5, + value: safetyPatrolInspection.allClose, name: '已巡检', }, { - value: 5, + value: safetyPatrolInspection.allNoClose, name: '未巡检', }, ]" diff --git a/src/views/projectAdmin/fourEngin/command/rightTwo.vue b/src/views/projectAdmin/fourEngin/command/rightTwo.vue index c26356a3..0a0399c5 100644 --- a/src/views/projectAdmin/fourEngin/command/rightTwo.vue +++ b/src/views/projectAdmin/fourEngin/command/rightTwo.vue @@ -40,11 +40,11 @@ :color="['#6EE4F0', '#E7622A']" :data="[ { - value: 5, + value: safetyPatrolInspection.allRectificationNum, name: '已巡检', }, { - value: 5, + value: safetyPatrolInspection.allNoRectificationNum, name: '未巡检', }, ]" diff --git a/src/views/projectAdmin/fourEngin/progress/uav.vue b/src/views/projectAdmin/fourEngin/progress/uav.vue index ebafec48..5ab35e3c 100644 --- a/src/views/projectAdmin/fourEngin/progress/uav.vue +++ b/src/views/projectAdmin/fourEngin/progress/uav.vue @@ -108,6 +108,7 @@ export default { background-size: 90% 100%; font-size: 16px; margin-top: 20px; + cursor: pointer; .areaName { font-size: 20px; span { diff --git a/src/views/projectAdmin/fourEngin/quality/centerBottom.vue b/src/views/projectAdmin/fourEngin/quality/centerBottom.vue index 9c264e63..50e62fa9 100644 --- a/src/views/projectAdmin/fourEngin/quality/centerBottom.vue +++ b/src/views/projectAdmin/fourEngin/quality/centerBottom.vue @@ -188,7 +188,7 @@ export default { ::v-deep .el-range-input { cursor: pointer; background: transparent; - color: #6ee4f0; + color: #fff; } ::v-deep .el-date-editor { cursor: pointer; diff --git a/src/views/projectAdmin/fourEngin/quality/rightBottom.vue b/src/views/projectAdmin/fourEngin/quality/rightBottom.vue index d21d7f77..d32f1632 100644 --- a/src/views/projectAdmin/fourEngin/quality/rightBottom.vue +++ b/src/views/projectAdmin/fourEngin/quality/rightBottom.vue @@ -231,7 +231,7 @@ export default { ::v-deep .el-range-input { cursor: pointer; background: transparent; - color: #6ee4f0; + color: #fff; } ::v-deep .el-date-editor { cursor: pointer; diff --git a/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue b/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue index 29dff193..d3759d06 100644 --- a/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue +++ b/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue @@ -1,7 +1,7 @@