From dd758a1bfb6480593c77585dddf0be7a3940f51c Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 9 Jun 2020 13:16:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=87=E4=BB=A4=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/ningbo_01/menus/dialog/switchControl.vue | 4 ++-- src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue | 8 ++++---- src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js | 10 ++++------ src/jmapNew/theme/xian_02/menus/menuSwitch.vue | 4 ++-- src/scripts/cmdPlugin/CommandEnum.js | 10 +++++----- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/switchControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/switchControl.vue index 25737c572..db6bb209f 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/switchControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/switchControl.vue @@ -199,11 +199,11 @@ export default { }, // 道岔定位 locate() { - this.sendCommand(menuOperate.Switch.npChain); + this.sendCommand(menuOperate.Switch.locate); }, // 道岔反位 reverse() { - this.sendCommand(menuOperate.Switch.rpChain); + this.sendCommand(menuOperate.Switch.reverse); }, // 区段切除 split() { diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue index e2027b8a3..1b0d33284 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue @@ -59,12 +59,12 @@ export default { { label: '道岔单锁', handler: this.lock, - cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK_CHAIN + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK }, { label: '道岔单解', handler: this.unlock, - cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK_CHAIN + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK }, { label: '道岔封锁', @@ -185,7 +185,7 @@ export default { }, // 定操定位 locate() { - commitOperate(menuOperate.Switch.npChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Switch.locate, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ if (valid) { this.$refs.switchControl.doShow(operate, this.selected); } @@ -193,7 +193,7 @@ export default { }, // 定操反位 reverse() { - commitOperate(menuOperate.Switch.rpChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Switch.reverse, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ if (valid) { this.$refs.switchControl.doShow(operate, this.selected); } diff --git a/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js b/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js index f2a3d6317..1e4d33713 100644 --- a/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js +++ b/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js @@ -131,14 +131,12 @@ export const menuOperate = { lock:{ // 道岔单锁(联锁) operation: OperationEvent.Switch.lock.menu.operation, - // cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK - cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK_CHAIN + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK }, unlock:{ // 道岔解锁(联锁) operation: OperationEvent.Switch.unlock.menu.operation, - // cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK - cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK_CHAIN + cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK }, block:{ // 道岔封锁 @@ -150,12 +148,12 @@ export const menuOperate = { operation: OperationEvent.Switch.unblock.menu.operation, cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK }, - npChain:{ + locate:{ // 道岔定操（联动） operation: OperationEvent.Switch.locate.menu.operation, cmdType:CMD.Switch.CMD_SWITCH_NORMAL_POSITION }, - rpChain:{ + reverse:{ // 道岔反操（联动） operation: OperationEvent.Switch.reverse.menu.operation, cmdType:CMD.Switch.CMD_SWITCH_REVERSE_POSITION diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue index 82865702b..1dd7dafb2 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue @@ -256,7 +256,7 @@ export default { }, // 定操定位 locate() { - commitOperate(menuOperate.Switch.npChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Switch.locate, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ if (valid) { this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, @@ -269,7 +269,7 @@ export default { }, // 定操反位 reverse() { - commitOperate(menuOperate.Switch.rpChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ + commitOperate(menuOperate.Switch.reverse, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ if (valid) { this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index db8872779..b2c1c0d49 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -8,10 +8,10 @@ export default { CMD_SWITCH_SINGLE_LOCK: {value:'Switch_Single_Lock', label: '单锁'}, /** 单解 */ CMD_SWITCH_SINGLE_UNLOCK: {value:'Switch_Single_Unlock', label: '单解'}, - /** 单锁(联动) */ - CMD_SWITCH_SINGLE_LOCK_CHAIN: {value:'Switch_Single_Lock_Chain', label: '单锁(联动)'}, - /** 单解(联动) */ - CMD_SWITCH_SINGLE_UNLOCK_CHAIN: {value:'Switch_Single_Unlock_Chain', label: '单解(联动)'}, + // /** 单锁(联动) */ + // CMD_SWITCH_SINGLE_LOCK_CHAIN: {value:'Switch_Single_Lock_Chain', label: '单锁(联动)'}, + // /** 单解(联动) */ + // CMD_SWITCH_SINGLE_UNLOCK_CHAIN: {value:'Switch_Single_Unlock_Chain', label: '单解(联动)'}, /** 封锁 */ CMD_SWITCH_BLOCK: {value:'Switch_Block', label: '封锁'}, /** 解封 */ @@ -78,7 +78,7 @@ export default { CMD_SIGNAL_SET_ROUTE: {value:'Signal_Set_Route', label: '排列进路'}, /** 取消进路 */ CMD_SIGNAL_CANCEL_ROUTE: {value:'Signal_Cancel_Route', label: '取消进路'}, - /** 强制取消进路 */ + // /** 强制取消进路 */ // CMD_SIGNAL_FORCE_CANCEL_ROUTE: {value: 'Signal_Force_Cancel_Route', label: '强制取消进路'}, /** 人解进路 */ CMD_SIGNAL_HUMAN_RELEASE_ROUTE: {value:'Signal_Human_Release_Route', label: '人解进路'},