From c248d1070bd636c6b57460651685cedc95cd9d43 Mon Sep 17 00:00:00 2001
From: yuan <yuanliye@joylink.club>
Date: Fri, 16 Jul 2021 17:35:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E5=8F=B0=E6=95=85=E9=9A=9C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0'=E6=97=A0=E5=85=B3=E9=97=AD=E9=94=81=E7=B4=A7?=
 =?UTF-8?q?=E4=BF=A1=E5=8F=B7',=20=E4=BA=92=E9=94=81=E8=A7=A3=E9=99=A4?=
 =?UTF-8?q?=E5=90=8E=E5=B1=8F=E8=94=BD=E9=97=A8=E6=98=BE=E7=A4=BA=E7=BA=A2?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/graph/Psd/ESafeDoor.js | 11 ++++++-----
 src/scripts/cmdPlugin/Config.js          |  6 ++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/jmapNew/shape/graph/Psd/ESafeDoor.js b/src/jmapNew/shape/graph/Psd/ESafeDoor.js
index 4d282040d..ec41ba0d1 100644
--- a/src/jmapNew/shape/graph/Psd/ESafeDoor.js
+++ b/src/jmapNew/shape/graph/Psd/ESafeDoor.js
@@ -44,8 +44,8 @@ class ESafeDoor extends Group {
             },
             style: {
                 lineWidth: 0,
-                stroke:style.backgroundColor,
-                fill:style.backgroundColor
+                stroke: style.backgroundColor,
+                fill: style.backgroundColor
                 // stroke: style.Psd.safetyDoorNormal.defaultColor,
                 // fill: style.Psd.safetyDoorNormal.defaultColor
             }
@@ -72,11 +72,12 @@ class ESafeDoor extends Group {
             } else if (model.fault == 'PSD_CANNOT_BE_CLOSED') {
                 this.safeC.show();
             }
+        } else {
+            model.screenDoorOpenStatus == 0 ? this.safeC.show() : this.safeC.hide();
+        }
+        if (model.interlockRelease) {
             const style = this.model.style;
             this.setColor(style.Psd.safetyDoorNormal.splitDoorColor);
-        } else {
-            // model.screenDoorOpenStatus == 0 ? this.safeC.hide() : this.safeC.show();
-            model.screenDoorOpenStatus == 0 ? this.safeC.show() : this.safeC.hide();
         }
     }
 
diff --git a/src/scripts/cmdPlugin/Config.js b/src/scripts/cmdPlugin/Config.js
index c5c815e81..f5dffe8d6 100644
--- a/src/scripts/cmdPlugin/Config.js
+++ b/src/scripts/cmdPlugin/Config.js
@@ -49,7 +49,8 @@ export const deviceFaultType = {
     ],
     StationStand: [
         {label: '屏蔽门无法关闭', value: 'PSD_CANNOT_BE_CLOSED'},
-        {label: '屏蔽门无法开启', value: 'PSD_CANNOT_BE_OPENED'}
+        {label: '屏蔽门无法开启', value: 'PSD_CANNOT_BE_OPENED'},
+        {label: '无关闭锁紧信号', value: 'NO_CLOSE_AND_LOCK'}
     ],
     ZcControl:[
         {label: 'zc故障', value: 'FAULT'}
@@ -87,7 +88,8 @@ export const deviceFaultMap = {
     },
     StationStand: {
         PSD_CANNOT_BE_CLOSED: '屏蔽门无法关闭',
-        PSD_CANNOT_BE_OPENED: '屏蔽门无法开启'
+        PSD_CANNOT_BE_OPENED: '屏蔽门无法开启',
+        NO_CLOSE_AND_LOCK: '无关闭锁紧信号'
     },
     ZcControl: {
         FAULT: 'zc故障'