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-01-20 15:53:23 +08:00
commit 25b6ad4ca8
7 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jlmap3d/edit/testEditorModel/StationStandList.js
View File

@ -92,19 +92,25 @@ export function StationStandList() {
// console.log(jlmap3ddata); // console.log(jlmap3ddata);
let jlmapstationdata = jlmapdata.stationList; let jlmapstationdata = jlmapdata.stationList;
let jlmapstanddata = jlmapdata.stationStandList; let jlmapstanddata = jlmapdata.stationStandList;
//
// console.log(jlmapstationdata);
//
// console.log(standsdata);
// console.log(jlmapstationdata); // console.log(jlmapstationdata);
for(let i=0;i<jlmapstationdata.length;i++){ for(let i=0;i<jlmapstationdata.length;i++){
if(jlmapstationdata[i].visible == false || jlmapstationdata[i].depot == true){ if(jlmapstationdata[i].visible == false || jlmapstationdata[i].depot == true){
jlmapstationdata.splice(i,1); jlmapstationdata.splice(i,1);
i--; i--;
}else{ }else{
// console.log(jlmapstationdata[i]);
// console.log(standsdata[i]);
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(otherStation); // console.log(otherStation);
// console.log(standsdata); // console.log(standsdata);
console.log(assetloader.modellist); // console.log(assetloader.modellist);
let stations = jlmap3ddata.stationstandlist.list; let stations = jlmap3ddata.stationstandlist.list;
let num; let num;
let num2; let num2;
@ -150,6 +156,7 @@ export function StationStandList() {
section : jlmapstanddata[j].standTrackCode, section : jlmapstanddata[j].standTrackCode,
inside : jlmapstanddata[j].inside, inside : jlmapstanddata[j].inside,
}; };
stands.push(changestand); stands.push(changestand);
} }
} }

13
src/jlmap3d/main/loaders/DriverLoadNew.js
View File

@ -71,17 +71,16 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist,
let standsdata = JSON.parse(netdata.stands); let standsdata = JSON.parse(netdata.stands);
let psddata = data.psdList; let psddata = data.psdList;
if(standsdata[0].inside == undefined){ for(let i=0;i<standsdata.length;i++){
for(let i=0;i<standsdata.length;i++){ for(let j=0;j<mapdata.stationStandList.length;j++){
for(let j=0;j<mapdata.stationStandList.length;j++){ if(standsdata[i].code == mapdata.stationStandList[j].stationCode){
if(standsdata[i].code == mapdata.stationStandList[j].stationCode){ standsdata[i].inside = mapdata.stationStandList[j].inside;
standsdata[i].inside = mapdata.stationStandList[j].inside; j = mapdata.stationStandList.length;
j = mapdata.stationStandList.length;
}
} }
} }
} }
assetloader.setModelListOver(JSON.parse(netdata.assets).sceneAssetList,0,JSON.parse(netdata.assets).others); assetloader.setModelListOver(JSON.parse(netdata.assets).sceneAssetList,0,JSON.parse(netdata.assets).others);
assetloader.assetPromiseOver(sceneload) assetloader.assetPromiseOver(sceneload)

5
src/jlmap3d/main/loaders/SimulationLoadNew.js
View File

@ -66,17 +66,16 @@ 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 = mapdata.psdList; let psddata = mapdata.psdList;
console.log(mapdata);
if(standsdata[0].inside == undefined){
for(let i=0;i<standsdata.length;i++){ for(let i=0;i<standsdata.length;i++){
for(let j=0;j<mapdata.stationStandList.length;j++){ for(let j=0;j<mapdata.stationStandList.length;j++){
if(standsdata[i].code == mapdata.stationStandList[j].stationCode){ if(standsdata[i].code == mapdata.stationStandList[j].stationCode){
standsdata[i].inside = mapdata.stationStandList[j].inside; standsdata[i].inside = mapdata.stationStandList[j].inside;
j = mapdata.stationStandList.length; j = mapdata.stationStandList.length;
} }
} }
} }
}
assetloader.setModelListOver(JSON.parse(netdata.assets).sceneAssetList,1.3,JSON.parse(netdata.assets).others); assetloader.setModelListOver(JSON.parse(netdata.assets).sceneAssetList,1.3,JSON.parse(netdata.assets).others);
// assetloader.setmodellistnew(netdata.assets); // assetloader.setmodellistnew(netdata.assets);

