From f23a3a8112370b33a921edd4d384698b4f64fe70 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 3 Aug 2020 16:20:14 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8C=89=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E8=A1=8C=E8=BD=A6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/jointTrainingNew/menuDemon.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 079414e57..971aca873 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -165,6 +165,11 @@ export default {
         },
         '$store.state.training.prdType': function(prdType) {
             this.change3dname();
+        },
+        '$store.state.socket.simulationStart': async function (val) {
+            if (val) {
+                this.$store.dispatch('training/setInitTime', +new Date(val));
+            }
         }
     },
     async mounted() {

From 3c622b6fb5a5b03b8276fe1bc3b15a520e0e11cb Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 3 Aug 2020 16:55:05 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=BF=E7=9C=9F?=
 =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/jointTrainingNew/chatView/chatBox.vue     | 12 +++++++++++-
 .../jointTrainingNew/memberManage/membersManage.vue  |  3 +++
 src/views/newMap/jointTrainingNew/menuDemon.vue      |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
index 5af5df65d..80cdd5eb3 100644
--- a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
+++ b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
@@ -317,6 +317,7 @@ export default {
                         electricDispatcherList.push(this.memberData[item.id]);
                         break;
                     case 'DEPOT_DISPATCHER':
+                        this.memberData[item.id].label = device.name;
                         depotDispatcherList.push(this.memberData[item.id]);
                         break;
                     case 'STATION_SUPERVISOR':
@@ -353,6 +354,11 @@ export default {
                     id: 'maintainer',
                     type: 'role',
                     children: maintainerList
+                }, {
+                    label: '车辆段',
+                    id: 'depotDispatcher',
+                    type: 'role',
+                    children: depotDispatcherList
                 }];
                 this.initCommonMemberList();
             }
