修改综合演练三维驾驶初始样式
This commit is contained in:
parent
ed5f1dd7eb
commit
dae99ee4ad
@ -93,18 +93,21 @@ export function StationStandList() {
|
|||||||
let jlmapstationdata = jlmapdata.stationList;
|
let jlmapstationdata = jlmapdata.stationList;
|
||||||
let jlmapstanddata = jlmapdata.stationStandList;
|
let jlmapstanddata = jlmapdata.stationStandList;
|
||||||
// jlmapstationdata.splice(0,1);
|
// jlmapstationdata.splice(0,1);
|
||||||
|
console.log(standsdata);
|
||||||
|
console.log(jlmapstationdata);
|
||||||
for(let i=0;i<jlmapstationdata.length;i++){
|
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);
|
jlmapstationdata.splice(i,1);
|
||||||
i--;
|
i--;
|
||||||
}else{
|
}else{
|
||||||
standsdata[i].code = jlmapstationdata[i].code;
|
standsdata[i].code = jlmapstationdata[i].code;
|
||||||
standsdata[i].name = jlmapstationdata[i].name;
|
standsdata[i].name = jlmapstationdata[i].name;
|
||||||
}
|
}
|
||||||
|
// console.log(jlmapstationdata[i].subheadDisplay);
|
||||||
}
|
}
|
||||||
console.log(standsdata);
|
|
||||||
// console.log(jlmapstationdata);
|
// console.log(jlmapstationdata);
|
||||||
// console.log(jlmapstanddata);
|
console.log(standsdata);
|
||||||
let stations = jlmap3ddata.stationstandlist.list;
|
let stations = jlmap3ddata.stationstandlist.list;
|
||||||
let num;
|
let num;
|
||||||
let num2;
|
let num2;
|
||||||
|
@ -129,6 +129,7 @@ import axios from 'axios';
|
|||||||
}
|
}
|
||||||
|
|
||||||
window.updateDriverTrust = this.updateDriverTrust;
|
window.updateDriverTrust = this.updateDriverTrust;
|
||||||
|
window.updateDriveValue = this.updateDriveValue;
|
||||||
// this.teststomp = new StompClient();
|
// this.teststomp = new StompClient();
|
||||||
|
|
||||||
|
|
||||||
@ -274,6 +275,12 @@ import axios from 'axios';
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
updateDriveValue(newvalue){
|
||||||
|
|
||||||
|
if(newvalue != this.value){
|
||||||
|
this.value = newvalue;
|
||||||
|
}
|
||||||
|
},
|
||||||
updatetrainlist(){
|
updatetrainlist(){
|
||||||
getSimulationTrainlistNew(this.group).then(netdata => {
|
getSimulationTrainlistNew(this.group).then(netdata => {
|
||||||
this.options = [];
|
this.options = [];
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
|
|
||||||
<div class="jalmap3ddiv">
|
<div id="drivediv" class="jalmap3ddiv" >
|
||||||
|
|
||||||
<div class="trainstatus">
|
<div class="trainstatus">
|
||||||
{{$t('jlmap3d.trainGroupNumber')}}{{ trainnum }}</br>
|
{{$t('jlmap3d.trainGroupNumber')}}{{ trainnum }}</br>
|
||||||
@ -71,6 +71,7 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
driveIndex:1500,
|
||||||
trainlist: null,
|
trainlist: null,
|
||||||
stationlist: null,
|
stationlist: null,
|
||||||
msgdata: null,
|
msgdata: null,
|
||||||
@ -92,6 +93,7 @@ export default {
|
|||||||
dcontrolshow: false,
|
dcontrolshow: false,
|
||||||
msgshow:false,
|
msgshow:false,
|
||||||
controlmsg:"不能选择其它列车",
|
controlmsg:"不能选择其它列车",
|
||||||
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
@ -181,11 +183,14 @@ export default {
|
|||||||
// this.$refs.mmiui.init();
|
// this.$refs.mmiui.init();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
show: function (skinCode,group) {
|
show: function (skinCode,group,zindex) {
|
||||||
// console.log("show");
|
// console.log("show");
|
||||||
// console.log(skinCode);
|
// console.log(skinCode);
|
||||||
// console.log(this.jlmap3d);
|
// console.log(this.jlmap3d);
|
||||||
|
if(zindex){
|
||||||
|
this.driveIndex = zindex;
|
||||||
|
document.getElementById("drivediv").style.zIndex = zindex;
|
||||||
|
}
|
||||||
if (this.jlmap3d == null) {
|
if (this.jlmap3d == null) {
|
||||||
this.init(skinCode,group);
|
this.init(skinCode,group);
|
||||||
} else {
|
} else {
|
||||||
@ -287,9 +292,14 @@ export default {
|
|||||||
updatestatus(newdata){
|
updatestatus(newdata){
|
||||||
if(newdata.groupNumber){
|
if(newdata.groupNumber){
|
||||||
this.trainnum = newdata.groupNumber;
|
this.trainnum = newdata.groupNumber;
|
||||||
|
|
||||||
|
updateDriveValue(this.trainnum);
|
||||||
}
|
}
|
||||||
updatedoorlight(newdata);
|
updatedoorlight(newdata);
|
||||||
this.$refs.mmiui.updatetrainstatus(newdata);
|
if(this.$refs.mmiui){
|
||||||
|
this.$refs.mmiui.updatetrainstatus(newdata);
|
||||||
|
}
|
||||||
|
|
||||||
updatabuttonlight(newdata);
|
updatabuttonlight(newdata);
|
||||||
},
|
},
|
||||||
warningmsg(nowmsg){
|
warningmsg(nowmsg){
|
||||||
@ -354,7 +364,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.trainstatus{
|
.trainstatus{
|
||||||
left:0;
|
left:48%;
|
||||||
top:0;
|
top:0;
|
||||||
width:fit-content;
|
width:fit-content;
|
||||||
width:-webkit-fit-content;
|
width:-webkit-fit-content;
|
||||||
|
@ -1071,7 +1071,7 @@ export default {
|
|||||||
width: 503px;
|
width: 503px;
|
||||||
transform: translateX(-503px);
|
transform: translateX(-503px);
|
||||||
transition: all 0.4s;
|
transition: all 0.4s;
|
||||||
z-index: 9;
|
z-index: 35;
|
||||||
&.active{
|
&.active{
|
||||||
transform: translateX(0px);
|
transform: translateX(0px);
|
||||||
}
|
}
|
||||||
|
@ -393,6 +393,7 @@ export default {
|
|||||||
this.$store.dispatch('training/setPrdType', '04');
|
this.$store.dispatch('training/setPrdType', '04');
|
||||||
this.$store.dispatch('training/setRoles', 'DRIVER');
|
this.$store.dispatch('training/setRoles', 'DRIVER');
|
||||||
this.jl3dmaintainershow = false;
|
this.jl3dmaintainershow = false;
|
||||||
|
this.hidepanel();
|
||||||
break;
|
break;
|
||||||
case 'MAINTAINER':
|
case 'MAINTAINER':
|
||||||
this.$store.dispatch('training/setPrdType', '');
|
this.$store.dispatch('training/setPrdType', '');
|
||||||
@ -484,7 +485,7 @@ export default {
|
|||||||
if (this.$store.state.training.prdType == '04') {
|
if (this.$store.state.training.prdType == '04') {
|
||||||
this.panelShow = false;
|
this.panelShow = false;
|
||||||
this.drivingShow = true;
|
this.drivingShow = true;
|
||||||
this.$refs.Jl3dDrive.show(this.mapId, this.group);
|
this.$refs.Jl3dDrive.show(this.mapId, this.group,34);
|
||||||
} else {
|
} else {
|
||||||
const routeData = this.$router.resolve({
|
const routeData = this.$router.resolve({
|
||||||
path:'/jlmap3d/sandbox',
|
path:'/jlmap3d/sandbox',
|
||||||
|
@ -244,7 +244,7 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
<style>
|
<style>
|
||||||
.schema {
|
.schema {
|
||||||
z-index: 34;
|
z-index: 8;
|
||||||
display: inline;
|
display: inline;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 5px;
|
right: 5px;
|
||||||
|
Loading…
Reference in New Issue
Block a user