diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue index 847abad59..01f96c52b 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue @@ -26,7 +26,7 @@ import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordIn import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; import DrawSelect from './dialog/drawSelect'; import { EventBus } from '@/scripts/event-bus'; -import {UserOperationType} from "../../../../scripts/ConstDic"; +import {UserOperationType} from '../../../../scripts/ConstDic'; export default { name: 'SignalMenu', @@ -62,34 +62,40 @@ export default { label: '办理 通过进路', handler: this.arrangementRoute, cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, - isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' + isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork', + isShow: (section, work) => work === 'dispatchWork' }, { - type: 'separator' + type: 'separator', + isShow: (section, work) => work === 'dispatchWork' }, { label: '列车 办理进路', handler: this.arrangementRoute, cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, - isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' + isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork', + isShow: (section, work) => work === 'dispatchWork' }, { label: '取消进路', handler: this.cancelTrainRoute, cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, - isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' + isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork', + isShow: (section, work) => work === 'dispatchWork' }, { label: '信号重开', handler: this.reopenSignal, cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, - isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' + isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork', + isShow: (section, work) => work === 'dispatchWork' }, { label: '封锁/解封', handler: this.lockOrUnlock, cmdType: '', - isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' + isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork', + isShow: (section, work) => work === 'dispatchWork' // cmdType: CMD.Signal.CMD_SIGNAL_BLOCK }, @@ -97,22 +103,26 @@ export default { label: '总人解', handler: this.humanTrainRoute, cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE, - isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' + isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork', + isShow: (section, work) => work === 'dispatchWork' }, { - type: 'separator' + type: 'separator', + isShow: (section, work) => work === 'dispatchWork' }, { label: '引导', handler: this.guide, cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, - isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' + isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork', + isShow: (section, work) => work === 'dispatchWork' }, { label: '坡道解锁', handler: '', cmdType: '', - isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' + isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork', + isShow: (section, work) => work === 'dispatchWork' } ], menuForce: [ diff --git a/src/jmapNew/theme/datie_02/menus/menuSwitch.vue b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue index 7bce72fdb..478a0e653 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSwitch.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue @@ -63,71 +63,86 @@ export default { label: '定操', handler: this.locate, cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION, - isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' + isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork', + isShow: (section, work) => work === 'dispatchWork' }, { label: '反操', handler: this.reverse, cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION, - isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' + isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork', + isShow: (section, work) => work === 'dispatchWork' }, { label: '单锁', handler: this.lock, cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, - isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' + isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork', + isShow: (section, work) => work === 'dispatchWork' }, { label: '单解', handler: this.unlock, cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK, - isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' + isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork', + isShow: (section, work) => work === 'dispatchWork' }, { label: '道岔钩锁', handler: this.hookLock, cmdType: CMD.Switch.CMD_SWITCH_HOOK_LOCK, - isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork' + isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork', + isShow: (section, work) => work === 'dispatchWork' }, { label: '封锁/解封', - handle: '' + handle: '', + isShow: (section, work) => work === 'dispatchWork' }, { label: '区故解', - handle: '' + handle: '', + isShow: (section, work) => work === 'dispatchWork' }, { label: '岔前 分路不良', - handle: '' + handle: '', + isShow: (section, work) => work === 'dispatchWork' }, { label: '定位 分路不良', - handle: '' + handle: '', + isShow: (section, work) => work === 'dispatchWork' }, { label: '反位 分路不良', - handle: '' + handle: '', + isShow: (section, work) => work === 'dispatchWork' }, { label: '接触网定位无电', - handle: '' + handle: '', + isShow: (section, work) => work === 'dispatchWork' }, { label: '接触网反位无电', - handle: '' + handle: '', + isShow: (section, work) => work === 'dispatchWork' }, { label: '添加调机号', - handle: '' + handle: '', + isShow: (section, work) => work === 'dispatchWork' }, { label: '删除调机号', - handle: '' + handle: '', + isShow: (section, work) => work === 'dispatchWork' }, { label: '修改调机号', - handle: '' + handle: '', + isShow: (section, work) => work === 'dispatchWork' } ], menuForce: [ diff --git a/src/views/newMap/display/terminals/abnormalTrain/index.vue b/src/views/newMap/display/terminals/abnormalTrain/index.vue index e9e54e43c..43d12e45c 100644 --- a/src/views/newMap/display/terminals/abnormalTrain/index.vue +++ b/src/views/newMap/display/terminals/abnormalTrain/index.vue @@ -2,12 +2,12 @@
-
+
-