diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index 4b5a9a13d..2fce4b5e1 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -160,12 +160,12 @@ export default { computed:{ ...mapGetters([ 'canvasWidth' - ]), - ...mapGetters('map', [ - 'map', - 'stationList' - ]), - // ...mapGetters('training', [ + ]), + ...mapGetters('map', [ + 'map', + 'stationList' + ]), + // ...mapGetters('training', [ // 'offsetStationCode' // ]), mode() { @@ -220,8 +220,8 @@ export default { this.setMode(); }, '$store.state.app.windowSizeCount': function() { - this.setWindowSize(); - this.setPosition(); + this.setWindowSize(); + this.setPosition(); }, $route() { this.initLoadData(); @@ -240,20 +240,21 @@ export default { }); }, 'stationList': function () { - this.setStationList(); + !this.isExam && !this.isLesson && this.setStationList(); }, '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态 if (this.planRunning) { this.$store.dispatch('training/simulationStart'); } - this.switchStationMode(this.showStation); + this.isExam && this.$store.state.exam.deviceCode && this.setCenter(this.$store.state.exam.deviceCode); + !this.isExam && !this.isLesson && this.switchStationMode(this.showStation); } }, async mounted() { this.group = this.$route.query.group; this.setWindowSize(); - await this.initLoadData(); - this.setMode(); + await this.initLoadData(); + this.setMode(); }, beforeDestroy() { this.quit(this.group); @@ -300,7 +301,7 @@ export default { // 缩放设置 setWindowSize() { const width = this.width; - const height = this.height; + const height = this.height; this.$store.dispatch('config/resize', { width, height }); // this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode }); }, @@ -497,6 +498,8 @@ export default { // } setPosition() { this.$nextTick(() => { + this.offset = 10; + this.offsetBottom = 15; const menuBar = document.getElementById('menuBar'); const menuTool = document.getElementById('menuTool'); const menuBottom = document.getElementById('menuButton'); diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index 8c4684f5c..c59d00adf 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -133,9 +133,6 @@ export default { } this.setCenter(code); }, - '$store.state.exam.deviceCode': function (val) { - val && this.setCenter(val); - }, '$store.state.config.canvasSizeCount': function (val) { this.resetSize(); }, diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 037abb0bd..97114632d 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -17,10 +17,10 @@ :is-admin="isAdmin" :device-code="deviceCode" :countdown-time="countdownTime" - @passflow="passflow" + @passflow="passflow" @getUserRole="getUserRole" @hidepanel="hidepanel" - @devicemodel="devicemodel" + @devicemodel="devicemodel" @startCounting="startCounting" @hidejl3dcctv="hidejl3dcctv" @handlerMemberManage="handlerMemberManage" @@ -210,8 +210,8 @@ export default { }); }, '$store.state.app.windowSizeCount': function() { // 窗口变化 - this.setWindowSize(); - this.setPosition(); + this.setWindowSize(); + this.setPosition(); }, $route() { this.initLoadData(); @@ -479,8 +479,8 @@ export default { }, faultChooseShow() { // 故障列表加载 this.$refs.faultChoose.doShow(); - }, - passflow() { + }, + passflow() { const routeData = this.$router.resolve({ path:'/jlmap3d/passengerflow', query:{ @@ -516,7 +516,7 @@ export default { window.open(routeData.href, '_blank', 'noopener noreferrer'); }, hidepanel() { // 司机视角 - if (this.$store.state.training.prdType == '04') { + if (this.$store.state.training.prdType == '04') { this.panelShow = false; this.drivingShow = true; this.$refs.Jl3dDrive.show(this.mapId, this.group);