diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue index db1b9233a..9160b5430 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue @@ -452,7 +452,6 @@ export default { this.$refs.noticeInfo.doShow({}, ['所选的进路没有一个是自动的']); return false; } - debugger; const step = { start: true, over:true, diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue index 958cd69f1..34a9dcc31 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue @@ -109,45 +109,55 @@ export default { } ], Center: [ + // { + // label: this.$t('menu.menuSignal.routeSelect'), + // handler: this.arrangementRoute, + // cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE + // }, + // { + // label: this.$t('menu.menuSignal.routeCancel'), + // handler: this.cancelTrainRoute, + // cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE + // }, { - label: this.$t('menu.menuSignal.routeSelect'), - handler: this.arrangementRoute, - cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE - }, - { - label: this.$t('menu.menuSignal.routeCancel'), - handler: this.cancelTrainRoute, - cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE - }, - { - label: this.$t('menu.menuSignal.signalBlock'), + label: '封锁信号', handler: this.lock, cmdType: CMD.Signal.CMD_SIGNAL_BLOCK }, { - label: this.$t('menu.menuSignal.signalDeblock'), + label: '解封信号', handler: this.unlock, cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK }, { - label: this.$t('menu.menuSignal.signalOff'), + label: '关单信号', handler: this.signalClose, cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL }, { - label: this.$t('menu.menuSignal.signalReopen'), + label: '重复开放', handler: this.reopenSignal, cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL }, { - label: this.$t('menu.menuSignal.humanControl'), + label: '自排单关', handler: this.humanControl, cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING }, { - label: this.$t('menu.menuSignal.atsAutoControl'), + label: '自排单开', handler: this.atsAutoControl, cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING + }, + { + label: '追踪单开', + handler: this.setAutoTrigger, + cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER + }, + { + label: '追踪单关', + handler: this.cancelAutoTrigger, + cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER } ] }, diff --git a/src/views/newMap/displayNew/demon/runPlanView.vue b/src/views/newMap/displayNew/demon/runPlanView.vue index cc2927c5e..9f7437404 100644 --- a/src/views/newMap/displayNew/demon/runPlanView.vue +++ b/src/views/newMap/displayNew/demon/runPlanView.vue @@ -1,79 +1,110 @@