From 744544d2a654525e100dcfc3110df07468e4d390 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Fri, 6 Aug 2021 16:36:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B6tms=E7=95=8C=E9=9D=A2=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4=E8=AF=BE=E7=A8=8B=E6=88=90?=
 =?UTF-8?q?=E7=BB=A9=E8=80=83=E8=AF=95=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jlmap3d/lesson3d/lesson3dplayer.js        |  35 +-
 .../lesson3d/manager/controlmanager.js        |  13 +
 src/views/jlmap3d/drive/jl3ddrive.vue         |   9 +-
 .../drive/sceneview/tmscomponent/tmsfault.vue | 285 +++++++++++---
 src/views/jlmap3d/drive/sceneview/tmsview.vue | 367 +++++++++++++++++-
 .../jlmap3d/lesson3dplayer/lesson3dplayer.vue |  84 ++--
 .../lesson3dplayer/tools/actiontips.vue       |  71 ----
 .../lesson3dplayer/tools/explainpane.vue      |   4 +-
 .../lesson3dplayer/tools/resulttips.vue       | 119 ++++++
 .../lesson3dplayer/tools/stepstips.vue        |   4 +-
 static/jl3d/tms/PMS3.png                      | Bin 0 -> 3242 bytes
 static/jl3d/tms/PMsa2.png                     | Bin 0 -> 4705 bytes
 12 files changed, 829 insertions(+), 162 deletions(-)
 delete mode 100644 src/views/jlmap3d/lesson3dplayer/tools/actiontips.vue
 create mode 100644 src/views/jlmap3d/lesson3dplayer/tools/resulttips.vue
 create mode 100644 static/jl3d/tms/PMS3.png
 create mode 100644 static/jl3d/tms/PMsa2.png

diff --git a/src/jlmap3d/lesson3d/lesson3dplayer.js b/src/jlmap3d/lesson3d/lesson3dplayer.js
index 4dc2dcc89..1a84b8f0b 100644
--- a/src/jlmap3d/lesson3d/lesson3dplayer.js
+++ b/src/jlmap3d/lesson3d/lesson3dplayer.js
@@ -35,6 +35,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) {
 
 	//定义当前课程角色
 	let nowRole = "";
+	let oldIndex = 0;
 	//考试课程
 	let examList = [];
 	let examData = {};
@@ -88,20 +89,34 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) {
 	}
 
 	this.changeIndex = function(nowIndex){
+		if(nowIndex!=0){
+			oldIndex = lessonIndex;
+		}
+		if(lessonData.lessonProgress[oldIndex].roleName == nowRole){
+			updateExam(lessonData.lessonProgress[oldIndex],oldIndex);
+		}
+
+
 		lessonIndex = nowIndex;
+
+		console.log(nowIndex);
 		scope.nowSceneType = lessonData.lessonProgress[nowIndex].progressScene;
-		console.log(nowRole);
-		console.log(lessonData.lessonProgress[lessonIndex].roleName);
+		// console.log(nowRole);
+		// console.log(lessonData.lessonProgress[lessonIndex].roleName);
 		if(lessonData.lessonProgress[lessonIndex].roleName == nowRole){
 			controlManager.initControlMode(lessonIndex);
 			controlManager.initRoleMode(true,nowRole);
 			controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,true,assetModelManager.lessonTriggerList[scope.nowSceneType]);
+
 		}else{
 			controlManager.initControlMode(lessonIndex);
 			controlManager.initRoleMode(false,nowRole);
 			controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,false,assetModelManager.lessonTriggerList[scope.nowSceneType]);
 		}
 
+		if(nowIndex == lessonData.lessonProgress.length-1){
+			lessonEnd();
+		}
 	}
 
 	this.changeCameraPos = function(pos){
@@ -116,10 +131,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) {
 			if(lessonData.lessonProgress[lessonIndex].roleName == nowRole){
 				roleMode = true;
 			}
-
 			controlManager.initRoleMode(roleMode);
-			console.log(assetModelManager);
-
 			for(let i=0;i<lessonData.lessonProgress.length;i++){
 				if(nowRole == lessonData.lessonProgress[i].roleName){
 					examList.push(
@@ -140,7 +152,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) {
 				nowStep:0,
 				time:0,
 			};
-
+			controlManager.initExam(examList,examData);
 			updataExamStatus(examData);
 			// if(lessonData.lessonProgress[lessonIndex].action.length>0){
 			controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,roleMode,assetModelManager.lessonTriggerList[scope.nowSceneType]);
@@ -151,6 +163,17 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) {
 			// }
 	};
 
+	function updateExam(newIndexData,newIndex){
+		for(let i=0;i<examList.length;i++){
+			if(examList[i].index == newIndex){
+				examData.trueStep.push(newIndexData);
+				examData.lastScore += 10;
+				examData.nowStep += 1;
+				updataExamStatus(examData);
+				break;
+			}
+		}
+	}
 	//循环渲染函数
 	function animate() {
 
diff --git a/src/jlmap3d/lesson3d/manager/controlmanager.js b/src/jlmap3d/lesson3d/manager/controlmanager.js
index 7939387c5..8d1bf732c 100644
--- a/src/jlmap3d/lesson3d/manager/controlmanager.js
+++ b/src/jlmap3d/lesson3d/manager/controlmanager.js
@@ -15,6 +15,10 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) {
   this.eventHitMode = false;
   let nowRole = "";
   let roleMode = false;
+
+  let examList = {};
+  let examData = {};
+
   let eventBoxs = [];
   let raycasterBoxs = [];
   let actionList = [];
@@ -108,6 +112,15 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) {
     // console.log(roleMode);
   };
 
+  this.initExam = function(newExamList,newExamData){
+    examList = newExamList;
+    examData = newExamData;
+  };
+
+  function updateExam(){
+    updataExamStatus(examData);
+  }
+
   const worldOctree = new Octree();
 
 	const playerCollider = new Capsule( new THREE.Vector3( 0, 10, 0 ), new THREE.Vector3( 0, 11.9, 0 ), 1 );
diff --git a/src/views/jlmap3d/drive/jl3ddrive.vue b/src/views/jlmap3d/drive/jl3ddrive.vue
index 974145e34..5c6212913 100644
--- a/src/views/jlmap3d/drive/jl3ddrive.vue
+++ b/src/views/jlmap3d/drive/jl3ddrive.vue
@@ -33,7 +33,7 @@
     </div>
 
     <Drive-Mmi v-if="mmishow" ref="mmiui" />
-    <Drive-Tms v-if="tmsshow" />
+    <Drive-Tms v-if="tmsshow" ref="tmsui"/>
     <Drive-Control v-if="dcontrolshow" ref="dcontrol"  @warningmsg="warningmsg" @warningmsgoff="warningmsgoff" />
   </div>
 
@@ -105,6 +105,9 @@ export default {
 					if (this.mmishow == true) {
 						this.$refs.mmiui.updatespeed(newVal);
 					}
+          // if(this.tmsshow == true){
+  				// 	this.$refs.tmsui.updatespeed(newVal);
+          // }
 				}
 			}
 		},
