From 736c81a61da854b83d4a5fa33cca0ab9885d5da9 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 19 May 2020 14:01:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83=20=20?=
 =?UTF-8?q?=E5=89=A7=E6=9C=AC=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

---
 .../newMap/displayNew/chatView/chatBox.vue    |  1 +
 .../displayNew/chatView/chatContent.vue       | 36 +++++++++-----
 .../chatView/chatCoversitionList.vue          |  5 +-
 src/views/newMap/jointTrainingNew/chatBox.vue | 12 ++++-
 .../newMap/jointTrainingNew/chatContent.vue   | 48 +++++++++++++------
 .../jointTrainingNew/chatCoversitionList.vue  | 26 ++++++++++
 src/views/newMap/jointTrainingNew/index.vue   |  8 ++--
 .../scriptManage/display/tipScriptRecord.vue  |  1 +
 src/views/trainRoom/e-roles.vue               |  4 +-
 9 files changed, 106 insertions(+), 35 deletions(-)

diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue
index a9b079620..6ea2f84da 100644
--- a/src/views/newMap/displayNew/chatView/chatBox.vue
+++ b/src/views/newMap/displayNew/chatView/chatBox.vue
@@ -140,6 +140,7 @@ export default {
             if (this.recordSending) {
                 this.cancleRecording();
             }
+            this.$refs.chatContent.scrollTop();
         },
         setHeadTitle(headerTitle) {
             this.headerTitle = headerTitle;
diff --git a/src/views/newMap/displayNew/chatView/chatContent.vue b/src/views/newMap/displayNew/chatView/chatContent.vue
index fc55c986d..3a94a2e08 100644
--- a/src/views/newMap/displayNew/chatView/chatContent.vue
+++ b/src/views/newMap/displayNew/chatView/chatContent.vue
@@ -1,18 +1,20 @@
 <template>
   <div class="chatcontentIn">
-    <div v-for="(chatContent,index) in chatContentList" :key="index" class="chatContentInClass">
-      <div :class="chatContent.self?'rightUser':'leftUser'">
-        <div class="userHeader">
-          <div v-if="chatContent.group&& !chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
-          <div :class="chatContent.self?'userChatTime textRight':'userChatTime'">{{ formatTime(chatContent.chatTime) }}</div>
-        </div>
-        <div class="userBubble" @click="playAudio('audio'+index)">
-          <div class="userMessage">
-            <!-- &&!(chatContent.self) -->
-            <span v-if="chatContent.group">@{{ covertName(chatContent.targetName) }}</span>
-            <span class="el-icon-video-play playicon" />
-            <span class="messageText">{{ chatContent.message }}</span>
-            <audio :id="'audio'+index" :src="baseUrl+chatContent.src" style="display:none" />
+    <div class="chatcontentInner">
+      <div v-for="(chatContent,index) in chatContentList" :key="index" class="chatContentInClass">
+        <div :class="chatContent.self?'rightUser':'leftUser'">
+          <div class="userHeader">
+            <div v-if="chatContent.group&& !chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
+            <div :class="chatContent.self?'userChatTime textRight':'userChatTime'">{{ formatTime(chatContent.chatTime) }}</div>
+          </div>
+          <div class="userBubble" @click="playAudio('audio'+index)">
+            <div class="userMessage">
+              <!-- &&!(chatContent.self) -->
+              <span v-if="chatContent.group">@{{ covertName(chatContent.targetName) }}</span>
+              <span class="el-icon-video-play playicon" />
+              <span class="messageText">{{ chatContent.message }}</span>
+              <audio :id="'audio'+index" :src="baseUrl+chatContent.src" style="display:none" />
+            </div>
           </div>
         </div>
       </div>
@@ -42,6 +44,7 @@ export default {
             const simulationText = this.$store.state.socket.simulationText;
             if (this.currentCoversition.id == val.id) {
                 this.chatContentList.push(simulationText);
+                this.scrollTop();
             } else {
                 if (!simulationText.group) {
                     this.$emit('changeCoversition', simulationText);
@@ -79,6 +82,7 @@ export default {
                     return coversition;
                 });
                 this.chatContentList = coversitionList;
+                this.scrollTop();
             });
             // const coversitionListAll = Object.assign({}, this.$store.state.socket.coversitionList);
             // const coversitionList = coversitionListAll[this.coversition.id] || [];
@@ -88,6 +92,12 @@ export default {
         clearData() {
             this.chatContentList = [];
         },
+        scrollTop() {
+            this.$nextTick(function() {
+                const scrollTop = document.querySelector('.chatcontentInner').offsetHeight - document.querySelector('.chatcontentIn').offsetHeight + 30;
+                document.querySelector('.chatcontentIn').scrollTop = scrollTop;
+            });
+        },
         formatTime(time) {
             return /\d{2}:\d{2}:\d{2}/.exec(time)[0] || time;
         },
diff --git a/src/views/newMap/displayNew/chatView/chatCoversitionList.vue b/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
index b57071f02..c5512932c 100644
--- a/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
+++ b/src/views/newMap/displayNew/chatView/chatCoversitionList.vue
@@ -67,7 +67,10 @@ export default {
             const objectCover = this.handleMemberName(coversition);
             coversition.coverName = objectCover.coversitionName;
             coversition.isOnline = objectCover.isOnline;
-            this.coversitionList.push(coversition);
+            const index = this.coversitionList.findIndex(item=>{ return item.id == coversition.id; });
+            if (index < 0) {
+                this.coversitionList.push(coversition);
+            }
             this.changeCoversition(coversition);
         },
         handleMemberName(conversition) {
diff --git a/src/views/newMap/jointTrainingNew/chatBox.vue b/src/views/newMap/jointTrainingNew/chatBox.vue
index 78c5a0375..72f0a1b69 100644
--- a/src/views/newMap/jointTrainingNew/chatBox.vue
+++ b/src/views/newMap/jointTrainingNew/chatBox.vue
@@ -19,7 +19,7 @@
             </div>
           </div>
           <div class="chat-box-content">
-            <chat-content ref="chatContent" :current-coversition="currentCoversition" />
+            <chat-content ref="chatContent" :current-coversition="currentCoversition" @changeCoversition="changeCoversition" />
             <div v-if="recordSending" class="chat_record_tip">
               <div id="record_progress_bar" :style="'width:'+100/60*seconds+'%'" />
               <div class="record_icon" />
@@ -110,6 +110,13 @@ export default {
         },
         setCurrentCoversition(coversition) {
             this.currentCoversition = coversition;
+            if (coversition.group) {
+                this.headerTitle = coversition.name;
+            }
+            if (this.recordSending) {
+                this.cancleRecording();
+            }
+            this.$refs.chatContent.scrollTop();
         },
         setHeadTitle(headerTitle) {
             this.headerTitle = headerTitle;
@@ -216,6 +223,9 @@ export default {
                 }
             });
         },
+        changeCoversition(data) {
+            this.$refs.chatCoversitionList.changeCoversitionOther(data);
+        },
         handleSetting() {
             this.$refs.chatSetting.doShow();
         },
diff --git a/src/views/newMap/jointTrainingNew/chatContent.vue b/src/views/newMap/jointTrainingNew/chatContent.vue
index 88b23211b..2c94350ae 100644
--- a/src/views/newMap/jointTrainingNew/chatContent.vue
+++ b/src/views/newMap/jointTrainingNew/chatContent.vue
@@ -1,17 +1,19 @@
 <template>
   <div class="chatcontentIn">
-    <div v-for="(chatContent,index) in chatContentList" :key="index" class="chatContentInClass">
-      <div :class="chatContent.self?'rightUser':'leftUser'">
-        <div class="userHeader">
-          <div v-if="chatContent.group&& !chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
-          <div :class="chatContent.self?'userChatTime textRight':'userChatTime'">{{ formatTime(chatContent.chatTime) }}</div>
-        </div>
-        <div class="userBubble" @click="playAudio('audio'+index)">
-          <div class="userMessage">
-            <span v-if="chatContent.group&&!chatContent.member.robot">@{{ covertName(chatContent.targetName) }}</span>
-            <span class="el-icon-video-play playicon" />
-            <span class="messageText">{{ chatContent.message }}</span>
-            <audio :id="'audio'+index" :src="baseUrl+chatContent.src" style="display:none" />
+    <div class="chatcontentInner">
+      <div v-for="(chatContent,index) in chatContentList" :key="index" class="chatContentInClass">
+        <div :class="chatContent.self?'rightUser':'leftUser'">
+          <div class="userHeader">
+            <div v-if="chatContent.group&& !chatContent.self" class="userName">{{ covertName(chatContent.member) }}</div>
+            <div :class="chatContent.self?'userChatTime textRight':'userChatTime'">{{ formatTime(chatContent.chatTime) }}</div>
+          </div>
+          <div class="userBubble" @click="playAudio('audio'+index)">
+            <div class="userMessage">
+              <span v-if="chatContent.group&&!chatContent.member.robot">@{{ covertName(chatContent.targetName) }}</span>
+              <span class="el-icon-video-play playicon" />
+              <span class="messageText">{{ chatContent.message }}</span>
+              <audio :id="'audio'+index" :src="baseUrl+chatContent.src" style="display:none" />
+            </div>
           </div>
         </div>
       </div>
@@ -38,9 +40,20 @@ export default {
     },
     watch:{
         '$store.state.socket.simulationText':function (val, old) { //  仿真聊天
-            if (this.currentCoversition.id == val.conversationId) {
-                const simulationText = this.$store.state.socket.simulationText;
+            // if (this.currentCoversition.id == val.conversationId) {
+            //     const simulationText = this.$store.state.socket.simulationText;
+            //     this.chatContentList.push(simulationText);
+            // }
+            const simulationText = this.$store.state.socket.simulationText;
+            if (this.currentCoversition.id == val.id) {
                 this.chatContentList.push(simulationText);
+                this.scrollTop();
+            } else {
+                if (!simulationText.group) {
+                    this.$emit('changeCoversition', simulationText);
+                    // this.$emit('addCoversition', {data:simulationText, headerTitle:''});
+                    this.chatContentList.push(simulationText);
+                }
             }
         },
         $route() {
@@ -72,12 +85,19 @@ export default {
                     return coversition;
                 });
                 this.chatContentList = coversitionList;
+                this.scrollTop();
             });
             // const coversitionListAll = Object.assign({}, this.$store.state.socket.coversitionList);
             // const coversitionList = coversitionListAll[this.coversition.id] || [];
             // // console.log('inintData---coversitionList' + JSON.stringify(this.$store.state.socket.coversitionList[this.coversition.id]));
             // this.chatContentList = coversitionList;
         },
