From 52898a24ac90002b11fa0f6e22e9c45841c49e04 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 18 Mar 2021 09:35:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../displayNew/dispatherContest/index.vue     | 48 ++++++-------------
 src/views/newMap/displayNew/menuDemon.vue     | 39 ++++-----------
 .../scriptDisplay/scriptPreview/index.vue     | 42 ++++++----------
 .../newMap/jointTrainingNew/menuDemon.vue     | 29 ++---------
 4 files changed, 43 insertions(+), 115 deletions(-)

diff --git a/src/views/newMap/displayNew/dispatherContest/index.vue b/src/views/newMap/displayNew/dispatherContest/index.vue
index 2c5fba104..209e1cba0 100644
--- a/src/views/newMap/displayNew/dispatherContest/index.vue
+++ b/src/views/newMap/displayNew/dispatherContest/index.vue
@@ -28,20 +28,21 @@
 
     <div class="display-draft" :class="{'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group class="button-group-box">
-        <el-button type="primary" size="small" @click="back">退出</el-button>
         <template v-if="!dataError">
           <template v-if="isScriptLoad">
-            <el-button type="danger" size="small" @click="handleQuitQuest">退出场景</el-button>
-            <el-button type="success" size="small" :disabled="!isScriptRun" @click="endTraining">结束</el-button>
-            <el-button type="primary" size="small" :disabled="isScriptRun" @click="startTraining">开始</el-button>
             <el-button type="" size="small" @click="handleExplain">说明</el-button>
+            <el-button type="primary" size="small" :disabled="isScriptRun" @click="startTraining">开始</el-button>
+            <el-button type="success" size="small" :disabled="!isScriptRun" @click="endTraining">结束</el-button>
+            <el-button type="danger" size="small" @click="handleQuitQuest">退出场景</el-button>
           </template>
           <template v-else>
-            <!-- 初始化 -->
-            <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
             <!-- 按计划行车 -->
             <el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
+            <!-- 初始化 -->
+            <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
           </template>
+          <el-button type="primary" size="small" @click="back">退出</el-button>
+
         </template>
       </el-button-group>
     </div>
@@ -527,31 +528,12 @@ export default {
 		width: 450px;
 		bottom: 15px!important;
 	}
-</style>
-<style lang="scss">
-.display-draft {
-    position: absolute;
-    right: 10px;
-    bottom: 15px;
-	button {
-		float: right!important;
-	}
-	.button-group-box{
-		float: right;
-	}
-	/deep/ .el-button-group>.el-button:last-child {
-		border-top-right-radius: 0;
-		border-bottom-right-radius: 0;
-		border-top-left-radius: 4px;
-		border-bottom-left-radius: 4px;
-	}
-	/deep/ .el-button-group>.el-button:first-child{
-		border-top-right-radius: 4px;
-		border-bottom-right-radius: 4px;
-		border-top-left-radius: 0;
-		border-bottom-left-radius: 0;
-		border-right-color: transparent;
-	}
-
-}
+	.display-draft {
+		position: absolute;
+		right: 10px;
+		bottom: 15px;
+		.button-group-box{
+			float: right;
+		}
+	}
 </style>
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index ea2dfae73..0d786f5a1 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -25,16 +25,16 @@
 
     <div class="display-draft" :class="{'haerbin_btn_box': $route.query.lineCode == '07'||$route.query.lineCode == '14'}" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group class="button-group-box">
-        <el-button v-if="project !='bjd'" type="primary" size="small" @click="back">{{ projectDevice?'退出':$t('display.demon.back') }}</el-button>
         <template v-if="!dataError&&project != 'bjd'">
           <template v-if="isScriptRun">
             <el-button type="danger" size="small" @click="handleQuitQuest">退出剧本</el-button>
           </template>
           <template v-else-if="!projectDevice">
-            <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
             <el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
+            <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
           </template>
         </template>
+        <el-button v-if="project !='bjd'" type="primary" size="small" @click="back">{{ projectDevice?'退出':$t('display.demon.back') }}</el-button>
       </el-button-group>
     </div>
 
@@ -415,31 +415,12 @@ export default {
 		width: 450px;
 		bottom: 15px!important;
 	}
