diff --git a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js index e49ebd793..00a38b578 100644 --- a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js +++ b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js @@ -206,29 +206,15 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) { }); } } + let changeelement = document.getElementById('jl3d'); + window.addEventListener('resize', () => + onresize() + , false) + let onresize = function () { - window.onresize = function () { - - // if(scope.windowstatus){ - // changeelement.style.width = '50%'; - // changeelement.style.height = '50%'; - // changeelement.style.top = '25%'; - // scope.windowstatus = false; - // scope.updatewindowstatus('0'); - // }else{ - scope.camera.aspect = scope.dom.offsetWidth / scope.dom.offsetHeight; + scope.camera.aspect = changeelement.offsetWidth / changeelement.offsetHeight; scope.camera.updateProjectionMatrix(); - scope.renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight); - - if(scope.windowstatus == "0"){ - let changeelement = document.getElementById('jl3d'); - changeelement.style.width = '100%'; - changeelement.style.height = '100%'; - changeelement.style.top = '0'; - scope.camera.aspect = window.innerWidth / scope.dom.offsetHeight; - scope.camera.updateProjectionMatrix(); - scope.renderer.setSize(window.innerWidth, scope.dom.offsetHeight); - } + scope.renderer.setSize(changeelement.offsetWidth, changeelement.offsetHeight); } diff --git a/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js b/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js index cdfbf9ada..8e9dbd4bf 100644 --- a/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js +++ b/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js @@ -73,6 +73,10 @@ export function TrainConnect(trafficTrain,deviceaction,toptrain,routegroup,passe // jl3d.updateNowLeaveData("down",data.body.out); // } } + + if(data.type == "TRAIN_PIS"){ + console.log(data); + } if(data.type == "TRAIN_PFI_NUM"){ trafficTrain.trainList = []; diff --git a/src/views/jlmap3d/device/jl3ddevice.vue b/src/views/jlmap3d/device/jl3ddevice.vue index e5d1a49fb..5faac32d5 100644 --- a/src/views/jlmap3d/device/jl3ddevice.vue +++ b/src/views/jlmap3d/device/jl3ddevice.vue @@ -4,7 +4,7 @@ - +
初始化 @@ -16,7 +16,7 @@