From cd877b88002d0000ccd6cb85dc97e9267111c9a9 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 13 Aug 2020 16:18:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/index.vue         | 12 ++-
 src/views/newMap/displayNew/menuScript.vue    | 76 +++++++++++++++++--
 .../newMap/newMapdraft/mapoperate/counter.vue | 24 +++---
 .../newMapdraft/mapoperate/espDraft.vue       |  9 ---
 src/views/scriptManage/tipScriptRecord.vue    | 18 +++++
 5 files changed, 111 insertions(+), 28 deletions(-)

diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 901de89f8..07cc664bf 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -62,7 +62,16 @@
         @switchStationMode="switchStationMode"
       />
 
-      <menu-script v-if="isScript" ref="menuScript" :offset-bottom="offsetBottom" :data-error="dataError" @script3ddriveshow="script3ddriveshow" />
+      <menu-script
+        v-if="isScript"
+        ref="menuScript"
+        :offset-bottom="offsetBottom"
+        :offset="offset"
+        :project="project"
+        :text-status-height="textStatusHeight"
+        :data-error="dataError"
+        @script3ddriveshow="script3ddriveshow"
+      />
 
       <menu-practice
         v-if="isPractice"
@@ -539,6 +548,7 @@ export default {
                 }
                 if (textStatus) {
                     this.textStatusHeight = textStatus.offsetHeight || 0;
+                    textStatus.style.top = this.offset - 15 + 'px';
                 }
             });
         },
diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue
index 0b7c25848..694e88723 100644
--- a/src/views/newMap/displayNew/menuScript.vue
+++ b/src/views/newMap/displayNew/menuScript.vue
@@ -1,21 +1,36 @@
 <template>
   <div>
-    <div class="display-draft" :style="{bottom: offsetBottom + 'px'}">
+    <div class="display-draft">
+      <!-- :style="{bottom: offsetBottom + 'px'}" -->
       <el-button-group>
-        <el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ $t('joinTraining.driverPerspective') }}</el-button>
         <el-button v-if="!isScriptCommand" type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('scriptRecord.drivingByPlan') }}</el-button>
         <el-button v-if="!isScriptCommand" type="danger" :disabled="dataError" @click="end">初始化</el-button>
         <el-button type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
       </el-button-group>
     </div>
+    <div v-if="!dataError" class="display_top_draft" :style="{top: offset+textStatusHeight+'px'}">
+      <div class="btn_hover" @click="menuClick">菜单</div>
+      <el-button-group ref="button_group_box" class="button_group_box" :style="`margin-left:-${btnWidth}px`">
+        <!-- 地图错误判断 -->
+        <!-- 设备视图 -->
+        <!-- <el-button v-if="isShow3dmodel && !isShowScheduling" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button> -->
+        <!-- 三维视图 -->
+        <el-button v-if="!isShowScheduling&&!isDriver" size="small" @click="jumpjlmap3d">{{ $t('display.demon.threeDimensionalView') }}</el-button>
+        <!-- cctv视图 -->
+        <!-- <el-button v-if="!isShowScheduling" size="small" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button> -->
+        <!-- 司机视角 -->
+        <el-button v-if="isDriver" size="small" type="jumpjlmap3d" @click="jumpjlmap3dDriver">{{ $t('joinTraining.driverPerspective') }}</el-button>
+      </el-button-group>
+    </div>
     <script-chat ref="chatbox" :group="group" :user-role="userRole" />
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
-    <tip-script-record-new ref="tipTaskRecordNew" :group="group" :offset-bottom="offsetBottom" />
+    <tip-script-record-new ref="tipTaskRecordNew" :group="group" :offset-bottom="offsetBottom" :offset="offset" />
   </div>
 </template>
 
 <!-- 单人仿真 -->
 <script>
+import { getToken } from '@/utils/auth';
 import ScriptChat from './scriptChat';
 import TipScriptRecordNew from '@/views/scriptManage/tipScriptRecord';
 import SetTime from './demon/setTime';
@@ -40,14 +55,33 @@ export default {
             default() {
                 return false;
             }
+        },
+        offset: {
+            type: Number,
+            required: true
+        },
+        textStatusHeight: {
+            type: Number,
+            default() {
+                return 0;
+            }
+        },
+        project:{
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             isDisable: false,
-            isScriptCommand:false
+            isScriptCommand:false,
+            hoverBtn: false,
+            btnWidth: 0
         };
     },
