From 893c8846bbc1d44a758959260316d2820c1afa26 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 28 Jul 2020 11:14:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?gzb=E3=80=81xty=E3=80=81heb=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4&=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AE=BE=E5=A4=87=E7=99=BB=E5=BD=95=E5=8E=BB=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scripts/ProjectConfig.js | 6 ++++++ src/views/login/index.vue | 5 +++-- src/views/newMap/jointTrainingNew/menuSchema.vue | 10 +++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index 68abc59f7..21cd914ef 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -20,6 +20,7 @@ export const loginInfo = { title: '西安铁路职业技术学院城市轨道交通实训平台', loginPath:'/login?pro=xty', loginParam: 'XTY', + titleDistance: '-150px', navigationLogoWidth: '40px', navigationMarginLeft: '60px' }, @@ -41,6 +42,7 @@ export const loginInfo = { title: '西安铁路职业技术学院城市轨道交通设计平台', loginPath:'/design/login?project=xty', loginParam: 'XTY', + titleDistance: '-150px', navigationLogoWidth: '40px', navigationMarginLeft: '60px' }, @@ -48,12 +50,14 @@ export const loginInfo = { title: '贵州装备制造职业学院城市轨道交通实训平台', loginPath:'/login?project=gzb', loginParam: 'GZB', + titleDistance: '-150px', navigationLogoWidth: '40px', navigationMarginLeft: '60px' }, designgzb: { title: '贵州装备制造职业学院城市轨道交通设计平台', loginPath:'/design/login?project=gzb', + titleDistance: '-150px', loginParam: 'GZB', navigationLogoWidth: '40px', navigationMarginLeft: '60px' @@ -63,6 +67,7 @@ export const loginInfo = { loginTitle: '城市轨道交通综合行车模拟仿真系统V1.0', logoWidth: '140px', loginPath: '/login?project=heb', + titleDistance: '150px', bottomColumn: '哈尔滨盈达科技有限公司 联系电话:0451-87001273', loginParam: 'HEB', navigationLogoWidth: '120px', @@ -72,6 +77,7 @@ export const loginInfo = { title: '城市轨道交通设计平台V1.0', loginTitle: '城市轨道交通设计平台V1.0', logoWidth: '140px', + titleDistance: '150px', loginPath: '/design/login?project=heb', bottomColumn: '哈尔滨盈达科技有限公司 联系电话:0451-87001273', loginParam: 'HEB', diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 2bf39aa8a..a381b6e2d 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -197,7 +197,6 @@ export default { } }, loginTitle () { - // this.$route.path.split('/')[1] return loginInfo[this.project].loginTitle; }, title() { @@ -591,7 +590,9 @@ export default { .text-box{ font-size: 40px; font-weight: bold; - top: -50px; + top: 150px; + width: 1000px; + text-align: center; position: absolute; } .left-logo-box{ diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue index 0a0d5824c..8ff737b88 100644 --- a/src/views/newMap/jointTrainingNew/menuSchema.vue +++ b/src/views/newMap/jointTrainingNew/menuSchema.vue @@ -4,7 +4,7 @@ - 大屏 + 大屏 {{ $t('joinTraining.runGraphPreview') }} { - let offset = 15; - let offsetBottom = 15; const menuBar = document.getElementById('menuBar'); const menuTool = document.getElementById('menuTool'); const menuBottom = document.getElementById('menuButton'); const menuButtonsBox = document.getElementById('menuButtons_box'); if (menuBar) { - offset += (menuBar.offsetHeight || 0); + this.offset = (menuBar.offsetHeight || 0) + 15; } if (menuTool) { - offset += (menuTool.offsetHeight || 0); + this.offset = (menuTool.offsetHeight || 0) + 15; } const buttonWidth = this.width - 1200; if (menuBottom && buttonWidth < 550) { - offsetBottom = (menuBottom.offsetHeight || 0) + 15; + this.offsetBottom = (menuBottom.offsetHeight || 0) + 15; } if (menuButtonsBox) { this.tipBottom = (menuButtonsBox.offsetHeight || 0) + 15; } - if (this.offset != offset) { - this.offset = offset; - } - if (this.offsetBottom != offsetBottom) { - this.offsetBottom = offsetBottom; - } }); }, setCenter(code) { diff --git a/src/views/newMap/displayNew/menuSystemTime.vue b/src/views/newMap/displayNew/menuSystemTime.vue index 302c49a59..4be5d117d 100644 --- a/src/views/newMap/displayNew/menuSystemTime.vue +++ b/src/views/newMap/displayNew/menuSystemTime.vue @@ -29,10 +29,6 @@ export default { offset: { type: Number, required: true - }, - right: { - type: Number, - required: true } }, data() { @@ -64,7 +60,7 @@ export default { return this.isShowDate ? (this.$route.query.prdType == '05' ? 5 : 35) : this.offset; }, newRight() { - return this.isShowDate ? this.$store.state.config.width - 420 : this.right; + return this.isShowDate ? this.$store.state.config.width - 420 : this.$store.state.config.width / 2 - 55; } }, watch: { diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index f3e63b507..b2cfd76b6 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -41,7 +41,7 @@ - + @@ -153,9 +153,6 @@ export default { height() { return this.$store.state.app.height; }, - right() { - return this.$store.state.config.width / 2 - 55; - }, userId() { return this.$store.state.user ? this.$store.state.user.id : ''; }, @@ -209,7 +206,7 @@ export default { } }); }, - '$store.state.app.windowSizeCount': function() { + '$store.state.app.windowSizeCount': function() { // 窗口变化 this.setWindowSize(); }, $route() { @@ -250,29 +247,18 @@ export default { // 设置菜单和工具栏位置 setPosition() { this.$nextTick(() => { - let offset = 10; - let offsetBottom = 15; const menuBar = document.getElementById('menuBar'); const menuTool = document.getElementById('menuTool'); const menuBottom = document.getElementById('menuButton'); if (menuBar) { - offset += (menuBar.offsetHeight || 0); + this.offset = (menuBar.offsetHeight || 0) + 15; } if (menuTool) { - offset += (menuTool.offsetHeight || 0); + this.offset = (menuTool.offsetHeight || 0) + 15; } const buttonWidth = this.width - 1200; if (menuBottom && buttonWidth < 550) { - offsetBottom += (menuBottom.offsetHeight || 0); - } - if (this.$store.state.training.prdType === '07') { - offset = 10; - } - if (this.offset != offset) { - this.offset = offset; - } - if (this.offsetBottom != offsetBottom) { - this.offsetBottom = offsetBottom; + this.offsetBottom = (menuBottom.offsetHeight || 0) + 15; } }); }, @@ -529,17 +515,10 @@ export default { }); }, setWindowSize() { - // this.$nextTick(() => { + this.$store.dispatch('config/resize', { width: this.width, height: this.height }); if (this.prdType == '07') { - const width = this.$store.state.app.width - 2; - const height = this.$store.state.app.height; - this.$store.dispatch('config/resize', { width, height }); this.setBigScreenMode(); - } else { - this.$store.dispatch('config/resize', { width: this.width, height: this.height }); - // this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode }); } - // }); }, switchStationMode(stationCode) { this.showStation = stationCode;