From dae99ee4ad7e2715cbcf33b96f49b0dbdb1206b3 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Thu, 10 Dec 2020 11:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=BC=E5=90=88=E6=BC=94?=
 =?UTF-8?q?=E7=BB=83=E4=B8=89=E7=BB=B4=E9=A9=BE=E9=A9=B6=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edit/testEditorModel/StationStandList.js  |  9 ++++++---
 .../drive/drivecontrol/drivecontrol.vue       |  7 +++++++
 src/views/jlmap3d/drive/jl3ddrive.vue         | 20 ++++++++++++++-----
 src/views/newMap/chatView/chatBox.vue         |  2 +-
 src/views/newMap/jointTrainingNew/index.vue   |  3 ++-
 .../newMap/jointTrainingNew/menuSchema.vue    |  2 +-
 6 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/jlmap3d/edit/testEditorModel/StationStandList.js b/src/jlmap3d/edit/testEditorModel/StationStandList.js
index 21ce3368e..fc68908e2 100644
--- a/src/jlmap3d/edit/testEditorModel/StationStandList.js
+++ b/src/jlmap3d/edit/testEditorModel/StationStandList.js
@@ -93,18 +93,21 @@ export function StationStandList() {
       let jlmapstationdata = jlmapdata.stationList;
       let jlmapstanddata = jlmapdata.stationStandList;
       // jlmapstationdata.splice(0,1);
+        console.log(standsdata);
+        console.log(jlmapstationdata);
       for(let i=0;i<jlmapstationdata.length;i++){
-        if(jlmapstationdata[i].visible == false){
+        if(jlmapstationdata[i].visible == false || jlmapstationdata[i].subheadDisplay == false){
           jlmapstationdata.splice(i,1);
           i--;
         }else{
           standsdata[i].code = jlmapstationdata[i].code;
           standsdata[i].name = jlmapstationdata[i].name;
         }
+        // console.log(jlmapstationdata[i].subheadDisplay);
       }
-      console.log(standsdata);
+
       // console.log(jlmapstationdata);
-      // console.log(jlmapstanddata);
+      console.log(standsdata);
       let stations = jlmap3ddata.stationstandlist.list;
       let num;
       let num2;
diff --git a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
index 2b9f3672f..441fe69c1 100644
--- a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
@@ -129,6 +129,7 @@ import axios from 'axios';
 			}
 
 			window.updateDriverTrust = this.updateDriverTrust;
+			window.updateDriveValue = this.updateDriveValue;
 			// this.teststomp = new StompClient();
 
 
@@ -274,6 +275,12 @@ import axios from 'axios';
 					}
 				}
 			},
+			updateDriveValue(newvalue){
+				
+				if(newvalue != this.value){
+					this.value = newvalue;
+				}
+			},
 			updatetrainlist(){
 				getSimulationTrainlistNew(this.group).then(netdata => {
 					this.options = [];
diff --git a/src/views/jlmap3d/drive/jl3ddrive.vue b/src/views/jlmap3d/drive/jl3ddrive.vue
index 0a3a8863b..78b31e6bf 100644
--- a/src/views/jlmap3d/drive/jl3ddrive.vue
+++ b/src/views/jlmap3d/drive/jl3ddrive.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <div class="jalmap3ddiv">
+  <div id="drivediv" class="jalmap3ddiv" >
 
     <div class="trainstatus">
       {{$t('jlmap3d.trainGroupNumber')}}{{ trainnum }}</br>
@@ -71,6 +71,7 @@ export default {
 	},
 	data() {
 		return {
+      driveIndex:1500,
 			trainlist: null,
 			stationlist: null,
 			msgdata: null,
@@ -92,6 +93,7 @@ export default {
       dcontrolshow: false,
       msgshow:false,
       controlmsg:"不能选择其它列车",
+
 		};
 	},
 	watch: {
@@ -181,11 +183,14 @@ export default {
 		// this.$refs.mmiui.init();
 	},
 	methods: {
-		show: function (skinCode,group) {
+		show: function (skinCode,group,zindex) {
 			// console.log("show");
 			// console.log(skinCode);
 			// console.log(this.jlmap3d);
-
+      if(zindex){
+        this.driveIndex = zindex;
+        document.getElementById("drivediv").style.zIndex = zindex;
+      }
 			if (this.jlmap3d == null) {
 				this.init(skinCode,group);
 			} else {
@@ -287,9 +292,14 @@ export default {
     updatestatus(newdata){
       if(newdata.groupNumber){
         this.trainnum = newdata.groupNumber;
+
+        updateDriveValue(this.trainnum);
       }
       updatedoorlight(newdata);
-      this.$refs.mmiui.updatetrainstatus(newdata);
+      if(this.$refs.mmiui){
+        this.$refs.mmiui.updatetrainstatus(newdata);
+      }
+
       updatabuttonlight(newdata);
     },
     warningmsg(nowmsg){
@@ -354,7 +364,7 @@ export default {
   }
 
   .trainstatus{
-    left:0;
+    left:48%;
     top:0;
     width:fit-content;
     width:-webkit-fit-content;
diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue
index 387f497db..58644bd3b 100644
--- a/src/views/newMap/chatView/chatBox.vue
+++ b/src/views/newMap/chatView/chatBox.vue
@@ -1071,7 +1071,7 @@ export default {
 	width: 503px;
 	transform: translateX(-503px);
 	transition: all 0.4s;
-	z-index: 9;
+	z-index: 35;
 	&.active{
 		transform: translateX(0px);
 	}
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index d58fe0666..f4f891745 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -393,6 +393,7 @@ export default {
                 this.$store.dispatch('training/setPrdType', '04');
                 this.$store.dispatch('training/setRoles', 'DRIVER');
                 this.jl3dmaintainershow = false;
+                this.hidepanel();
                 break;
             case 'MAINTAINER':
                 this.$store.dispatch('training/setPrdType', '');
@@ -484,7 +485,7 @@ export default {
             if (this.$store.state.training.prdType == '04') {
                 this.panelShow = false;
                 this.drivingShow = true;
-                this.$refs.Jl3dDrive.show(this.mapId, this.group);
+                this.$refs.Jl3dDrive.show(this.mapId, this.group,34);
             } else {
                 const routeData = this.$router.resolve({
                     path:'/jlmap3d/sandbox',
diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index 0b3b072cf..e6fa48239 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -244,7 +244,7 @@ export default {
 </script>
 <style>
     .schema {
-        z-index: 34;
+        z-index: 8;
         display: inline;
         position: absolute;
         right: 5px;