diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js index 5c574df96..b71194943 100644 --- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js +++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js @@ -103,7 +103,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta return; } if(data.type == "Train_Hmi_3D"){ - // console.log(data.body); + console.log(data.body); updatestatus(data.body); // if(data.body.trust){ diff --git a/src/jlmap3d/jl3dsimulation/jlmap3d.js b/src/jlmap3d/jl3dsimulation/jlmap3d.js index ed3f45359..596b4088e 100644 --- a/src/jlmap3d/jl3dsimulation/jlmap3d.js +++ b/src/jlmap3d/jl3dsimulation/jlmap3d.js @@ -108,7 +108,6 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) { getPublishMapDetail(skinCode).then(data => { let mapnetdata = data.data; getPublish3dMapDetail(skinCode).then(netdata => { - console.log(netdata); let assetsdata = JSON.parse(netdata.data.sections); if(assetsdata.link){ scope.datatype = "old"; diff --git a/src/jlmap3d/main/loaders/SimulationLoadNew.js b/src/jlmap3d/main/loaders/SimulationLoadNew.js index 0ecf66d20..5f07c0902 100644 --- a/src/jlmap3d/main/loaders/SimulationLoadNew.js +++ b/src/jlmap3d/main/loaders/SimulationLoadNew.js @@ -143,6 +143,13 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce }); }) .then(function(data){ + camera.position.x = stationstandlist.group.children[0].position.x; + camera.position.y = stationstandlist.group.children[0].position.y+500; + camera.position.z = stationstandlist.group.children[0].position.z+800; + //更新相机方向 + controls.target = new THREE.Vector3(stationstandlist.group.children[0].position.x,stationstandlist.group.children[0].position.y,stationstandlist.group.children[0].position.z); + controls.upmodeldirect(stationstandlist,trainlisttest); + controls.update(); backdata.loaderdata(sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails); scope.Subscribe.updatamap(sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails,scope.materiallist,scope.actions,scope.sceneload); diff --git a/src/views/jlmap3d/simulation/show/menu.vue b/src/views/jlmap3d/simulation/show/menu.vue index e3906791a..4ab785ff6 100644 --- a/src/views/jlmap3d/simulation/show/menu.vue +++ b/src/views/jlmap3d/simulation/show/menu.vue @@ -144,6 +144,7 @@ export default { width:80%; height:30px; margin:0px 0px 50px 0px; + cursor:pointer; } .modelpic{ left:0; diff --git a/src/views/newMap/displayNew/demon/scheduling.vue b/src/views/newMap/displayNew/demon/scheduling.vue index 3955c9ad3..22a6c4800 100644 --- a/src/views/newMap/displayNew/demon/scheduling.vue +++ b/src/views/newMap/displayNew/demon/scheduling.vue @@ -67,7 +67,7 @@ import EditTable from '@/views/components/editTable/index'; // 排班计划弹窗列表 export default { - name: 'AddQuest', + name: 'Scheduling', components: { EditTable }, diff --git a/src/views/newMap/displayNew/demon/schedulingView.vue b/src/views/newMap/displayNew/demon/schedulingView.vue new file mode 100644 index 000000000..c88bb58c6 --- /dev/null +++ b/src/views/newMap/displayNew/demon/schedulingView.vue @@ -0,0 +1,302 @@ + + + + diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index b452e4a09..1eda06e67 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -19,6 +19,7 @@ @jl3dstation="jl3dstation" @devicemodel="devicemodel" @showScheduling="showScheduling" + @schedulingView="schedulingView" @switchStationMode="switchStationMode" /> +