From c3e7f8227a090c827d1b382050b7b7fed75bf420 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 29 Jul 2020 13:23:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=BA=E6=AE=B5=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=98=BE=E7=A4=BA=EF=BC=8C=E8=B0=83=E6=95=B4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/menuDemon.vue                 | 3 +++
 src/views/newMap/jointTrainingNew/menuDemon.vue           | 5 +++--
 src/views/newMap/newMapdraft/mapoperate/section/index.vue | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 710670eee..f88d164b7 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -363,5 +363,8 @@ export default {
     float: right;
     right: 5px;
     bottom: 15px;
+	button {
+		float: right;
+	}
 }
 </style>
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index c53ff75db..605e9f7c3 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -8,14 +8,12 @@
         <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" size="small">{{ $t('display.demon.passengerflow') }}</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" size="small">{{ $t('display.demon.deviceView') }}</el-button>
-
         <template v-if="isAdmin && project != 'refereeJsxt'">
           <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>
@@ -507,6 +505,9 @@ export default {
 		// &.active{
 		// 	transform: translateX(0);
 		// }
+		button {
+			float: right;
+		}
 	}
 	.haerbin_btn_box{
 		width: 450px;
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
index b351a85a2..3fef86026 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
@@ -340,7 +340,7 @@ export default {
             return this.editModel.type == '01' && this.editModel.standTrack;
         },
         isreentryTrackName() {
-            return !this.isParentCode && this.editModel.reentryTrack;
+            return this.hasAssociatedSection && this.editModel.reentryTrack;
         },
         istransferTrackName() {
             return this.editModel.type == '01' && this.editModel.transferTrack;
@@ -349,10 +349,10 @@ export default {
             return this.editModel.type == '01' && !this.editModel.reentryTrack;
         },
         isReentryTrackShow() {
-            return !this.isParentCode && !this.editModel.transferTrack;
+            return this.hasAssociatedSection && !this.editModel.transferTrack;
         },
         isdestinationCode() {
-            return !this.isParentCode && (this.editModel.reentryTrack || this.editModel.transferTrack);
+            return this.hasAssociatedSection && (this.editModel.reentryTrack || this.editModel.transferTrack);
         },
         isStopPointOffset() {
             return this.editModel.type !== '04' && (this.editModel.reentryTrack || this.editModel.standTrack || this.editModel.transferTrack);