diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue index 20cac8daa..3dc08cd7b 100644 --- a/src/views/newMap/displayNew/demonMenu.vue +++ b/src/views/newMap/displayNew/demonMenu.vue @@ -23,7 +23,6 @@ 理论考试 - 切换地图 @@ -49,7 +47,6 @@ import Jl3dDevice from '@/views/jlmap3d/device/jl3ddevice'; import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive'; import { getToken } from '@/utils/auth'; -import ChangeMap from './dispatherContest/changeMap'; import { getSessionStorage } from '@/utils/auth'; import Scheduling from '@/views/newMap/displayNew/demon/scheduling'; import SchedulingView from '@/views/newMap/displayNew/demon/schedulingView'; @@ -63,7 +60,6 @@ export default { Jl3dDrive, Scheduling, SchedulingView, - ChangeMap, DistributeDraft, QrCode }, @@ -248,12 +244,6 @@ export default { this.$refs.schedulingView && this.$refs.schedulingView.doClose(); } }, - viewChangeMap() { - this.$refs.changeMap.doShow(); - }, - changeMap(query) { - this.$emit('changeMap', query); - }, fieldPractice() { this.$emit('fieldPractice'); }, diff --git a/src/views/newMap/displayNew/dispatherContest/changeMap.vue b/src/views/newMap/displayNew/dispatherContest/changeMap.vue deleted file mode 100644 index 26e3d0d86..000000000 --- a/src/views/newMap/displayNew/dispatherContest/changeMap.vue +++ /dev/null @@ -1,62 +0,0 @@ - - diff --git a/src/views/newMap/displayNew/dispatherContest/index.vue b/src/views/newMap/displayNew/dispatherContest/index.vue index 6b2221485..15b42ce73 100644 --- a/src/views/newMap/displayNew/dispatherContest/index.vue +++ b/src/views/newMap/displayNew/dispatherContest/index.vue @@ -12,7 +12,6 @@ :jlmap3d-fault-show="false" :driver-show="isDrive" :all-style="'top:'+(offset+textStatusHeight)+'px'" - @changeMap="changeMap" @fieldPractice="fieldPractice" @goTheoryQuiz="goTheoryQuiz" /> @@ -99,9 +98,7 @@ import SelectRole from '@/views/newMap/displayNew/scriptDisplay/component/select // import { setGoodsTryUse } from '@/api/management/goods'; import {competitionPracticalSceneStart, competitionPracticalSceneExit, competitionPracticalSceneFinish, getEmptyOperationalStatistics} from '@/api/competition'; -import { launchFullscreen } from '@/utils/screen'; import { EventBus } from '@/scripts/event-bus'; -import { createSimulationNew } from '@/api/simulation'; import OperationalStatistic from './operationalStatistic.vue'; import TestResult from './testResult.vue'; import Vue from 'vue'; @@ -267,25 +264,6 @@ export default { selectBeginTime() { this.$refs.setTime.doShow(); }, - changeMap(query) { - clearSimulation(this.group).then(res=>{ - const data = { mapId: query.mapId, prdType: query.prdType }; - createSimulationNew(data).then(resp => { - this.$store.dispatch('training/over'); - this.$store.dispatch('training/reset'); - this.$store.dispatch('map/mapClear'); - this.$store.dispatch('training/setPrdType', this.currentPrdType); // 改变prdType - query.group = resp.data; - const newQuery = Object.assign({}, query); - newQuery.noFirst = true; - this.$router.replace({query: newQuery}); - launchFullscreen(); - }).catch(error => { - this.$messageBox(this.$t('error.createSimulationFailed') + error.message); - this.disabled = false; - }); - }); - }, start(model) { // 开始仿真 const data = { time: model.initTime