+        scrollTop() {
+            this.$nextTick(function() {
+                const scrollTop = document.querySelector('.chatcontentInner').offsetHeight - document.querySelector('.chatcontentIn').offsetHeight + 30;
+                document.querySelector('.chatcontentIn').scrollTop = scrollTop;
+            });
+        },
         formatTime(time) {
             return /\d{2}:\d{2}:\d{2}/.exec(time)[0] || time;
         },
diff --git a/src/views/newMap/jointTrainingNew/chatCoversitionList.vue b/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
index 30f92ebb8..4516e5b0f 100644
--- a/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
+++ b/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
@@ -61,6 +61,16 @@ export default {
             this.$emit('setCurrentCoversition', coversition);
             // this.$refs.chatContent.reloadData(this.currentCoversition);
         },
+        changeCoversitionOther(coversition) {
+            const objectCover = this.handleMemberName(coversition);
+            coversition.coverName = objectCover.coversitionName;
+            coversition.isOnline = objectCover.isOnline;
+            const index = this.coversitionList.findIndex(item=>{ return item.id == coversition.id; });
+            if (index < 0) {
+                this.coversitionList.push(coversition);
+            }
+            this.changeCoversition(coversition);
+        },
         handleMemberName(conversition) {
             if (conversition.group) {
                 return {coversitionName:conversition.name, isOnline:true};
@@ -86,6 +96,22 @@ export default {
                             coversitionName = data + deviceName + memberName;
                         }
                     });
