From 83eddd42d3de310b79d3a2239c6696d64f31279a Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 27 Apr 2021 15:52:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=93=81=E4=BB=BF=E7=9C=9F=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=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/datie_01.js       |  2 +-
 src/jmapNew/shape/Signal/index.js             |  2 +-
 .../theme/datie_01/menus/menuButton.vue       | 22 +++++++++----------
 .../dataRelation/bigroutingoperate/detail.vue |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/jmapNew/config/skinCode/datie_01.js b/src/jmapNew/config/skinCode/datie_01.js
index a0ccdc163..ee9a79318 100644
--- a/src/jmapNew/config/skinCode/datie_01.js
+++ b/src/jmapNew/config/skinCode/datie_01.js
@@ -183,7 +183,7 @@ class SkinCode extends defaultStyle {
                 fontSize: 11,								// 信号机名称字体大小
                 fontWeight: 'bold',							// 信号机名称字体粗细
                 defaultColor: '#FFFFFF',					// 信号灯字体默认色
-                blockColor: '#EF0C08',						// 信号灯字体锁定颜色
+                blockColor: '#FFFFFF',						// 信号灯字体锁定颜色
                 checkColor: '#00FF00'						// 信号保护区段检查颜色
             },
             lamp: {
diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js
index 81683c885..94ada2b5f 100644
--- a/src/jmapNew/shape/Signal/index.js
+++ b/src/jmapNew/shape/Signal/index.js
@@ -699,7 +699,7 @@ class Signal extends Group {
         if (this.style.Signal.text.nameBorderShow) {
             this.sigName.setStyle({ textBorderWidth: 1 });
         }
-        if (this.sigBack) {
+        if (this.sigBack && (!this.model.signalButtonList || !this.model.signalButtonList.length)) {
             this.sigBack.show();
             this.sigBack.setStyle('fill', this.style.Signal.sigBack.fillColor);
         }
diff --git a/src/jmapNew/theme/datie_01/menus/menuButton.vue b/src/jmapNew/theme/datie_01/menus/menuButton.vue
index 7bad1eb4f..73dcb0bcf 100644
--- a/src/jmapNew/theme/datie_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuButton.vue
@@ -51,12 +51,12 @@
         <center><b>单解</b></center>
       </span>
     </button>
-    <button :id="Signal.lock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.lock.button.operation, ['Signal'])">
+    <button :id="Signal.lock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.lock.button.operation, ['Signal', 'SignalButton'])">
       <span style="color: black">
         <center><b>按钮封锁</b></center>
       </span>
     </button>
-    <button :id="Signal.unlock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.unlock.button.operation, ['Signal'])">
+    <button :id="Signal.unlock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.unlock.button.operation, ['Signal', 'SignalButton'])">
       <span style="color: black">
         <center><b>按钮解封</b></center>
       </span>
@@ -508,15 +508,14 @@ export default {
             });
         },
         handleGuideSignal(model) {
-            const signal = this.$store.getters['map/getDeviceByCode'](model.code);
             const operate = {
                 over: true,
                 code: model.code,
                 operation: this.Signal.guide.button.operation,
                 cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
-                param: {signalId: model.code}
+                param: {signalId: model.signalCode}
             };
-            if (signal.delayTime) {
+            if (this.guideTime) {
                 this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
                     this.guideTime = 15;
                     this.handleGuideTime();
@@ -666,7 +665,8 @@ export default {
             if (model.signalButtonList && model.signalButtonList.length > 0) {
                 let flag = false;
                 model.signalButtonList.forEach(item => {
-                    flag = flag || item.type === 'TRAIN_TERMINAL';
+                    const signalButton = this.$store.getters['map/getDeviceByCode'](item);
+                    flag = flag || signalButton.type === 'PICK';
                 });
                 return flag;
             } else {
@@ -690,7 +690,7 @@ export default {
                     operate.cmdType = CMD.Signal.CMD_SIGNAL_UNBLOCK;
                     operate.param = {signalId: model.code};
                 }
-            } else if (model._type === 'SignalButton' && model.type === 'TRAIN_TERMINAL') {
+            } else if (model._type === 'SignalButton' && model.type === 'PICK') {
                 if (buttonOperation === this.Signal.lock.button.operation) {
                     operate.cmdType = CMD.Signal.CMD_SIGNAL_BLOCK;
                     operate.param = {signalId: model.signalCode};
@@ -766,13 +766,10 @@ export default {
                 const station = this.$store.getters['map/getDeviceByCode'](model.stationCode);
                 if (station) {
                     if (buttonOperation && this.commandTypeList.includes(model._type)) {
-                        this.deviceList.push(model);
                         if (buttonOperation === this.MixinCommand.totalCancel.button.operation) {
                             this.handelTotalCancel(model, subType);
                         } else if (buttonOperation === this.Signal.humanTrainRoute.button.operation) {
                             this.handleTotalHumanSolution(model);
-                        // } else if (buttonOperation === this.Signal.guide.button.operation) {
-                        //     this.handleGuideRoute(this.deviceList);
                         } else if (buttonOperation === this.Signal.atsAutoControl.button.operation || buttonOperation === this.Signal.humanControl.button.operation) {
                             this.handelControlRoute(model);
                         } else if (switchOperation.includes(buttonOperation)) {
@@ -805,11 +802,14 @@ export default {
         checkSignalBlock(code) {
             if (code) {
                 const signal = this.$store.getters['map/getDeviceByCode'](code);
-                return signal.blockade;
+                return signal && signal.blockade;
             } else { return false; }
         },
         clearOperate() {
             Handler.clear(); // 清空操作组
+            if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'SignalButton') {
+                this.$store.dispatch('training/updateMapState', [{code: this.deviceList[0].code, _type: 'SignalButton', hasSelected: 0}]);
+            }
             this.deviceList = [];
             this.$store.dispatch('menuOperation/setButtonOperation', null);
         }
diff --git a/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue
index a6f958375..1134bfdf7 100644
--- a/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue
@@ -245,8 +245,8 @@ export default {
                 routeAspectList.forEach(item => {
                     const route = this.filterRouteMap[item.routeCode];
                     if (route) {
-                        const signalAspect = this.$convertField(route.signalAspect, this.signalAspectList, ['value', 'label']) || '';
-                        nameList.push(route.name + '(' + signalAspect + ')');
+                        const signalAspect = this.$convertField(item.signalAspect, this.signalAspectList, ['value', 'label']) || '';
+                        nameList.push(route + '(' + signalAspect + ')');
                     }
                 });
             }