diff --git a/src/jmapNew/theme/beijing_01/menus/menuBar.vue b/src/jmapNew/theme/beijing_01/menus/menuBar.vue index 4e15ad56a..bcbd910fa 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuBar.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuBar.vue @@ -100,7 +100,6 @@ diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index 85f9f7fe5..9426ce8b2 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -330,6 +330,12 @@ export const menuOperate = { cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL } }, + LimitControl: { + cancelSpeed: { + operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation, + cmdType: CMD.Fault.CMD_CANCEL_ALL_LIMIT_SPEED + } + }, Common: { setFault: { operation: OperationEvent.MixinCommand.stoppage.menu.operation, diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index 73f6f7ee7..614d4ac0d 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -147,7 +147,8 @@ export default { { label: '站台', value: 'Stand' }, { label: '车站', value: 'Station' }, { label: '控制模式', value: 'ControlConvertMenu' }, - { label: '车次窗', value: 'TrainWindow' } + { label: '车次窗', value: 'TrainWindow' }, + { label: '全线限速', value: 'LimitControl' } ], QuestionTypeList: [ { label: '选择题', value: 'select' }, diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index b2c1c0d49..73452e650 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -255,6 +255,6 @@ export default { CMD_CANCEL_FAULT: {value: 'Cancel_Fault', label: '取消故障'} }, LimitControl: { - + CMD_CANCEL_ALL_LIMIT_SPEED: {value: 'Cancel_All_Limit_Speed', label: '取消全线临时限速'} } }; diff --git a/src/scripts/cmdPlugin/MenuContextHandler.js b/src/scripts/cmdPlugin/MenuContextHandler.js index e8bc0e8e6..449f87221 100644 --- a/src/scripts/cmdPlugin/MenuContextHandler.js +++ b/src/scripts/cmdPlugin/MenuContextHandler.js @@ -23,6 +23,8 @@ class MenuContextHandler { control = store.getters['map/getStationCodeByTrain'](selected); } else if (selected._type == 'TrainWindow') { control = store.getters['map/getDeviceTrainWindowCodeByStationCode'](selected.code); + } else if (selected._type == 'LimitControl') { + return true; } else { control = store.getters['map/getDeviceStationCodeByStationCode'](selected.stationCode); } @@ -81,9 +83,13 @@ class MenuContextHandler { return; } const data = CommandHandler.getDefinition(elem.cmdType); + if (data) { // 判断指令是否显示 - if (data.simulationRole.toUpperCase() == type.toUpperCase() && data.controlMode.indexOf(status) > -1) { + if (data.operateObject == 'LimitControl') { + elem.show = true; + elem.disabled = false; + } else if (data.simulationRole.toUpperCase() == type.toUpperCase() && data.controlMode.indexOf(status) > -1) { elem.show = true; elem.disabled = this.checkDisabled(data, selected); } else {