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] =?UTF-8?q?gzb=E3=80=81xty=E3=80=81heb=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4&=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=99=BB=E5=BD=95=E5=8E=BB=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=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 @@
       <el-option v-for="item in stationList" :key="item.value" :label="item.name" :value="item.value" />
     </el-select>
     <el-button-group>
-      <el-button v-if="userRole=== 'DISPATCHER'" size="small" @click="goBigScreen">大屏</el-button>
+      <el-button v-if="userRole=== 'DISPATCHER' && !$route.query.projectDevice" size="small" @click="goBigScreen">大屏</el-button>
       <el-button v-if="runing && !dataError" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('joinTraining.runGraphPreview') }}</el-button>
       <template v-if="isAdmin">
         <el-button v-if="!runing && !dataError" size="small" type="warning" @click="loadRunPlan">
@@ -154,12 +154,12 @@ export default {
         },
         setRuning(run) {
             this.runing = run;
-		},
-		// 选择车站
+        },
+        // 选择车站
         switchStationMode(stationCode) {
             this.$emit('switchStationMode', stationCode);
-		},
-		// 点击大屏预览
+        },
+        // 点击大屏预览
         goBigScreen() {
             const routeData = this.$router.resolve({
                 path:`/displayBigScreen/${this.$route.query.mapId}`,