From a271f9916317c91605fdb9e2e1cb0755520d7b7d Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 10 Sep 2021 15:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=93=E5=B2=94=E4=BF=A1=E5=8F=B7=E6=9C=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/graph/Signal/index.js | 11 ++++++-----
 src/jmapNew/shape/graph/Switch/index.js | 10 ++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js
index f9601688d..49ef3ae17 100644
--- a/src/jmapNew/shape/graph/Signal/index.js
+++ b/src/jmapNew/shape/graph/Signal/index.js
@@ -826,8 +826,6 @@ class Signal extends Group {
         }
         if (this.style.Signal.post.autoRouteColor) {
             this.sigPost.setColor(this.style.Signal.post.autoRouteColor);
-        } else if (this.style.Signal.post.autoRouteVerColor) {
-            this.sigPost.setVerColor(this.style.Signal.post.autoRouteVerColor);
         }
     }
 
@@ -1056,12 +1054,15 @@ class Signal extends Group {
                     });
                 }
             }
+            // LEVEL_Close = 0;---关闭  LEVEL_Guide = 1;-----引导级 LEVEL_Atp = 2;-----ATP级 LEVEL_Main = 3-----主信号级
             if ( model.level === 3 && this.style.Signal.post.mainSignalVerColor && !model.fleetMode) {
                 this.sigPost.setVerColor(this.style.Signal.post.mainSignalVerColor);
-            } else if (model.level === 1 && this.style.Signal.post.closeSignalVerColor && !model.fleetMode) {
+            } else if (model.level === 0 && this.style.Signal.post.closeSignalVerColor && !model.fleetMode) {
                 this.sigPost.setVerColor(this.style.Signal.post.closeSignalVerColor);
-            } else if (model.level === 2 && this.style.Signal.post.guideSignalVerColor && !model.fleetMode) {
+            } else if (model.level === 1 && this.style.Signal.post.guideSignalVerColor && !model.fleetMode) {
                 this.sigPost.setVerColor(this.style.Signal.post.guideSignalVerColor);
+            } else if (model.level === 2 && this.style.Signal.post.autoRouteVerColor && !model.fleetMode) {
+                this.sigPost.setVerColor(this.style.Signal.post.autoRouteVerColor);
             }
 
             if (this.style.Signal.lamp.special) {
@@ -1081,7 +1082,7 @@ class Signal extends Group {
                 this.tText && this.tText.show();
             }
             // 设置灰显
-            if (model.noStatus || model.level === 0) {
+            if (model.noStatus) {
                 this.setAshShow();
             }
 
diff --git a/src/jmapNew/shape/graph/Switch/index.js b/src/jmapNew/shape/graph/Switch/index.js
index 7cd1261b1..c95896377 100644
--- a/src/jmapNew/shape/graph/Switch/index.js
+++ b/src/jmapNew/shape/graph/Switch/index.js
@@ -355,7 +355,7 @@ export default class Switch extends Group {
             this.shapeModelB.setColor(this.style.Section.line.spareColor);
             this.shapeModelC.show();
             this.shapeModelC.setColor(this.style.backgroundColor);
-        }
+        } 
         if (this.style.Switch.core.graphShow) { // 佛山线路显示
             this.shapeModelB.show();
             this.shapeModelB.setColor(this.style.Switch.core.graphLocalColor);
@@ -436,7 +436,7 @@ export default class Switch extends Group {
     // N-定位 R-反位 NO-无(失表) EX-挤叉
     setSwitchFault(fault, pos) {
         if (this.style.Switch.jointImg.faultStatus && fault && (pos == 'NO' || pos == 'EX') ) { // 宁波线失表状态
-            this.setForkAction(); // 道岔挤岔
+            this.setForkAction(fault); // 道岔挤岔
         } else if (this.style.Switch.faultNoHandle ) {
             this.shapeModelA.hide();
             this.shapeModelB.hide();
@@ -457,7 +457,7 @@ export default class Switch extends Group {
         }
     }
     /** 挤叉*/
-    setForkAction() {
+    setForkAction(fault) {
         if (this.style.Switch.jointImg.fork) {
             this.recover();
             this.shapeModelB.show();
@@ -485,6 +485,8 @@ export default class Switch extends Group {
                     .start();
             });
             this.setTextColor('red');
+        } else {
+            this.setLossAction(fault); // 若不是具有特殊的挤岔，则显示状态和失表一样
         }
     }
 
@@ -710,7 +712,7 @@ export default class Switch extends Group {
             } else if (model.pos == 'NO') {
                 this.setLossAction(model.fault); // 失去
             } else if (model.pos == 'EX') {
-                this.setForkAction(); // 挤岔
+                this.setForkAction(model.fault); // 挤岔
             }
             model.isCiConfirm && this.setCiConfirm(); // 道岔使能显示