joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
fan 2021-09-27 14:38:26 +08:00
commit 4225f58d50
5 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
View File

@ -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;

37
src/views/jlmap3d/drive/equipbox/equipbox.vue
View File

@ -56,9 +56,9 @@
<div id="doorpick" class="ebpanebutton2" style="top:33%;left:40%;">
<img class="ebbuttonimg2" :src="zuoimg" />
<img class="ebbuttonimg2" :src="niuimg"/>
<div class="tfbutton" style="font-size:1px;top:13px;left:5px;">{{ $t('jlmap3d.leftSide') }}</div>
<!-- <div class="tfbutton" style="font-size:1px;top:13px;left:5px;">{{ $t('jlmap3d.leftSide') }}</div>
<div class="tfbutton" style="font-size:1px;top:5px;left:33px;">{{ $t('jlmap3d.location0') }}</div>
<div class="tfbutton" style="font-size:1px;top:13px;left:50px;">{{ $t('jlmap3d.rightSide') }}</div>
<div class="tfbutton" style="font-size:1px;top:13px;left:50px;">{{ $t('jlmap3d.rightSide') }}</div> -->
<div style="font-size:10px;" :style="{position:'absolute',width:'70px',height:'20px',position:'absolute',top:'70px',left:'5px'}" >
<div :style="{height:'10px',backgroundColor:'#000',color:' #fff'}">
废排风机
@ -72,9 +72,9 @@
<div id="doorpick" class="ebpanebutton2" style="top:33%;left:50%;">
<img class="ebbuttonimg2" :src="zuoimg" />
<img class="ebbuttonimg2" :src="niuimg"/>
<div class="tfbutton" style="font-size:1px;top:13px;left:5px;">{{ $t('jlmap3d.leftSide') }}</div>
<!-- <div class="tfbutton" style="font-size:1px;top:13px;left:5px;">{{ $t('jlmap3d.leftSide') }}</div>
<div class="tfbutton" style="font-size:1px;top:5px;left:33px;">{{ $t('jlmap3d.location0') }}</div>
<div class="tfbutton" style="font-size:1px;top:13px;left:50px;">{{ $t('jlmap3d.rightSide') }}</div>
<div class="tfbutton" style="font-size:1px;top:13px;left:50px;">{{ $t('jlmap3d.rightSide') }}</div> -->
<div style="font-size:10px;" :style="{position:'absolute',width:'70px',height:'20px',position:'absolute',top:'70px',left:'5px'}" >
<div :style="{height:'10px',backgroundColor:'#000',color:' #fff'}">
客室电加热
@ -88,9 +88,9 @@
<div id="doorpick" class="ebpanebutton2" style="top:33%;left:60%;">
<img class="ebbuttonimg2" :src="zuoimg" />
<img class="ebbuttonimg2" :src="niuimg"/>
<div class="tfbutton" style="font-size:1px;top:13px;left:5px;">{{ $t('jlmap3d.leftSide') }}</div>
<!-- <div class="tfbutton" style="font-size:1px;top:13px;left:5px;">{{ $t('jlmap3d.leftSide') }}</div>
<div class="tfbutton" style="font-size:1px;top:5px;left:33px;">{{ $t('jlmap3d.location0') }}</div>
<div class="tfbutton" style="font-size:1px;top:13px;left:50px;">{{ $t('jlmap3d.rightSide') }}</div>
<div class="tfbutton" style="font-size:1px;top:13px;left:50px;">{{ $t('jlmap3d.rightSide') }}</div> -->
<div style="font-size:10px;" :style="{position:'absolute',width:'70px',height:'20px',position:'absolute',top:'70px',left:'5px'}" >
<div :style="{height:'10px',backgroundColor:'#000',color:' #fff'}">
司机室电加热
@ -103,10 +103,9 @@
<div id="doorpick" class="ebpanebutton2" style="top:33%;left:70%;">
<img class="ebbuttonimg2" :src="zuoimg" />
<img class="ebbuttonimg2" :src="niuimg" @click="atpclick"/>
<div class="tfbutton" style="font-size:1px;top:13px;left:5px;">{{ $t('jlmap3d.leftSide') }}</div>
<div class="tfbutton" style="font-size:1px;top:5px;left:33px;">{{ $t('jlmap3d.location0') }}</div>
<div class="tfbutton" style="font-size:1px;top:13px;left:50px;">{{ $t('jlmap3d.rightSide') }}</div>
<img class="ebbuttonimg2" :src="niuimg" @click=""/>
<div class="tfbutton" style="font-size:10px;top:5px;left:33px;" @click="atpclick(false)">正常</div>
<div class="tfbutton" style="font-size:10px;top:13px;left:50px;" @click="atpclick(false)">切除</div>
<div style="font-size:10px;" :style="{position:'absolute',width:'70px',height:'20px',position:'absolute',top:'70px',left:'5px'}" >
<div :style="{height:'10px',backgroundColor:'#000',color:' #fff'}">
ATP切除
@ -120,9 +119,9 @@
<div id="doorpick" class="ebpanebutton2" style="top:33%;left:80%;">
<img class="ebbuttonimg2" :src="zuoimg" />
<img class="ebbuttonimg2" :src="niuimg"/>
<div class="tfbutton" style="font-size:1px;top:13px;left:5px;">{{ $t('jlmap3d.leftSide') }}</div>
<!-- <div class="tfbutton" style="font-size:1px;top:13px;left:5px;">{{ $t('jlmap3d.leftSide') }}</div>
<div class="tfbutton" style="font-size:1px;top:5px;left:33px;">{{ $t('jlmap3d.location0') }}</div>
<div class="tfbutton" style="font-size:1px;top:13px;left:50px;">{{ $t('jlmap3d.rightSide') }}</div>
<div class="tfbutton" style="font-size:1px;top:13px;left:50px;">{{ $t('jlmap3d.rightSide') }}</div> -->
<div style="font-size:10px;" :style="{position:'absolute',width:'70px',height:'20px',position:'absolute',top:'70px',left:'5px'}" >
<div :style="{height:'10px',backgroundColor:'#000',color:' #fff'}">
空压机模式
@ -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);

2
src/views/jlmap3d/drive/jl3ddrive.vue
View File

@ -52,7 +52,7 @@
<Drive-Mmi v-if="mmishow" ref="mmiui" />
<Drive-Tms v-if="tmsshow" ref="tmsui"/>
<Drive-Control v-if="dcontrolshow" ref="dcontrol" :group-num="groupnum" :user-role="userrole"/>
<Equip-Box v-if="equipboxshow" />
<Equip-Box v-if="equipboxshow" :group-num="groupnum" />
<psl v-if="pslShow" ref="psl" pop-class="xian-01__systerm" />
</div>

20
src/views/jlmap3d/drive/sceneview/mmiview.vue
View File

@ -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){

2
static/workertest/driverWebWorker.js
View File

@ -714,7 +714,7 @@ function timedCount() {
return;
}
if (data.body.deviceType== "PSD") {
if (data.body.type== "PSD") {
postMessage(data);
return;
}