diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index 09fc16a1e..e5a894c98 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -144,7 +144,6 @@ export default { this.$store.dispatch('map/mapClear'); }, async mounted() { - this.group = this.$route.query.group; this.setWindowSize(); this.initLoadData(); }, @@ -217,6 +216,7 @@ export default { }, // 初始化 initLoadData() { + this.group = this.$route.query.group; this.$store.dispatch('training/reset'); this.loadSimulationInfo(); this.loadMapData(); diff --git a/src/views/newMap/displayNew/menuDispatherContest.vue b/src/views/newMap/displayNew/menuDispatherContest.vue index 912892b3c..de2c1161f 100644 --- a/src/views/newMap/displayNew/menuDispatherContest.vue +++ b/src/views/newMap/displayNew/menuDispatherContest.vue @@ -57,7 +57,6 @@ import SetTime from './demon/setTime'; import DemonMenu from './demonMenu'; import DemonChat from './demonChat'; -import { Notification } from 'element-ui'; import MenuSchema from '@/views/newMap/displayNew/menuSchema'; import { getGoodsTryUse } from '@/api/management/goods'; import { ranAsPlan, exitRunPlan, clearSimulation, getSimulationInfoNew } from '@/api/simulation'; @@ -156,9 +155,9 @@ export default { } }); }, - '$store.state.socket.simulationOver':function(val) { - !this.isGoback && this.back(); - }, + // '$store.state.socket.simulationOver':function(val) { + // !this.isGoback && this.back(); + // }, // '$store.state.training.started': function (val) { // this.setRuning(val); // }, @@ -258,7 +257,8 @@ export default { this.$store.dispatch('map/mapClear'); this.$store.dispatch('training/setPrdType', this.currentPrdType); // 改变prdType query.group = resp.data; - this.$router.replace({query: query}); + const newQuery = Object.assign({}, query); + this.$router.replace({query: newQuery}); launchFullscreen(); }).catch(error => { this.$messageBox(this.$t('error.createSimulationFailed') + error.message); diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue index c9f184c3f..446e9906d 100644 --- a/src/views/newMap/displayNew/menuSchema.vue +++ b/src/views/newMap/displayNew/menuSchema.vue @@ -5,7 +5,7 @@