From 4efca07ac8176fd22032794d42560daf81e4645d Mon Sep 17 00:00:00 2001 From: lVAL Date: Tue, 26 Jan 2021 17:45:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=20=E5=AE=81=E6=B3=A23=20=20?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=B7=B3=E5=81=9C=E5=92=8C=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E8=B7=B3=E5=81=9C=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/ningbo_03/menus/menuBar.vue | 108 +++++++------- .../menus/menuDialog/standControl.vue | 25 ++-- .../theme/ningbo_03/operationConfig.js | 139 +++++++++--------- src/scripts/cmdPlugin/OperationHandler.js | 38 ++++- .../mapsystemNew/plugin/trainingtip.vue | 1 + 5 files changed, 177 insertions(+), 134 deletions(-) diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue index a4eca340d..4ed89ae3d 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue @@ -412,139 +412,139 @@ export default { }, { title: '线路(G)', - operate: OperationEvent.Command.commandNingBo.line, + operate: OperationEvent.Command.commandNingBo3.line, children: [ { title: '站台', - operate: OperationEvent.Command.commandNingBo.line_stand, + operate: OperationEvent.Command.commandNingBo3.line_stand, children: [ { title: '开放/关闭', click: this.standOpenOrClose, - operate: OperationEvent.Command.commandNingBo.line_stand_openOrClose + operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose }, { title: '设置/取消扣车', click: this.setStandDetain, - operate: OperationEvent.Command.commandNingBo.line_stand_holdOrNot + operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot }, { title: '设置站间列车数量', click: this.undeveloped, - operate: OperationEvent.Command.commandNingBo.line_stand_trainNum + operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum }, { title: '分配停站时间', click: this.setAllocateTime, - operate: OperationEvent.Command.commandNingBo.line_stand_stopTime + operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime }, { title: '授权转移', click: this.authorizeTransfer, - operate: OperationEvent.Command.commandNingBo.line_stand_transfer + operate: OperationEvent.Command.commandNingBo3.line_stand_transfer }, { title: '显示', click: this.showStandDetail, - operate: OperationEvent.Command.commandNingBo.line_stand_detail + operate: OperationEvent.Command.commandNingBo3.line_stand_detail } ] }, { title: '道岔', - operate: OperationEvent.Command.commandNingBo.line_switch, + operate: OperationEvent.Command.commandNingBo3.line_switch, children: [ { title: '命令', - operate: OperationEvent.Command.commandNingBo.line_switch_cmd, + operate: OperationEvent.Command.commandNingBo3.line_switch_cmd, click: this.setSwitchCommand }, { title: '封锁', - operate: OperationEvent.Command.commandNingBo.line_switch_block, + operate: OperationEvent.Command.commandNingBo3.line_switch_block, click: this.setBlockSwitch }, { title: '解除封锁', - operate: OperationEvent.Command.commandNingBo.line_switch_unblock, + operate: OperationEvent.Command.commandNingBo3.line_switch_unblock, click: this.setUnblockSwitch }, { title: '请求动岔/请求或授权/取消', - operate: OperationEvent.Command.commandNingBo.line_switch_empower, + operate: OperationEvent.Command.commandNingBo3.line_switch_empower, click: this.setSwitchActive }, { title: '显示', - operate: OperationEvent.Command.commandNingBo.line_switch_detail, + operate: OperationEvent.Command.commandNingBo3.line_switch_detail, click: this.showSwitchDetail } ] }, { title: '信号机', - operate: OperationEvent.Command.commandNingBo.line_signal, + operate: OperationEvent.Command.commandNingBo3.line_signal, children: [ { title: '引导', - operate: OperationEvent.Command.commandNingBo.line_signal_guide, + operate: OperationEvent.Command.commandNingBo3.line_signal_guide, click: this.setSignalGuide }, { title: '取消允许锁闭', - operate: OperationEvent.Command.commandNingBo.line_signal_lockOrNot, + operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot, click: this.setSignalCanBlock }, { title: '进路/命令', - operate: OperationEvent.Command.commandNingBo.line_signal_cmd, + operate: OperationEvent.Command.commandNingBo3.line_signal_cmd, click: this.setRouteCommand }, { title: '信号指示模式', - operate: OperationEvent.Command.commandNingBo.line_signal_indicator, + operate: OperationEvent.Command.commandNingBo3.line_signal_indicator, click: this.setSignalModel }, { title: '封锁', - operate: OperationEvent.Command.commandNingBo.line_signal_block, + operate: OperationEvent.Command.commandNingBo3.line_signal_block, click: this.setSignalBlock }, { title: '解除封锁', - operate: OperationEvent.Command.commandNingBo.line_signal_unblock, + operate: OperationEvent.Command.commandNingBo3.line_signal_unblock, click: this.setSignalCancelBlock }, { title: '显示', - operate: OperationEvent.Command.commandNingBo.line_signal_detail, + operate: OperationEvent.Command.commandNingBo3.line_signal_detail, click: this.showSignalDetail } ] }, { title: '轨道', - operate: OperationEvent.Command.commandNingBo.line_section, + operate: OperationEvent.Command.commandNingBo3.line_section, children: [ { title: '开放', - operate: OperationEvent.Command.commandNingBo.line_section_open, + operate: OperationEvent.Command.commandNingBo3.line_section_open, click: this.handleOpenSection }, { title: '关闭', - operate: OperationEvent.Command.commandNingBo.line_section_close, + operate: OperationEvent.Command.commandNingBo3.line_section_close, click: this.handleCloseSection }, { title: '临时限速', - operate: OperationEvent.Command.commandNingBo.line_section_limitSpeed, + operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed, click: this.handleLimitSpeed }, { title: '显示', - operate: OperationEvent.Command.commandNingBo.line_section_detail, + operate: OperationEvent.Command.commandNingBo3.line_section_detail, click: this.handleSectionShow } ] @@ -908,138 +908,138 @@ export default { }, { title: '线路(G)', - operate: OperationEvent.Command.commandNingBo.line, + operate: OperationEvent.Command.commandNingBo3.line, children: [ { title: '站台', - operate: OperationEvent.Command.commandNingBo.line_stand, + operate: OperationEvent.Command.commandNingBo3.line_stand, children: [ { title: '开放/关闭', click: this.standOpenOrClose, - operate: OperationEvent.Command.commandNingBo.line_stand_openOrClose + operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose }, { title: '设置/取消扣车', click: this.setStandDetain, - operate: OperationEvent.Command.commandNingBo.line_stand_holdOrNot + operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot }, { title: '设置站间列车数量', click: this.undeveloped, - operate: OperationEvent.Command.commandNingBo.line_stand_trainNum + operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum }, { title: '分配停站时间', click: this.setAllocateTime, - operate: OperationEvent.Command.commandNingBo.line_stand_stopTime + operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime }, { title: '授权转移', click: this.authorizeTransfer, - operate: OperationEvent.Command.commandNingBo.line_stand_transfer + operate: OperationEvent.Command.commandNingBo3.line_stand_transfer }, { title: '显示', click: this.showStandDetail, - operate: OperationEvent.Command.commandNingBo.line_stand_detail + operate: OperationEvent.Command.commandNingBo3.line_stand_detail } ] }, { title: '道岔', - operate: OperationEvent.Command.commandNingBo.line_switch, + operate: OperationEvent.Command.commandNingBo3.line_switch, children: [ { title: '命令', - operate: OperationEvent.Command.commandNingBo.line_switch_cmd, + operate: OperationEvent.Command.commandNingBo3.line_switch_cmd, click: this.setSwitchCommand }, { title: '封锁', - operate: OperationEvent.Command.commandNingBo.line_switch_block, + operate: OperationEvent.Command.commandNingBo3.line_switch_block, click: this.setBlockSwitch }, { title: '解除封锁', - operate: OperationEvent.Command.commandNingBo.line_switch_unblock, + operate: OperationEvent.Command.commandNingBo3.line_switch_unblock, click: this.setUnblockSwitch }, { title: '请求动岔/请求或授权/取消', - operate: OperationEvent.Command.commandNingBo.line_switch_empower, + operate: OperationEvent.Command.commandNingBo3.line_switch_empower, click: this.setSwitchActive }, { title: '显示', - operate: OperationEvent.Command.commandNingBo.line_switch_detail, + operate: OperationEvent.Command.commandNingBo3.line_switch_detail, click: this.showSwitchDetail } ] }, { title: '信号机', - operate: OperationEvent.Command.commandNingBo.line_signal, + operate: OperationEvent.Command.commandNingBo3.line_signal, children: [ { title: '引导', - operate: OperationEvent.Command.commandNingBo.line_signal_guide, + operate: OperationEvent.Command.commandNingBo3.line_signal_guide, click: this.setSignalGuide }, { title: '取消允许锁闭', - operate: OperationEvent.Command.commandNingBo.line_signal_lockOrNot, + operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot, click: this.setSignalCanBlock }, { title: '进路/命令', - operate: OperationEvent.Command.commandNingBo.line_signal_cmd, + operate: OperationEvent.Command.commandNingBo3.line_signal_cmd, click: this.setRouteCommand }, { title: '信号指示模式', - operate: OperationEvent.Command.commandNingBo.line_signal_indicator, + operate: OperationEvent.Command.commandNingBo3.line_signal_indicator, click: this.setSignalModel }, { title: '封锁', - operate: OperationEvent.Command.commandNingBo.line_signal_block, + operate: OperationEvent.Command.commandNingBo3.line_signal_block, click: this.setSignalBlock }, { title: '解除封锁', - operate: OperationEvent.Command.commandNingBo.line_signal_unblock, + operate: OperationEvent.Command.commandNingBo3.line_signal_unblock, click: this.setSignalCancelBlock }, { title: '显示', - operate: OperationEvent.Command.commandNingBo.line_signal_detail, + operate: OperationEvent.Command.commandNingBo3.line_signal_detail, click: this.showSignalDetail } ] }, { title: '轨道', - operate: OperationEvent.Command.commandNingBo.line_section, + operate: OperationEvent.Command.commandNingBo3.line_section, children: [ { title: '开放', - operate: OperationEvent.Command.commandNingBo.line_section_open, + operate: OperationEvent.Command.commandNingBo3.line_section_open, click: this.handleOpenSection }, { title: '关闭', - operate: OperationEvent.Command.commandNingBo.line_section_close, + operate: OperationEvent.Command.commandNingBo3.line_section_close, click: this.handleCloseSection }, { title: '临时限速', - operate: OperationEvent.Command.commandNingBo.line_section_limitSpeed, + operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed, click: this.handleLimitSpeed }, { title: '显示', - operate: OperationEvent.Command.commandNingBo.line_section_detail, + operate: OperationEvent.Command.commandNingBo3.line_section_detail, click: this.handleSectionShow } ] diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue index 5826038c5..b4c9a99db 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue @@ -7,6 +7,7 @@ :data="stationStandList" highlight-current-row height="350px" + :id="domIdChoose" @current-change="handleCurrentChange" > @@ -35,7 +36,7 @@ 应用(A) - 关闭(C) + 关闭(C) 帮助(H) @@ -73,17 +74,17 @@ export default { show() { return this.dialogShow && !this.$store.state.menuOperation.break; }, - domIdCancel() { - return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; - }, domIdChoose() { - return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : ''; + return this.dialogShow ? OperationEvent.Command.common.choose.domId : '' }, domIdConfirm() { - return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : ''; + return this.dialogShow ? OperationEvent.Command.common.confirm.domId : ''; + }, + domIdClose() { + return this.dialogShow ? OperationEvent.Command.common.close.domId : ''; }, domIdApply() { - return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menuButton.domId : ''; + return this.dialogShow ? OperationEvent.Command.common.apply.domId : ''; }, title() { return '站台开放/关闭'; @@ -120,7 +121,7 @@ export default { const step = { over: true, cmdType:this.status ? CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP : CMD.Stand.CMD_STAND_SET_JUMP_STOP, - operation:this.status ? OperationEvent.StationStand.cancelJumpStop.confirm.operation : OperationEvent.StationStand.setJumpStop.confirm.operation, + operation: isClose? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation, param: {standCode: this.selected.code} }; @@ -147,9 +148,9 @@ export default { if (!val) { return; } const standEle = this.$store.getters['map/getDeviceByCode'](val.code); const step = { - code: `${val.code}`, - operation:standEle.allSkip ? OperationEvent.StationStand.setJumpStop.choose.operation : OperationEvent.StationStand.cancelJumpStop.choose.operation, - param: {} + code: val.code, + operation: OperationEvent.Command.common.choose.operation, + val: val.code }; this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { @@ -164,7 +165,7 @@ export default { }, cancel() { const operate = { - operation: OperationEvent.Command.cancel.menu.operation + operation: OperationEvent.Command.common.close.operation }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { diff --git a/src/jmapNew/theme/ningbo_03/operationConfig.js b/src/jmapNew/theme/ningbo_03/operationConfig.js index 1472542b5..1d170b9a5 100644 --- a/src/jmapNew/theme/ningbo_03/operationConfig.js +++ b/src/jmapNew/theme/ningbo_03/operationConfig.js @@ -803,10 +803,12 @@ export default { trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_stand.operation, tip: '鼠标右键菜单选择【站台】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_stand_openOrClose.operation, tip: '鼠标右键菜单选择【开放/关闭】' } - // { deviceType: '02', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_stand_openOrClose.operation, tip: '鼠标右键菜单选择【开放/关闭】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标右键菜单选择【站台】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标右键菜单选择【开放/关闭】' }, + { deviceType: 'bar', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{10}】', codeType: 'STAND', val: '{10}' }, + { deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' }, + { deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }, ] }, { @@ -819,9 +821,12 @@ export default { trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_stand.operation, tip: '鼠标右键菜单选择【站台】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_stand_openOrClose.operation, tip: '鼠标右键菜单选择【开放/关闭】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标右键菜单选择【站台】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标右键菜单选择【开放/关闭】' }, + { deviceType: 'bar', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{10}】', codeType: 'STAND', val: '{10}' }, + { deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' }, + { deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }, ] }, { @@ -834,9 +839,9 @@ export default { trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_stand.operation, tip: '鼠标右键菜单选择【站台】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_stand_holdOrNot.operation, tip: '鼠标右键菜单选择【设置/取消扣车】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标右键菜单选择【站台】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot.operation, tip: '鼠标右键菜单选择【设置/取消扣车】' } ] }, { @@ -849,9 +854,9 @@ export default { trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_stand.operation, tip: '鼠标右键菜单选择【站台】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_stand_holdOrNot.operation, tip: '鼠标右键菜单选择【设置/取消扣车】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标右键菜单选择【站台】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot.operation, tip: '鼠标右键菜单选择【设置/取消扣车】' } ] }, { @@ -864,9 +869,9 @@ export default { trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_stand.operation, tip: '鼠标右键菜单选择【站台】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_stand_stopTime.operation, tip: '鼠标右键菜单选择【分配停站时间】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标右键菜单选择【站台】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_stopTime.operation, tip: '鼠标右键菜单选择【分配停站时间】' } ] }, { @@ -879,9 +884,9 @@ export default { trainingType: 'Stand', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_stand.operation, tip: '鼠标右键菜单选择【站台】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_stand_detail.operation, tip: '鼠标右键菜单选择【显示】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标右键菜单选择【站台】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_detail.operation, tip: '鼠标右键菜单选择【显示】' } ] }, @@ -896,9 +901,9 @@ export default { trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_switch_cmd.operation, tip: '鼠标右键菜单选择【命令】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_cmd.operation, tip: '鼠标右键菜单选择【命令】' } ] }, { @@ -911,9 +916,9 @@ export default { trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_switch_cmd.operation, tip: '鼠标右键菜单选择【命令】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_cmd.operation, tip: '鼠标右键菜单选择【命令】' } ] }, { @@ -926,9 +931,9 @@ export default { trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_switch_block.operation, tip: '鼠标右键菜单选择【封锁】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_block.operation, tip: '鼠标右键菜单选择【封锁】' } ] }, { @@ -941,9 +946,9 @@ export default { trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_switch_unblock.operation, tip: '鼠标右键菜单选择【解除封锁】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_unblock.operation, tip: '鼠标右键菜单选择【解除封锁】' } ] }, { @@ -956,9 +961,9 @@ export default { trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_switch_empower.operation, tip: '鼠标右键菜单选择【请求动岔/请求或授权/取消】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_empower.operation, tip: '鼠标右键菜单选择【请求动岔/请求或授权/取消】' } ] }, { @@ -971,9 +976,9 @@ export default { trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_switch_empower.operation, tip: '鼠标右键菜单选择【请求动岔/请求或授权/取消】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_empower.operation, tip: '鼠标右键菜单选择【请求动岔/请求或授权/取消】' } ] }, @@ -987,9 +992,9 @@ export default { trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_signal_guide.operation, tip: '鼠标右键菜单选择【引导】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_guide.operation, tip: '鼠标右键菜单选择【引导】' } ] }, { @@ -1002,9 +1007,9 @@ export default { trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_signal_lockOrNot.operation, tip: '鼠标右键菜单选择【开始锁闭解除】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot.operation, tip: '鼠标右键菜单选择【开始锁闭解除】' } ] }, { @@ -1017,9 +1022,9 @@ export default { trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_signal_block.operation, tip: '鼠标右键菜单选择【封锁】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_block.operation, tip: '鼠标右键菜单选择【封锁】' } ] }, { @@ -1032,9 +1037,9 @@ export default { trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_signal_unblock.operation, tip: '鼠标右键菜单选择【解除封锁】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_unblock.operation, tip: '鼠标右键菜单选择【解除封锁】' } ] }, { @@ -1047,9 +1052,9 @@ export default { trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_signal_indicator.operation, tip: '鼠标右键菜单选择【信号指示模式】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_indicator.operation, tip: '鼠标右键菜单选择【信号指示模式】' } ] }, { @@ -1062,9 +1067,9 @@ export default { trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_signal_indicator.operation, tip: '鼠标右键菜单选择【信号指示模式】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_indicator.operation, tip: '鼠标右键菜单选择【信号指示模式】' } ] }, { @@ -1077,9 +1082,9 @@ export default { trainingType: 'Signal', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_signal_detail.operation, tip: '鼠标右键菜单选择【显示】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_detail.operation, tip: '鼠标右键菜单选择【显示】' } ] }, @@ -1093,9 +1098,9 @@ export default { trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_section.operation, tip: '鼠标右键菜单选择【轨道】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_section_open.operation, tip: '鼠标右键菜单选择【开放】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_section.operation, tip: '鼠标右键菜单选择【轨道】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_section_open.operation, tip: '鼠标右键菜单选择【开放】' } ] }, { @@ -1108,9 +1113,9 @@ export default { trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_section.operation, tip: '鼠标右键菜单选择【轨道】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_section_close.operation, tip: '鼠标右键菜单选择【关闭】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_section.operation, tip: '鼠标右键菜单选择【轨道】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_section_close.operation, tip: '鼠标右键菜单选择【关闭】' } ] }, { @@ -1123,9 +1128,9 @@ export default { trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo.line.operation, tip: '鼠标右键菜单选择【线路】' }, - { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo.line_section.operation, tip: '鼠标右键菜单选择【轨道】' }, - { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo.line_section_limitSpeed.operation, tip: '鼠标右键菜单选择【临时限速】' } + { deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' }, + { deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_section.operation, tip: '鼠标右键菜单选择【轨道】' }, + { deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_section_limitSpeed.operation, tip: '鼠标右键菜单选择【临时限速】' } ] } ] diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index d50dfc291..57ed05f8b 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -1,6 +1,42 @@ export const OperationEvent = { // 直接指令 Command: { + // 对话框 + common: { + choose: { + operation: 'com01', + domId: '_Tips-Cmd-Common-Choose' + }, + confirm: { + operation: 'com02', + domId: '_Tips-Cmd-Common-Confirm' + }, + apply: { + operation: 'com04', + domId: '_Tips-Cmd-Common-Apply' + }, + close: { + operation: 'com05', + domId: '_Tips-Cmd-Common-Close' + }, + choose1: { + operation: 'com06', + domId: '_Tips-Cmd-Common-Choose1' + }, + confirm1: { + operation: 'com07', + domId: '_Tips-Cmd-Common-Confirm1' + }, + apply1: { + operation: 'com08', + domId: '_Tips-Cmd-Common-Apply1' + }, + close1: { + operation: 'com09', + domId: '_Tips-Cmd-Common-Close1' + }, + }, + // 取消操作 cancel: { menu: { @@ -251,7 +287,7 @@ export const OperationEvent = { } }, // 宁波三 - commandNingBo: { + commandNingBo3: { // 线路 line: { operation: '00a', diff --git a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue index ad92af037..d8d5e1cde 100644 --- a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue +++ b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue @@ -44,6 +44,7 @@ export default { if (this.$store.state.training.trainingStart) { const order = this.$store.state.training.order; const steps = this.$store.state.training.steps; + if (order > -1 && order < steps.length) { const step = steps[order]; const distance = 5;