+
     computed: {
         scriptId() {
             return this.$route.query.scriptId;
@@ -60,6 +94,12 @@ export default {
         },
         userRole() {
             return this.$store.state.scriptRecord.userRole ? this.$store.state.scriptRecord.userRole : 'ADMIN';
+        },
+        isDriver() {
+            return this.$store.state.scriptRecord.userRole == 'DRIVER';
+        },
+        isShowScheduling() {
+            return this.$store.state.training.prdType == '05';
         }
     },
     watch: {
@@ -75,6 +115,9 @@ export default {
         if (!this.isScriptCommand) {
             this.$store.dispatch('training/setPrdType', '01');
         }
+        this.$nextTick(() => {
+            this.menuClick();
+        });
     },
     methods: {
         initPlannedDriving(isDisable) {
@@ -86,6 +129,16 @@ export default {
         resetBeginTime() {
             this.isDisable = false;
         },
+        menuClick() {
+            this.hoverBtn = !this.hoverBtn;
+            if (this.hoverBtn) {
+                // this.$refs.button_group_box.$el.clientWidth ||
+                this.btnWidth = 500; // 默认宽度
+            } else {
+                // button_group_box
+                this.btnWidth = 0;
+            }
+        },
         start(model) {
             this.isDisable = true;
             const data = {
@@ -143,8 +196,21 @@ export default {
                 Notification.closeAll();
             });
         },
-        jumpjlmap3d() {
+        jumpjlmap3dDriver() {
             this.$emit('script3ddriveshow');
+        },
+        jumpjlmap3d() {
+            const routeData = this.$router.resolve({
+                path:'/jlmap3d/sandbox',
+                query:{
+                    mapid:this.$route.query.mapId,
+                    group:this.group,
+                    token:getToken(),
+                    project: this.project,
+                    noPreLogout: true
+                }
+            });
+            window.open(routeData.href, '_blank', 'noopener noreferrer');
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/mapoperate/counter.vue b/src/views/newMap/newMapdraft/mapoperate/counter.vue
index 694178c8b..a14e2af63 100644
--- a/src/views/newMap/newMapdraft/mapoperate/counter.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/counter.vue
@@ -66,17 +66,8 @@ export default {
             addModel: {
                 type: '',
                 stationCode: ''
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'counterList',
-            'stationList',
-            'lineCode'
-        ]),
-        rules: function () {
-            return {
+            },
+            rules: {
                 code: [
                     { required: true, message: this.$t('map.pleaseSelectDevice'), trigger: 'change' }
                 ],
@@ -98,8 +89,15 @@ export default {
                 'position.y': [
                     { required: true, message: this.$t('map.pleaseEnterYCoordinate'), trigger: 'change' }
                 ]
-            };
-        },
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'counterList',
+            'stationList',
+            'lineCode'
+        ]),
         form() {
             const form = {
                 labelWidth: '120px',
diff --git a/src/views/newMap/newMapdraft/mapoperate/espDraft.vue b/src/views/newMap/newMapdraft/mapoperate/espDraft.vue
index 2072c3485..79d91985a 100644
--- a/src/views/newMap/newMapdraft/mapoperate/espDraft.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/espDraft.vue
@@ -1,15 +1,6 @@
 <template>
   <el-tabs v-model="activeName" class="card">
     <el-tab-pane class="view-control" :label="$t('map.property')" name="first" :lazy="lazy">
-      <!-- <div class="view-control-content">
-        <config-list ref="dataform" :form="form" :form-model="editModel" :rules="rules" />
-      </div>
-      <div class="button_box">
-        <el-button-group class="map-draft-group">
-          <el-button type="primary" size="small" @click="edit">{{ $t('map.updateObj') }}</el-button>
-          <el-button type="danger" size="small" @click="deleteObj">{{ $t('map.deleteObj') }}</el-button>
-        </el-button-group>
-      </div> -->
       <operate-property
         ref="dataform"
         :form="form"
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index ef4e78419..533c321b3 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -35,6 +35,7 @@
 <script>
 import Vue from 'vue';
 import GetActionNew from './getAction';
+import { getToken } from '@/utils/auth';
 import {getSimulationMemberList, executeScriptNew, dumpScriptDataNew, saveScriptDataNew, saveScriptScenesNew, updateMapLocationNew, simulationPause} from '@/api/simulation';
 import ConstConfig from '@/scripts/ConstConfig';
 import {getDraftScriptByGroupNew, changeScriptRole} from '@/api/script';
@@ -53,6 +54,10 @@ export default {
         offsetBottom:{
             type: Number,
             required: true
+        },
+        offset:{
+            type: Number,
+            required: true
         }
     },
     data() {
@@ -172,6 +177,19 @@ export default {
                         this.$store.dispatch('training/setRoles', 'DISPATCHER');
                     } else if (memberInfo.type == '司机') {
                         prdType = '04';
+                    } else if (memberInfo.type == '通号') {
+                        prdType = '';
+                        const routeData = this.$router.resolve({
+                            path:'/jlmap3d/maintainer',
+                            query:{
+                                mapid:this.$route.query.mapId,
+                                group:this.group,
+                                token:getToken(),
+                                project: this.project,
+                                noPreLogout: true
+                            }
+                        });
+                        window.open(routeData.href, '_blank', 'noopener noreferrer');
                     } else {
                         prdType = '';
                     }

From 0ed57e54888f0472f2ffc9369735e0eda77fe0fb Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 13 Aug 2020 16:45:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/map.js                                   |  4 ++--
 .../theme/components/menus/passiveDialog/control.vue | 12 ++++++------
 .../foshan_01/menus/menuDialog/stationControl.vue    |  2 +-
 .../menus/menuDialog/stationControlConvert.vue       |  4 ++--
 .../theme/ningbo_01/menus/dialog/stationControl.vue  |  6 +++---
 .../ningbo_01/menus/menuDialog/stationControl.vue    |  2 +-
 .../menus/menuDialog/stationControlConvert.vue       |  4 ++--
 src/views/scriptManage/tipScriptRecord.vue           |  8 ++++++--
 8 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 1d9bf6c98..5c2773d40 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -435,10 +435,10 @@ class Jlmap {
                 }
             } else if (elem.deviceType === 'STATION') {
                 // 如果是控制权转移消息
-                if (elem.hasOwnProperty('applicantIdOfControlTransfer')) {
+                if (elem.hasOwnProperty('applicantId')) {
                     controlTransferList.push(elem);
                 }
-                if (!elem.applicantIdOfControlTransfer) {
+                if (!elem.applicantId) {
                     const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
                     const guideLock = this.mapDevice[oDevice.guideLockCode];
                     const guideLockStatus = {totalGuideLock: elem.totalGuideLock};
diff --git a/src/jmapNew/theme/components/menus/passiveDialog/control.vue b/src/jmapNew/theme/components/menus/passiveDialog/control.vue
index f2e968f37..48b5331c8 100644
--- a/src/jmapNew/theme/components/menus/passiveDialog/control.vue
+++ b/src/jmapNew/theme/components/menus/passiveDialog/control.vue
@@ -186,12 +186,12 @@ export default {
         },
         doShow(controlTransferList) {
             const controlTransfer = controlTransferList[0];
-            if (controlTransfer.applicantIdOfControlTransfer) {
-                const member = this.$store.state.training.memberData[controlTransfer.applicantIdOfControlTransfer];
+            if (controlTransfer.applicantId) {
+                const member = this.$store.state.training.memberData[controlTransfer.applicantId];
                 const simulationUserList = this.$store.state.training.simulationUserList;
                 if (member.type == 'DISPATCHER' && controlTransferList.length > 1) {
                     controlTransferList.forEach(each=>{
-                        this.showDialog(this.$store.state.training.memberData[each.applicantIdOfControlTransfer], each, simulationUserList, [each]);
+                        this.showDialog(this.$store.state.training.memberData[each.applicantId], each, simulationUserList, [each]);
                     });
                 } else {
                     this.showDialog(member, controlTransfer, simulationUserList, controlTransferList);
@@ -221,8 +221,8 @@ export default {
                         });
                     }
                     // 后端倒计时
-                    if (controlTransfer.validDurationOfControlTransferApplication) {
-                        this.count = controlTransfer.validDurationOfControlTransferApplication;
+                    if (controlTransfer.validDuration) {
+                        this.count = controlTransfer.validDuration;
                         this.dialogShow = true;
                         this.requestInfo = info;
                         this.disabledAgree = true;
@@ -240,7 +240,7 @@ export default {
                     }
                 } else {
                     // 后端倒计时
-                    this.count = controlTransfer.validDurationOfControlTransferApplication;
+                    this.count = controlTransfer.validDuration;
                 }
             }
         },
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue
index c736675c7..fec6ae761 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue
@@ -154,7 +154,7 @@ export default {
         updateTableValue(controlTransfer) {
             this.centralizedStationList.forEach((row, index) => {
                 if (row.code == controlTransfer.code) {
-                    if (controlTransfer.applicantIdOfControlTransfer) {
+                    if (controlTransfer.applicantId) {
                         this.disabledCommit = true;
                     } else {
                         this.disabledCommit = false;
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
index 6a6b37fea..52087b189 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
@@ -173,8 +173,8 @@ export default {
         updateTableValue(controlTransfer) {
             this.tableData.forEach((row, index) => {
                 if (row.code == controlTransfer.code) {
-                    if (controlTransfer.applicantIdOfControlTransfer) {
-                        row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDurationOfControlTransferApplication + this.$t('menu.menuDialog.senedMessageTwo');
+                    if (controlTransfer.applicantId) {
+                        row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDuration + this.$t('menu.menuDialog.senedMessageTwo');
                         row.disabled = true;
                         row.check = false;
                     } else {
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
index ed6441c26..de5a2fb4d 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
@@ -152,7 +152,7 @@ export default {
         updateTableValue(controlTransfer) {
             this.stationLists.forEach((row, index) => {
                 if (row.code == controlTransfer.code) {
-                    if (controlTransfer.applicantIdOfControlTransfer) {
+                    if (controlTransfer.applicantId) {
                         this.commitDisabled = true;
                     } else {
                         this.commitDisabled = false;
@@ -161,8 +161,8 @@ export default {
             });
             // this.tableData.forEach((row, index) => {
             //     if (row.code == controlTransfer.code) {
-            //         if (controlTransfer.applicantIdOfControlTransfer) {
-            //             row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDurationOfControlTransferApplication + this.$t('menu.menuDialog.senedMessageTwo');
+            //         if (controlTransfer.applicantId) {
+            //             row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDuration + this.$t('menu.menuDialog.senedMessageTwo');
             //             row.disabled = true;
             //             row.check = false;
             //         } else {
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue
index b984a0b7c..219792dfc 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue
@@ -150,7 +150,7 @@ export default {
         updateTableValue(controlTransfer) {
             this.concertrateStationList.forEach((row, index) => {
                 if (row.code == controlTransfer.code) {
-                    if (controlTransfer.applicantIdOfControlTransfer) {
+                    if (controlTransfer.applicantId) {
                         this.disabledCommit = true;
                     } else {
                         this.disabledCommit = false;
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
index fe5c50bdd..1a6610d0b 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
@@ -173,8 +173,8 @@ export default {
         updateTableValue(controlTransfer) {
             this.tableData.forEach((row, index) => {
                 if (row.code == controlTransfer.code) {
-                    if (controlTransfer.applicantIdOfControlTransfer) {
-                        row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDurationOfControlTransferApplication + this.$t('menu.menuDialog.senedMessageTwo');
+                    if (controlTransfer.applicantId) {
+                        row.result = this.$t('menu.menuDialog.senedMessageOne') + controlTransfer.validDuration + this.$t('menu.menuDialog.senedMessageTwo');
                         row.disabled = true;
                         row.check = false;
                     } else {
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index 533c321b3..9f4c19472 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -77,7 +77,8 @@ export default {
             size: {
                 width: 300,
                 height: 300
-            }
+            },
+            openWindow:null
         };
     },
     watch:{
@@ -168,6 +169,9 @@ export default {
                     return member.id == role;
                 });
                 if (memberInfo) {
+                    if (this.openWindow) {
+                        this.openWindow.close();
+                    }
                     if (memberInfo.type == '行值') {
                         prdType = '01';
                         this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR');
@@ -189,7 +193,7 @@ export default {
                                 noPreLogout: true
                             }
                         });
-                        window.open(routeData.href, '_blank', 'noopener noreferrer');
+                        this.openWindow = window.open(routeData.href);
                     } else {
                         prdType = '';
                     }