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:
joylink_cuiweidong 2020-05-20 11:14:01 +08:00
commit 71cd5af93b
4 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
View File

@ -58,6 +58,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
// // console.log(event.data);
//
// }
console.log(event.data);
if(event.data.type == "Device_Load_Destroy_3D"){
DeviceDestroy(event.data);
return;

22
src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
View File

@ -23,11 +23,7 @@
<!--
<div class="msg" v-show ="msgshow">
<div class="msgtext">
{{controlmsg}}
</div>
</div>
<div class="switchpane" style="left:0;top:47.5%;transform: rotate(90deg);" v-show="switchleft" @tap="switchl">
<image class="switchimg" :src="jiantou" />
@ -85,6 +81,7 @@ import axios from 'axios';
groupnum:"",
userrole:'',
drawWay:'',
}
},
watch: {
@ -117,8 +114,11 @@ import axios from 'axios';
}
}
bindSimulationTrain(this.group,this.groupnum);
bindSimulationTrain(this.group,this.groupnum).then(netdata => {
}).catch(error => {
console.log(error);
});
},
clickselect(e){
if(e == true){
@ -206,15 +206,7 @@ import axios from 'axios';
font-size: 4px;
}
.msgtext{
width:200px;
height:50px;
border-radius:5px;
background:#C0C0C0;
color:#FFFFFF;
font-size: 40px;
transform: rotate(90deg);
}
.switchpane{
width:30px;

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

@ -24,6 +24,12 @@
<div id="jlcctv" v-show="cctvshow" class="jlmap3cctv">
</div>
<div class="msg" v-show ="msgshow">
<div class="msgtext">
{{controlmsg}}
</div>
</div>
<Drive-Mmi v-if="mmishow" ref="mmiui" />
<Drive-Tms v-if="mmishow" />
@ -80,6 +86,8 @@ export default {
trainnum: '',
stoptimes: '',
dcontrolshow: false,
msgshow:false,
controlmsg:"不能选择其它列车",
};
},
watch: {
@ -359,4 +367,21 @@ export default {
left: 0;
z-index: -12;
}
.msg{
width:40%;
height:50px;
left:30%;
top:0;
text-align: center;
position:absolute;
}
.msgtext{
width:400px;
height:50px;
border-radius:5px;
background:#C0C0C0;
color:#FFFFFF;
font-size: 40px;
}
</style>

2
src/views/newMap/displayNew/menuDemon.vue
View File

@ -10,7 +10,7 @@
<el-button-group>
<el-button v-if="isShowScheduling && !dataError" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
<el-button v-if="!isShowScheduling && !dataError" type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
<el-button v-if="!isShowScheduling && !dataError" type="jl3dstation" @click="jumpjl3dstation">{{ jl3dstation }}</el-button>
<!-- <el-button v-if="!isShowScheduling && !dataError" type="jl3dstation" @click="jumpjl3dstation">{{ jl3dstation }}</el-button> -->
<el-button v-if="!isShowScheduling && !dataError" type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
<el-button v-if="isShow3dmodel && !isShowScheduling && !dataError" type="jumpjlmap3dmodel" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
<template v-if="isShowQuest">