调整综合监控流程

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);

src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue

@@ -128,18 +128,47 @@ export default {
         },
         // 固定关联关系 模块变化
         relevance() {
-            let model = {};
+            let time = 0;
-            // valve true 变绿 false 红色
+            let modelRelevance = {};
-            if (this.model.code == 'group_2' || this.model.code == 'group_52') {
+            if (this.model.code == 'group_2' && this.model['valve']) {
-                model = this.$iscs.iscsDevice['group_23'].model;
+                modelRelevance = this.$iscs.iscsDevice['group_34'].model;
-                model['valve'] = !(this.$iscs.iscsDevice['group_2'].model['valve'] || this.$iscs.iscsDevice['group_52'].model['valve']);
+                modelRelevance['valve'] = this.model['valve'];
-            } else if (this.model.code == 'group_3' || this.model.code == 'group_16') {
+            } else if (this.model.code == 'group_52' && this.model['valve']) {
-                model = this.$iscs.iscsDevice['group_15'].model;
+                modelRelevance = this.$iscs.iscsDevice['group_22'].model;
-                model['valve'] = !(this.$iscs.iscsDevice['group_3'].model['valve'] || this.$iscs.iscsDevice['group_16'].model['valve']);
+                modelRelevance['valve'] = this.model['valve'];
             }
-            if (model && model.code) {
+            if (modelRelevance && modelRelevance.code) {
-                this.handleModel(model);
+                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) {

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>

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) {