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

src/jmapNew/config/skinCode/ningbo_03.js

@@ -180,6 +180,7 @@ class SkinCode extends defaultStyle {
             },
             lamp: {
                 bgShow: false, // 是否被选中
+                logicDisplayNone: true,
                 guidName: 'half',							// 默认引导类型
                 borderVariable: false,						// 信号灯边框可变
                 stopWidth: 2,								// 禁止线宽度

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

@@ -236,12 +236,20 @@ export default {
                     cmdType:this.cmdType,
                     param: data.param
                 };
+
+            } else if (data.nextCmdType) {
+                operate = {
+                    over: true,
+                    operation: data.operation,
+                    cmdType:data.nextCmdType
+                };
             } else {
                 operate = {
                     operation: data.operateNext
                 };
             }
             this.trainingOperation(operate);
+
         },
         checkCancel() {
             Handler.clear(); // 清空操作组
@@ -391,7 +399,6 @@ export default {
             const operate = {
                 over: true,
                 operation: this.$store.state.menuOperation.buttonOperation,
-                cmdType: '',
                 param: {}
             };
             if (model._type === 'StationStand' && subType === 'StopJumpLamp') {
@@ -419,21 +426,38 @@ export default {
                     operate.code = model.code;
                     break;
                 case 'center':
-                    operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
+                    // operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
+                    delete operate.over;
+                    operate.subType = 'center';
                     operate.param = {stationCodes: [model.code]};
                     operate.code = model.code;
                     break;
                 case 'emergency':
-                    operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
+                    // operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
+                    delete operate.over;
+                    operate.subType = 'emergency';
                     operate.param = {stationCodes: [model.code]};
                     operate.code = model.code;
                     break;
                 }
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch((error) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                // 判断是否需要 弹窗密码框
+                // const operate = Object.assign({}, operate);
+                if (subType == 'center' || subType == 'emergency') {
+                    operate['operateNext'] = operate.operation = this.Command.close.password.operation;
+                    if (subType == 'center') {
+                        operate['nextCmdType'] = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
+                    } else {
+                        operate['nextCmdType'] = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
+                    }
+                    this.$refs.password.doShow(operate);
+                }
+            }).catch((error) => {
                 this.deviceList = [];
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
+
             });
         },
         handelTotalCancel(model, subType) {

src/jmapNew/theme/chengdu_03/operationConfig.js

@@ -72,7 +72,8 @@ export default {
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【紧急站控】', codeType:'STATION', subType:'emergency' }
+                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【紧急站控】', codeType:'STATION', subType:'emergency' },
+                { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }
             ]
         },
         {
@@ -86,7 +87,8 @@ export default {
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【中控】', codeType:'STATION', subType:'center' }
+                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【中控】', codeType:'STATION', subType:'center' },
+                { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }
             ]
         },
         // 信号机列表

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

@@ -570,6 +570,7 @@ export default {
         handleSectionMenu() {
             this.deviceHighLight(this.oldDevice, false);
             this.deviceHighLight(this.selectedObj, true);
+            this.oldDevice = this.selectedObj;
             this.oldClickObj = deepAssign({}, this.selectedObj);
 
             this.initCentralizedStationList(this.sectionParamList);