diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js index b13f8954e..7eae34a89 100644 --- a/src/jmapNew/shape/Train/index.js +++ b/src/jmapNew/shape/Train/index.js @@ -408,7 +408,6 @@ export default class Train extends Group { this.setHoldStatus(model.hold); this.setJumpStatus(model.jump); this.setSoonerOrLater(model.dt); - const style = this.style; if (style.Section.trainPosition.display) { this.updateSection(object); diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue index 7f215a543..ebf7bea3f 100644 --- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue @@ -49,42 +49,36 @@ export default { menuNormal: { Local: [], Center: [ - // { - // label: this.$t('menu.menuTrain.addTrainId'), - // handler: this.addTrainId, - // auth: { station: true, center: true }, - // cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT - // }, - // { - // label: this.$t('menu.menuTrain.deleteTrainId'), - // handler: this.delTrainId, - // auth: { station: true, center: true }, - // cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT - // }, - // { - // label: this.$t('menu.menuTrain.editTrainId'), - // handler: this.editTrainId, - // auth: { station: true, center: true }, - // cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT - // }, - // { - // label: this.$t('menu.menuTrain.editTrainNo'), - // handler: this.editTrainNo, - // auth: { station: true, center: true }, - // cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT - // }, - // { - // label: this.$t('menu.menuTrain.moveTrainId'), - // handler: this.moveTrainId, - // auth: { station: true, center: true }, - // cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT - // }, - // { - // label: this.$t('menu.menuTrain.switchTrainId'), - // handler: this.switchTrainId, - // auth: { station: true, center: true }, - // cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT - // } + { + label: this.$t('menu.menuTrain.addTrainId'), + handler: this.addTrainId, + cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK + }, + { + label: this.$t('menu.menuTrain.deleteTrainId'), + handler: this.delTrainId, + cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK + }, + { + label: this.$t('menu.menuTrain.editTrainId'), + handler: this.editTrainId, + cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK + }, + { + label: this.$t('menu.menuTrain.editTrainNo'), + handler: this.editTrainNo, + cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK + }, + { + label: this.$t('menu.menuTrain.moveTrainId'), + handler: this.moveTrainId, + cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK + }, + { + label: this.$t('menu.menuTrain.switchTrainId'), + handler: this.switchTrainId, + cmdType:CMD.Switch.CMD_SWITCH_REMOVE_FAULT + } ] }, menuForce: [ @@ -146,6 +140,8 @@ export default { this.menu = [...this.menuForce, ...this.menuSpeed]; } + // this.menu = this.menuNormal.Center; + // console.log(this.menu, '222222222222222'); // this.menu = MenuContextHandler.covert(this.menu); }, doShow(point) { diff --git a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue index 64cc1e513..68b60815b 100644 --- a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue +++ b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue @@ -8,6 +8,7 @@
开启LCD屏 +
关闭LCD屏
确定
diff --git a/src/views/login/hydLogin.vue b/src/views/login/hydLogin.vue index a6ab19cc9..2eb18d7e5 100644 --- a/src/views/login/hydLogin.vue +++ b/src/views/login/hydLogin.vue @@ -72,7 +72,7 @@ import { UrlConfig } from '@/scripts/ConstDic'; import { ProjectIcon } from '@/scripts/ProjectConfig'; import { removeToken } from '@/utils/auth'; import LangStorage from '@/utils/lang'; -import logoImgHyd from '@/assets/logo_hyd.png'; +import logoImgHyd from '@/assets/project_icon/logo_hyd.png'; export default { name: 'Login', data() {