diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue index 47473fd91..a6a296481 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue @@ -78,10 +78,30 @@ export default { return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; }, domIdChoose() { - return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : ''; + if (this.dialogShow) { + if (this.operation == OperationEvent.StationControl.requestCentralControl.menu.operation) { + return OperationEvent.StationControl.requestCentralControl.choose.domId; + } else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) { + return OperationEvent.StationControl.StationControl.choose.domId; + } else { + return ''; + } + } else { + return ''; + } }, domIdConfirm() { - return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : ''; + if (this.dialogShow) { + if (this.operation == OperationEvent.StationControl.requestCentralControl.menu.operation) { + return OperationEvent.StationControl.requestCentralControl.confirm.domId; + } else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) { + return OperationEvent.StationControl.StationControl.confirm.domId; + } else { + return ''; + } + } else { + return ''; + } }, title() { return '站遥控转换'; @@ -216,10 +236,10 @@ export default { }; if (this.controlMode == 'center') { operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL; - operate.operation = OperationEvent.StationControl.requestStationControl.menu.operation; + operate.operation = OperationEvent.StationControl.requestStationControl.confirm.operation; } else if (this.controlMode == 'local') { operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL; - operate.operation = OperationEvent.StationControl.requestCentralControl.menu.operation; + operate.operation = OperationEvent.StationControl.requestCentralControl.confirm.operation; } this.loading = true; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue index 283eaca05..fee348e7d 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue @@ -112,7 +112,7 @@ export default { }, setCenterControl() { // 请求中控(遥控) - commitOperate(menuOperate.StationControl.requestCentralControl, {}, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.StationControl.requestCentralControl, {standCode:this.selected.code}, 0).then(({valid, operate})=>{ if (valid) { this.$refs.stationControl.doShow(operate, this.selected); } @@ -120,7 +120,7 @@ export default { }, setStationControl() { // 请求站控 - commitOperate(menuOperate.StationControl.requestStationControl, {}, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.StationControl.requestStationControl, {standCode:this.selected.code}, 0).then(({valid, operate})=>{ if (valid) { this.$refs.stationControl.doShow(operate, this.selected); } diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js index b1cfc0716..7d4490c3b 100644 --- a/src/jmapNew/theme/ningbo_01/operationConfig.js +++ b/src/jmapNew/theme/ningbo_01/operationConfig.js @@ -414,7 +414,7 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: 'Section_Confirm_Axis_Valid', + operateType: 'Switch_Confirm_Axis_Valid', skinCode: '06', trainingName: '确认计轴有效({8}{9})', trainingRemark: '确认计轴有效功能', @@ -743,8 +743,8 @@ export default { trainingType: 'ControlConvertMenu', productTypes: ['02'], // 行调请求中控 stepVOList: [ - { deviceType: 'button', orderNum: 1, operateCode: '202', tip: '鼠标右键菜单选择【请求遥控】'}, - { deviceType: '05', orderNum: 2, operateCode: '202', tip: '鼠标左键点击【应用】' } + { deviceType: 'button', orderNum: 1, operateCode: '204', tip: '鼠标右键菜单选择【请求遥控】'}, + { deviceType: '05', orderNum: 2, operateCode: '2043', tip: '鼠标左键点击【应用】' } ] }, { @@ -757,8 +757,8 @@ export default { trainingType: 'ControlConvertMenu', productTypes: ['01'], // 现地请求站控 stepVOList: [ - { deviceType: 'button', orderNum: 1, operateCode: '204', tip: '鼠标右键菜单选择【请求站控】'}, - { deviceType: '05', orderNum: 2, operateCode: '204', tip: '鼠标左键点击【应用】' } + { deviceType: 'button', orderNum: 1, operateCode: '202', tip: '鼠标右键菜单选择【请求站控】'}, + { deviceType: '05', orderNum: 2, operateCode: '2023', tip: '鼠标左键点击【应用】' } ] } ] diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 04f9f1d41..ee134a38c 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -29,7 +29,7 @@ export default { /** 强扳 */ CMD_SWITCH_FORCE_TURN: {value:'Switch_Force_Turn', label: '强扳'}, /** 确认计轴有效 */ - CMD_SWITCH_COMFIRMATION_AXLE:{value:'Switch_Comfirmation_Axle', label: '确认计轴有效'}, + CMD_SWITCH_COMFIRMATION_AXLE:{value:'Switch_Confirm_Axis_Valid', label: '确认计轴有效'}, /** 定位(定操) */ CMD_SWITCH_NORMAL_POSITION:{value:'Switch_Normal_Position', label:'单操到定位'}, /** 反位(反操) */ diff --git a/src/views/system/commandDictionary/edit.vue b/src/views/system/commandDictionary/edit.vue index 316937d32..d7b4d6fd6 100644 --- a/src/views/system/commandDictionary/edit.vue +++ b/src/views/system/commandDictionary/edit.vue @@ -53,6 +53,8 @@