@@ -618,6 +624,7 @@ export default {
             const temStationSupervisorList = [];
             const temMaintainerList = [];
             const temDriverList = [];
+            const temDepotDispatcherList = [];
             this.$store.state.training.memberList.forEach(item =>{
                 switch (item.type) {
                 case 'DISPATCHER':
@@ -632,9 +639,12 @@ export default {
                 case 'DRIVER':
                     temDriverList.push({memberId: item.id, connect:true });
                     break;
+                case 'DEPOT_DISPATCHER':
+                    temDepotDispatcherList.push({memberId: item.id, connect:true });
+                    break;
                 }
             });
-            this.commonMemberList = [...temDispatcherList, ...temStationSupervisorList, ...temMaintainerList, ...temDriverList];
+            this.commonMemberList = [...temDispatcherList, ...temStationSupervisorList, ...temMaintainerList, ...temDriverList, ...temDepotDispatcherList];
             if (this.userRole === 'AUDIENCE' || this.commonConversation) {
                 this.conversitionMemberList = [];
                 this.messageList = [...this.commonMessageList];
diff --git a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
index 61fd26da7..bc884e559 100644
--- a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
+++ b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
@@ -198,6 +198,9 @@ export default {
                     id: 'maintainer',
                     children: maintainerList
                 }];
+                if (depotDispatcherList) {
+                    this.treeData.push({label: '车辆段', id: 'depotDispatcher', children: depotDispatcherList});
+                }
             }
         },
         '$store.state.map.activeTrainListChange': function () {
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index d94359e28..1bbdbc7b4 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -180,6 +180,7 @@ export default {
         '$store.state.socket.simulationStart': async function (val) {
             if (val) {
                 this.$store.dispatch('training/setInitTime', +new Date(val));
+                this.$store.dispatch('training/start');
             }
         }
     },

From baf0fe4900cba95c490f065a795e29c22c387a60 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 3 Aug 2020 16:59:23 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=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/menuSchema.vue       | 2 +-
 src/views/newMap/jointTrainingNew/menuSchema.vue | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index 7685f1444..0be9732b1 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -17,7 +17,7 @@
           <el-button v-if="notScript && !runing" size="small" type="warning" @click="loadRunPlan">{{ $t('display.schema.loadRunDiagram') }}</el-button>
           <el-button v-if="faultMode" size="small" type="danger" @click="setFault">自动故障设置</el-button>
         </el-button-group>
-        <el-button v-if="!isScheduling" size="small" :type="faultMode ? 'danger' : ''" @click="changeOperateMode()">故障模式</el-button>
+        <el-button v-if="!isScheduling" size="small" :type="faultMode ? '':'primary' " @click="changeOperateMode()">{{ faultMode?'切换到普通模式':'切换到故障模式' }}</el-button>
         <!-- <el-button v-if="!isLocalStation" size="small" :type="faultMode ? 'danger' : ''" @click="changeDirectiveMode()">指令模式</el-button> -->
       </template>
     </div>
diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index 1ddef081f..ae5d190b3 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -15,7 +15,8 @@
           <el-button v-if="faultMode && !dataError" size="small" type="danger" @click="setFault">{{ $t('joinTraining.faultSetting') }}</el-button>
         </template>
       </el-button-group>
-      <el-button v-if="isAdmin && !dataError && !isScreen" size="small" :type="faultMode ? 'danger' : ''" @click="changeOperateMode()">故障模式</el-button>
+      <!-- <el-button v-if="isAdmin && !dataError && !isScreen" size="small" :type="faultMode ? 'danger' : ''" @click="changeOperateMode()">故障模式</el-button> -->
+      <el-button v-if="isAdmin && !dataError && !isScreen" size="small" :type="faultMode ? '' : 'primary' " @click="changeOperateMode()">{{ faultMode?' 切换到普通模式':'切换到故障模式' }}</el-button>
       <!-- isCenter && !dataError && !isAdmin 此判断用于以后(目前 暂时不用) -->
       <el-button v-if="isShowDirective" size="small" :type="directiveMode ? 'primary' : ''" @click="changeDirectiveMode()">指令模式</el-button>
     </div>

From a554912c09a376f52b06ac6a357381c2881caeab Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 3 Aug 2020 17:28:46 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=93=88=E5=B0=94=E6=BB=A8=E4=B8=80?=
 =?UTF-8?q?=E5=8F=B7=E7=BA=BF=E6=95=99=E7=A0=94=E6=9C=BA=20=E8=A1=8C?=
 =?UTF-8?q?=E8=B0=83=E5=88=87=E9=80=9A=E5=8F=B7=20=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jlmap3d/maintainer/jl3dmaintainer.vue     | 72 +++++++++----------
 src/views/newMap/displayNew/menuDemon.vue     |  2 +-
 src/views/newMap/displayNew/menuSchema.vue    |  2 +-
 .../newMap/jointTrainingNew/menuDemon.vue     |  2 +-
 .../newMap/jointTrainingNew/menuSchema.vue    |  2 +-
 5 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
index 3e4cb5f70..61c43cac7 100644
--- a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
+++ b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
@@ -1,13 +1,13 @@
 <template>
 
   <div class="jalmap3ddiv">
-    <div class="jl3dmap3dMaintainerSelect" v-show="selectShow">
+    <div v-show="selectShow" class="jl3dmap3dMaintainerSelect">
       <div class="maintainerSelectButton" style="left:33%" @click="initNormal">通号检修模式</div>
       <div class="maintainerSelectButton" style="right:33%" @click="initVR">通号检修模式(VR)</div>
     </div>
     <div class="display-draft">
       <el-button-group>
-        <el-button v-if="isAdmin" @click="memberManage">成员管理</el-button>
+        <!-- <el-button v-if="isAdmin" @click="memberManage">成员管理</el-button> -->
         <el-button type="primary" @click="back">{{ $t('global.back') }}</el-button>
       </el-button-group>
 
@@ -17,8 +17,7 @@
       v-show="faultlistshow"
       :devicelist="devicelist"
       @selectdevice="selectdevice"
-    >
-    </Devicefault-List>
+    />
 
     <Fault-Device
       v-show="deviceShow"
@@ -26,7 +25,6 @@
       @closedevice3dview="devicemodel"
     />
 
-
     <div id="testjlmap3d" class="jlmap3ddraw">
       <canvas id="canvastexture" />
     </div>
@@ -62,7 +60,6 @@ import FaultDevice from '@/views/jlmap3d/maintainer/component/faultdevice';
 import Jlmap3dConfig from '@/views/jlmap3d/simulation/show/configmenu';
 import { ProjectIcon } from '@/scripts/ProjectConfig';
 
-
 import bgPsdImg from '@/assets/bg_psd.png';
 // import Jlmap3dMsg from '@/views/jlmap3d/show/msg';
 
@@ -71,7 +68,7 @@ export default {
     name: 'Jl3dMaintainer',
     components: {
         DevicefaultList,
-        FaultDevice,
+        FaultDevice
         // Jlmap3dMsg
         // ShowProperty
     },
@@ -138,7 +135,6 @@ export default {
             this.token = this.$route.query.token;
         },
 
-
         show: function (skinCode, group) {
             if (this.jlmap3d == null) {
                 this.initNormal(skinCode, group);
@@ -150,36 +146,36 @@ export default {
             }
         },
         initNormal: function () {
-          this.selectShow = false;
-          this.deviceShow = false;
-          // this.deviceShow = true;
-          // this.faultlistshow = true;
-          const mapdata = this.$store.getters['map/map'];
-          const dom = document.getElementById('app');
-          const project = this.$route.query.project;
-          // console.log(project);
+            this.selectShow = false;
+            this.deviceShow = false;
+            // this.deviceShow = true;
+            // this.faultlistshow = true;
+            const mapdata = this.$store.getters['map/map'];
+            const dom = document.getElementById('app');
+            const project = this.$route.query.project;
+            // console.log(project);
 
-          if (project) {
+            if (project) {
 
 		        this.jlmap3d = new JLmap3dMaintainer(dom, mapdata, this.mapid, this.$store, this.group, project);
-          } else {
+            } else {
 
-            this.jlmap3d = new JLmap3dMaintainer(dom, mapdata, this.mapid, this.$store, this.group, '');
-          }
-          this.jlmap3d.eventon();
+                this.jlmap3d = new JLmap3dMaintainer(dom, mapdata, this.mapid, this.$store, this.group, '');
+            }
+            this.jlmap3d.eventon();
         },
         initVR:function (skinCode, group) {
 
-          const routeData = this.$router.resolve({
-              path:'/jlmap3d/maintainervr',
-              query:{
-                  mapid:this.mapid,
-                  group:this.group,
-                  token:this.token,
-                  noPreLogout: true
-              }
-          });
-          window.open(routeData.href);
+            const routeData = this.$router.resolve({
+                path:'/jlmap3d/maintainervr',
+                query:{
+                    mapid:this.mapid,
+                    group:this.group,
+                    token:this.token,
+                    noPreLogout: true
+                }
+            });
+            window.open(routeData.href);
         },
         raystand() {
             this.jlmap3d.rayswitch('stand');
@@ -233,13 +229,13 @@ export default {
             // console.log(divicedata);
             this.$refs.faultdevice.showmodel(divicedata);
         },
-        warningmsg(nowmsg){
-          this.controlmsg = nowmsg;
-          this.msgshow = true;
-          setTimeout(this.warningmsgoff,3000);
+        warningmsg(nowmsg) {
+            this.controlmsg = nowmsg;
+            this.msgshow = true;
+            setTimeout(this.warningmsgoff, 3000);
         },
-        warningmsgoff(){
-          this.msgshow = false;
+        warningmsgoff() {
+            this.msgshow = false;
         },
         showroom() {
             this.deviceShow = true;
@@ -248,7 +244,7 @@ export default {
         back() {
             this.$emit('back');
             this.isswitch = false;
-        },
+        }
     }
 };
 </script>
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 5e882daa7..f75daa582 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -411,7 +411,7 @@ export default {
 		height: 32px;
 		overflow: hidden;
 		padding-left: 44px;
-        z-index: 9;
+        z-index: 360;
 		.btn_hover{
 			position: absolute;
 			left: 0;
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index 0be9732b1..4ff8efaaf 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -267,7 +267,7 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     .schema {
-        z-index: 9;
+        z-index: 360;
         display: inline;
         position: absolute;
         right: 5px;
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 1bbdbc7b4..697654505 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -533,7 +533,7 @@ export default {
 		height: 32px;
 		overflow: hidden;
 		padding-left: 44px;
-        z-index: 9;
+        z-index: 360;
 		.btn_hover{
 			position: absolute;
 			left: 0;
diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index ae5d190b3..f5de2b151 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -203,7 +203,7 @@ export default {
 </script>
 <style>
     .schema {
-        z-index: 9;
+        z-index: 360;
         display: inline;
         position: absolute;
         right: 5px;