修改三维沙盘哈尔滨静态文件,修改elmentui站台列表bug,修改影藏列车信息bug
This commit is contained in:
parent
41319d9543
commit
debd9f54d0
@ -272,13 +272,14 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
this.showtrainmsg = function(showtype){
|
this.showtrainmsg = function(showtype){
|
||||||
|
console.log(trainlisttest);
|
||||||
if(showtype == "show"){
|
if(showtype == "show"){
|
||||||
for(let st=0;st<trainlisttest.textlist.length;st++){
|
for(let st=0;st<trainlisttest.textlist.length;st++){
|
||||||
trainlisttest.list[trainlisttest.textlist[st].tcode].children[0].add(trainlisttest.textlist[st]);
|
trainlisttest.list[trainlisttest.textlist[st].name].children[0].add(trainlisttest.textlist[st]);
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
for(let st=0;st<trainlisttest.textlist.length;st++){
|
for(let st=0;st<trainlisttest.textlist.length;st++){
|
||||||
trainlisttest.list[trainlisttest.textlist[st].tcode].children[0].remove(trainlisttest.textlist[st]);
|
trainlisttest.list[trainlisttest.textlist[st].name].children[0].remove(trainlisttest.textlist[st]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -69,7 +69,7 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
|
|||||||
let signaldata = JSON.parse(netdata.signals);
|
let signaldata = JSON.parse(netdata.signals);
|
||||||
let standsdata = JSON.parse(netdata.stands);
|
let standsdata = JSON.parse(netdata.stands);
|
||||||
let psddata = data.psdList;
|
let psddata = data.psdList;
|
||||||
console.log(netdata.assets);
|
|
||||||
assetloader.setModelListOver(JSON.parse(netdata.assets).sceneAssetList);
|
assetloader.setModelListOver(JSON.parse(netdata.assets).sceneAssetList);
|
||||||
// assetloader.setmodellistnew(netdata.assets);
|
// assetloader.setmodellistnew(netdata.assets);
|
||||||
|
|
||||||
|
@ -47,8 +47,6 @@ export default {
|
|||||||
|
|
||||||
},
|
},
|
||||||
showtrain(){
|
showtrain(){
|
||||||
console.log("showtrain");
|
|
||||||
|
|
||||||
if(this.bt2name == this.$t('jlmap3d.trainInfoDisplay')){
|
if(this.bt2name == this.$t('jlmap3d.trainInfoDisplay')){
|
||||||
this.bt2name = this.$t('jlmap3d.trainInfoHidden');
|
this.bt2name = this.$t('jlmap3d.trainInfoHidden');
|
||||||
this.$emit('showtrainmsg',"unshow");
|
this.$emit('showtrainmsg',"unshow");
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<el-tabs style="margin:5px" v-model="activeName">
|
<el-tabs style="margin:5px" v-model="activeName">
|
||||||
|
|
||||||
<el-tab-pane class="displayscrol" label="车站" name="station">
|
<el-tab-pane class="displayscrol" label="车站" name="station">
|
||||||
<el-scrollbar ref="stationscrol" class="default-scrollbar" wrap-class="default-scrollbar__wrap">
|
<div class="scrollbarlist">
|
||||||
<el-form ref="form" label-width="130px" size="mini">
|
<el-form ref="form" label-width="130px" size="mini">
|
||||||
<div class="displaylist" v-for="(station,index) in stationlist" @click="stationselect(index,station)" v-show="station.type==stationtype" >
|
<div class="displaylist" v-for="(station,index) in stationlist" @click="stationselect(index,station)" v-show="station.type==stationtype" >
|
||||||
<div >
|
<div >
|
||||||
@ -12,11 +12,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-scrollbar>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
|
|
||||||
<el-tab-pane class="displayscrol" label="列车" name="train">
|
<el-tab-pane class="displayscrol" label="列车" name="train">
|
||||||
<el-scrollbar ref="trainscrol" style="height:100%;margin-bottom:1px">
|
<div class="scrollbarlist">
|
||||||
<el-form ref="form" label-width="120px" size="mini">
|
<el-form ref="form" label-width="120px" size="mini">
|
||||||
<div class="displaylist" v-for="(train,index) in trainlist" @click="trainselect(index,train)" v-show="train.dispose==traintype" >
|
<div class="displaylist" v-for="(train,index) in trainlist" @click="trainselect(index,train)" v-show="train.dispose==traintype" >
|
||||||
<div>
|
<div>
|
||||||
@ -24,7 +24,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-scrollbar>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
|
|
||||||
|
|
||||||
@ -66,12 +66,7 @@ export default {
|
|||||||
filterText(val) {
|
filterText(val) {
|
||||||
this.$refs.tree2.filter(val);
|
this.$refs.tree2.filter(val);
|
||||||
},
|
},
|
||||||
'stationlist.length':function(newVal){
|
|
||||||
this.$refs.stationscrol.update()
|
|
||||||
},
|
|
||||||
'trainlist.length':function(newVal){
|
|
||||||
this.$refs.trainscrol.update()
|
|
||||||
}
|
|
||||||
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
@ -125,6 +120,15 @@ export default {
|
|||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.scrollbarlist{
|
||||||
|
height:100%;
|
||||||
|
width:100%;
|
||||||
|
top:10%;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.default-scrollbar {
|
.default-scrollbar {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 299 KiB After Width: | Height: | Size: 446 KiB |
Binary file not shown.
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 71 KiB |
Binary file not shown.
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 114 KiB |
Loading…
Reference in New Issue
Block a user