From 584a30a634ac68e38cc5c79f527dc5f76a4803e2 Mon Sep 17 00:00:00 2001 From: lVAL Date: Fri, 22 Jan 2021 17:39:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=8C=BA=E6=AE=B5?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E5=BB=BA=E5=88=97=E8=BD=A6=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E8=8F=9C=E5=8D=95=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?operate=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 | 167 +++++++++++------- .../menus/menuDialog/initSignalBlock.vue | 90 +++++----- .../menuDialog/initializeSignalCanBlock.vue | 82 ++++----- .../menus/menuDialog/signalCanBlock.vue | 30 ++-- .../theme/ningbo_03/menus/menuSection.vue | 21 ++- src/scripts/cmdPlugin/OperationHandler.js | 145 ++++++++++++++- 6 files changed, 370 insertions(+), 165 deletions(-) diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue index e4e76c153..5a06858d1 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue @@ -245,6 +245,7 @@ export default { } }, data() { + console.log(OperationEvent.Command.commandNingBo.line_stand) return { classA: -1, classB: -1, @@ -256,7 +257,7 @@ export default { Local: [ // { // title: '窗口(W)', - // operate: OperationEvent.Command.mBar.system, + // operate: '', // children: [ // { // title: '报警', @@ -412,118 +413,139 @@ export default { }, { title: '线路(G)', - operate: '', + operate: OperationEvent.Command.commandNingBo.line, children: [ { title: '站台', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_stand, children: [ { title: '开放/关闭', - click: this.standOpenOrClose + click: this.standOpenOrClose, + operate: OperationEvent.Command.commandNingBo.line_stand_openOrClose }, { title: '设置/取消扣车', - click: this.setStandDetain + click: this.setStandDetain, + operate: OperationEvent.Command.commandNingBo.line_stand_holdOrNot }, { title: '设置站间列车数量', - // click: this.setIntervalStopNumber - click: this.undeveloped + click: this.undeveloped, + operate: OperationEvent.Command.commandNingBo.line_stand_trainNum }, { title: '分配停站时间', - click: this.setAllocateTime + click: this.setAllocateTime, + operate: OperationEvent.Command.commandNingBo.line_stand_stopTime }, { title: '授权转移', - click: this.authorizeTransfer + click: this.authorizeTransfer, + operate: OperationEvent.Command.commandNingBo.line_stand_transfer }, { title: '显示', - click: this.showStandDetail + click: this.showStandDetail, + operate: OperationEvent.Command.commandNingBo.line_stand_detail } ] }, { title: '道岔', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_switch, children: [ { - title: '命令', + title: '命令', + operate: OperationEvent.Command.commandNingBo.line_switch_cmd, click: this.setSwitchCommand }, { - title: '封锁', + title: '封锁', + operate: OperationEvent.Command.commandNingBo.line_switch_block, click: this.setBlockSwitch }, { - title: '解除封锁', + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo.line_switch_unblock, click: this.setUnblockSwitch }, { - title: '请求动岔/请求或授权/取消', + title: '请求动岔/请求或授权/取消', + operate: OperationEvent.Command.commandNingBo.line_switch_empower, click: this.setSwitchActive }, { - title: '显示', + title: '显示', + operate: OperationEvent.Command.commandNingBo.line_switch_detail, click: this.showSwitchDetail } ] }, { title: '信号机', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_signal, children: [ { - title: '引导', + title: '引导', + operate: OperationEvent.Command.commandNingBo.line_signal_guide, click: this.setSignalGuide }, { - title: '取消允许锁闭', + title: '取消允许锁闭', + operate: OperationEvent.Command.commandNingBo.line_signal_lockOrNot, click: this.setSignalCanBlock }, { - title: '进路/命令', + title: '进路/命令', + operate: OperationEvent.Command.commandNingBo.line_signal_cmd, click: this.setRouteCommand }, { - title: '信号指示模式', + title: '信号指示模式', + operate: OperationEvent.Command.commandNingBo.line_signal_indicator, click: this.setSignalModel }, { - title: '封锁', + title: '封锁', + operate: OperationEvent.Command.commandNingBo.line_signal_block, click: this.setSignalBlock }, { - title: '解除封锁', + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo.line_signal_unblock, click: this.setSignalCancelBlock }, { - title: '显示', + title: '显示', + operate: OperationEvent.Command.commandNingBo.line_signal_detail, click: this.showSignalDetail } ] }, { title: '轨道', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_section, children: [ { - title: '开放', + title: '开放', + operate: OperationEvent.Command.commandNingBo.line_section_open, click: this.handleOpenSection }, { - title: '关闭', + title: '关闭', + operate: OperationEvent.Command.commandNingBo.line_section_close, click: this.handleCloseSection }, { - title: '临时限速', + title: '临时限速', + operate: OperationEvent.Command.commandNingBo.line_section_limitSpeed, click: this.handleLimitSpeed }, { - title: '显示', + title: '显示', + operate: OperationEvent.Command.commandNingBo.line_section_detail, click: this.handleSectionShow } ] @@ -887,121 +909,142 @@ export default { }, { title: '线路(G)', - operate: '', + operate: OperationEvent.Command.commandNingBo.line, children: [ - { + { title: '站台', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_stand, children: [ { title: '开放/关闭', - click: this.standOpenOrClose + click: this.standOpenOrClose, + operate: OperationEvent.Command.commandNingBo.line_stand_openOrClose }, { title: '设置/取消扣车', - click: this.setStandDetain + click: this.setStandDetain, + operate: OperationEvent.Command.commandNingBo.line_stand_holdOrNot }, { title: '设置站间列车数量', - click: this.setIntervalStopNumber + click: this.undeveloped, + operate: OperationEvent.Command.commandNingBo.line_stand_trainNum }, { title: '分配停站时间', - click: this.setAllocateTime + click: this.setAllocateTime, + operate: OperationEvent.Command.commandNingBo.line_stand_stopTime }, { title: '授权转移', - click: this.authorizeTransfer + click: this.authorizeTransfer, + operate: OperationEvent.Command.commandNingBo.line_stand_transfer }, { title: '显示', - click: this.showStandDetail + click: this.showStandDetail, + operate: OperationEvent.Command.commandNingBo.line_stand_detail } ] }, { title: '道岔', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_switch, children: [ { - title: '命令', + title: '命令', + operate: OperationEvent.Command.commandNingBo.line_switch_cmd, click: this.setSwitchCommand }, { - title: '封锁', + title: '封锁', + operate: OperationEvent.Command.commandNingBo.line_switch_block, click: this.setBlockSwitch }, { - title: '解除封锁', + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo.line_switch_unblock, click: this.setUnblockSwitch }, { - title: '请求动岔/请求或授权/取消', + title: '请求动岔/请求或授权/取消', + operate: OperationEvent.Command.commandNingBo.line_switch_empower, click: this.setSwitchActive }, { - title: '显示', + title: '显示', + operate: OperationEvent.Command.commandNingBo.line_switch_detail, click: this.showSwitchDetail } ] }, - { + { title: '信号机', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_signal, children: [ - { - title: '引导', + title: '引导', + operate: OperationEvent.Command.commandNingBo.line_signal_guide, click: this.setSignalGuide }, { - title: '取消允许锁闭', + title: '取消允许锁闭', + operate: OperationEvent.Command.commandNingBo.line_signal_lockOrNot, click: this.setSignalCanBlock }, { - title: '进路/命令', + title: '进路/命令', + operate: OperationEvent.Command.commandNingBo.line_signal_cmd, click: this.setRouteCommand }, { - title: '信号指示模式', + title: '信号指示模式', + operate: OperationEvent.Command.commandNingBo.line_signal_indicator, click: this.setSignalModel }, { - title: '封锁', + title: '封锁', + operate: OperationEvent.Command.commandNingBo.line_signal_block, click: this.setSignalBlock }, { - title: '解除封锁', + title: '解除封锁', + operate: OperationEvent.Command.commandNingBo.line_signal_unblock, click: this.setSignalCancelBlock }, { - title: '显示', + title: '显示', + operate: OperationEvent.Command.commandNingBo.line_signal_detail, click: this.showSignalDetail } ] }, - { + { title: '轨道', - operate: '', + operate: OperationEvent.Command.commandNingBo.line_section, children: [ { - title: '开放', + title: '开放', + operate: OperationEvent.Command.commandNingBo.line_section_open, click: this.handleOpenSection }, { - title: '关闭', + title: '关闭', + operate: OperationEvent.Command.commandNingBo.line_section_close, click: this.handleCloseSection }, { - title: '临时限速', + title: '临时限速', + operate: OperationEvent.Command.commandNingBo.line_section_limitSpeed, click: this.handleLimitSpeed }, { - title: '显示', + title: '显示', + operate: OperationEvent.Command.commandNingBo.line_section_detail, click: this.handleSectionShow } ] - }, + }, { title: '闭塞区段', operate: '', @@ -1234,7 +1277,7 @@ export default { return true; }, initMenu(menu) { - const type = State2SimulationMap[this.$store.state.training.prdType]; + const type = State2SimulationMap[this.$store.state.training.prdType]; this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode); this.clickEvent(); this.closeMenu(true); diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue index 7bad76a30..d6058c012 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue @@ -1,48 +1,50 @@ diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 44d2efb5c..1639f04cf 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -234,7 +234,8 @@ export const OperationEvent = { operation: '0082', domId: '_Tips-commandHaerbin-confirmCr2{BOTTOM}' } - }, + }, + // 西安 commandXian: { confirm: { operation: '009', @@ -248,7 +249,145 @@ export const OperationEvent = { operation: '0092', domId: '_Tips-commandXian-requestBar{TOP}' } - } + }, + // 宁波三 + commandNingBo: { + //线路 + line: { + operation: '00a', + domId: '_Tips-ningBo-line{TOP}' + }, + //站台 + line_stand: { + operation: '00a0', + domId: '_Tips-ningBo-line-stand{TOP}' + }, + //开放或关闭 + line_stand_openOrClose: { + operation: '00a01', + domId: '_Tips-ningBo-line-stand-openOrClose{TOP}' + }, + //设置或取消扣车 + line_stand_holdOrNot: { + operation: '00a02', + domId: '_Tips-ningBo-line_stand_holdOrNote{TOP}' + }, + //设置站间列车数量 + line_stand_trainNum: { + operation: '00a03', + domId: '_Tips-ningBo-line_stand_trainNum{TOP}' + }, + //设置站间停站时间 + line_stand_stopTime: { + operation: '00a04', + domId: '_Tips-ningBo-line_stand_stopTime{TOP}' + }, + //授权转移 + line_stand_transfer: { + operation: '00a05', + domId: '_Tips-ningBo-line_stand_transfer{TOP}' + }, + //显示 + line_stand_detail: { + operation: '00a06', + domId: '_Tips-ningBo-line_stand_detail{TOP}' + }, + //道岔 + line_switch: { + operation: '00a1', + domId: '_Tips-ningBo-line-switch{TOP}' + }, + //命令 + line_switch_cmd: { + operation: '00a11', + domId: '_Tips-ningBo-line-switch-cmd{TOP}' + }, + //封锁 + line_switch_block: { + operation: '00a12', + domId: '_Tips-ningBo-line-switch-block{TOP}' + }, + //解除封锁 + line_switch_unblock: { + operation: '00a13', + domId: '_Tips-ningBo-line-switch-unblock{TOP}' + }, + //请求动岔/请求/授权 + line_switch_empower: { + operation: '00a14', + domId: '_Tips-ningBo-line-switch-empower{TOP}' + }, + //显示 + line_switch_detail: { + operation: '00a15', + domId: '_Tips-ningBo-line-switch-detail{TOP}' + }, + //信号机 + line_signal: { + operation: '00a2', + domId: '_Tips-ningBo-line-signal{TOP}' + }, + //引导 + line_signal_guide: { + operation: '00a21', + domId: '_Tips-ningBo-line-signal-guide{TOP}' + }, + //取消允许锁闭 + line_signal_lockOrNot: { + operation: '00a22', + domId: '_Tips-ningBo-line-signal-lockOrNot{TOP}' + }, + //进路 + line_signal_cmd: { + operation: '00a23', + domId: '_Tips-ningBo-line-signal-cmd{TOP}' + }, + //信号指示模式 + line_signal_indicator: { + operation: '00a24', + domId: '_Tips-ningBo-line-signal-indicator{TOP}' + }, + //封锁 + line_signal_block: { + operation: '00a25', + domId: '_Tips-ningBo-line-signal-block{TOP}' + }, + //解封 + line_signal_unblock: { + operation: '00a26', + domId: '_Tips-ningBo-line-signal-unblock{TOP}' + }, + //显示 + line_signal_detail: { + operation: '00a27', + domId: '_Tips-ningBo-line-signal-detail{TOP}' + }, + //轨道 + line_section: { + operation: '00a3', + domId: '_Tips-ningBo-line-section{TOP}' + }, + //开放 + line_section_open: { + operation: '00a31', + domId: '_Tips-ningBo-line-section-open{TOP}' + }, + //关闭 + line_section_close: { + operation: '00a32', + domId: '_Tips-ningBo-line-section-close{TOP}' + }, + //临时限速 + line_section_limitSpeed: { + operation: '00a33', + domId: '_Tips-ningBo-line-section-limitSpeed{TOP}' + }, + //显示 + line_section_detail: { + operation: '00a34', + domId: '_Tips-ningBo-line-section-detail{TOP}' + } + } }, // 站台概要表 StandTable: { @@ -2597,6 +2736,8 @@ export const OperationEvent = { }; +console.log(OperationEvent); + import { MapDeviceType } from './Config.js'; class OperationHandler {