From 47ec0a8b7d72aa0c679d3e07ed7d0c8284395f3a Mon Sep 17 00:00:00 2001 From: sunzhenyu Date: Mon, 27 Sep 2021 10:24:15 +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=B6atp=E6=8C=89=E9=92=AE=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E9=97=A8=E4=B8=8D=E5=BC=80bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jl3ddrive/moveupdate/DrivingConnectNew.js | 4 +- src/views/jlmap3d/drive/equipbox/equipbox.vue | 37 +++++++++++-------- src/views/jlmap3d/drive/jl3ddrive.vue | 2 +- src/views/jlmap3d/drive/sceneview/mmiview.vue | 20 +++++----- static/workertest/driverWebWorker.js | 2 +- 5 files changed, 35 insertions(+), 30 deletions(-) diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js index 9d9a0a381..824f66be9 100644 --- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js +++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js @@ -986,7 +986,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri } function standupdate(data) { code = data.code; - console.log(data); + if ( actions[code]) { if (data.command == 'K') { actions[code].status = data.command; @@ -1006,7 +1006,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri } function signalupdate(data) { code = data.code; - + if(data.command == 'No'){ signallist.list[code].mesh.getObjectByName("red").material.map = materials["black"]; signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true; diff --git a/src/views/jlmap3d/drive/equipbox/equipbox.vue b/src/views/jlmap3d/drive/equipbox/equipbox.vue index 594f8c724..4b542dea1 100644 --- a/src/views/jlmap3d/drive/equipbox/equipbox.vue +++ b/src/views/jlmap3d/drive/equipbox/equipbox.vue @@ -56,9 +56,9 @@
-
{{ $t('jlmap3d.leftSide') }}
+
废排风机 @@ -72,9 +72,9 @@
-
{{ $t('jlmap3d.leftSide') }}
+
客室电加热 @@ -88,9 +88,9 @@
-
{{ $t('jlmap3d.leftSide') }}
+
司机室电加热 @@ -103,10 +103,9 @@
- -
{{ $t('jlmap3d.leftSide') }}
-
{{ $t('jlmap3d.location0') }}
-
{{ $t('jlmap3d.rightSide') }}
+ +
正常
+
切除
ATP切除 @@ -120,9 +119,9 @@
-
{{ $t('jlmap3d.leftSide') }}
+
空压机模式 @@ -168,6 +167,12 @@ components: { }, + props: { + groupNum: { + type: String, + default: null + } + }, data() { return { showEquipbox:true, @@ -180,7 +185,9 @@ } }, computed: { - + group() { + return this.$route.query.group; + }, }, watch: { @@ -219,11 +226,11 @@ } }, - atpclick: function (e){ + atpclick: function (type){ //console.log("atp"); let data = { groupNumber:this.groupNum, - cutOff:true, + cutOff:type, }; trainSimulationAtp(this.group,data).then(netdata => { // console.log(netdata); diff --git a/src/views/jlmap3d/drive/jl3ddrive.vue b/src/views/jlmap3d/drive/jl3ddrive.vue index 6b67a4793..d362fe6a5 100644 --- a/src/views/jlmap3d/drive/jl3ddrive.vue +++ b/src/views/jlmap3d/drive/jl3ddrive.vue @@ -52,7 +52,7 @@ - +
diff --git a/src/views/jlmap3d/drive/sceneview/mmiview.vue b/src/views/jlmap3d/drive/sceneview/mmiview.vue index 401dca7ae..2b0ceca4c 100644 --- a/src/views/jlmap3d/drive/sceneview/mmiview.vue +++ b/src/views/jlmap3d/drive/sceneview/mmiview.vue @@ -233,9 +233,6 @@ export default { this.updateMmiLen(newdata.maLen); } - - - this.updatemmidrivemodelevel(newdata.runLevel,newdata.driveMode,newdata.atoOn,newdata.atpOn); // this.updatammirunlevel(newdata.runLevel); // @@ -524,14 +521,15 @@ export default { // } // } // - // if(this.m9state2 != atpon){ - // this.m9state2 = atpon; - // if(atpon){ - // - // }else{ - // this.m9image = this.images.m9["atp"]; - // } - // } + // console.log(atpon); + if(this.m9state2 != atpon){ + this.m9state2 = atpon; + if(atpon){ + this.m9image = this.images.m9["none"]; + }else{ + this.m9image = this.images.m9["atp"]; + } + } }, updatemmidoormode(leftDoorCanClose,rightDoorCanClose){ diff --git a/static/workertest/driverWebWorker.js b/static/workertest/driverWebWorker.js index 30e7a0dab..4b24eb08f 100644 --- a/static/workertest/driverWebWorker.js +++ b/static/workertest/driverWebWorker.js @@ -714,7 +714,7 @@ function timedCount() { return; } - if (data.body.deviceType== "PSD") { + if (data.body.type== "PSD") { postMessage(data); return; }