@@ -336,10 +339,14 @@ export default {
       //   updateDriveValue(this.trainnum);
       // }
       updatedoorlight(newdata);
+      console.log(newdata.v);
+      updatetmsstatus(newdata);
+
       if(this.$refs.mmiui){
         this.$refs.mmiui.updatetrainstatus(newdata);
       }
 
+
       updatabuttonlight(newdata);
     },
     warningmsg(nowmsg){
diff --git a/src/views/jlmap3d/drive/sceneview/tmscomponent/tmsfault.vue b/src/views/jlmap3d/drive/sceneview/tmscomponent/tmsfault.vue
index cce1a2b75..e0b79dbb8 100644
--- a/src/views/jlmap3d/drive/sceneview/tmscomponent/tmsfault.vue
+++ b/src/views/jlmap3d/drive/sceneview/tmscomponent/tmsfault.vue
@@ -1,9 +1,210 @@
 <template>
   <div class = "tmsfault" >
-    <div class = "tmsvoltage">{{voltage}}</div>
-    <div class = "tmscurrent">{{current}}</div>
-    <div class = "tmslevel">{{level}}</div>
-    <div class = "tmsspeed">{{speed}}</div>
+    <el-row class="demoRow" >
+        <el-col :span="59"><div class="demoCol">车号</div></el-col>
+        <el-col :span="59"><div class="demoCol">1</div></el-col>
+        <el-col :span="59"><div class="demoCol">2</div></el-col>
+        <el-col :span="59"><div class="demoCol">3</div></el-col>
+        <el-col :span="59"><div class="demoCol">4</div></el-col>
+        <el-col :span="59"><div class="demoCol">5</div></el-col>
+        <el-col :span="59"><div class="demoCol">6</div></el-col>
+    </el-row>
+    <el-row class="demoRow" >
+        <el-col :span="59"><div class="demoCol">辅助状态</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}">辅助ON</div></el-col>
+        <el-col :span="59"><div class="demoCol">--</div></el-col>
+        <el-col :span="59"><div class="demoCol">辅助OFF</div></el-col>
+        <el-col :span="59"><div class="demoCol">--</div></el-col>
+        <el-col :span="59"><div class="demoCol">--</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}">辅助ON</div></el-col>
+    </el-row>
+    <el-row class="demoRow" >
+        <el-col :span="59"><div class="demoCol">牵引系统状态</div></el-col>
+        <el-col :span="59"><div class="demoCol">--</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}">58A</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}">58A</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}">46A</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}">57A</div></el-col>
+        <el-col :span="59"><div class="demoCol">--</div></el-col>
+    </el-row>
+    <el-row class="demoRow" >
+        <el-col :span="59"><div class="demoCol">制动缸压力</div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="twodiv">0.00</div>
+          <div class="twodiv">0.00</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="twodiv">0.00</div>
+          <div class="twodiv">0.00</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="twodiv">0.00</div>
+          <div class="twodiv">0.00</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="twodiv">0.00</div>
+          <div class="twodiv">0.00</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="twodiv">0.00</div>
+          <div class="twodiv">0.00</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="twodiv">0.00</div>
+          <div class="twodiv">0.00</div>
+        </div></el-col>
+    </el-row>
+    <el-row class="demoRow" >
+        <el-col :span="59"><div class="demoCol">转向架切除</div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="twodiv"></div>
+          <div class="twodiv"></div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="twodiv"></div>
+          <div class="twodiv"></div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="twodiv"></div>
+          <div class="twodiv"></div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="twodiv"></div>
+          <div class="twodiv"></div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="twodiv"></div>
+          <div class="twodiv"></div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="twodiv"></div>
+          <div class="twodiv"></div>
+        </div></el-col>
+    </el-row>
+    <el-row class="demoRow" >
+        <el-col :span="59"><div class="demoCol">1侧门</div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="fourdiv">1</div>
+          <div class="fourdiv">3</div>
+          <div class="fourdiv">5</div>
+          <div class="fourdiv">7</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="fourdiv">1</div>
+          <div class="fourdiv">3</div>
+          <div class="fourdiv">5</div>
+          <div class="fourdiv">7</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="fourdiv">1</div>
+          <div class="fourdiv">3</div>
+          <div class="fourdiv">5</div>
+          <div class="fourdiv">7</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="fourdiv">8</div>
+          <div class="fourdiv">6</div>
+          <div class="fourdiv">4</div>
+          <div class="fourdiv">2</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="fourdiv">8</div>
+          <div class="fourdiv">6</div>
+          <div class="fourdiv">4</div>
+          <div class="fourdiv">2</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="fourdiv">8</div>
+          <div class="fourdiv">6</div>
+          <div class="fourdiv">4</div>
+          <div class="fourdiv">2</div>
+        </div></el-col>
+    </el-row>
+    <el-row class="demoRow" >
+        <el-col :span="59"><div class="demoCol">2侧门</div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="fourdiv">2</div>
+          <div class="fourdiv">4</div>
+          <div class="fourdiv">6</div>
+          <div class="fourdiv">8</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="fourdiv">2</div>
+          <div class="fourdiv">4</div>
+          <div class="fourdiv">6</div>
+          <div class="fourdiv">8</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="fourdiv">2</div>
+          <div class="fourdiv">4</div>
+          <div class="fourdiv">6</div>
+          <div class="fourdiv">8</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="fourdiv">7</div>
+          <div class="fourdiv">5</div>
+          <div class="fourdiv">3</div>
+          <div class="fourdiv">1</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="fourdiv">7</div>
+          <div class="fourdiv">5</div>
+          <div class="fourdiv">3</div>
+          <div class="fourdiv">1</div>
+        </div></el-col>
+        <el-col :span="59"><div class="demoCol">
+          <div class="fourdiv">7</div>
+          <div class="fourdiv">5</div>
+          <div class="fourdiv">3</div>
+          <div class="fourdiv">1</div>
+        </div></el-col>
+    </el-row>
+    <el-row class="demoRow" >
+        <el-col :span="59"><div class="demoCol">交流输出电压</div></el-col>
+        <el-col :span="59"><div class="demoCol">378</div></el-col>
+        <el-col :span="59"><div class="demoCol">--</div></el-col>
+        <el-col :span="59"><div class="demoCol">--</div></el-col>
+        <el-col :span="59"><div class="demoCol">-</div></el-col>
+        <el-col :span="59"><div class="demoCol">-</div></el-col>
+        <el-col :span="59"><div class="demoCol">378</div></el-col>
+    </el-row>
+    <el-row class="demoRow" >
+        <el-col :span="59"><div class="demoCol">空压机状态</div></el-col>
+        <el-col :span="59"><div class="demoCol">-- --</div></el-col>
+        <el-col :span="59"><div class="demoCol">-- --</div></el-col>
+        <el-col :span="59"><div class="demoCol"></div></el-col>
+        <el-col :span="59"><div class="demoCol"></div></el-col>
+        <el-col :span="59"><div class="demoCol">-- --</div></el-col>
+        <el-col :span="59"><div class="demoCol">-- --</div></el-col>
+    </el-row>
+    <el-row class="demoRow" >
+        <el-col :span="59"><div class="demoCol">停放制动施加状态</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}">7.85 bar</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}">7.9 bar</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}">7.8 bar</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}">7.85 bar</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}">7.85 bar</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}">7.85 bar</div></el-col>
+    </el-row>
+    <el-row class="demoRow" >
+        <el-col :span="59"><div class="demoCol">HSCB状态</div></el-col>
+        <el-col :span="59"><div class="demoCol">-- --</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}"></div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}"></div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}"></div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}"></div></el-col>
+        <el-col :span="59"><div class="demoCol">-- --</div></el-col>
+    </el-row>
+    <el-row class="demoRow" >
+        <el-col :span="59"><div class="demoCol">牵引脉冲使能</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}"></div></el-col>
+        <el-col :span="59"><div class="demoCol">-- --</div></el-col>
+        <el-col :span="59"><div class="demoCol">-- --</div></el-col>
+        <el-col :span="59"><div class="demoCol">-- --</div></el-col>
+        <el-col :span="59"><div class="demoCol">-- --</div></el-col>
+        <el-col :span="59"><div class="demoCol" :style="{backgroundColor:'#00ff00',color:'#000'}"></div></el-col>
+    </el-row>
+
   </div>
 </template>
 
