diff --git a/src/views/designPlatform/bigScreen.vue b/src/views/designPlatform/bigScreen.vue index b9afbb2eb..240894dc2 100644 --- a/src/views/designPlatform/bigScreen.vue +++ b/src/views/designPlatform/bigScreen.vue @@ -31,10 +31,6 @@ export default { }, data() { return { - // size: { - // width: document.documentElement.clientWidth - 400, - // height: document.documentElement.clientHeight - 80 - // }, maskOpen: false, maskWidth: 'calc(100% - 450px)', disPlay: false @@ -173,8 +169,6 @@ export default { this.clearSubscribe(); } this.$store.dispatch('training/over').then(() => { - EventBus.$emit('runPlanStop'); - EventBus.$emit('chatSubscribeStop'); history.go(-1); }); }, @@ -189,8 +183,7 @@ export default { this.clearSubscribe(); const header = { group: this.$route.query.group || '', 'X-Token': getToken() }; creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header); - - await this.$store.dispatch('training/setHasSubscribed'); + // await this.$store.dispatch('training/setHasSubscribed'); }, clearSubscribe() { clearSubscribe(`${displayTopic}\/${this.$route.query.group}`); diff --git a/src/views/designPlatform/bigSplitScreen.vue b/src/views/designPlatform/bigSplitScreen.vue index 83958d0ca..18c4579a2 100644 --- a/src/views/designPlatform/bigSplitScreen.vue +++ b/src/views/designPlatform/bigSplitScreen.vue @@ -180,8 +180,6 @@ export default { this.clearSubscribe(); } this.$store.dispatch('training/over').then(() => { - EventBus.$emit('runPlanStop'); - EventBus.$emit('chatSubscribeStop'); history.go(-1); }); }, @@ -196,8 +194,7 @@ export default { this.clearSubscribe(); const header = { group: this.$route.query.group || '', 'X-Token': getToken() }; creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header); - - await this.$store.dispatch('training/setHasSubscribed'); + // await this.$store.dispatch('training/setHasSubscribed'); }, clearSubscribe() { clearSubscribe(`${displayTopic}\/${this.$route.query.group}`); diff --git a/src/views/designPlatform/testRunplan.vue b/src/views/designPlatform/testRunplan.vue index 382ca440f..d37d294f7 100644 --- a/src/views/designPlatform/testRunplan.vue +++ b/src/views/designPlatform/testRunplan.vue @@ -133,8 +133,7 @@ export default { this.clearSubscribe(); const header = { group: this.group || '', 'X-Token': getToken() }; creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header); - - await this.$store.dispatch('training/setHasSubscribed'); + // await this.$store.dispatch('training/setHasSubscribed'); }, clearSubscribe() { clearSubscribe(`${displayTopic}\/${this.group}`); diff --git a/src/views/ibp/ibpsystem/index.vue b/src/views/ibp/ibpsystem/index.vue index c8b33e309..3e8a775c5 100644 --- a/src/views/ibp/ibpsystem/index.vue +++ b/src/views/ibp/ibpsystem/index.vue @@ -281,8 +281,7 @@ export default { this.clearSubscribe(); const header = { group: this.$route.query.group || '', 'X-Token': getToken() }; creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header); - - await this.$store.dispatch('training/setHasSubscribed'); + // await this.$store.dispatch('training/setHasSubscribed'); }, clearSubscribe() { clearSubscribe(`${displayTopic}\/${this.$route.query.group}`); diff --git a/src/views/iscs/iscsSystem/groupNav.vue b/src/views/iscs/iscsSystem/groupNav.vue index dc0263c4c..cbd86420a 100644 --- a/src/views/iscs/iscsSystem/groupNav.vue +++ b/src/views/iscs/iscsSystem/groupNav.vue @@ -345,8 +345,7 @@ export default { this.clearSubscribe(); const header = { group: this.group || '', 'X-Token': getToken() }; creatSubscribe(`${displayTopic}\/${this.group}`, header); - - await this.$store.dispatch('training/setHasSubscribed'); + // await this.$store.dispatch('training/setHasSubscribed'); }, clearSubscribe() { clearSubscribe(`${displayTopic}\/${this.group}`); diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue index 898f7d5be..1e31eb0b0 100644 --- a/src/views/iscs/iscsSystem/stationNav.vue +++ b/src/views/iscs/iscsSystem/stationNav.vue @@ -381,7 +381,7 @@ export default { this.clearSubscribe(); const header = { group: this.group || '', 'X-Token': getToken() }; creatSubscribe(`${displayTopic}\/${this.group}`, header); - await this.$store.dispatch('training/setHasSubscribed'); + // await this.$store.dispatch('training/setHasSubscribed'); }, clearSubscribe() { clearSubscribe(`${displayTopic}\/${this.group}`); diff --git a/src/views/newMap/displayNew/demon/planSchedule.vue b/src/views/newMap/displayNew/demon/planSchedule.vue index 8387c0eea..8ceacbbb1 100644 --- a/src/views/newMap/displayNew/demon/planSchedule.vue +++ b/src/views/newMap/displayNew/demon/planSchedule.vue @@ -170,7 +170,7 @@ export default { this.clearSubscribe(); const header = { group: this.$route.query.group || '', 'X-Token': getToken() }; creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header); - await this.$store.dispatch('training/setHasSubscribed'); + // await this.$store.dispatch('training/setHasSubscribed'); this.$store.dispatch('app/animationsClose'); }, clearSubscribe() { diff --git a/src/views/newMap/displayNew/practiceDisplay.vue b/src/views/newMap/displayNew/practiceDisplay.vue index 8f3296696..1edba5942 100644 --- a/src/views/newMap/displayNew/practiceDisplay.vue +++ b/src/views/newMap/displayNew/practiceDisplay.vue @@ -161,19 +161,7 @@ export default { this.$store.dispatch('config/resize', { width, height }); }, async back() { - // if (this.group) { - // await clearSimulation(this.group); - // this.clearSubscribe(); - // } - // this.$store.dispatch('map/setShowCentralizedStationCode', ''); - // history.go(-1); - // await this.$store.dispatch('map/mapClear'); - // if (this.group) { - // await clearSimulation(this.group); - // this.clearSubscribe(); - // } window.close(); - // Notification.closeAll(); }, async statusMessage(list) { await this.$store.dispatch('training/updateMapState', list); @@ -182,13 +170,8 @@ export default { async subscribe() { this.clearSubscribe(); const header = { group: this.group || '', 'X-Token': getToken() }; - // creatSubscribe(`${jl3dTopic}\/${this.$route.query.group}`, header); creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header); - // setTimeout(()=>{ - - // }, 500); - // }); - await this.$store.dispatch('training/setHasSubscribed'); + // await this.$store.dispatch('training/setHasSubscribed'); }, clearSubscribe() { clearSubscribe(`${jl3dTopic}\/${this.group}`); diff --git a/src/views/newMap/mapsystemNew/index.vue b/src/views/newMap/mapsystemNew/index.vue index dafcf2a3a..8e9129b4f 100644 --- a/src/views/newMap/mapsystemNew/index.vue +++ b/src/views/newMap/mapsystemNew/index.vue @@ -109,7 +109,6 @@ export default { this.clearSubscribe(); const header = { group: this.$route.query.group || '', 'X-Token': getToken() }; creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header); - await this.$store.dispatch('training/setHasSubscribed'); }, clearSubscribe() {