5
src/jlmap3d/main/newmodel/StationStandListN.js
View File

@ -203,8 +203,7 @@ export function StationStandListN() {
let newstationstand = new StationStandModel(standsdata[i]); let newstationstand = new StationStandModel(standsdata[i]);
newstationstand.code = standsdata[i].code; newstationstand.code = standsdata[i].code;
newstationstand.name = standsdata[i].name; newstationstand.name = standsdata[i].name;
newstationstand.type = "station"; newstationstand.type = "station";
@ -372,7 +371,7 @@ export function StationStandListN() {
let textmaterial = new THREE.MeshBasicMaterial( { side: THREE.DoubleSide,map:textt ,transparent: true} ); let textmaterial = new THREE.MeshBasicMaterial( { side: THREE.DoubleSide,map:textt ,transparent: true} );
let textplane = new THREE.Mesh( textgeometry, textmaterial ); let textplane = new THREE.Mesh( textgeometry, textmaterial );
textplane.name = standsdata[i].code; textplane.name = standsdata[i].code;
console.log("sss");
textplane.position.y = 70; textplane.position.y = 70;
textplane.rotation.x = Math.PI/2; textplane.rotation.x = Math.PI/2;
textplane.position.z = 80; textplane.position.z = 80;

2
src/jmapNew/theme/chengdu_03/menus/menuButton.vue
View File

@ -690,7 +690,7 @@ export default {
} }
} else { } else {
this.clearOperate(); this.clearOperate();
this.$messageBox('请先切换到站控或紧急站控'); // this.$messageBox('请先切换到站控或紧急站控');
} }
} }
} }

5
src/jmapNew/theme/chengdu_03/menus/menuSection.vue
View File

@ -49,11 +49,6 @@ export default {
menu: [], menu: [],
menuNormal: { menuNormal: {
Local: [ Local: [
{
label: '区故解',
handler: this.fault,
cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
}
], ],
Center: [ Center: [
{ {

8
src/views/newMap/displayNew/demon/planSchedule.vue
View File

@ -35,6 +35,7 @@ import { EventBus } from '@/scripts/event-bus';
import { getByGroupStationList, getPassengerHistoryList } from '@/api/jmap/map'; import { getByGroupStationList, getPassengerHistoryList } from '@/api/jmap/map';
import { loadRunPlanData } from '@/utils/loaddata'; import { loadRunPlanData } from '@/utils/loaddata';
import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp'; import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
import { getSimulationInfoNew } from '@/api/simulation';
import { getToken } from '@/utils/auth'; import { getToken } from '@/utils/auth';
export default { export default {
name: 'PlanSchedule', name: 'PlanSchedule',
@ -188,8 +189,11 @@ export default {
if (this.$route.query.group) { if (this.$route.query.group) {
// 获取排序的车站列表 // 获取排序的车站列表
getByGroupStationList(this.$route.query.group).then(response => { getByGroupStationList(this.$route.query.group).then(response => {
this.$store.dispatch('runPlan/setStations', response.data).then(async() => { getSimulationInfoNew(this.$route.query.group).then(res => {
loadRunPlanData(this.$route.query.group, this.dataError); this.$store.dispatch('runPlan/setRunPlanInfo', res.data.runPlan);
this.$store.dispatch('runPlan/setStations', response.data).then(async() => {
loadRunPlanData(this.$route.query.group, this.dataError);
});
}); });
}).catch(() => { }).catch(() => {
this.$messageBox(this.$t('display.schema.getStationListFail')); this.$messageBox(this.$t('display.schema.getStationListFail'));