From f8a6908d8c9712467c38c912647f1991b1234d9c Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 14 May 2020 15:37:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=BA=8C=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/xian_02.js  | 2 +-
 src/jmapNew/shape/Signal/index.js       | 3 ---
 src/jmapNew/shape/StationStand/index.js | 1 +
 src/jmapNew/shape/Switch/index.js       | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js
index 09fe73599..3b68afa5f 100644
--- a/src/jmapNew/config/skinCode/xian_02.js
+++ b/src/jmapNew/config/skinCode/xian_02.js
@@ -599,7 +599,7 @@ class SkinCode extends defaultStyle {
             rectWidth: 20, // 折返模块宽度
             lineWidth: 3, // 折返模块线宽
             fillColor: 'rgba(0,0,0,0)', // 填充色
-            strokeColor: '#FFFFFF' // 线颜色
+            strokeColor: '#9F9C9C' // 线颜色
         };
         this[deviceType.ModeStatusGroup] = { // 车站状态模式
             displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js
index 1b0f0875b..c60395f25 100644
--- a/src/jmapNew/shape/Signal/index.js
+++ b/src/jmapNew/shape/Signal/index.js
@@ -528,9 +528,6 @@ class Signal extends Group {
         /** 信号机封锁 */ // 缺一个功能封锁
         model.blockade && this.block();
         /** 设置灯的颜色 */
-        // model.redOpen = 1;
-        // model.yellowOpen = 1;
-        // model.greenOpen = 0;
         model.redOpen && model.yellowOpen && !model.greenOpen && this.guid(); // 引导信号显示
         model.redOpen && !model.yellowOpen && !model.greenOpen && this.close(); // 信号关闭
         model.greenOpen && !model.redOpen && !model.yellowOpen && this.openPositive(); // 信号正向开放
diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js
index 2ce6b4d69..d64cc8b5a 100644
--- a/src/jmapNew/shape/StationStand/index.js
+++ b/src/jmapNew/shape/StationStand/index.js
@@ -382,6 +382,7 @@ class StationStand extends Group {
         this.trainDepart && this.trainDepart.hideMode();
         this.reentry && this.reentry.hideMode();
         this.jump && this.jump.hideMode();
+        this.detainCircle && this.detainCircle.setColor(this.style.StationStand.detainCar.defaultColor);
     }
 
     /** 空闲*/
diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js
index 94dfff3ee..0b9312fcf 100644
--- a/src/jmapNew/shape/Switch/index.js
+++ b/src/jmapNew/shape/Switch/index.js
@@ -162,7 +162,7 @@ export default class Switch extends Group {
             _subType: 'enabled', // 标识
             style: {
                 x: arrowTextX,
-                y: arrowTextY,
+                y: arrowTextY + 10,
                 fontSize: 12,
                 text: 'E',
                 textAlign: 'center',