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', '');