地图预览大屏等切实训设计预览倒是实训步骤判断错误调整

This commit is contained in:
fan 2022-08-31 17:54:57 +08:00
parent 5fa020edcd
commit 6b6d8ac871
4 changed files with 8 additions and 4 deletions

View File

@ -16,6 +16,7 @@ import { clearSimulation } from '@/api/simulation';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp'; import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
import { TrainingMode } from '@/scripts/ConstDic';
export default { export default {
name: 'BigScreen', name: 'BigScreen',
@ -95,7 +96,7 @@ export default {
if (this.$route.query.group) { if (this.$route.query.group) {
loadMapDataById(this.$route.query.mapId, 'simulation'); loadMapDataById(this.$route.query.mapId, 'simulation');
} else { } else {
this.$store.dispatch('training/changeMode', { mode: null }); this.$store.dispatch('training/changeMode', { mode: TrainingMode.NORMAL });
loadMapDataById(this.$route.params.mapId, 'preview'); loadMapDataById(this.$route.params.mapId, 'preview');
} }
}, },

View File

@ -27,6 +27,7 @@ import { mapGetters } from 'vuex';
import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp'; import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
import { getSessionStorage } from '@/utils/auth'; import { getSessionStorage } from '@/utils/auth';
import { TrainingMode } from '@/scripts/ConstDic';
export default { export default {
name: 'MapPreview', name: 'MapPreview',
@ -105,7 +106,7 @@ export default {
if (this.$route.query.group) { if (this.$route.query.group) {
await loadMapDataById(this.$route.query.mapId, 'simulation'); await loadMapDataById(this.$route.query.mapId, 'simulation');
} else { } else {
this.$store.dispatch('training/changeMode', { mode: null }); this.$store.dispatch('training/changeMode', { mode: TrainingMode.NORMAL });
loadMapDataById(this.$route.params.mapId, 'preview'); loadMapDataById(this.$route.params.mapId, 'preview');
} }
}, },

View File

@ -11,6 +11,7 @@ import { EventBus } from '@/scripts/event-bus';
import { DeviceMenu, getDeviceMenuByDeviceType } from '@/scripts/ConstDic'; import { DeviceMenu, getDeviceMenuByDeviceType } from '@/scripts/ConstDic';
import PopMenu from '@/components/PopMenu'; import PopMenu from '@/components/PopMenu';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { TrainingMode } from '@/scripts/ConstDic';
export default { export default {
name: 'MapPreview', name: 'MapPreview',
@ -78,7 +79,7 @@ export default {
methods: { methods: {
initLoadData() { // initLoadData() { //
if (parseInt(this.mapId)) { if (parseInt(this.mapId)) {
this.$store.dispatch('training/changeMode', { mode: null }); this.$store.dispatch('training/changeMode', { mode: TrainingMode.NORMAL });
loadMapDataById(this.mapId, 'preview'); loadMapDataById(this.mapId, 'preview');
} else { } else {
this.endViewLoading(); this.endViewLoading();

View File

@ -19,6 +19,7 @@ import { loadMapDataById } from '@/utils/loaddata';
import { EventBus } from '@/scripts/event-bus'; import { EventBus } from '@/scripts/event-bus';
import RouteConfig from './routeConfig'; import RouteConfig from './routeConfig';
import GernaratePlan from '../menus/gernaratePlanTrain'; import GernaratePlan from '../menus/gernaratePlanTrain';
import { TrainingMode } from '@/scripts/ConstDic';
export default { export default {
name: 'RouteMap', name: 'RouteMap',
@ -119,7 +120,7 @@ export default {
}); });
}, },
loadInitPage() { loadInitPage() {
this.$store.dispatch('training/changeMode', { mode: null }); this.$store.dispatch('training/changeMode', { mode: TrainingMode.NORMAL });
loadMapDataById(this.$route.query.mapId, 'preview'); loadMapDataById(this.$route.query.mapId, 'preview');
}, },
endViewLoading(isSuccess) { endViewLoading(isSuccess) {