From 1ce9303bcbed8870091ce454db6b661c13bc93ed Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 29 Jul 2020 09:31:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=93=88=E5=B0=94?=
 =?UTF-8?q?=E6=BB=A8=E6=98=BE=E7=A4=BA=E5=B7=A6=E4=B8=8B=E8=A7=92=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/menuDemon.vue     |  6 +-
 .../newMap/jointTrainingNew/menuDemon.vue     | 67 ++++++++++++++++---
 2 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 66318d945..54e8dd6ca 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -6,7 +6,7 @@
         <span v-if="countTime" class="display-score">{{ $t('display.demon.trialTime') }} {{ countTime }}</span>
       </el-row>
     </div>
-    <div class="display-draft" :style="{bottom: offsetBottom + 'px'}">
+    <div class="display-draft" :class="{'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group>
 		  <!-- 排班计划 -->
         <el-button v-if="isShowScheduling && !dataError" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
@@ -352,6 +352,10 @@ export default {
         font-size: 18px !important;
         color: #fff;
     }
+	.haerbin_btn_box{
+		width: 420px;
+		bottom: 15px!important;
+	}
 </style>
 <style lang="scss">
 .display-draft {
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 85c73fe90..f32d6da96 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <chat-box :group="group" :user-role="userRole" />
-    <div class="display-draft" :class="{'display-type-hb': $route.query.lineCode == '07' && $store.state.training.prdType=='01'}" :style="{bottom: offsetBottom + 'px'}">
+	<!-- <div class="btn_hover" @mouseenter="btnHover"><i class="el-icon-s-promotion" /></div> -->
+	<!--  @mouseenter="btnBoxEnter" @mouseleave.stop="btnBoxLeave"  -->
+    <div class="display-draft" :class="{'display-type-hb': $route.query.lineCode == '07' && $store.state.training.prdType=='01', 'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group>
         <el-button v-if="isAdmin && isProject" @click="handleEquipment">设备管理</el-button>
         <el-button v-if="isAdmin" @click="memberManage">成员管理</el-button>
@@ -18,14 +20,14 @@
           <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
           <el-button type="danger" :disabled="dataError" @click="end">{{ $t('joinTraining.initialize') }}</el-button>
         </template>
+		<template v-if="project==='jsxt'">
+			<div style="background: #FFF;display: inline-block;height: 40px;line-height: 40px;padding: 0 5px;border: 2px solid #F00;border-radius: 6px;margin-right: 8px;">{{ '剩余时间:' + countdownTime }}</div>
+			<el-button :disabled="!jsStart" type="success" @click="startCompetition">开始</el-button>
+			<el-button :disabled="jsStart" type="danger" @click="endCompetition">提交</el-button>
+		</template>
+		<el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition">退出</el-button>
+		<el-button v-if="project!=='jsxt'&&project!=='refereeJsxt'" type="primary" :loading="backLoading" @click="back">退出</el-button>
       </el-button-group>
-      <template v-if="project==='jsxt'">
-        <div style="background: #FFF;display: inline-block;height: 40px;line-height: 40px;padding: 0 5px;border: 2px solid #F00;border-radius: 6px;margin-right: 8px;">{{ '剩余时间:' + countdownTime }}</div>
-        <el-button :disabled="!jsStart" type="success" @click="startCompetition">开始</el-button>
-        <el-button :disabled="jsStart" type="danger" @click="endCompetition">提交</el-button>
-      </template>
-      <el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition">退出</el-button>
-      <el-button v-if="project!=='jsxt'&&project!=='refereeJsxt'" type="primary" :loading="backLoading" @click="back">退出</el-button>
     </div>
     <qr-code ref="qrCode" />
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
@@ -101,6 +103,7 @@ export default {
 			noQrcodeList: NoQrcodeList,
 			isShow3dmodel :false,
 			jl3dname: this.$t('display.demon.threeDimensionalView'),
+			hoverBtn: false
         };
     },
     computed: {
@@ -373,7 +376,32 @@ export default {
                 this.jl3dname = this.$t('display.demon.threeDimensionalView'); // 三维视图
                 this.isShow3dmodel = true;
             }
-        }
+		}
+		// btnHover() {
+		// 	if (!this.btnHoverTime) {
+		// 		this.btnHoverTime = setTimeout(() => {
+		// 			this.hoverBtn = false;
+		// 		}, 8000)
+		// 	}
+		// 	this.hoverBtn = true;
+		// },
+		// btnBoxEnter() {
+		// 	if (this.btnHoverTime) {
+		// 		clearTimeout(this.btnHoverTime);
+		// 		this.btnHoverTime = null;
+		// 	}
+		// 	if (this.btnBoxLeaveTime) {
+		// 		clearTimeout(this.btnBoxLeaveTime);
+		// 		this.btnBoxLeaveTime = null;
+		// 	}
+		// },
+		// btnBoxLeave() {
+		// 	if (!this.btnBoxLeaveTime) {
+		// 		this.btnBoxLeaveTime = setTimeout(() => {
+		// 			this.hoverBtn = false;
+		// 		}, 5000)
+		// 	}
+		// }
     }
 };
 </script>
