From 70ec386b9de5291db226f1568beedc2dd833eb70 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 29 Jul 2022 11:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF=20?=
=?UTF-8?q?=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6=20=E8=BD=A6=E7=AB=99?=
=?UTF-8?q?=E6=89=B3=E9=81=93=E5=91=98=20=20=E6=B7=BB=E5=8A=A0=20=E9=81=93?=
=?UTF-8?q?=E5=B2=94=E9=92=A9=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../theme/datie_02/menus/menuSwitch.vue | 2 +-
.../theme/datie_jd1a/menus/menuSwitch.vue | 140 +++++++++---------
.../theme/datie_tky/menus/menuSwitch.vue | 25 ++--
3 files changed, 83 insertions(+), 84 deletions(-)
diff --git a/src/jmapNew/theme/datie_02/menus/menuSwitch.vue b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue
index d7a35a11f..3637112e7 100644
--- a/src/jmapNew/theme/datie_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue
@@ -205,7 +205,7 @@ export default {
} else { this.menu.forEach(item => { item.disabled = false; }); }
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
- if (!this.$store.state.scriptRecord.bgSet) {
+ if (!this.$store.state.scriptRecord.bgSet || this.$store.state.scriptRecord.userRole == 'STATION_SWITCH_MAN') {
const menuHook = [{
label: '道岔钩锁',
handler: this.hookLock
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue b/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue
index 013b098bb..68bcfaafa 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue
@@ -7,7 +7,7 @@
-
+
@@ -36,7 +36,7 @@ export default {
SetFault,
SwitchHookLock,
DrawSelect,
- RouteCancel
+ RouteCancel
},
mixins: [
CancelMouseState
@@ -54,72 +54,72 @@ export default {
menu: [],
menuNormal: {
Local: [
- {
- label: '定操',
- handler: this.locate,
- cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
- },
- {
- label: '反操',
- handler: this.reverse,
- cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
- },
- {
- label: '单锁',
- handler: this.lock,
- cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
- },
- {
- label: '单解',
- handler: this.unlock,
- cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
- },
- {
- label: '封锁',
- handle: this.block,
+ {
+ label: '定操',
+ handler: this.locate,
+ cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
+ },
+ {
+ label: '反操',
+ handler: this.reverse,
+ cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
+ },
+ {
+ label: '单锁',
+ handler: this.lock,
+ cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+ },
+ {
+ label: '单解',
+ handler: this.unlock,
+ cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+ },
+ {
+ label: '封锁',
+ handle: this.block,
cmdType: CMD.Switch.CMD_SWITCH_BLOCK
},
- {
- label: '解封',
- handle: this.unblock,
+ {
+ label: '解封',
+ handle: this.unblock,
cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
- },
- {
- label: '区故解',
- handle: ''
- },
- {
- label: '岔前 分路不良',
- handle: ''
- },
- {
- label: '定位 分路不良',
- handle: ''
- },
- {
- label: '反位 分路不良',
- handle: ''
- },
- {
- label: '接触网定位无电',
- handle: ''
- },
- {
- label: '接触网反位无电',
- handle: ''
- },
- {
- label: '添加调机号',
- handle: ''
- },
- {
- label: '删除调机号',
- handle: ''
- },
- {
- label: '修改调机号',
- handle: ''
- }
+ },
+ {
+ label: '区故解',
+ handle: ''
+ },
+ {
+ label: '岔前 分路不良',
+ handle: ''
+ },
+ {
+ label: '定位 分路不良',
+ handle: ''
+ },
+ {
+ label: '反位 分路不良',
+ handle: ''
+ },
+ {
+ label: '接触网定位无电',
+ handle: ''
+ },
+ {
+ label: '接触网反位无电',
+ handle: ''
+ },
+ {
+ label: '添加调机号',
+ handle: ''
+ },
+ {
+ label: '删除调机号',
+ handle: ''
+ },
+ {
+ label: '修改调机号',
+ handle: ''
+ }
],
Center: [
// {
@@ -193,7 +193,7 @@ export default {
},
watch: {
'$store.state.menuOperation.menuCount': function (val) {
- if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && (!this.buttonOperation || this.$route.query.ctc)) {
+ if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && (!this.buttonOperation || this.$route.query.ctc)) {
this.doShow(this.$store.state.menuOperation.menuPosition);
} else {
this.doClose();
@@ -207,7 +207,7 @@ export default {
this.menu = this.menuNormal.Local;
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
- if (!this.$store.state.scriptRecord.bgSet) {
+ if (!this.$store.state.scriptRecord.bgSet || this.$store.state.scriptRecord.userRole == 'STATION_SWITCH_MAN') {
const menuHook = [{
label: '道岔钩锁',
handler: this.hookLock
@@ -270,7 +270,7 @@ export default {
},
// 道岔封锁
block() {
- debugger
+ debugger;
commitOperate(menuOperate.Switch.block, { switchCode: this.selected.code}, 0).then(({valid, operate}) => {
if (valid) {
this.$refs.switchControl.doShow(operate, this.selected);
@@ -306,7 +306,7 @@ export default {
commitOperate(menuOperate.Switch.locate, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
// this.$refs.switchControl.doShow(operate, this.selected);
- this.$refs.routeCancel.doShow(operate, this.selected);
+ this.$refs.routeCancel.doShow(operate, this.selected);
}
});
},
@@ -315,7 +315,7 @@ export default {
commitOperate(menuOperate.Switch.reverse, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
// this.$refs.switchControl.doShow(operate, this.selected);
- this.$refs.routeCancel.doShow(operate, this.selected);
+ this.$refs.routeCancel.doShow(operate, this.selected);
}
});
},
diff --git a/src/jmapNew/theme/datie_tky/menus/menuSwitch.vue b/src/jmapNew/theme/datie_tky/menus/menuSwitch.vue
index 4e7760193..42c5a2f2d 100644
--- a/src/jmapNew/theme/datie_tky/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/datie_tky/menus/menuSwitch.vue
@@ -7,8 +7,7 @@