From 050df854654f07b4467832d00b2bb19224c1222d Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 6 May 2022 15:09:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF=E8=B0=83?=
 =?UTF-8?q?=E6=95=B432?=
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/SignalButton/index.js   |  1 -
 src/jmapNew/theme/datie_02/menus/menuButton.vue |  1 +
 src/store/modules/map.js                        |  5 ++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js
index 153d5e8f3..ac028dee6 100644
--- a/src/jmapNew/shape/graph/Signal/index.js
+++ b/src/jmapNew/shape/graph/Signal/index.js
@@ -697,6 +697,11 @@ class Signal extends Group {
             }
         }
     }
+    // 双黄灯
+	doubleYellow() {
+    	this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.yellowColor);
+		this.lamps[1] && this.lamps[1].setColor(this.style.Signal.lamp.yellowColor);
+	}
     lampWhite() {
         if (this.lamps.length === 1) {
             this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.whiteColor);
@@ -984,7 +989,7 @@ class Signal extends Group {
         if (this.model.signalButtonList && this.model.signalButtonList.length) {
             this.model.signalButtonList.forEach(item => {
                 const button = store.getters['map/getDeviceByCode'](item);
-                button && button.instance && button.instance.recover();
+                button && button.instance && button.instance.setState({});
             });
         }
     }
@@ -1042,6 +1047,10 @@ class Signal extends Group {
                 this.lampBlue();
                 break;
             }
+			case 'YY': {
+				this.doubleYellow();
+				break;
+			}
             default: {
                 this.close(model.logicLight); // 信号关闭
                 break;
diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js
index f59d29f5e..5aedfe2de 100644
--- a/src/jmapNew/shape/graph/SignalButton/index.js
+++ b/src/jmapNew/shape/graph/SignalButton/index.js
@@ -247,7 +247,6 @@ export default class SignalButton extends Group {
                 this.startAnimate();
             }
         }
-
     }
     getAnchorPoint() {
     }
diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index f1591e476..a8269b2d8 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -395,6 +395,7 @@ export default {
                     if (valid) {
                         this.commandTypeList = [];
                         this.$store.dispatch('menuOperation/setButtonOperation', null);
+						this.guideLockRightFlag = false;
                     }
                 });
             }
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index 05c4a45ab..2b0655424 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -698,8 +698,11 @@ const map = {
             if (state.map && state.map.displayList && state.map.displayList.length && store.state.training.prdType) {
                 let flag = false;
                 const stationCode = state.showCentralizedStationCode;
+				if (deviceCode === 'BTN36775'){
+					console.log(store.state.training.prdType, state.map.displayList, '---', stationCode, deviceCode);
+				}
                 state.map.displayList.forEach(item => {
-                    if (
+					if (
                         store.state.training.prdType === '01' &&
             item.type === 'LOCAL' &&
             ((item.stationCodeList.includes(stationCode) && item.elementList.includes(deviceCode)) || !stationCode)