@@ -460,11 +488,30 @@ export default {
 		}
 	}
 
+	.btn_hover{
+		position: absolute;
+		right: -2px;
+		bottom: 15px;
+		color: #fff;
+		font-size: 24px;
+		background: #1756e4;
+		padding: 8px 2px;
+		border-radius: 5px;
+	}
 	.display-draft {
 		position: absolute;
-		float: right;
+		// float: right;
 		right: 40px;
 		bottom: 28px;
+		// transform: translateX(calc(100% + 40px));
+		// transition: all 0.5s;
+		// &.active{
+		// 	transform: translateX(0);
+		// }
+	}
+	.haerbin_btn_box{
+		width: 420px;
+		bottom: 15px!important;
 	}
 	.display-type-hb{
 		bottom: 105px;

From d91467db708db828a84e89f413e039b3b8ee8bfe Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 29 Jul 2020 10:27:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=8A=9F=E8=83=BD=E6=A0=8F=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baseUrl.js                          |  4 +--
 .../newMap/displayNew/demon/equipment.vue     | 23 +++++++--------
 src/views/newMap/displayNew/menuDemon.vue     | 22 +++++++--------
 src/views/newMap/displayNew/menuSchema.vue    |  2 +-
 src/views/newMap/jlmapNew/pendant/zoom.vue    |  4 +--
 src/views/newMap/jointTrainingNew/index.vue   |  4 ---
 .../newMap/jointTrainingNew/menuDemon.vue     | 28 +++++++++----------
 .../newMap/jointTrainingNew/menuSchema.vue    |  2 +-
 8 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index c59924e25..778caeb7b 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,9 +2,9 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-        BASE_API = 'http://192.168.3.6:9000'; // 旭强
+        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
diff --git a/src/views/newMap/displayNew/demon/equipment.vue b/src/views/newMap/displayNew/demon/equipment.vue
index 50df8255a..f30de4670 100644
--- a/src/views/newMap/displayNew/demon/equipment.vue
+++ b/src/views/newMap/displayNew/demon/equipment.vue
@@ -1,17 +1,14 @@
 <template>
   <div>
-    <el-dialog
-      title="设备管理"
-      :visible.sync="show"
-      custom-class="dialog_box"
-      top="0px"
-      width="800px"
-      :modal="false"
-      :before-do-close="doClose"
-      :close-on-click-modal="false"
-      :z-index="2000"
-    >
-      <div style="margin-bottom: 3px; overflow: hidden;">
+	<el-drawer
+		title="设备管理"
+		:visible.sync="show"
+		direction="ltr"
+		:before-close="doClose"
+		custom-class="dialog_box"
+		size="43%"
+	>
+      <div style="margin-bottom: 3px; overflow: hidden; padding: 0 10px;">
         <div class="plc_box">名称: {{ plcInfo.name }}</div>
         <div class="plc_box">状态: <span :style="{'color': plcInfo.status ? 'green' : 'red'}">{{ plcInfo.status ? '在线' : '不在线' }}</span></div>
         <el-button type="text" size="small" class="freshen_box" @click="getList">刷新</el-button>
@@ -32,7 +29,7 @@
           </template>
         </el-table-column>
       </el-table>
-    </el-dialog>
+	</el-drawer>
   </div>
 </template>
 
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 54e8dd6ca..710670eee 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -9,23 +9,23 @@
     <div class="display-draft" :class="{'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group>
 		  <!-- 排班计划 -->
-        <el-button v-if="isShowScheduling && !dataError" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
+        <el-button v-if="isShowScheduling && !dataError" type="primary" @click="jumpScheduling" size="small">{{ $t('display.demon.dispatchingPlan') }}</el-button>
 		<!-- cctv视图 -->
-        <el-button v-if="!isShowScheduling && !dataError" type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
-        <!-- <el-button v-if="!isShowScheduling && !dataError" type="jl3dstation" @click="jumpjl3dstation">{{ jl3dstation }}</el-button> -->
+        <el-button v-if="!isShowScheduling && !dataError" @click="jumpjl3dpassflow" size="small">{{ jl3dpassflow }}</el-button>
+        <!-- <el-button v-if="!isShowScheduling && !dataError" @click="jumpjl3dstation">{{ jl3dstation }}</el-button> -->
 		<!-- 三维视图 -->
-        <el-button v-if="!isShowScheduling && !dataError" type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
+        <el-button v-if="!isShowScheduling && !dataError" @click="jumpjlmap3d" size="small">{{ jl3dname }}</el-button>
 		<!-- 设备视图 -->
-        <el-button v-if="isShow3dmodel && !isShowScheduling && !dataError" type="jumpjlmap3dmodel" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
+        <el-button v-if="isShow3dmodel && !isShowScheduling && !dataError" @click="jumpjlmap3dmodel" size="small">{{ jl3dmodel }}</el-button>
         <template v-if="isShowQuest">
           <!-- && !isDesignPlatform  -->
-          <el-button v-if="!isDesignPlatform && !dataError" type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
+          <el-button v-if="!isDesignPlatform && !dataError" type="danger" @click="handleQuitQuest" size="small">{{ $t('display.demon.exitScript') }}</el-button>
         </template>
         <template v-else-if="!projectDevice">
-          <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
-          <el-button type="danger" :disabled="dataError" @click="end">{{ $t('display.demon.initialize') }}</el-button>
+          <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime" size="small">{{ $t('display.demon.drivingByPlan') }}</el-button>
+          <el-button type="danger" :disabled="dataError" @click="end" size="small">{{ $t('display.demon.initialize') }}</el-button>
         </template>
-        <el-button type="primary" @click="back">{{ projectDevice?'退出':$t('display.demon.back') }}</el-button>
+        <el-button type="primary" @click="back" size="small">{{ projectDevice?'退出':$t('display.demon.back') }}</el-button>
       </el-button-group>
     </div>
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
@@ -353,7 +353,7 @@ export default {
         color: #fff;
     }
 	.haerbin_btn_box{
-		width: 420px;
+		width: 450px;
 		bottom: 15px!important;
 	}
 </style>
@@ -361,7 +361,7 @@ export default {
 .display-draft {
     position: absolute;
     float: right;
-    right: 20px;
+    right: 5px;
     bottom: 15px;
 }
 </style>
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index 84be4da13..6357e195b 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -265,7 +265,7 @@ export default {
         z-index: 9;
         display: inline;
         position: absolute;
-        right: 15px;
+        right: 5px;
     }
 
     /deep/ .el-button+.el-button {
diff --git a/src/views/newMap/jlmapNew/pendant/zoom.vue b/src/views/newMap/jlmapNew/pendant/zoom.vue
index 50bc7db13..0b2349242 100644
--- a/src/views/newMap/jlmapNew/pendant/zoom.vue
+++ b/src/views/newMap/jlmapNew/pendant/zoom.vue
@@ -21,7 +21,7 @@ export default {
     },
     data() {
         return {
-            offset: 15
+            offset: 10
         };
     },
     watch: {
@@ -67,7 +67,7 @@ export default {
     .zoom-box {
         z-index: 7;
         position: absolute;
-        left: 20px;
+        left: 5px;
         width: 120px;
         height: 32px;
         background: rgb(224, 223, 223);
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 05f878886..037abb0bd 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -516,10 +516,6 @@ export default {
             window.open(routeData.href, '_blank', 'noopener noreferrer');
         },
         hidepanel() { // 司机视角
-            // this.panelShow = false;
-            // this.drivingShow = true;
-            // this.ibpShow = false;
-			// this.$refs.Jl3dDrive.show(this.mapId, this.group);
 			if (this.$store.state.training.prdType == '04') {
                 this.panelShow = false;
                 this.drivingShow = true;
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 670059ae6..c53ff75db 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -5,28 +5,28 @@
 	<!--  @mouseenter="btnBoxEnter" @mouseleave.stop="btnBoxLeave"  -->
     <div class="display-draft" :class="{'display-type-hb': $route.query.lineCode == '07' && $store.state.training.prdType=='01', 'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group>
-        <el-button v-if="isAdmin && isProject" @click="handleEquipment">设备管理</el-button>
-        <el-button v-if="isAdmin" @click="memberManage">成员管理</el-button>
-        <el-button v-if="isAdmin && !noQrcodeList.includes(project)" type="primary" @click="generateQrCode">生成二维码</el-button>
+        <el-button v-if="isAdmin && isProject" @click="handleEquipment" size="small">设备管理</el-button>
+        <el-button v-if="isAdmin" @click="memberManage" size="small">成员管理</el-button>
+        <el-button v-if="isAdmin && !noQrcodeList.includes(project)" type="primary" @click="generateQrCode" size="small">生成二维码</el-button>
 
         <!-- cctv视图 -->
-        <el-button v-if="(isShowScheduling && !dataError) || (isStationSupervisor && !dataError)" @click="jumpjl3dpassflow">{{ $t('display.demon.passengerflow') }}</el-button>
+        <el-button v-if="(isShowScheduling && !dataError) || (isStationSupervisor && !dataError)" @click="jumpjl3dpassflow" size="small">{{ $t('display.demon.passengerflow') }}</el-button>
         <!-- 三维视图 / 司机视角 -->
-        <el-button v-if="(isShowScheduling && !dataError) || (isDriver && !dataError)" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
+        <el-button v-if="(isShowScheduling && !dataError) || (isDriver && !dataError)" @click="jumpjlmap3d" size="small">{{ jl3dname }}</el-button>
         <!-- 设备视图 -->
-        <el-button v-if="isShow3dmodel && isShowScheduling && !dataError" @click="jumpjlmap3dmodel">{{ $t('display.demon.deviceView') }}</el-button>
+        <el-button v-if="isShow3dmodel && isShowScheduling && !dataError" @click="jumpjlmap3dmodel" size="small">{{ $t('display.demon.deviceView') }}</el-button>
 
         <template v-if="isAdmin && project != 'refereeJsxt'">
-          <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
-          <el-button type="danger" :disabled="dataError" @click="end">{{ $t('joinTraining.initialize') }}</el-button>
+          <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime" size="small">{{ $t('joinTraining.drivingByPlan') }}</el-button>
+          <el-button type="danger" :disabled="dataError" @click="end" size="small">{{ $t('joinTraining.initialize') }}</el-button>
         </template>
 		<template v-if="project==='jsxt'">
 			<div style="background: #FFF;display: inline-block;height: 40px;line-height: 40px;padding: 0 5px;border: 2px solid #F00;border-radius: 6px;margin-right: 8px;">{{ '剩余时间:' + countdownTime }}</div>
-			<el-button :disabled="!jsStart" type="success" @click="startCompetition">开始</el-button>
-			<el-button :disabled="jsStart" type="danger" @click="endCompetition">提交</el-button>
+			<el-button :disabled="!jsStart" type="success" @click="startCompetition" size="small">开始</el-button>
+			<el-button :disabled="jsStart" type="danger" @click="endCompetition" size="small">提交</el-button>
 		</template>
-		<el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition">退出</el-button>
-		<el-button v-if="project!=='jsxt'&&project!=='refereeJsxt'" type="primary" :loading="backLoading" @click="back">退出</el-button>
+		<el-button v-if="project==='refereeJsxt'" type="success" @click="refeeEndCompetition" size="small">退出</el-button>
+		<el-button v-if="project!=='jsxt'&&project!=='refereeJsxt'" type="primary" :loading="backLoading" @click="back" size="small">退出</el-button>
       </el-button-group>
     </div>
     <qr-code ref="qrCode" />
@@ -500,7 +500,7 @@ export default {
 	.display-draft {
 		position: absolute;
 		// float: right;
-		right: 40px;
+		right: 5px;
 		bottom: 28px;
 		// transform: translateX(calc(100% + 40px));
 		// transition: all 0.5s;
@@ -509,7 +509,7 @@ export default {
 		// }
 	}
 	.haerbin_btn_box{
-		width: 420px;
+		width: 450px;
 		bottom: 15px!important;
 	}
 	.display-type-hb{
diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index 8ff737b88..c3413a2ac 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -182,7 +182,7 @@ export default {
         z-index: 9;
         display: inline;
         position: absolute;
-        right: 20px;
+        right: 5px;
     }
 
     .schema .el-radio-group .el-radio-button__inner {