-</style>
-<style lang="scss">
-.display-draft {
-    position: absolute;
-    right: 10px;
-    bottom: 15px;
-	button {
-		float: right!important;
-	}
-	.button-group-box{
-		float: right;
-	}
-	/deep/ .el-button-group>.el-button:last-child {
-		border-top-right-radius: 0;
-		border-bottom-right-radius: 0;
-		border-top-left-radius: 4px;
-		border-bottom-left-radius: 4px;
-	}
-	/deep/ .el-button-group>.el-button:first-child{
-		border-top-right-radius: 4px;
-		border-bottom-right-radius: 4px;
-		border-top-left-radius: 0;
-		border-bottom-left-radius: 0;
-		border-right-color: transparent;
-	}
-
-}
+	.display-draft {
+		position: absolute;
+		right: 10px;
+		bottom: 15px;
+		.button-group-box{
+			float: right;
+		}
+	}
 </style>
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue
index bfa4e4d67..c3a3dc0b4 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue
@@ -278,35 +278,21 @@ export default {
     }
 };
 </script>
-<style>
-    .main {
-        z-index: 10;
-        display: block;
-        width: 100%;
-        height: 100%;
-        overflow: hidden;
-
-        -moz-user-select: none;
-        -o-user-select: none;
-        -khtml-user-select: none;
-        -webkit-user-select: none;
-        -ms-user-select: none;
-        user-select: none;
-    }
-    .display-draft {
-        position: absolute;
-        float: right;
-        right: 20px;
-        bottom: 15px;
-    }
-    .schema {
-        z-index: 36;
-        display: inline;
-        position: absolute;
-        right: 5px;
-    }
-</style>
 <style rel="stylesheet/scss" lang="scss" scoped>
+	.main {
+		z-index: 10;
+		display: block;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+
+		-moz-user-select: none;
+		-o-user-select: none;
+		-khtml-user-select: none;
+		-webkit-user-select: none;
+		-ms-user-select: none;
+		user-select: none;
+	}
 /deep/ .el-button+.el-button {
         margin-left: 0px;
     }
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 21e6b00ee..36a556451 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -29,14 +29,14 @@
     </div>
     <div class="display-draft" :class="{'haerbin_btn_box': lineCode == '07'||lineCode=='14'}" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group class="button-group-box">
-        <el-button type="primary" :loading="backLoading" size="small" @click="back">退出</el-button>
         <template v-if="!dataError"> <!-- 地图错误判断 -->
           <template v-if="isAdmin && project != 'refereeJsxt' && $route.query.type !== 'ILW'">
-            <el-button type="danger" size="small" @click="end">{{ $t('joinTraining.initialize') }}</el-button>
             <!-- 按计划行车 -->
             <el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
+            <el-button type="danger" size="small" @click="end">{{ $t('joinTraining.initialize') }}</el-button>
           </template>
         </template>
+        <el-button type="primary" :loading="backLoading" size="small" @click="back">退出</el-button>
       </el-button-group>
     </div>
     <qr-code ref="qrCode" />
@@ -130,8 +130,8 @@ export default {
             // 行调与管理员 可显示
             return (this.$store.state.training.prdType == '02' || this.isAdmin) && (!this.$route.query.projectDevice);
         },
-        isDISPATCHER(){
-          return (this.$store.state.training.prdType == '02' || this.isAdmin) && (!this.$route.query.projectDevice || this.project == 'sdy');
+        isDISPATCHER() {
+            return (this.$store.state.training.prdType == '02' || this.isAdmin) && (!this.$route.query.projectDevice || this.project == 'sdy');
         },
         isStationSupervisor() {
             return this.userRole == 'STATION_SUPERVISOR' && (!this.$route.query.projectDevice || this.project == 'sdy');
@@ -529,30 +529,9 @@ export default {
 		position: absolute;
 		right: 10px;
 		bottom: 28px;
-		// transform: translateX(calc(100% + 40px));
-		// transition: all 0.5s;
-		// &.active{
-		// 	transform: translateX(0);
-		// }
-		button {
-			float: right!important;
-		}
 		.button-group-box{
 			float: right;
 		}
-		/deep/ .el-button-group>.el-button:last-child {
-			border-top-right-radius: 0;
-			border-bottom-right-radius: 0;
-			border-top-left-radius: 4px;
-			border-bottom-left-radius: 4px;
-		}
-		/deep/ .el-button-group>.el-button:first-child{
-			border-top-right-radius: 4px;
-			border-bottom-right-radius: 4px;
-			border-top-left-radius: 0;
-			border-bottom-left-radius: 0;
-			border-right-color: transparent;
-		}
 	}
 	.display_top_draft{
 		position: absolute;