From 32f4ead0360e1a48443c3ac7ff9f3930ebf1dc9a Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 19 Jun 2020 18:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/index.vue      | 32 ++++++++++++----------
 src/views/newMap/displayNew/menuScript.vue |  4 +--
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 718d7a064..d39fc155f 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -52,7 +52,7 @@
         @showScheduling="showScheduling"
       />
 
-      <menu-script v-if="isScript" ref="menuScript" @script3ddriveshow="script3ddriveshow" :offset-bottom="offsetBottom" :group="group" :data-error="dataError" />
+      <menu-script v-if="isScript" ref="menuScript" :offset-bottom="offsetBottom" :group="group" :data-error="dataError" @script3ddriveshow="script3ddriveshow" />
 
       <menu-practice
         v-if="isPractice"
@@ -181,6 +181,7 @@ export default {
             questId: 0, 		// 加载任务的Id
             showStation: '',
             stationList: [],
+            grouper:'',
             showSelectStation: false, // 是否展示现地选择设备集中站select
             prdTypeMap: {
                 '01': '01', 	// 现地 => 现地
@@ -326,6 +327,9 @@ export default {
         '$store.state.map.map': function (val) {
             this.showSelectStation = val.skinVO.code === '06' && this.$store.state.training.prdType === '01';
             this.showSelectStation && this.setStationList(val);
+        },
+        'group':function(group) {
+            this.grouper = group;
         }
     },
     async created() {
@@ -335,15 +339,15 @@ export default {
         EventBus.$on('clearCheckLogin', () => {
             this.clearCheckLogin();
         });
-
+        this.grouper = this.group;
         await this.setWindowSize();
         await this.initLoadData();
     },
-    async beforeDestroy() {
-        await this.clearAllTimer();
-        await this.quit();
-        await this.$store.dispatch('training/reset');
-        await this.$store.dispatch('map/mapClear');
+    beforeDestroy() {
+        this.quit(this.grouper);
+        this.clearAllTimer();
+        this.$store.dispatch('training/reset');
+        this.$store.dispatch('map/mapClear');
         EventBus.$off('clearCheckLogin');
     },
     methods: {
@@ -577,9 +581,9 @@ export default {
         },
 
         // 销毁仿真
-        async quit() {
-            await clearSimulation(this.group);
-            await this.$store.dispatch('training/over');
+        quit(group) {
+            clearSimulation(group);
+            this.$store.dispatch('training/over');
         },
         // 仿真错误时，被动退出时调用
         async back() {
@@ -624,10 +628,10 @@ export default {
                 window.open(routeData.href, '_blank', 'noopener noreferrer');
             }
         },
-        script3ddriveshow(){
-          this.panelShow = false;
-          this.drivingShow = true;
-          this.$refs.Jl3dDrive.show(this.mapId, this.group);
+        script3ddriveshow() {
+            this.panelShow = false;
+            this.drivingShow = true;
+            this.$refs.Jl3dDrive.show(this.mapId, this.group);
         },
         passflow() {
             const routeData = this.$router.resolve({
diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue
index eed2bfb73..5cb240510 100644
--- a/src/views/newMap/displayNew/menuScript.vue
+++ b/src/views/newMap/displayNew/menuScript.vue
@@ -7,7 +7,7 @@
                 <el-button type="danger" @click="dumpScenesData">重置剧本</el-button>
             </el-button-group> -->
       <el-button-group>
-        <el-button  type="jumpjlmap3d" @click="jumpjlmap3d">{{ $t('joinTraining.driverPerspective') }}</el-button>
+        <el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ $t('joinTraining.driverPerspective') }}</el-button>
         <el-button v-if="!isScriptCommand" type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('scriptRecord.drivingByPlan') }}</el-button>
         <el-button v-if="!isScriptCommand" type="danger" :disabled="dataError" @click="end">初始化</el-button>
         <el-button type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
@@ -200,7 +200,7 @@ export default {
             });
         },
         jumpjlmap3d() {
-          this.$emit('script3ddriveshow');
+            this.$emit('script3ddriveshow');
         },
         async loadSystemTime() {