From 3cc700308568e7e964f65ebe16cc93df18cb3345 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 4 Nov 2020 16:32:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=BC=E5=90=88=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/iscs/shape/text.js                              |  2 +-
 src/utils/baseUrl.js                                |  2 +-
 src/views/iscs/iscsDraw/icscComponents/text.vue     |  6 +++---
 .../iscsSystem/stationConfig/canvas/iscsCanvas.vue  | 11 +++++++++++
 .../iscsSystem/stationConfig/dialog/malfunction.vue | 13 ++++++++++++-
 .../iscs/iscsSystem/stationConfig/dialog/valve.vue  | 13 ++++++++++++-
 6 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/iscs/shape/text.js b/src/iscs/shape/text.js
index 7a57815d8..95ea5d8ac 100644
--- a/src/iscs/shape/text.js
+++ b/src/iscs/shape/text.js
@@ -66,7 +66,7 @@ export default class text extends Group {
         this.model.point.y += dy;
     }
     setState(model) {
-        this.textName.setStyle('text', model.context);
+        model.context && this.textName.setStyle('text', model.context);
         model.gbColor && this.textName.setStyle('textBackgroundColor', model.gbColor);
     }
     setSize(width, height) {
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 89ce9ee58..4bb14fdb5 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -5,7 +5,7 @@ export function getBaseUrl() {
         BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.8.107:9000'; // 袁琪
         // BASE_API = 'http://192.168.8.114:9000'; // 旭强
-        // BASE_API = 'http://192.168.3.175:9000'; // 张赛
+        // BASE_API = 'http://192.168.8.109:9000'; // 张赛
         // BASE_API = 'http://192.168.8.110:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
diff --git a/src/views/iscs/iscsDraw/icscComponents/text.vue b/src/views/iscs/iscsDraw/icscComponents/text.vue
index 195b3c1ea..d96a0bf8b 100644
--- a/src/views/iscs/iscsDraw/icscComponents/text.vue
+++ b/src/views/iscs/iscsDraw/icscComponents/text.vue
@@ -1,11 +1,11 @@
 <template>
   <div style="overflow-y: scroll;height: calc(100% - 46px); width: 100%;">
     <el-form ref="form" :rules="rules" :model="form" label-width="120px" style="width: 100%;padding: 10px 50px;">
-      <!-- <el-form-item label="code:" prop="code">
+      <el-form-item label="code:" prop="code">
         <el-select v-model="form.code">
-          <el-option v-for="(item, index) in iscs.iscsTextList" :key="index" :label="item.code" :value="item.code" />
+          <el-option v-for="(item, index) in iscs.iscsTextList" :key="index" :label="item.code" :value="item.code" disabled />
         </el-select>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item label="文字内容:" prop="context">
         <el-input v-model="form.context" type="textarea" size="small" />
       </el-form-item>
diff --git a/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue b/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue
index 61465ea86..4e2cfd08b 100644
--- a/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue
@@ -173,6 +173,17 @@ export default {
                     device.instance.setState(el);
                 }
             });
+            if (model.code == 'group_34' || model.code == 'group_22') {
+                const judge = !(this.$iscs.iscsDevice['group_34'].model['valve'] || this.$iscs.iscsDevice['group_22'].model['valve']);
+                ['IscsText_112', 'IscsText_113', 'IscsText_114', 'IscsText_116', 'IscsText_117', 'IscsText_118', 'IscsText_119', 'IscsText_120'].forEach(code => {
+                    const device = this.$iscs.iscsDevice[code];
+                    if (device && device.instance) {
+                        device.instance.setState({
+                            gbColor: judge ? '#2aff00' : '#ff0000'
+                        });
+                    }
+                });
+            }
         }
     }
 };
diff --git a/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue b/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue
index a0c69d4ce..7f764c25c 100644
--- a/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue
@@ -144,7 +144,7 @@ export default {
                     let models = {};
                     // valve true 变绿 false 红色
                     if (model.code == 'group_2' || model.code == 'group_52') {
-                        models = this.$iscs.iscsDevice['group_23'].model;
+                        models = this.$iscs.iscsDevice['group_54'].model;
                         models['valve'] = false;
                     } else if (model.code == 'group_3' || model.code == 'group_16') {
                         models = this.$iscs.iscsDevice['group_15'].model;
@@ -213,6 +213,17 @@ export default {
                 this.$store.dispatch('iscs/setAddAlarmList', params);
                 this.$store.dispatch('iscs/setAddIncidentList', params);
             }
+            if (model.code == 'group_34' || model.code == 'group_22') {
+                const judge = !(this.$iscs.iscsDevice['group_34'].model['valve'] || this.$iscs.iscsDevice['group_22'].model['valve']);
+                ['IscsText_112', 'IscsText_113', 'IscsText_114', 'IscsText_116', 'IscsText_117', 'IscsText_118', 'IscsText_119', 'IscsText_120'].forEach(code => {
+                    const device = this.$iscs.iscsDevice[code];
+                    if (device && device.instance) {
+                        device.instance.setState({
+                            gbColor: judge ? '#2aff00' : '#ff0000'
+                        });
+                    }
+                });
+            }
         },
         filterTime() {
             const date = new Date();
diff --git a/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue b/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue
index 808c454fd..7a2f985fa 100644
--- a/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue
@@ -188,7 +188,7 @@ export default {
                     let model = {};
                     // valve true 变绿 false 红色
                     if (this.model.code == 'group_2' || this.model.code == 'group_52') {
-                        model = this.$iscs.iscsDevice['group_23'].model;
+                        model = this.$iscs.iscsDevice['group_54'].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;
@@ -281,6 +281,17 @@ export default {
                 arrList.push(item);
             });
             this.$store.commit('iscs/setFaultList', arrList);
+            if (model.code == 'group_34' || model.code == 'group_22') {
+                const judge = !(this.$iscs.iscsDevice['group_34'].model['valve'] || this.$iscs.iscsDevice['group_22'].model['valve']);
+                ['IscsText_112', 'IscsText_113', 'IscsText_114', 'IscsText_116', 'IscsText_117', 'IscsText_118', 'IscsText_119', 'IscsText_120'].forEach(code => {
+                    const device = this.$iscs.iscsDevice[code];
+                    if (device && device.instance) {
+                        device.instance.setState({
+                            gbColor: judge ? '#2aff00' : '#ff0000'
+                        });
+                    }
+                });
+            }
         },
         doClose() {
             this.dialogShow = false;