Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/jmapNew/theme/datie_02/menus/index.vue

@@ -115,7 +115,7 @@ export default {
 			const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
 			this.initDate(date);
 		}
-    },//16227
+    },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('config/updateMenuBar');

src/jmapNew/theme/datie_02/menus/menuButton.vue

@@ -596,8 +596,14 @@ export default {
                     nextCmdType: CMD.Switch.CMD_SWITCH_MASTER_LOCK,
                     param: {signalCode: model.signalCode}
                 };
+				// 信号机引导时间15s以内再次点击引导不需要进行密码输入
+				if (signal.guideTime) {
+					operate.cmdType = CMD.Switch.CMD_SWITCH_MASTER_LOCK;
+					this.sendCommand(operate);
+				} else {
 					this.$refs.password.doShow(operate);
 				}
+            }
         },
         handelFaultSection(model) {
             if (model._type === 'Section') {

src/views/newMap/newMapdraft/mapoperate/signal/index.vue

@@ -77,7 +77,9 @@ export default {
                 { code: 'RGY', name: '红绿黄三灯信号机'},
                 { code: 'R', name: '单红灯信号机'},
                 { code: 'BW', name: '蓝白调车信号机'},
-                { code: 'YRW', name: '黄红白列车兼调车信号机' }
+                { code: 'YRW', name: '黄红白列车兼调车信号机' },
+				{ code: 'YGRYW', name: '黄绿红黄白信号机' },
+				{ code: 'YGRGW', name: '黄绿红绿白信号机' }
             ],
             field:'',
             editModel: getModel('Signal'),