From c57b4f6814f13eb4ee6443d3250bdade7764880e Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 28 Oct 2022 16:06:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/bigTrainRunplanManage/index.vue | 10 +++++-----
src/views/newMap/display/terminals/terminalMenu.vue | 2 +-
src/views/organization/trainingManage/index.vue | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/bigTrainRunplanManage/index.vue b/src/views/bigTrainRunplanManage/index.vue
index cdfb5d6c5..1e73811e3 100644
--- a/src/views/bigTrainRunplanManage/index.vue
+++ b/src/views/bigTrainRunplanManage/index.vue
@@ -10,9 +10,9 @@
-
+
@@ -110,9 +110,9 @@ export default {
}
this.activeTab = name;
},
- quit() {
- window.close();
- },
+ // quit() {
+ // window.close();
+ // },
initLoadData() {
loadMapDataById(this.$route.query.mapId, 'parse');
},
diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue
index 57bb207da..f9df85aa8 100644
--- a/src/views/newMap/display/terminals/terminalMenu.vue
+++ b/src/views/newMap/display/terminals/terminalMenu.vue
@@ -187,7 +187,7 @@ export default {
} else if (this.roles === 'DISPATCHER') {
if (this.$route.query.lineCode === '16') {
this.changePictureShow('dispatcherManage');
- this.$store.dispatch('app/ animationsClose');
+ this.$store.dispatch('app/animationsClose');
} else {
this.changePictureShow('dispatchWork');
}
diff --git a/src/views/organization/trainingManage/index.vue b/src/views/organization/trainingManage/index.vue
index 392a66fb6..106848908 100644
--- a/src/views/organization/trainingManage/index.vue
+++ b/src/views/organization/trainingManage/index.vue
@@ -155,7 +155,7 @@ export default {
loadScript(index, row) {
// 子系统: mapSystem 客户端: terminal
// row.mapSystem
- const data = {mapId: row.mapId, type:'METRO', memberId: '1'};
+ const data = {mapId: row.mapId, type:row.mapSystem || 'METRO', memberId: '1'};
// domConfig: Object
// hasExam: false
// hasTraining: false