diff --git a/src/jmapNew/theme/beijing_01/menus/menuButton.vue b/src/jmapNew/theme/beijing_01/menus/menuButton.vue index 548fedefb..6cd39b79d 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuButton.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuButton.vue @@ -444,33 +444,6 @@ export default { Handler.clear(); this.$store.dispatch('menuOperation/setButtonOperation', null); } - - // 按钮按下时 - // if (this.$store.state.menuOperation.buttonOperation) { - // const model = this.$store.state.menuOperation.selected; - // if (model && model._type) { - // // const deviceType = MapDeviceType[model._type]; - // const operate = { - // send: true, - // model: model, - // code: model.code, - // // type: deviceType.type, - // operation: this.$store.state.menuOperation.buttonOperation, - // tempData: this.tempData - // }; - - // this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => { - // if (valid) { - // if (response) { - // this.tempData = response.data; - // } - // } - // }); - // } else { - // Handler.clear(); - // this.$store.dispatch('menuOperation/setButtonOperation', null); - // } - // } } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuSection.vue b/src/jmapNew/theme/foshan_01/menus/menuSection.vue index 1da696f0f..9982b12aa 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSection.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSection.vue @@ -16,7 +16,6 @@ import SpeedLimitControl from './dialog/speedLimitControl'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import { mapGetters } from 'vuex'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; -import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import {menuOperate, commitOperate} from './utils/menuOperate'; diff --git a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue index 360080e9a..830957023 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue @@ -29,7 +29,6 @@ import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import {menuOperate, commitOperate} from './utils/menuOperate'; -// import { querySignalStatus } from '@/api/simulation'; export default { name: 'SignalMenu', diff --git a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue index f0e819add..a9b8bfbec 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue @@ -22,7 +22,6 @@ import StandRunLevel from './dialog/standRunLevel'; import StandStopTime from './dialog/standStopTime'; import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'; import StandDetainTrainAll from './dialog/standDetainTrainAll'; -// import Handler from '@/scripts/cmdPlugin/Handler'; import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; diff --git a/src/scripts/cmdPlugin/MenuContextHandler.js b/src/scripts/cmdPlugin/MenuContextHandler.js index 854d9463a..3ec7adf69 100644 --- a/src/scripts/cmdPlugin/MenuContextHandler.js +++ b/src/scripts/cmdPlugin/MenuContextHandler.js @@ -33,35 +33,6 @@ class MenuContextHandler { return store.state.training.prdType; } - // menuFiltration(menuList) { - // const selected = this.getCurrentStateObject(); - // let menu = []; - // const control = this.getStationControl(selected); - // if (control) { - // if ( this.getPrdType() != '') { - // const type = State2SimulationMap[this.getPrdType()]; - // const status = State2ControlMap[control.status]; - // menu = [...menuList[type]]; - // if (menu.constructor === Array) { - // menu.forEach(elem => { - // if (elem.type === 'separator') { - // elem.show = true; - // return; - // } - // if (elem.auth.constructor === Object) { - // elem.show = true; - // if (!elem.auth['station'] && !elem.auth['center']) { // 控制不显示 - // elem.show = false; - // } - // elem.defaultDisabled = !elem.auth[status]; - // } - // }); - // } - // } - // } - // return menu; - // } - // 判断指令是否隐藏 checkDisabled(data, selected) { let result = false; @@ -82,8 +53,6 @@ class MenuContextHandler { } } }); - // 特殊处理哈尔滨线的虚拟信号机操作( 因为哈尔滨虚拟信号机有些操作没有 ) - // 待处理 result = !result; } return result; diff --git a/src/views/newMap/displayNew/menuTrainList.vue b/src/views/newMap/displayNew/menuTrainList.vue index e6680eb3b..54c282ba1 100644 --- a/src/views/newMap/displayNew/menuTrainList.vue +++ b/src/views/newMap/displayNew/menuTrainList.vue @@ -19,11 +19,11 @@ size="50%" >