From e69840c87f5068961232a39c9f4723baf21e2c2c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 19 May 2020 17:05:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83=E4=BB=A3?=
 =?UTF-8?q?=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/newMap/jointTrainingNew/chatMemberList.vue | 1 +
 src/views/newMap/jointTrainingNew/index.vue          | 1 +
 src/views/newMap/jointTrainingNew/menuDemon.vue      | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/src/views/newMap/jointTrainingNew/chatMemberList.vue b/src/views/newMap/jointTrainingNew/chatMemberList.vue
index 39b42e602..ed497a016 100644
--- a/src/views/newMap/jointTrainingNew/chatMemberList.vue
+++ b/src/views/newMap/jointTrainingNew/chatMemberList.vue
@@ -75,6 +75,7 @@ export default {
                     }
                 });
                 lastData = JSON.parse(lastData);
+                lastData = lastData.filter(memberIn=>{ return memberIn.role != '观众'; });
                 lastData.map(member=>{
                     const deviceName = member.deviceName ? '-' + member.deviceName : '';
                     const memberName = member.name ? '-' + member.name : '';
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index c8c245650..6ae246ac5 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -320,6 +320,7 @@ export default {
                 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)}`));
+                this.$store.dispatch('map/setRunPlanStatus', resp.data.planRunning);
                 if (resp.data.planRunning) {
                     this.$store.dispatch('training/simulationStart');
                 } else {
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index de0aba85c..291f1be8f 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -113,12 +113,16 @@ export default {
             if (val) {
                 this.$store.dispatch('training/simulationStart', { start: true });
             }
+        },
+        '$store.state.map.runPlanStatus': function (val) {
+            this.isDisable = val;
         }
     },
     async mounted() {
         this.userId = this.$store.state.user.id;
         this.backLoading = false;
         await this.initLoadPage();
+        this.isDisable = this.$store.state.map.runPlanStatus;
     },
     beforeDestroy() {
         this.$store.dispatch('training/setGroup', '');