From 98a4a7b622d30b7cd3949475feb54e6a1a46e9cf Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 13 May 2020 17:34:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A7=E5=B1=8F=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=8E=A8=E5=87=BA=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/designPlatform/bigScreen.vue | 61 ++++++++++++++------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/views/designPlatform/bigScreen.vue b/src/views/designPlatform/bigScreen.vue
index 7aa0c68c3..f3a8ba32d 100644
--- a/src/views/designPlatform/bigScreen.vue
+++ b/src/views/designPlatform/bigScreen.vue
@@ -2,7 +2,7 @@
   <div class="map-view">
     <div v-show="maskOpen" class="mask" :style="{'width': maskWidth}" />
     <jlmap-visual ref="jlmapVisual" />
-    <div class="display-draft">
+    <div v-show="disPlay" class="display-draft">
       <el-button-group>
         <el-button type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
       </el-button-group>
@@ -12,6 +12,7 @@
 <script>
 import JlmapVisual from '@/views/newMap/jlmapNew/index';
 import { loadNewMapDataByGroup, loadMapDataById } from '@/utils/loaddata';
+import { clearSimulation } from '@/api/simulation';
 import { EventBus } from '@/scripts/event-bus';
 import { mapGetters } from 'vuex';
 import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
@@ -35,7 +36,8 @@ export default {
                 height: document.documentElement.clientHeight - 80
             },
             maskOpen: false,
-            maskWidth: '100%'
+            maskWidth: '100%',
+            disPlay: false
         };
     },
     computed: {
@@ -69,7 +71,9 @@ export default {
             this.$jlmap.off('zoom');
             this.$jlmap.off('pan');
             this.handleUpdateScreen();
-            this.subscribe();
+            if (this.$route.query.group) {
+                this.subscribe();
+            }
         },
         '$store.state.socket.equipmentStatus': function (val) {
             if (val.length && this.$route.query.group) {
@@ -83,43 +87,37 @@ export default {
     async mounted() {
         await this.setWindowSize();
         await this.initLoadData();
+        this.disPlay = true;
+        if (this.$route.path.includes('design/bigScreen')) {
+            this.disPlay = false;
+        }
     },
     methods: {
         async initLoadData() { // 加载地图数据
             if (this.$route.query.group) {
                 await loadNewMapDataByGroup(this.$route.query.group);
             } else {
-                await loadMapDataById(this.$route.params.mapId);
+                this.loadMapDataById(this.$route.params.mapId);
+            }
+        },
+        // 通过id加载地图数据
+        async loadMapDataById(mapId) {
+            try {
+                await this.$store.dispatch('training/changeMode', { mode: null });
+                loadMapDataById(mapId).then(()=>{
+                    this.$store.dispatch('training/over');
+                    this.$store.dispatch('training/setMapDefaultState');
+                    this.$store.dispatch('map/clearJlmapTrainView');
+                });
+            } catch (error) {
+                this.$messageBox(`获取地图数据失败: ${error.message}`);
+                this.endViewLoading();
             }
         },
         async statusMessage(list) {
             await this.$store.dispatch('training/updateMapState', list);
             await this.$store.dispatch('socket/setEquipmentStatus');
         },
-        // 通过id加载地图数据
-        async loadMapDataById(mapId) {
-            // try {
-            //     await this.$store.dispatch('training/changeMode', { mode: null });
-            //     loadMapDataById(mapId).then(()=>{
-            //         this.$store.dispatch('training/over');
-            //         this.$store.dispatch('training/setMapDefaultState');
-            //         this.$store.dispatch('map/clearJlmapTrainView');
-            //     });
-            // } catch (error) {
-            //     this.$messageBox(`获取地图数据失败: ${error.message}`);
-            //     this.endViewLoading();
-            // }
-        },
-        // 结束加载状态
-        endViewLoading(isSuccess) {
-            if (!isSuccess) {
-                this.$store.dispatch('map/mapClear');
-            }
-
-            this.$nextTick(() => {
-                EventBus.$emit('viewLoading', false);
-            });
-        },
         setWindowSize() {
             this.$nextTick(() => {
                 if (this.widthLeft) {
@@ -159,7 +157,11 @@ export default {
                 this.$messageBox('该线路没有大屏切割位置信息, 请前往地图绘制编辑');
             }
         },
-        back() {
+        async back() {
+            if (this.$route.query.group) {
+                await clearSimulation(this.$route.query.group);
+                this.clearSubscribe();
+            }
             this.$store.dispatch('training/over').then(() => {
                 EventBus.$emit('runPlanStop');
                 EventBus.$emit('chatSubscribeStop');
@@ -199,5 +201,6 @@ export default {
         float: right;
         right: 15px;
         bottom: 15px;
+		z-index: 19;
     }
 </style>