From c5f63c9e5223e147df8b4c09fa3aebfe7160a62b Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Sat, 9 May 2020 19:35:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=9B=BE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=B4=E6=8A=A4=E4=B8=AD=E6=8F=90=E7=A4=BA&?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E4=BB=BF=E7=9C=9F=E7=AE=A1=E7=90=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/index.vue       | 2 +-
 src/views/newMap/jointTrainingNew/index.vue | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index d02fa9753..93087ee30 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -400,7 +400,7 @@ export default {
                 }
             } else if (resp && resp.code == 200 && resp.data && resp.data.dataError) {
                 this.dataError = true;
-                this.$messageBox('此地图数据正在维护中！');
+                this.$alert('此地图数据正在维护中！', {confirmButtonText: '确定', callback: action => { this.$router.go(-1); }});
             }
         },
         // 加载地图数据
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index c9e502f27..b6a0320c9 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -298,7 +298,7 @@ export default {
         },
         async loadSimulationInfo() {
             const resp = await getSimulationInfoNew(this.group);
-            if (resp && resp.code == 200) {
+            if (resp && resp.code == 200 && resp.data && !resp.data.dataError) {
                 this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
                 this.questId = Number(resp.data.questId) || 0;
                 this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(resp.data.systemTime)}`));
@@ -312,6 +312,9 @@ export default {
                 } else if (this.isScript) {
                     this.$refs.menuScript.initPlannedDriving(resp.data.planRunning);
                 }
+            } else if (resp && resp.code == 200 && resp.data && resp.data.dataError) {
+                this.dataError = true;
+                this.$alert('此地图数据正在维护中！', {confirmButtonText: '确定', callback: action => { this.$router.go(-1); }});
             }
         },
         async getUserRole() {