From cdf91f98d25c0e0f4376d34505e3af9bf13ced0f Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 26 Oct 2020 15:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=20=E8=B0=83=E6=95=B4=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/map.js                            |  1 -
 .../iscsSystem/stationConfig/dialog/valve.vue | 49 +++++++++++++++----
 src/views/newMap/displayNew/demonMenu.vue     |  2 +-
 src/views/newMap/displayNew/menuDemon.vue     |  1 +
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 0ea48be33..125263262 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -256,7 +256,6 @@ class Jlmap {
                 } else {
                     elem['points'] = { x: model.points[model.points.length - 1].x, y: model.points[model.points.length - 1].y };
                 }
-                console.log(elem, 'overAp');
             }
             // const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
             const oDevice = deviceFactory(type, elem, this.showConfig);
diff --git a/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue b/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue
index 6b050f4ff..9b388df85 100644
--- a/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue
@@ -128,18 +128,47 @@ export default {
         },
         // 固定关联关系 模块变化
         relevance() {
-            let model = {};
-            // valve true 变绿 false 红色
-            if (this.model.code == 'group_2' || this.model.code == 'group_52') {
-                model = this.$iscs.iscsDevice['group_23'].model;
-                model['valve'] = !(this.$iscs.iscsDevice['group_2'].model['valve'] || this.$iscs.iscsDevice['group_52'].model['valve']);
-            } else if (this.model.code == 'group_3' || this.model.code == 'group_16') {
-                model = this.$iscs.iscsDevice['group_15'].model;
-                model['valve'] = !(this.$iscs.iscsDevice['group_3'].model['valve'] || this.$iscs.iscsDevice['group_16'].model['valve']);
+            let time = 0;
+            let modelRelevance = {};
+            if (this.model.code == 'group_2' && this.model['valve']) {
+                modelRelevance = this.$iscs.iscsDevice['group_34'].model;
+                modelRelevance['valve'] = this.model['valve'];
+            } else if (this.model.code == 'group_52' && this.model['valve']) {
+                modelRelevance = this.$iscs.iscsDevice['group_22'].model;
+                modelRelevance['valve'] = this.model['valve'];
             }
-            if (model && model.code) {
-                this.handleModel(model);
+            if (modelRelevance && modelRelevance.code) {
+                this.handleModel(modelRelevance);
+                time = 1500;
             }
+            setTimeout(() => {
+                let model = {};
+                // valve true 变绿 false 红色
+                if (this.model.code == 'group_2' || this.model.code == 'group_52') {
+                    model = this.$iscs.iscsDevice['group_23'].model;
+                    model['valve'] = !(this.$iscs.iscsDevice['group_2'].model['valve'] || this.$iscs.iscsDevice['group_52'].model['valve']);
+                } else if (this.model.code == 'group_3' || this.model.code == 'group_16') {
+                    model = this.$iscs.iscsDevice['group_15'].model;
+                    model['valve'] = !(this.$iscs.iscsDevice['group_3'].model['valve'] || this.$iscs.iscsDevice['group_16'].model['valve']);
+                }
+                if (model && model.code) {
+                    this.handleModel(model);
+                    time = 1500;
+                }
+                setTimeout(() => {
+                    if (this.model.code == 'group_2' && !this.model['valve']) {
+                        modelRelevance = this.$iscs.iscsDevice['group_34'].model;
+                        modelRelevance['valve'] = this.model['valve'];
+                    } else if (this.model.code == 'group_52' && !this.model['valve']) {
+                        modelRelevance = this.$iscs.iscsDevice['group_22'].model;
+                        modelRelevance['valve'] = this.model['valve'];
+                    }
+                    if (modelRelevance && modelRelevance.code) {
+                        this.handleModel(modelRelevance);
+                    }
+                }, time);
+            }, time);
+
         },
         // 执行操作
         handleModel(model) {
diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue
index b1aeb7bed..0001fe902 100644
--- a/src/views/newMap/displayNew/demonMenu.vue
+++ b/src/views/newMap/displayNew/demonMenu.vue
@@ -15,7 +15,7 @@
         <!-- 故障设备视图 -->
         <el-button v-if="jlmap3dFaultShow" size="small" @click="jumpjlmap3dFault">故障设备</el-button>
         <!-- 司机视角 -->
-        <el-button v-if="driverShow" size="small" type="jumpjlmap3d" @click="jumpjlmap3dDriver">{{ $t('joinTraining.driverPerspective') }}</el-button>
+        <el-button v-if="driverShow" size="small" type="jumpjlmap3d" @click="jumpjlmap3dDriver">司机视角</el-button>
         <!-- 排班计划 -->
         <el-button v-if="scheduleLoadShow" type="primary" size="small" @click="jumpScheduling">派班计划加载</el-button>
         <el-button v-if="schedulePreviewShow" type="primary" size="small" @click="schedulingView">派班计划预览</el-button>
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 58078885f..f949cbdc0 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -181,6 +181,7 @@ export default {
         } else {
             this.userRole = 'AUDIENCE';
         }
+        console.log(this.$route.query.prdType, '=======');
     },
     beforeDestroy() {
         if (this.time) {