大铁线路调整32

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;

src/jmapNew/shape/graph/SignalButton/index.js

@@ -247,7 +247,6 @@ export default class SignalButton extends Group {
                 this.startAnimate();
             }
         }
-
     }
     getAnchorPoint() {
     }

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;
                     }
                 });
             }

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)