+                } else if (conversition.member) {
+                    const member = conversition.member;
+                    let data = member.role;
+                    const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
+                    roleTypeList.forEach(function(element) {
+                        const rolename = element.value;
+                        if (Cookies.get('user_lang') == 'en') {
+                            data = data.replace(rolename, element.enLabel);
+                        } else {
+                            data = data.replace(rolename, element.label);
+                        }
+                    });
+                    const deviceName = member.deviceName ? '-' + member.deviceName : '';
+                    const memberName = member.name ? '-' + member.name : '';
+                    isOnline = member.online;
+                    coversitionName = data + deviceName + memberName;
                 } else {
                     coversitionName = conversition.name;
                 }
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 9f4c980ff..28fccbe3e 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -126,17 +126,17 @@ export default {
             this.setPosition();
             if (val === '01' && this.$route.query.lineCode === '06') {
                 this.showSelectStation = true;
-                this.mapViewLoadedOver && this.$refs.mapCanvas && this.$refs.mapCanvas.setShowStation(this.showStation);
+                // this.mapViewLoadedOver && this.$refs.mapCanvas && this.$refs.mapCanvas.setShowStation(this.showStation);
             } else if (val === '02' && this.$route.query.lineCode === '06') {
                 this.showSelectStation = false;
-                this.mapViewLoadedOver && this.$refs.mapCanvas && this.$refs.mapCanvas.setShowStation('');
+                // this.mapViewLoadedOver && this.$refs.mapCanvas && this.$refs.mapCanvas.setShowStation('');
             }
         },
         '$store.state.map.mapViewLoadedCount': function (val) {
             this.mapBoxP = document.getElementById(this.canvasId).children[0];
             this.mapBoxP.style.cursor = '';
             this.mapViewLoadedOver = true;
-            this.showSelectStation && this.$refs.mapCanvas && this.$refs.mapCanvas.setShowStation(this.showStation);
+            // this.showSelectStation && this.$refs.mapCanvas && this.$refs.mapCanvas.setShowStation(this.showStation);
         },
         '$store.state.socket.permissionOver': function () {
             this.$alert(this.$t('tip.userRightsHaveBeenReclaimed'), this.$t('tip.hint'), {
@@ -436,7 +436,7 @@ export default {
         },
         switchStationMode(val) {
             this.showStation = val;
-            this.$refs.mapCanvas && this.$refs.mapCanvas.setShowStation(this.showStation);
+            // this.$refs.mapCanvas && this.$refs.mapCanvas.setShowStation(this.showStation);
         },
         setStationList(val) {
             this.stationList = [];
diff --git a/src/views/scriptManage/display/tipScriptRecord.vue b/src/views/scriptManage/display/tipScriptRecord.vue
index ea36b40a3..11a92595a 100644
--- a/src/views/scriptManage/display/tipScriptRecord.vue
+++ b/src/views/scriptManage/display/tipScriptRecord.vue
@@ -98,6 +98,7 @@ export default {
     },
     beforeDestroy() {
         this.clearAutoSave();
+        this.$store.dispatch('scriptRecord/updateBgSet', false);
     },
     methods: {
         setIsParse(isPause) {
diff --git a/src/views/trainRoom/e-roles.vue b/src/views/trainRoom/e-roles.vue
index e048b3ba8..6cb4010b3 100644
--- a/src/views/trainRoom/e-roles.vue
+++ b/src/views/trainRoom/e-roles.vue
@@ -33,7 +33,7 @@
             @changeUser="handleUpdUser"
             @delUser="handleDelUser"
           />
-          <e-role
+          <!-- <e-role
             class="role"
             title-i18n="trainRoom.teacher"
             role-type="Instructor"
@@ -42,7 +42,7 @@
             @addUser="handleAddUser"
             @changeUser="handleUpdUser"
             @delUser="handleDelUser"
-          />
+          /> -->
           <e-role
             class="role"
             title-i18n="trainRoom.universalAccount"

From e3b7d513ba7bb6c3d8fbba77a4cc6c4da69d51fe Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 19 May 2020 14:47:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83?=
 =?UTF-8?q?=E8=A1=8C=E8=B0=83=E6=B7=BB=E5=8A=A0=20=E5=88=97=E8=BD=A6?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/jointTrainingNew/index.vue   | 20 ++++++++++++++-----
 .../newMap/jointTrainingNew/menuDemon.vue     |  5 ++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index d8e45b8f1..c8c245650 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -25,6 +25,8 @@
       <join-run-plan-Load ref="runPlanLoad" :group="group" />
       <join-run-plan-view ref="runPlanView" :group="group" />
       <menu-system-time ref="menuSystemTime" :offset="offset" :group="group" :right="right" />
+      <menu-train-list v-if="prdType=='02'" @setCenter="setCenter" />
+
     </div>
   </div>
 
@@ -39,6 +41,7 @@ import JoinRunPlanLoad from '@/views/newMap/displayNew/demon/runPlanLoad';
 import JoinRunPlanView from '@/views/newMap/displayNew/demon/runPlanView';
 import menuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
 import IbpPlate from '@/views/ibp/ibpsystem/index';
+import MenuTrainList from './menuTrainList';
 import { mapGetters } from 'vuex';
 import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import { checkLoginLine } from '@/api/login';
@@ -61,6 +64,7 @@ export default {
         JoinFaultChoose,
         JoinRunPlanLoad,
         JoinRunPlanView,
+        MenuTrainList,
         menuSystemTime,
         Jl3dDrive,
         IbpPlate
@@ -117,6 +121,9 @@ export default {
         },
         userId() {
             return this.$store.state.user ? this.$store.state.user.id : '';
+        },
+        prdType() {
+            return this.$store.state.training.prdType;
         }
     },
     watch: {
@@ -288,6 +295,9 @@ export default {
                 EventBus.$emit('viewLoading', false);
             });
         },
+        setCenter(code) {
+            this.$refs.mapCanvas.setCenter(code);
+        },
         // 加载地图数据
         initLoadData() {
             const width = document.documentElement.clientWidth;
@@ -315,11 +325,11 @@ export default {
                 } else {
                     this.$store.dispatch('training/over');
                 }
-                if (this.isDemon) {
-                    this.$refs.menuDemon.initPlannedDriving(resp.data.planRunning);
-                } else if (this.isScript) {
-                    this.$refs.menuScript.initPlannedDriving(resp.data.planRunning);
-                }
+                // if (this.isDemon) {
+                //     this.$refs.menuDemon.initPlannedDriving(resp.data.planRunning);
+                // } else if (this.isScript) {
+                //     this.$refs.menuScript.initPlannedDriving(resp.data.planRunning);
+                // }
             } else if (resp && resp.code == 200 && resp.data && resp.data.dataError) {
                 this.dataError = true;
                 this.$messageBox('此地图数据正在维护中,无法运行！');
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 2c98ebe5c..de0aba85c 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -220,6 +220,7 @@ export default {
             };
             ranAsPlan(data, this.group).then(res => {
                 this.$store.dispatch('training/simulationStart').then(() => {
+                    this.$store.dispatch('map/setRunPlanStatus', true);
                     this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${model.initTime}`));
                 });
             }).catch((error) => {
@@ -250,7 +251,9 @@ export default {
         end() {
             this.isDisable = false;
             EventBus.$emit('trainView');
-            exitRunPlan(this.group).catch(() => {
+            exitRunPlan(this.group).then(()=>{
+                this.$store.dispatch('map/setRunPlanStatus', false);
+            }).catch(() => {
                 this.$store.dispatch('training/over').then(() => {
                     this.isDisable = true;
                     this.$messageBox(this.$t('error.endSimulationFailed'));