剧本代码调整

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() {
+    beforeDestroy() {
-        await this.clearAllTimer();
+        this.quit(this.grouper);
-        await this.quit();
+        this.clearAllTimer();
-        await this.$store.dispatch('training/reset');
+        this.$store.dispatch('training/reset');
-        await this.$store.dispatch('map/mapClear');
+        this.$store.dispatch('map/mapClear');
         EventBus.$off('clearCheckLogin');
     },
     methods: {
@@ -577,9 +581,9 @@ export default {
         },
 
         // 销毁仿真
-        async quit() {
+        quit(group) {
-            await clearSimulation(this.group);
+            clearSimulation(group);
-            await this.$store.dispatch('training/over');
+            this.$store.dispatch('training/over');
         },
         // 仿真错误时，被动退出时调用
         async back() {
@@ -624,7 +628,7 @@ export default {
                 window.open(routeData.href, '_blank', 'noopener noreferrer');
             }
         },
-        script3ddriveshow(){
+        script3ddriveshow() {
             this.panelShow = false;
             this.drivingShow = true;
             this.$refs.Jl3dDrive.show(this.mapId, this.group);