@@ -18,10 +219,7 @@ export default {
   },
   data() {
     return {
-      voltage:"750V",
-      current:"0A",
-      level:"",
-      speed:"km/h",
+
     }
   },
   mounted() {
@@ -48,48 +246,43 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .tmsfault{
   position: absolute;
-  // border-style:solid;
-  // border-color: #ffffff;
-  top:7%;
-  width:100%;
-  height:84%;
-  color:white;
-}
-.tmsvoltage{
-  top:7%;
-  left:3%;
-  width: 15%;
-  position: absolute;
+  top:95px;
+  left:15px;
+  width:420px;
+  height:180px;
   text-align: center;
-  // border-style:solid;
-  // border-color: #ffffff;
 }
-.tmscurrent{
-  top:7%;
-  left:19%;
-  width: 15%;
-  position: absolute;
-  text-align: center;
-  // border-style:solid;
-  // border-color: #ffffff;
+
+.demoRow{
 }
-.tmslevel{
-  top:7%;
-  left:60%;
-  width: 20%;
-  position: absolute;
-  text-align: center;
-  // border-style:solid;
-  // border-color: #ffffff;
+
+.demoCol{
+
+  width:60px;
+  height:15px;
+  color:#fff;
+  font-size: 9px;
+  border:solid 1px #fff;
+  background-color: #000;
 }
-.tmsspeed{
-  top:7%;
-  left:82%;
-  width: 15%;
-  position: absolute;
-  text-align: center;
-  // border-style:solid;
-  // border-color: #ffffff;
+
+.twodiv{
+  width:28.9px;
+  height:15px;
+  float:left;
+  // position: absolute;
+  border-right:solid 0.5px #fff;
+  margin: auto;
+}
+.fourdiv{
+  width:12px;
+  height:13px;
+  margin:1px;
+  float:left;
+  // position: absolute;
+  // border-right:solid 0.5px #fff;
+  background-color: #00ff00;
+  color:#000;
 
 }
 </style>
diff --git a/src/views/jlmap3d/drive/sceneview/tmsview.vue b/src/views/jlmap3d/drive/sceneview/tmsview.vue
index 186f1d9a9..3a028cc20 100644
--- a/src/views/jlmap3d/drive/sceneview/tmsview.vue
+++ b/src/views/jlmap3d/drive/sceneview/tmsview.vue
@@ -1,7 +1,65 @@
 <template>
-  <div class = "tms"   :style="{'background-image': 'url('+localStatic+'/jl3d/tms.png)'}" >
+  <div class = "tmsdiv"    >
+    <div class="tmstopdiv">
+      <div class="tmstopdivchild" style="left:0">
+        运行
+      </div>
+
+      <div :id="topmsg.id" class="tmstopdivchild" v-for="(topmsg,index) in trainData" :style="{left:topmsg.left+'px',width:topmsg.width+'px'}">
+        <div class="tmstopmsg" style="top:0" :style="{width:topmsg.width+'px'}">
+          {{topmsg.name}}
+        </div>
+        <div  class="tmstopmsg" style="bottom:0" :style="{width:topmsg.width+'px',color:topmsg.color,backgroundColor:topmsg.bgcolor}">
+          {{topmsg.value1}}{{topmsg.value2}}
+        </div>
+      </div>
+
+      <div class="tmstopdivchild" style="right:30px;font-size:10px">
+        <div id="tmstime" style="width:100%;height:20px;position:absolute;top:0;font-size:10px">
+        </div>
+        <div id="tmstimeupdate" style="width:100%;height:20px;position:absolute;bottom:0;font-size:10px">
+        </div>
+      </div>
+
+      <div class="tmstopdivchild" style="width:30px;right:0px"></div>
+    </div>
+
+    <div style="position:absolute;width:340px;height:25px;left:70px;top:70px;background-repeat:no-repeat;background-size:100% 100%"
+    :style="{backgroundImage: 'url(' + trainStatusPng + ')' }"/>
+
+    <div class="tractionText" :style="{color:trainData[3].bgcolor}">
+      {{trainData[3].value2}}
+    </div>
+    <div style="position:absolute;width:55px;height:150px;right:10px;top:110px;background-repeat:no-repeat;background-size:100% 100%"
+    :style="{backgroundImage: 'url(' + trainSpeedPng + ')' }">
+      <div class="tractionPlane" :style="{height:tractionHeight+'px',backgroundColor:trainData[3].bgcolor}"></div>
+      <div class="speedPlane" :style="{height:speedHeight+'px'}"></div>
+    </div>
+    <div class="speedText">
+      {{trainData[2].value2}}
+    </div>
+
     <Tms-Fault>
     </Tms-Fault>
+
+    <div class="tmsdowndiv">
+
+      <div class="tmsdowndivmsg" style="top:0;">
+        <div class="tmsdownbutton"
+        v-for="(button1,indexbt1) in buttonList1"
+        :style="{left:button1.left+'px',backgroundColor:button1.bgcolor}">
+          {{button1.name}}
+        </div>
+      </div>
+
+      <div class="tmsdowndivmsg" style="bottom:0;border:solid 0.5px #fff">
+        <div class="tmsdownbutton"
+        v-for="(button2,indexbt2) in buttonList2"
+        :style="{left:button2.left+'px',backgroundColor:button2.bgcolor}">
+          {{button2.name}}
+        </div>
+      </div>
+    </div>
   </div>
 
 
@@ -10,6 +68,8 @@
 <script>
 
 import axios from 'axios';
+
+import { prefixIntrger } from '@/utils/date';
 import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 
 import TmsFault from '@/views/jlmap3d/drive/sceneview/tmscomponent/tmsfault';
@@ -22,6 +82,147 @@ export default {
   data() {
     return {
       localStatic:JL3D_LOCAL_STATIC,
+      timer: '',
+      speedHeight:0,
+      tractionHeight:0,
+      trainData: [
+        {
+          id:"voltage",
+          width:48,
+          left:48,
+          name:"网压",
+          value1:"",
+          value2:"1600 V",
+          color:"#0000FF",
+          bgcolor:"#000",
+        },
+        {
+          id:"electricity",
+          width:48,
+          left:96,
+          name:"网流",
+          value1:"",
+          value2:"317 A",
+          color:"#0000FF",
+          bgcolor:"#000",
+        },
+        {
+          id:"v",
+          width:48,
+          left:144,
+          name:"速度",
+          value1:"",
+          value2:"0 km/h",
+          color:"#0000FF",
+          bgcolor:"#000",
+        },
+        {
+          id:"traction",
+          width:66,
+          left:192,
+          name:"牵引/制动级位",
+          value1:"",
+          value2:"0 %",
+          color:"#fff",
+          bgcolor:"#000",
+        },
+        {
+          id:"kilm",
+          width:48,
+          left:258,
+          name:"里程标",
+          value1:"",
+          value2:"---",
+          color:"#0000FF",
+          bgcolor:"#000",
+        },
+        {
+          id:"nextStation",
+          width:48,
+          left:306,
+          name:"下一站",
+          value1:"",
+          value2:"XXX",
+          color:"#0000FF",
+          bgcolor:"#000",
+        },
+        {
+          id:"lastStation",
+          width:48,
+          left:354,
+          name:"目的站",
+          value1:"",
+          value2:"XXX",
+          color:"#0000FF",
+          bgcolor:"#000",
+        }
+      ],
+      trainStatusPng:JL3D_LOCAL_STATIC+'/jl3d/tms/PMsa2.png',
+      trainSpeedPng:JL3D_LOCAL_STATIC+'/jl3d/tms/PMS3.png',
+      buttonList1:[
+        {
+          name:"ATO模式",
+          left:"5",
+          bgcolor:"#00FF00",
+        },
+        {
+          name:"网络模式",
+          left:"65",
+          bgcolor:"#00FF00",
+        },
+        {
+          name:"紧急广播",
+          left:"245",
+          bgcolor:"#fff",
+        },
+        {
+          name:"报站设定",
+          left:"325",
+          bgcolor:"#fff",
+        },
+      ],
+      buttonList2:[
+        {
+          name:"主菜单",
+          left:"5",
+          bgcolor:"#fff",
+        },
+        {
+          name:"运行",
+          left:"65",
+          bgcolor:"#0000FF",
+        },
+        {
+          name:"制动状态",
+          left:"125",
+          bgcolor:"#fff",
+        },
+        {
+          name:"牵引状态",
+          left:"185",
+          bgcolor:"#fff",
+        },
+        {
+          name:"辅助状态",
+          left:"245",
+          bgcolor:"#fff",
+        },
+        {
+          name:"旁路状态",
+          left:"305",
+          bgcolor:"#fff",
+        },
+        {
+          name:"空调状态",
+          left:"365",
+          bgcolor:"#fff",
+        },
+        {
+          name:"帮助",
+          left:"425",
+          bgcolor:"#fff",
+        }
+      ],
     }
   },
   beforeDestroy() {
@@ -29,13 +230,78 @@ export default {
 
   },
   watch: {
-
-  },
-  methods: {
-
+    '$store.state.training.initTime': function (initTime) {
+        let date = new Date(initTime);
+        this.timer = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
+        document.getElementById("tmstimeupdate").innerHTML = this.timer;
+    }
   },
   mounted() {
+    this.time();
+    window.updatetmsstatus = this.updatetmsstatus;
   },
+  methods: {
+    time(){
+      let vDay;
+      let date =  new Date();
+      let year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      let day = date.getDate();
+      let hours = date.getHours();
+      let minutes = date.getMinutes();
+      let seconds = date.getSeconds();
+      document.getElementById("tmstime").innerHTML = year + "/" + month + "/" + day ;
+    },
+    updatetmsstatus(newdata){
+
+
+      if(newdata.v || newdata.v == 0){
+        this.trainData[2].value2 = parseInt(newdata.v)+" km/h";
+        this.speedHeight = newdata.v/80*149;
+
+      }
+      if(newdata.forcePercent){
+        // console.log(newdata.forcePercent);
+        this.trainData[3].value2 = newdata.forcePercent+"%";
+        this.tractionHeight = newdata.forcePercent/100*149;
+      }
+      if(newdata.tow){
+        if(newdata.tow == "1"){
+
+          this.trainData[3].value1 = "牵引  ";
+          this.trainData[3].color = "#000";
+          this.trainData[3].bgcolor = "#00FF00";
+          // this.c1image = this.images.c1["qianyin"];
+        }
+        if(newdata.tow == "2"){
+          // this.c1image = this.images.c1["zhidong"];
+          this.trainData[3].value1 = "制动  ";
+          this.trainData[3].color = "#fff";
+          this.trainData[3].bgcolor = "#FF0000";
+        }
+        if(newdata.tow == "3"){
+          // this.c1image = this.images.c1["duoxing"];
+          this.trainData[3].value1 = "惰行  ";
+          this.trainData[3].color = "#fff";
+          this.trainData[3].bgcolor = "#000";
+        }
+        if(newdata.tow == "4"){
+          // this.c1image = this.images.c1["none"];
+          this.trainData[3].value1 = "";
+          this.trainData[3].color = "#fff";
+          this.trainData[3].bgcolor = "#000";
+        }
+      }
+      if(newdata.nextStation){
+        this.trainData[5].value2 = newdata.nextStation;
+      }
+
+      if(newdata.endStation){
+        this.trainData[6].value2 = newdata.endStation;
+      }
+    },
+  },
+
   beforeDestroy() {
 
   }
@@ -45,14 +311,101 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   @import "src/styles/mixin.scss";
-  .tms{
+  .tmsdiv{
     width:500px;
     height:333px;
-    background-size:100% 100%;
+    background-color: #000;
     position:absolute;
     bottom:0;
     left:0;
     // border: 0.1px solid #ffffff;
   }
+  .tractionPlane{
+    width:15px;
+    position:absolute;
+    bottom:1px;
+    left:11px;
+    background-color: #00ff00;
+  }
+  .tractionText{
+    width:60px;
+    height:30px;
+    text-align: center;
+    position: absolute;
+    color: #00ff00;
+    font-size: 12px;
+    top:90px;
+    right:0;
+  }
 
+  .speedPlane{
+    width:15px;
+    position:absolute;
+    bottom:1px;
+    right:11px;
+    background-color: #00FFFF;
+  }
+
+  .speedText{
+    width:60px;
+    height:30px;
+    text-align: center;
+    position: absolute;
+    color: #00FFFF;
+    font-size: 12px;
+    top:270px;
+    right:0;
+  }
+  .tmstopdiv{
+    width:480px;
+    height:60px;
+    top:3px;
+    left:10px;
+    position: absolute;
+    text-align: center;
+  }
+
+  .tmstopdivchild{
+    width:48px;
+    height:60px;
+    border:solid 0.5px #fff;
+    position: absolute;
+    color:#fff;
+  }
+  .tmstopmsg{
+    // width:100%;
+    height:50%;
+    position: absolute;
+    font-size:10px;
+    border:solid 0.5px #fff;
+    // font-weight:30px;
+    font-weight: 900;
+  }
+
+  .tmsdowndiv{
+    width:490px;
+    height:50px;
+    position:absolute;
+    text-align: center;
+    left:5px;
+    bottom:0;
+    font-size: 13px;
+    line-height: 20px;
+  }
+
+  .tmsdowndivmsg{
+    width:490px;
+    height:25px;
+    position:absolute;
+  }
+
+  .tmsdownbutton{
+    width:55px;
+    height:20px;
+    position: absolute;
+    top:2px;
+    color:#000;
+    background-color: #fff;
+    border:solid 0.5px #fff;
+  }
 </style>
diff --git a/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue b/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue
index 89d27a3cb..f06c2b6e4 100644
--- a/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue
+++ b/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue
@@ -70,19 +70,34 @@
         @changeCameraPos="changeCameraPos">
       </Tool-Bar>
 
+      <Result-Tips
+      :examStatus='examStatus'
+      ref="rtui">
+      </Result-Tips>
+
       <div id="lesson3ddraw" class="lesson3ddraw">
       </div>
     </div>
 
     <div class="lessondowndiv"
       :style="{'background-image': 'url('+lessonbg+')'}">
+
       <div class="lessondowndivroommsg"
         :style="{'background-image': 'url('+lessonbg+')'}">
         房间编号:1
       </div>
+
+
+      <div class="lessondowndivmsg"
+        :style="{'background-image': 'url('+lessonbg+')'}"
+        v-show = "endExam"
+        @click="showResult">
+        考试成绩分析
+      </div>
+
       <div class="lessondowndivmsg"
         :style="{'background-image': 'url('+lessonbg+')'}">
-        考试计时:{{this.playTime.h}}:{{this.playTime.m}}:{{this.playTime.s}}
+        考试计时:{{this.lastPlayTime}}
       </div>
       <div class="lessondowndivmsg"
         :style="{'background-image': 'url('+lessonbg+')'}">
@@ -103,6 +118,7 @@
   import localStore from 'storejs';
 
   // import AssetsModel from '@/views/jlmap3d/lesson3dedit/component/assetsmodel';
+  import ResultTips from '@/views/jlmap3d/lesson3dplayer/tools/resulttips';
 
   import StepTips from '@/views/jlmap3d/lesson3dplayer/tools/stepstips';
   import ProcessLog from '@/views/jlmap3d/lesson3dplayer/tools/processlog';
@@ -130,7 +146,8 @@
       ProcessLog,
       ExplainPane,
       JobPane,
-      ToolBar
+      ToolBar,
+      ResultTips
     },
     data() {
       return {
@@ -151,6 +168,10 @@
           s:0,
         },
         time:'',
+        ms:0,
+        lastPlayTime:"",
+        endExam:false,
+        examResultShow:false,
         showSelectJob:true,
         lessonMsg:{},
         selectJobList:[],
@@ -207,6 +228,7 @@
       window.actionEvent = this.actionEvent;
       window.startLesson = this.startLesson;
       window.updataExamStatus = this.updataExamStatus;
+      window.lessonEnd = this.lessonEnd;
       this.init(this.$route.query.lessonId);
     },
     beforeDestroy() {
@@ -245,13 +267,14 @@
             this.lessonData.loadLessonProgress(loadData.lessonProgress);
 
           }else{
+
             this.lessonData.initLessonProgress();
             this.$refs.jobpane.initJobList(this.jobPaneData.dataList);
             this.jl3d.initNowRole();
           }
-          console.log("loaddata----------------");
-          console.log(loadData);
-          console.log(this.lessonMsg);
+          // console.log("loaddata----------------");
+          // console.log(loadData);
+          // console.log(this.lessonMsg);
           this.jl3d = new Lesson3dPlayer(dom,loadData,this.lessonPlayIndex);
         }).catch(() => {
         });
@@ -259,6 +282,16 @@
       updataExamStatus(newExamStatus){
         this.examStatus = newExamStatus;
       },
+      lessonEnd(){
+        this.endExam = true;
+        this.showResult();
+
+        this.examStatus.time = this.lastPlayTime;
+        this.stopTime();
+      },
+      showResult(){
+        this.$refs.rtui.showdiv();
+      },
       selectJob(job){
         this.showSelectJob = false;
         for(let i=0;i<this.jobPaneData.dataList.length;i++){
@@ -267,35 +300,32 @@
             console.log(this.nowRole);
             this.lessonMsg.userJob = job;
             this.jl3d.initNowRole(this.nowRole);
-
+            this.timeStart();
           }
         }
 
       },
       timeStart(){
-        this.time =setInterval(this.timer,50)
+        this.time =setInterval(this.timer,100)
       },
       timer () {//定义计时函数
-        // this.ms =this.ms +50        //毫秒
-        // if (this.ms >=1000) {
-        //   this.ms =0
-        //   this.second =this.second +1        //秒
-        // }
-        //
-        // if (this.second >=60) {
-        //   this.second =0
-        //   this.minute =this.minute +1        //分钟
-        // }
-        //
-        // if (this.minute >=60) {
-        //   this.minute =0
-        //   this.hour =this.hour +1        //小时
-        // }
-        // this.str =this.toDub(this.hour) +':' +this.toDub(this.minute) +':' +this.toDub(this.second)/*+""+this.toDubms(this.ms)+"毫秒"*/
-        //
-        // this.playTime.s = parseInt(count % 60);
-        // this.playTime.m = parseInt(count / 60) % 60;
-        // this.playTime.h = parseInt(count / 60 / 60);
+        this.ms =this.ms +100        //毫秒
+        if (this.ms >=1000) {
+          this.ms =0
+          this.playTime.s =this.playTime.s +1        //秒
+        }
+
+        if (this.playTime.s >=60) {
+          this.playTime.s =0;
+          this.playTime.m =this.playTime.m +1        //分钟
+        }
+
+        if (this.playTime.m >=60) {
+          this.playTime.m;
+          this.playTime.h =this.playTime.h +1        //小时
+        }
+        this.lastPlayTime =this.toDub(this.playTime.h) +':' +this.toDub(this.playTime.m) +':' +this.toDub(this.playTime.s)/*+""+this.toDubms(this.ms)+"毫秒"*/
+
       },
       toDub (n) {//补0操作
         if (n <10) {
diff --git a/src/views/jlmap3d/lesson3dplayer/tools/actiontips.vue b/src/views/jlmap3d/lesson3dplayer/tools/actiontips.vue
deleted file mode 100644
index 781be9fb7..000000000
--- a/src/views/jlmap3d/lesson3dplayer/tools/actiontips.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-  <div class="stepstipsdiv" >
-    <div class="stepstipstittle" >
-      {{tipsTittle}}
-    </div>
-    <div class="stepstipstext" >
-      {{tipsText}}
-    </div>
-  </div>
-</template>
-<script>
-  import Vue from 'vue';
-  import localStore from 'storejs';
-	import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-  //操作提示
-  export default {
-    name: 'ActionTips',
-    components: {
-
-    },
-    data() {
-      return {
-        tipsTittle:"步骤一",
-        tipsText:"步骤一",
-      }
-    },
-    computed: {
-
-    },
-    watch: {
-
-    },
-    mounted() {
-
-    },
-    beforeDestroy() {
-
-    },
-    methods: {
-
-
-
-    },
-
-  }
-</script>
-
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .stepstipsdiv {
-    position: absolute;
-    width: 20%;
-    height: 20%;
-    left:0;
-    top:0;
-    border-radius:10px;
-    border:solid 2px #000;
-    background-color: #fff;
-    z-index:1;
-  }
-  .stepstipstittle{
-    text-align: center;
-    font-size: 20px;
-  }
-  .stepstipstext{
-    font-size: 16px;
-  }
-
-
-</style>
diff --git a/src/views/jlmap3d/lesson3dplayer/tools/explainpane.vue b/src/views/jlmap3d/lesson3dplayer/tools/explainpane.vue
index e494b823a..e52e8903a 100644
--- a/src/views/jlmap3d/lesson3dplayer/tools/explainpane.vue
+++ b/src/views/jlmap3d/lesson3dplayer/tools/explainpane.vue
@@ -81,7 +81,7 @@
   .explainpanetittle{
     // height:15%;
     text-align: center;
-    font-size: 25px;
+    font-size: 20px;
   }
 
   .explainpanepic{
@@ -97,7 +97,7 @@
     position:relative;
     left:5%;
     width:90%;
-    font-size: 20px;
+    font-size: 18px;
     // height:20%;
   }
 
diff --git a/src/views/jlmap3d/lesson3dplayer/tools/resulttips.vue b/src/views/jlmap3d/lesson3dplayer/tools/resulttips.vue
new file mode 100644
index 000000000..049978010
--- /dev/null
+++ b/src/views/jlmap3d/lesson3dplayer/tools/resulttips.vue
@@ -0,0 +1,119 @@
+<template>
+  <div class="stepstipsdiv"
+  :style="{'background-image': 'url('+lessonbg+')'}"
+  v-show="divshow">
+    <div class="resultTittleDiv">考试成绩</div>
+    <div class="resultMsgDiv">
+      <div  v-for="(examItem,index) in examStatus.trueStep" style="width:100%;height:10%">
+        <div>
+          {{examItem.explainPane.tittle}}
+        </div>
+        <div>
+          得分:10分
+        </div>
+      </div>
+
+      <div>
+        总成绩:{{examStatus.lastScore}}分
+      </div>
+      <div>
+        考试用时:{{examStatus.time}}
+      </div>
+    </div>
+    <div class="resultCloseDiv" @click="closediv">关闭窗口</div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue';
+  import localStore from 'storejs';
+	import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+  //操作提示
+  export default {
+    name: 'ResultTips',
+    props:['examStatus'],
+
+    components: {
+
+    },
+    data() {
+      return {
+        divshow:false,
+        lessonbg:JL3D_LOCAL_STATIC+"/lesson3d/lessonbg.png",
+      }
+    },
+    computed: {
+
+    },
+    watch: {
+
+    },
+    mounted() {
+
+    },
+    beforeDestroy() {
+
+    },
+    methods: {
+      showdiv(){
+        this.divshow = true;
+      },
+      closediv(){
+        this.divshow = false;
+      },
+
+
+    },
+
+  }
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import "src/styles/mixin.scss";
+  .stepstipsdiv {
+    position: absolute;
+    width: 60%;
+    height: 80%;
+    left:20%;
+    top:10%;
+    border-radius:10px;
+    border:solid 2px #000;
+    background-color: #fff;
+    z-index:1;
+  }
+
+
+  .resultTittleDiv{
+    width:60%;
+    height:40px;
+    font-size: 40px;
+    color:#fff;
+    position: absolute;
+    left:20%;
+    top:5%;
+    text-align: center;
+  }
+  .resultMsgDiv{
+    width:90%;
+    height:70%;
+    font-size: 20px;
+    color:#fff;
+    position: absolute;
+    left:5%;
+    top:15%;
+    border:solid 2px #000;
+    overflow:auto;
+  }
+  .resultCloseDiv{
+    width:40%;
+    height:30px;
+    font-size: 25px;
+    color:#fff;
+    position: absolute;
+    text-align: center;
+    left:30%;
+    bottom:5%;
+    border:solid 2px #000;
+  }
+
+</style>
diff --git a/src/views/jlmap3d/lesson3dplayer/tools/stepstips.vue b/src/views/jlmap3d/lesson3dplayer/tools/stepstips.vue
index 2d1573089..f716584dd 100644
--- a/src/views/jlmap3d/lesson3dplayer/tools/stepstips.vue
+++ b/src/views/jlmap3d/lesson3dplayer/tools/stepstips.vue
@@ -70,10 +70,10 @@
   }
   .stepstipstittle{
     text-align: center;
-    font-size: 25px;
+    font-size: 20px;
   }
   .stepstipstext{
-    font-size: 20px;
+    font-size: 18px;
   }
 
 
diff --git a/static/jl3d/tms/PMS3.png b/static/jl3d/tms/PMS3.png
new file mode 100644
index 0000000000000000000000000000000000000000..afee6b325d7ed8009268a7beae0a7be6d189bd03
GIT binary patch
literal 3242
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%0D|9|4^^J{O>9gxX|buW
zx9_-3e3E8R@pp{6uHsKe%!6g{Un%et+}F2M(c=st2}I5{-P>L;m+(7$8o@x03WjR^
zQWJRfbzEkcshzmtO`P~{P8!XRsF~Q#(V$vgFpBiFFJKDxVY&vvg{!s@3=lLt6vdFi
zK~77(<2RxJ^7G?0Kxu70Q#~+1rBf7NVf+tHxEXO_sodyv4xiProl7xEnaA2G&>ZMx
z(0{#<vafzeMlYb9DsJ8UKMSd&o|)jssxH-J;d>T@HJ<ant!<i@hGIzU)V~Mr@^v<O
zYsv-Ux;ui4NAj#clJX)^HjyiP>76(CIE^X$U`n3XeE%2r-_#03h@BqCgbE@;YPfc{
zX3jyT>7u;kupe2@m{3E9^T*W=IZ%$3r&gzd!y>24;sRu>xj^LqqeP}h(fi_A0w}yq
zg>d7185V@MzVC>-%U(r_oYpeeb+2?Ke|^Dzl_^M^b1qODtQ*{5_n+%)wEe#*VLNq>
z;ggiho=baOGrahZVkyK4s&7W-d349YbXdRl++U?bRzHiXAo`Wx_6N}}zC@rS$m4Kp
T=$GzQ9e}2~?!z)wtGE9F6MHPe

literal 0
HcmV?d00001

diff --git a/static/jl3d/tms/PMsa2.png b/static/jl3d/tms/PMsa2.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b341255cb0a0c55640f99abdd69cd55772b3b07
GIT binary patch
literal 4705
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

literal 0
HcmV?d00001