From 6dd4e305b3e363226440a695ad22acc55c49ea20 Mon Sep 17 00:00:00 2001 From: lVAL Date: Tue, 2 Feb 2021 19:00:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E8=AE=AD=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/foshan_01/operationConfig.js | 10 +-- .../theme/nanjing_02/menus/menuButton.vue | 6 +- .../theme/nanjing_02/operationConfig.js | 21 ++++++- .../theme/ningbo_03/operationConfig.js | 62 +++++++++++++++---- 4 files changed, 77 insertions(+), 22 deletions(-) diff --git a/src/jmapNew/theme/foshan_01/operationConfig.js b/src/jmapNew/theme/foshan_01/operationConfig.js index fafaa49f4..3c164eb65 100644 --- a/src/jmapNew/theme/foshan_01/operationConfig.js +++ b/src/jmapNew/theme/foshan_01/operationConfig.js @@ -190,7 +190,7 @@ export default { maxDuration: 15, minDuration: 8, operateType: CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN.value, - skinCode: '02', + skinCode: '08', trainingName: '强制取消扣车({10}-{12}站台)', trainingRemark: '强制取消扣车功能', trainingType: 'Stand', @@ -656,13 +656,13 @@ export default { minDuration: 5, operateType:CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING.value, skinCode: '08', - trainingName: '进路交自动控({5} 信号机)', + trainingName: '进路交自动控({3} 信号机)', trainingRemark: '进路交自动控功能', trainingType:'Signal', productTypes: ['01', '02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交自动控】' }, - { deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择【{5}】', val: '{6}' }, + { deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择【{3}】', val: '{4}' }, { deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' } ] }, @@ -671,13 +671,13 @@ export default { minDuration: 5, operateType:CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING.value, skinCode: '08', - trainingName: '进路交人工控({5} 信号机)', + trainingName: '进路交人工控({3} 信号机)', trainingRemark: '进路交人工控功能', trainingType:'Signal', productTypes: ['01', '02'], stepVOList: [ { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路交人工控】' }, - { deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择【{5}】', val: '{6}' }, + { deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择【{3}】', val: '{4}' }, { deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' } ] }, diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index e0f4e4790..9cc2d4531 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -386,20 +386,20 @@ export default { } else { const step = { operation: 'click', - code: this.selectedObj.code, + code: '', subType:this.$store.state.menuOperation.subType }; this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { this.handleBasicMenu(); + this.dialogVisible = false; } }).catch((error) => { console.error(error); EventBus.$emit('sendMsg', {message: '命令执行失败！'}); }); - this.dialogVisible = false; } }, '$store.state.map.showCentralizedStationCode': function(val) { @@ -1102,7 +1102,7 @@ export default { this.stationParamList = this.$store.state.training.prdType === '01' ? [ { name: '关站信号', commandTip: '封锁车站所有信号机', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch || !['Local'].includes(stationControl.controlMode) } ] : [ - { name: '关站信号', commandTip: '封锁车站所有信号机', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch || !['Local'].includes(stationControl.controlMode) }, + { name: '关站信号', commandTip: '封锁车站所有信号机', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch || !['Center'].includes(stationControl.controlMode) }, { name: '接收控制', commandTip: '接收控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menuButton, disabledCb: (stationControl) => ['Center'].includes(stationControl.controlMode) }, { name: '交出控制', commandTip: '交出控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menuButton, disabledCb: (stationControl) => ['Local', 'None'].includes(stationControl.controlMode) } ]; diff --git a/src/jmapNew/theme/nanjing_02/operationConfig.js b/src/jmapNew/theme/nanjing_02/operationConfig.js index 4d023e580..64fe96ee4 100644 --- a/src/jmapNew/theme/nanjing_02/operationConfig.js +++ b/src/jmapNew/theme/nanjing_02/operationConfig.js @@ -204,7 +204,7 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: 'Section_Confirm_Axis_Valid', + operateType: 'Section_Axis_Pre_Reset', skinCode: '02', trainingName: '预复位({8}{9})', trainingRemark: '预复位功能', @@ -251,6 +251,21 @@ export default { { maxDuration: 15, minDuration: 8, + operateType: 'Switch_Squeeze_Recovery', + skinCode: '07', + trainingName: '挤岔恢复({7})', + trainingRemark: '挤岔恢复({7})', + trainingType: 'Switch', + productTypes: ['01', '02'], + stepVOList: [ + { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' }, + { deviceType: '02', orderNum: 2, operateCode: '11a0', tip: '鼠标左键点击【挤岔恢复】按钮' }, + { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' } + ] + }, + { + maxDuration: 15, + minDuration: 8, operateType: 'Switch_Axle_Pre_Reset', skinCode: '07', trainingName: '预复位({7})', @@ -260,7 +275,9 @@ export default { stepVOList: [ { deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' }, { deviceType: '02', orderNum: 2, operateCode: '1106', tip: '鼠标左键点击【预复位】按钮' }, - { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' } + { deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }, + { deviceType: '02', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' }, + { deviceType: '02', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' } ] }, { diff --git a/src/jmapNew/theme/ningbo_03/operationConfig.js b/src/jmapNew/theme/ningbo_03/operationConfig.js index a226a67e5..66bf2f9a1 100644 --- a/src/jmapNew/theme/ningbo_03/operationConfig.js +++ b/src/jmapNew/theme/ningbo_03/operationConfig.js @@ -446,18 +446,37 @@ export default { minDuration: 15, operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL.value, skinCode: '12', - trainingName: '授权转移({1})', - trainingRemark: '控制权限转换，中控转站控', + trainingName: '请求站控({1})', + trainingRemark: '控制权限转换，接收转移', trainingType: 'ControlConvertMenu', - productTypes: ['01', '02'], + productTypes: ['01'], + stepVOList: [ + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, codeType:'NULL', tip: '鼠标左键选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_transfer.operation, tip: '鼠标左键选择【授权转移】' }, + { deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择车站【{1}】', codeType:'STATION', val: '{2}' }, + { deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' }, + { deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.confirm1.operation, tip: '请点击【确定】' }, + { deviceType: '04', orderNum: 7, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' } + ] + }, + { + maxDuration: 20, + minDuration: 15, + operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL.value, + skinCode: '12', + trainingName: '授权转移({1})', + trainingRemark: '控制权限转换，交出转移', + trainingType: 'ControlConvertMenu', + productTypes: ['02'], stepVOList: [ { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' }, { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' }, { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_transfer.operation, tip: '鼠标左键选择【授权转移】' }, { deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择车站【{1}】', codeType:'STATION', val: '{2}' }, - { deviceType: '05', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' }, - { deviceType: '05', orderNum: 6, operateCode: OperationEvent.Command.common.confirm1.operation, tip: '请点击【确定】' }, - { deviceType: '05', orderNum: 7, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' } + { deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' }, + { deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.confirm1.operation, tip: '请点击【确定】' }, + { deviceType: '04', orderNum: 7, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' } ] }, { @@ -466,17 +485,36 @@ export default { operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL.value, skinCode: '12', trainingName: '授权转移({1})', - trainingRemark: '控制权限转换，站控转中控', + trainingRemark: '控制权限转换，交出转移', trainingType: 'ControlConvertMenu', - productTypes: ['01', '02'], + productTypes: ['01'], stepVOList: [ { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' }, { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' }, { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_transfer.operation, tip: '鼠标左键选择【授权转移】' }, - { deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择车站【{1}】', codeType:'STATION', val: '{2}' }, - { deviceType: '05', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' }, - { deviceType: '05', orderNum: 6, operateCode: OperationEvent.Command.common.confirm1.operation, tip: '请点击【确定】' }, - { deviceType: '05', orderNum: 7, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' } + { deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择车站【{1}】', val: '{2}' }, + { deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' }, + { deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.confirm1.operation, tip: '请点击【确定】' }, + { deviceType: '04', orderNum: 7, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' } + ] + }, + { + maxDuration: 20, + minDuration: 15, + operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL.value, + skinCode: '12', + trainingName: '授权转移({1})', + trainingRemark: '控制权限转换，接收转移', + trainingType: 'ControlConvertMenu', + productTypes: ['02'], + stepVOList: [ + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_transfer.operation, tip: '鼠标左键选择【授权转移】' }, + { deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择车站【{1}】', val: '{2}' }, + { deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' }, + { deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.confirm1.operation, tip: '请点击【确定】' }, + { deviceType: '04', orderNum: 7, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' } ] }, ]