From 5762399c6b910a97ed6117e347844ce7c1090547 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 18 Feb 2021 15:50:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=E5=8F=B7=E7=BA=BF?= =?UTF-8?q?=20=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningbo_01/menus/dialog/routeSelection.vue | 4 +- src/jmapNew/theme/ningbo_01/menus/menuBar.vue | 157 ++++++++---------- 2 files changed, 74 insertions(+), 87 deletions(-) diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue index f4325c6e8..0cbbfa036 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue @@ -135,6 +135,7 @@ export default { doClose() { this.loading = false; this.dialogShow = false; + this.row = null; this.restoreBeforeDevices(); this.$refs.table.setCurrentRow(); this.$store.dispatch('training/emitTipFresh'); @@ -220,9 +221,9 @@ export default { commitOperate(menuOperate.Signal.arrangementRoute, {routeCode:this.row.code}, 1).then(({valid, operate})=>{ this.loading = false; if (valid) { - this.doClose(); const signal = this.$store.getters['map/getDeviceByCode'](this.row.startSignalCode); operate.message = `
命令：进路设置
始端信号机：${signal.name}
进路：${this.row.name}
`; + this.doClose(); this.$refs.confirmTip.doShow(operate); } }).catch(() => { @@ -236,7 +237,6 @@ export default { const operate = { operation: OperationEvent.Command.cancel.menu.operation }; - this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.doClose(); diff --git a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue index cf763ff5d..06849ed0a 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue @@ -19,65 +19,48 @@