From 9b422cd3b9d770bcb1d70acee1f74744b217f5ac Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Wed, 19 May 2021 15:14:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=8F=B7=E7=BA=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=88=E6=9C=AA=E5=AE=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanjing_02/menus/dialog/mapVisual.vue | 2 +- .../nanjing_02/menus/dialog/troDetail.vue | 33 +- src/jmapNew/theme/nanjing_02/menus/index.vue | 42 +- .../theme/nanjing_02/menus/menuBar.vue | 3 +- src/router/index.js | 6 + src/views/demonstration/detail/index.vue | 6 +- src/views/newMap/displayBaSiDi/baSiDi.vue | 365 ++++++++++++++++++ src/views/newMap/displayBaSiDi/index.vue | 315 +++++++++++++++ 8 files changed, 731 insertions(+), 41 deletions(-) create mode 100644 src/views/newMap/displayBaSiDi/baSiDi.vue create mode 100644 src/views/newMap/displayBaSiDi/index.vue diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue index d8aec6eca..fe64b16a2 100644 --- a/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue +++ b/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue @@ -182,7 +182,7 @@ export default { // 重置jlmap宽高 resetSize() { this.$nextTick(() => { - this.map && this.map.resize({ width: 1920, height: 960 }); + this.map && this.map.resize({ width: this.width, height: this.height }); }); }, // 设置显示图层 diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/troDetail.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/troDetail.vue index a64f39426..bb7c8b603 100644 --- a/src/jmapNew/theme/nanjing_02/menus/dialog/troDetail.vue +++ b/src/jmapNew/theme/nanjing_02/menus/dialog/troDetail.vue @@ -8,7 +8,7 @@ :before-close="doClose" :z-index="2000" > - +
@@ -18,12 +18,13 @@ diff --git a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue index ec526437a..d2c83508b 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue @@ -261,7 +261,8 @@ export default { 'order' ]), ...mapGetters('map', [ - 'stationList' + 'stationList', + 'trainList' ]), userId() { return this.$store.state.user ? this.$store.state.user.id : ''; diff --git a/src/router/index.js b/src/router/index.js index c5f947fc7..442c0d725 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -34,6 +34,7 @@ const Jlmap3dOtherVR = () => import('@/views/jlmap3d/maintainer/jl3dothervr'); const DisplayNew = () => import('@/views/newMap/displayNew/index'); const DisplayCity = () => import('@/views/newMap/displayCity/index'); +const DisplayBaSiDi = () => import('@/views/newMap/displayBaSiDi/index'); const DesignDisplayNew = () => import('@/views/newMap/displayNew/scriptDisplay/scriptPreview/index'); const PracticeDisplay = () => import('@/views/newMap/displayNew/practiceDisplay'); const BigLPFStrategy = () => import('@/views/newMap/displayNew/bigLPFStrategy'); @@ -393,6 +394,11 @@ export const publicAsyncRoute = [ component: DisplayCity, hidden: true }, + { + path: '/displayBaSiDi/:mode', + component: DisplayBaSiDi, + hidden: true + }, { path: '/design/displayNew/:mode', component: DesignDisplayNew, diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index e5fe7bf3d..959d86981 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -249,7 +249,11 @@ export default { if (this.loadingProjectList.includes(this.project)) { this.$store.dispatch('app/transitionAnimations'); } - this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query }); + if (this.currentPrdType === '02' && this.courseModel.lineCode === '14') { + this.$router.push({ path: `/displayBaSiDi/demon`, query: query }); + } else { + this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query }); + } launchFullscreen(); }).catch(error=>{ if (error.code == 10003) { diff --git a/src/views/newMap/displayBaSiDi/baSiDi.vue b/src/views/newMap/displayBaSiDi/baSiDi.vue new file mode 100644 index 000000000..d2b87962c --- /dev/null +++ b/src/views/newMap/displayBaSiDi/baSiDi.vue @@ -0,0 +1,365 @@ + + + + + diff --git a/src/views/newMap/displayBaSiDi/index.vue b/src/views/newMap/displayBaSiDi/index.vue new file mode 100644 index 000000000..91dd9eee4 --- /dev/null +++ b/src/views/newMap/displayBaSiDi/index.vue @@ -0,0 +1,315 @@ + +