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

@@ -119,7 +119,7 @@
         class="haerbin-01__systerm __menuButton"
         style="pointer-events: none"
         title="Dialog"
-		z-index="2008"
+        z-index="2008"
         :visible.sync="dialogVisible"
         :modal="false"
         :close-on-click-modal="false"
@@ -177,10 +177,10 @@
         class="haerbin-01__systerm __menuButton"
         style="pointer-events: none"
         title="IBP"
-		z-index="2008"
+        z-index="2008"
         :visible.sync="stationDialogVisible"
         :modal="false"
-		append-to-body
+        append-to-body
         :close-on-click-modal="false"
         width="30%"
         :before-close="handleStationClose"
@@ -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);
@@ -712,14 +713,14 @@ export default {
             }
         },
         clickCommand(row, index) {
-			const step = {};
+            const step = {};
 
             this.rightClickDialogVisible = false;
             this.paramIndex = row.next ? index : -1;
 
             if (row.commandTip) {
                 EventBus.$emit('sendMsg', {message: row.name});
-			}
+            }
 
             if (this.tempData.length) {
                 this.operate = row.operate.operation;
@@ -729,7 +730,7 @@ export default {
                 if (row.param) {
                     this.param = row.param;
                 }
-				step.param = this.param;
+                step.param = this.param;
                 this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                     if (valid) {
                         this.checkConfirmParam();
@@ -1014,10 +1015,10 @@ export default {
                 { name: '解封区段', commandTip: '允许通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
             ];
             this.switchParamList = [
-                { name: '岔区设限',  cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch},
+                { name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch},
-                { name: '岔区消限', commandTip: '取消对道岔区段的限速',cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
+                { name: '岔区消限', commandTip: '取消对道岔区段的限速', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '转换道岔', commandTip: '转换道岔', cmdType: CMD.Switch.CMD_SWITCH_TURN, operate: OperationEvent.Switch.turnout.menuButton, disabledCb: (stationControl) => !this.modeMatch },
-                { name: '强行转岔', commandTip: '强制操作道岔',cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN, operate: OperationEvent.Switch.turnoutForce.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
+                { name: '强行转岔', commandTip: '强制操作道岔', cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN, operate: OperationEvent.Switch.turnoutForce.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '强解道岔', commandTip: '强解道岔', cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK, operate: OperationEvent.Switch.fault.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '挤岔恢复', commandTip: '取消挤岔逻辑标志', cmdType: CMD.Switch.CMD_SWITCH_SQUEEZE_RECOVERY, operate: OperationEvent.Switch.squeezeRecovery.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '单独锁定', commandTip: '锁定道岔，阻止转换', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch },
@@ -1026,7 +1027,7 @@ export default {
                 { name: '封锁道岔', commandTip: '禁止通过道岔区段排列进路', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '解封道岔', commandTip: '允许通过道岔区段排列进路', cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK, operate: OperationEvent.Switch.unblock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '强行消限', commandTip: '强行取消对轨道区段的限速', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
-			];
+            ];
 
             this.signalParamList = this.$store.state.training.prdType === '01' ? [
                 { name: '关闭信号', commandTip: '设置信号机为关闭状态', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (stationControl) => !this.modeMatch },