From 9684fd69376fc8d0ecb9454bd2cd7e930d50ddf1 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 5 Jan 2021 14:45:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E6=9C=BA=20=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=B0=81=E9=94=81=20=E4=BD=BF=E8=83=BD=20=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Signal/index.js             | 20 ++++++++-----------
 .../theme/xian_02/menus/menuSignal.vue        |  1 +
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js
index 5c24572e4..3ad1a9a66 100644
--- a/src/jmapNew/shape/Signal/index.js
+++ b/src/jmapNew/shape/Signal/index.js
@@ -57,6 +57,7 @@ class Signal extends Group {
         const posit = this.model.positionType == '01' ? -1 : 1; // 位置  上:下
 
         // 信号机高柱矮柱 (信号机底座)
+        const sigPostY = model.position.y + model.positionPoint.y + posit * (style.Signal.distance + style.Section.line.width + style.Signal.lamp.radiusR);
         this.sigPost = new ESigPost({
             zlevel: this.zlevel,
             z: this.z,
@@ -64,28 +65,23 @@ class Signal extends Group {
             drict: drict,
             type: model.lampPostType,
             x: model.position.x + model.positionPoint.x,
-            y: model.position.y + model.positionPoint.y + posit * (style.Signal.distance + style.Section.line.width + style.Signal.lamp.radiusR)
+            y: sigPostY
         });
         if (style.Signal.ciConfirm) {
-            this.ciConfirm = new Text({
+            this.ciConfirm = new Text({ // 信号机使能 E 西安二号线独有
                 zlevel: this.zlevel,
                 z: this.z,
                 _val: '3',
                 silent: false,
-                _subType: 'enabled',
+                _subType: 'enabled', // 标识
                 style: {
-                    textBorderColor: 'red',
-                    textBorderWidth: 0,
-                    x: model.position.x + model.positionPoint.x,
-                    y: model.position.y + model.positionPoint.y + posit * (style.Signal.distance + style.Section.line.width + style.Signal.lamp.radiusR + style.Signal.ciConfirm.distance),
-                    fontWeight: style.textStyle.fontWeight,
+                    x: model.position.x + model.positionPoint.x - drict * 25,
+                    y: sigPostY + posit * 11,
                     fontSize: style.Signal.ciConfirm.fontSize,
-                    fontFamily: style.fontFamily,
                     text: style.Signal.ciConfirm.defaultText,
-                    textFill: style.Signal.ciConfirm.textColor,
                     textAlign: style.textStyle.textAlign,
-                    textPosition: 'inside',
-                    textVerticalAlign: style.textStyle.textVerticalAlign
+                    textVerticalAlign: style.textStyle.textVerticalAlign,
+                    textFill: style.Signal.ciConfirm.textColor
                 }
             });
             this.add(this.ciConfirm);
diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
index 8b853545a..ba5045be3 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@@ -416,6 +416,7 @@ export default {
                         device: this.selected,
                         operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '终端信号解封'},
                         param: {signalCode: this.selected.code},
+                        ciConfirm: true,
                         cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
                     });
                     this.$store.dispatch('training/updateMapState', [{code: this.selected.code, _type: 'Signal', isRequestLock: 1}]);