From 2615460674359368cda0bef32a7763a2664f0504 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 13 Aug 2020 17:25:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6=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/beijing_01/menus/menuSwitch.vue | 10 +++++---- .../theme/beijing_01/menus/menuTrain.vue | 10 +++++++-- .../theme/chengdu_01/menus/menuSwitch.vue | 22 ++++++++++--------- .../theme/chengdu_01/menus/menuTrain.vue | 12 ++++++++-- .../theme/chengdu_03/menus/menuSwitch.vue | 22 ++++++++++--------- .../theme/chengdu_03/menus/menuTrain.vue | 11 ++++++++-- .../theme/foshan_01/menus/menuSwitch.vue | 10 +++++---- .../theme/foshan_01/menus/menuTrain.vue | 10 +++++++-- .../theme/fuzhou_01/menus/menuSwitch.vue | 10 +++++---- .../theme/fuzhou_01/menus/menuTrain.vue | 11 +++++++--- .../theme/haerbin_01/menus/menuSwitch.vue | 22 ++++++++++--------- .../theme/haerbin_01/menus/menuTrain.vue | 11 ++++++++-- .../theme/ningbo_01/menus/menuSwitch.vue | 10 +++++---- .../theme/ningbo_01/menus/menuTrain.vue | 10 +++++++-- .../theme/xian_01/menus/menuSwitch.vue | 10 +++++---- src/jmapNew/theme/xian_01/menus/menuTrain.vue | 10 +++++++-- .../theme/xian_02/menus/menuSwitch.vue | 10 +++++---- src/jmapNew/theme/xian_02/menus/menuTrain.vue | 10 +++++++-- 18 files changed, 148 insertions(+), 73 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue index 9281c0abe..99d9ec6aa 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue @@ -98,10 +98,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '道岔钩锁', - handler: this.hookLock } ] }; @@ -146,6 +142,12 @@ export default { // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { this.menu = this.menuForce; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu.push({ + label: '道岔钩锁', + handler: this.hookLock + }); + } } }, doShow(point) { diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue index 0618cff57..9cac90607 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue @@ -284,11 +284,17 @@ export default { // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { - this.menu = [...this.menuForce, ...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuForce, ...this.menuDirective]; + } else { + this.menu = [...this.menuForce]; + } } // 指令模式列表 if (this.operatemode === OperateMode.DIRECTIVE) { - this.menu = [...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuDirective]; + } } // this.menu = menuConvert(this.menu); diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue index 2a68de6fb..151c60673 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue @@ -4,7 +4,7 @@ - + @@ -31,8 +31,8 @@ export default { NoticeInfo, CreateDeviceLabel, SwitchControl, - SetFault, - SwitchHookLock + SetFault, + SwitchHookLock }, mixins: [ CancelMouseState @@ -129,10 +129,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '道岔钩锁', - handler: this.hookLock } ] }; @@ -169,6 +165,12 @@ export default { // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { this.menu = this.menuForce; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu.push({ + label: '道岔钩锁', + handler: this.hookLock + }); + } } }, @@ -267,10 +269,10 @@ export default { this.$refs.switchControl.doShow(operate, this.selected); } }); - }, - // 道岔钩锁 + }, + // 道岔钩锁 hookLock() { - this.$refs.switchHookLock.doShow(this.selected); + this.$refs.switchHookLock.doShow(this.selected); }, undeveloped() { this.doClose(); diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue index f52861d1f..f44a19b00 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue @@ -191,13 +191,21 @@ export default { // 编辑模式菜单列表 // this.menu = trainMenuFiltration(this.menuNormal); this.menu = MenuContextHandler.covert(this.menuNormal); + // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { - this.menu = [...this.menuForce, ...this.menuDirective, ...this.menuSpeed]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuForce, ...this.menuDirective, ...this.menuSpeed]; + } else { + this.menu = [...this.menuForce]; + } } + // 指令模式列表 if (this.operatemode === OperateMode.DIRECTIVE) { - this.menu = [...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuDirective]; + } } // this.menu = menuConvert(this.menu); diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue index 64d75b0ac..69468f545 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue @@ -4,7 +4,7 @@ - + @@ -30,8 +30,8 @@ export default { SectionControl, SwitchControl, NoticeInfo, - SetFault, - SwitchHookLock + SetFault, + SwitchHookLock }, mixins: [ CancelMouseState @@ -101,10 +101,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '道岔钩锁', - handler: this.hookLock } ] }; @@ -141,6 +137,12 @@ export default { // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { this.menu = this.menuForce; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu.push({ + label: '道岔钩锁', + handler: this.hookLock + }); + } } }, @@ -235,10 +237,10 @@ export default { this.$refs.switchControl.doShow(operate, this.selected); } }); - }, - // 道岔钩锁 + }, + // 道岔钩锁 hookLock() { - this.$refs.switchHookLock.doShow(this.selected); + this.$refs.switchHookLock.doShow(this.selected); }, undeveloped() { this.doClose(); diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue index c1be54899..e05833a8f 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue @@ -175,12 +175,19 @@ export default { this.menu = MenuContextHandler.covert(this.menuNormal); // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { - this.menu = [...this.menuForce, ...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuForce, ...this.menuDirective]; + } else { + this.menu = [...this.menuForce]; + } } // 指令模式列表 if (this.operatemode === OperateMode.DIRECTIVE) { - this.menu = [...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuDirective]; + } } + }, doShow(point) { this.clickEvent(); diff --git a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue index ed97152bd..a9d87bb4e 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue @@ -126,10 +126,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '道岔钩锁', - handler: this.hookLock } ] }; @@ -170,6 +166,12 @@ export default { // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { this.menu = this.menuForce; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu.push({ + label: '道岔钩锁', + handler: this.hookLock + }); + } } }, doShow(point) { diff --git a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue index 640393dd8..c4e68b503 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue @@ -184,11 +184,17 @@ export default { this.menu = MenuContextHandler.covert(this.menuNormal); // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { - this.menu = [...this.menuForce, ...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuForce, ...this.menuDirective]; + } else { + this.menu = [...this.menuForce]; + } } // 指令模式列表 if (this.operatemode === OperateMode.DIRECTIVE) { - this.menu = [...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuDirective]; + } } }, doShow(point) { diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue index 785079544..9f80ebf72 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue @@ -166,10 +166,6 @@ export default { { label: this.$t('menu.menuSwitch.cancelFault'), handler: this.cancelStoppage - }, - { - label: '道岔钩锁', - handler: this.hookLock } ] }; @@ -209,6 +205,12 @@ export default { // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { this.menu = this.menuForce; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu.push({ + label: '道岔钩锁', + handler: this.hookLock + }); + } } }, doShow(point) { diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue index 4bf0c1a24..d97034f1e 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue @@ -163,14 +163,19 @@ export default { if (this.operatemode === OperateMode.ADMIN) { this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed]; } - // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { - this.menu = [...this.menuForce, ...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuForce, ...this.menuDirective]; + } else { + this.menu = [...this.menuForce]; + } } // 指令模式列表 if (this.operatemode === OperateMode.DIRECTIVE) { - this.menu = [...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuDirective]; + } } }, doShow(point) { diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue b/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue index 007b625b8..3aa392d62 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue @@ -2,7 +2,7 @@
- +
@@ -24,8 +24,8 @@ export default { components: { PopMenu, NoticeInfo, - SetFault, - SwitchHookLock + SetFault, + SwitchHookLock }, props: { selected: { @@ -54,10 +54,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '道岔钩锁', - handler: this.hookLock } ] }; @@ -93,6 +89,12 @@ export default { // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { this.menu = this.menuForce; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu.push({ + label: '道岔钩锁', + handler: this.hookLock + }); + } } }, doShow(point) { @@ -122,10 +124,10 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); - }, - // 道岔钩锁 + }, + // 道岔钩锁 hookLock() { - this.$refs.switchHookLock.doShow(this.selected); + this.$refs.switchHookLock.doShow(this.selected); } } }; diff --git a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue index 479829bee..583b4f6ba 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue @@ -127,12 +127,19 @@ export default { } // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { - this.menu = [...this.menuForce, ...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuForce, ...this.menuDirective]; + } else { + this.menu = [...this.menuForce]; + } } // 指令模式列表 if (this.operatemode === OperateMode.DIRECTIVE) { - this.menu = [...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuDirective]; + } } + }, doShow(point) { this.clickEvent(); diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue index ecd903e67..311f074b0 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue @@ -145,10 +145,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '道岔钩锁', - handler: this.hookLock } ] }; @@ -184,6 +180,12 @@ export default { // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { this.menu = this.menuForce; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu.push({ + label: '道岔钩锁', + handler: this.hookLock + }); + } } }, doShow(point) { diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue index 2305347d6..240ede036 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue @@ -282,11 +282,17 @@ export default { this.menu = MenuContextHandler.covert(this.menuNormal); // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { - this.menu = [...this.menuForce, ...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuForce, ...this.menuDirective]; + } else { + this.menu = [...this.menuForce]; + } } // 指令模式列表 if (this.operatemode === OperateMode.DIRECTIVE) { - this.menu = [...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuDirective]; + } } }, doShow(point) { diff --git a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue index a7f0ce363..23b78a245 100644 --- a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue @@ -175,10 +175,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '道岔钩锁', - handler: this.hookLock } ] }; @@ -217,6 +213,12 @@ export default { // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { this.menu = this.menuForce; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu.push({ + label: '道岔钩锁', + handler: this.hookLock + }); + } } }, doShow(point) { diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue index fc6ef8b36..7a214e176 100644 --- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue @@ -180,11 +180,17 @@ export default { } // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { - this.menu = [...this.menuForce, ...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuForce, ...this.menuDirective]; + } else { + this.menu = [...this.menuForce]; + } } // 指令模式列表 if (this.operatemode === OperateMode.DIRECTIVE) { - this.menu = [...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuDirective]; + } } }, doShow(point) { diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue index ac2c6dfe0..b2a544939 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue @@ -154,10 +154,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '道岔钩锁', - handler: this.hookLock } ] }; @@ -196,6 +192,12 @@ export default { // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { this.menu = this.menuForce; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu.push({ + label: '道岔钩锁', + handler: this.hookLock + }); + } } }, initMenuEnabled() { diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue index 2214a0b90..64a975dd5 100644 --- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue @@ -283,11 +283,17 @@ export default { } // 故障模式菜单列表 if (this.operatemode === OperateMode.FAULT) { - this.menu = [...this.menuForce, ...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuForce, ...this.menuDirective]; + } else { + this.menu = [...this.menuForce]; + } } // 指令模式列表 if (this.operatemode === OperateMode.DIRECTIVE) { - this.menu = [...this.menuDirective]; + if (!this.$store.state.scriptRecord.bgSet) { + this.menu = [...this.menuDirective]; + } } }, doShow(point) {