diff --git a/src/jlmap3d/edit/connect/newgetmodels.js b/src/jlmap3d/edit/connect/newgetmodels.js index 138b66af3..70501918e 100644 --- a/src/jlmap3d/edit/connect/newgetmodels.js +++ b/src/jlmap3d/edit/connect/newgetmodels.js @@ -98,16 +98,16 @@ export function getmodels(data) { let backgroundmodel = { id:"1010", - name:"xiansuidao", + name:"nbsuidao", deviceType:"suidaobg", - type:"xiansuidao", + type:"nbsuidao", picUrl:"", - assetUrl:"../../static/model/suidao/xiansuidao.FBX" + assetUrl:"../../static/model/suidao/nbsuidao.FBX" } assets.push(backgroundmodel); models.assets = assets; - models.stationtexture = "xian3"; + models.stationtexture = "nb1"; models.istexture = true; console.log(models); postmap.assets = JSON.stringify(models); diff --git a/src/jlmap3d/jl3ddevice/component/moveanimate.js b/src/jlmap3d/jl3ddevice/component/moveanimate.js index 04a593d56..b66cfaf10 100644 --- a/src/jlmap3d/jl3ddevice/component/moveanimate.js +++ b/src/jlmap3d/jl3ddevice/component/moveanimate.js @@ -231,14 +231,14 @@ export function Moveanimate(main){ pointsoff.push(new THREE.Vector3(modelon.position.x,modelon.position.y,modelon.position.z)); // if(i == 0){ - scope.initanimate(scope.animatelist[switchmodel.animacode+"on"],modelon,switchmodel.animacode+modelon.name+"on",pointson,0.01,true,i); - scope.initanimate(scope.animatelist[switchmodel.animacode+"off"],modelon,switchmodel.animacode+modelon.name+"off",pointsoff,0.01,true,leni-i-1); + scope.initanimate(scope.animatelist[switchmodel.animacode+"on"],modelon,switchmodel.animacode+modelon.name+"on",pointson,0.03,true,i); + scope.initanimate(scope.animatelist[switchmodel.animacode+"off"],modelon,switchmodel.animacode+modelon.name+"off",pointsoff,0.03,true,leni-i-1); // }else if((i+1)=0;an--){ actions["traindoor"].top[an].stop(); } @@ -216,6 +218,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta actions["traindoor"].down[an].play(); } }else if(trainmodel.openright == "1"){ + updatedoorlight(true,false); trainmodel.openright = "0"; for(let an=actions["traindoor"].down.length-1;an>=0;an--){ actions["traindoor"].down[an].stop(); @@ -429,6 +432,8 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta } }else if(trainmodel.openleft != data.open && data.open == "1"){ trainmodel.openleft = "1"; + console.log(data); + updatedoorlight(true,false); for(let an=actions["traindoor"].top.length-1;an>=0;an--){ actions["traindoor"].top[an].reset(); actions["traindoor"].top[an].time = 0; @@ -449,6 +454,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta } } else if (trainmodel.openright != data.open && data.open == '1') { trainmodel.openright = "1"; + updatedoorlight(false,true); for(let an=actions["traindoor"].down.length-1;an>=0;an--){ actions["traindoor"].down[an].reset(); actions["traindoor"].down[an].time = 0; @@ -673,6 +679,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta } function simulationreset(data){ + updatedoorlight(false,false); for(let i=0;i73){ - this.movex=75+"px"; + if(this.moveheight<86&&this.moveheight>73){ + this.movex=72+"px"; this.move = 0; }else if(this.moveheight<0&&this.moveheight>159){ }else{ - if(this.moveheight>=82){ + if(this.moveheight>=86){ this.move = -(this.moveheight-82)/65; } if(this.moveheight<=73){ @@ -229,7 +229,7 @@ } this.movex=this.moveheight-7+"px"; if(this.moveheight>=145){ - this.movex= 153+"px"; + this.movex= 150+"px"; this.move = -2; } diff --git a/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue index a0d17bfbe..98f5cb772 100644 --- a/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue +++ b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue @@ -25,7 +25,7 @@
- +
{{ $t('jlmap3d.closeLeftDoor') }}
@@ -116,7 +116,7 @@
{{ $t('jlmap3d.openRightDoor') }}
- +
{{ $t('jlmap3d.closeRightDoor') }}
@@ -186,7 +186,9 @@ runLevel:null, cbtcbuttonimg:"/static/jl3d/control/green.png", doorleftstatus:false, - doorleftstatus:false, + doorrightstatus:false, + doorleftimg:"/static/jl3d/control/green.png", + doorrightimg:"/static/jl3d/control/green.png", } }, @@ -207,6 +209,7 @@ }, mounted() { window.updatabuttonlight = this.updatabuttonlight; + window.updatedoorlight = this.updatedoorlight; }, beforeDestroy() { @@ -372,14 +375,33 @@ // console.log(netdata); }); }, + updatedoorlight: function (doorleftmode,doorrightmode){ + if(doorleftmode){ + if(doorleftmode == true){ + this.doorleftimg = this.greenlimg; + }else{ + this.doorleftimg = this.greenimg; + } + } + if(doorrightmode){ + if(doorrightmode == true){ + this.doorrightimg = this.greenlimg; + }else{ + this.doorrightimg = this.greenimg; + } + } + + }, dloclick: function (e){ trainSimulationDoorControl(this.group,this.groupNum,false,true).then(netdata => { // console.log(netdata); }); }, dlcclick: function (e){ + trainSimulationDoorControl(this.group,this.groupNum,false,false).then(netdata => { // console.log(netdata); + this.doorleftimg = this.greenimg; }); }, @@ -391,6 +413,7 @@ drcclick: function (e){ trainSimulationDoorControl(this.group,this.groupNum,true,false).then(netdata => { // console.log(netdata); + this.doorrightimg = this.greenimg; }); }, atoaclick: function (e){ diff --git a/static/model/station/fuzhou.FBX b/static/model/station/fuzhou.FBX index a6d438de3..8bf389b6f 100644 Binary files a/static/model/station/fuzhou.FBX and b/static/model/station/fuzhou.FBX differ diff --git a/static/model/station/station3.FBX b/static/model/station/station3.FBX index 6e91bdaed..3b468ffcd 100644 Binary files a/static/model/station/station3.FBX and b/static/model/station/station3.FBX differ diff --git a/static/model/station/waicestation.FBX b/static/model/station/waicestation.FBX index 5cc9411c9..53986c315 100644 Binary files a/static/model/station/waicestation.FBX and b/static/model/station/waicestation.FBX differ diff --git a/static/model/suidao/xiansuida1o.FBX b/static/model/suidao/xiansuida1o.FBX deleted file mode 100644 index a209bc57d..000000000 Binary files a/static/model/suidao/xiansuida1o.FBX and /dev/null differ diff --git a/static/model/suidao/xiansuidao.FBX b/static/model/suidao/xiansuidao.FBX index b45c4ec76..d413cd29f 100644 Binary files a/static/model/suidao/xiansuidao.FBX and b/static/model/suidao/xiansuidao.FBX differ diff --git a/static/texture/heb/haerbinlist.jpg b/static/texture/heb/haerbinlist.jpg index a0f4d965d..d6a468721 100644 Binary files a/static/texture/heb/haerbinlist.jpg and b/static/texture/heb/haerbinlist.jpg differ diff --git a/static/texture/heb/haerbinlistold.jpg b/static/texture/heb/haerbinlistold.jpg new file mode 100644 index 000000000..a0f4d965d Binary files /dev/null and b/static/texture/heb/haerbinlistold.jpg differ diff --git a/static/texture/nb1/Station11231.jpg b/static/texture/nb1/Station11231.jpg new file mode 100644 index 000000000..a0d813bd1 Binary files /dev/null and b/static/texture/nb1/Station11231.jpg differ diff --git a/static/texture/nb1/Station12421.jpg b/static/texture/nb1/Station12421.jpg new file mode 100644 index 000000000..4a1e8358a Binary files /dev/null and b/static/texture/nb1/Station12421.jpg differ diff --git a/static/texture/nb1/Station1533.jpg b/static/texture/nb1/Station1533.jpg new file mode 100644 index 000000000..6e7653038 Binary files /dev/null and b/static/texture/nb1/Station1533.jpg differ diff --git a/static/texture/nb1/Station16356.jpg b/static/texture/nb1/Station16356.jpg new file mode 100644 index 000000000..afc0c2d7a Binary files /dev/null and b/static/texture/nb1/Station16356.jpg differ diff --git a/static/texture/nb1/Station18678.jpg b/static/texture/nb1/Station18678.jpg new file mode 100644 index 000000000..8c822ec9d Binary files /dev/null and b/static/texture/nb1/Station18678.jpg differ diff --git a/static/texture/nb1/Station19817.jpg b/static/texture/nb1/Station19817.jpg new file mode 100644 index 000000000..27dbdac71 Binary files /dev/null and b/static/texture/nb1/Station19817.jpg differ diff --git a/static/texture/nb1/Station23567.jpg b/static/texture/nb1/Station23567.jpg new file mode 100644 index 000000000..91cb44621 Binary files /dev/null and b/static/texture/nb1/Station23567.jpg differ diff --git a/static/texture/nb1/Station24903.jpg b/static/texture/nb1/Station24903.jpg new file mode 100644 index 000000000..07b82a170 Binary files /dev/null and b/static/texture/nb1/Station24903.jpg differ diff --git a/static/texture/nb1/Station26416.jpg b/static/texture/nb1/Station26416.jpg new file mode 100644 index 000000000..6fecb3331 Binary files /dev/null and b/static/texture/nb1/Station26416.jpg differ diff --git a/static/texture/nb1/Station27207.jpg b/static/texture/nb1/Station27207.jpg new file mode 100644 index 000000000..f2ca22796 Binary files /dev/null and b/static/texture/nb1/Station27207.jpg differ diff --git a/static/texture/nb1/Station28032.jpg b/static/texture/nb1/Station28032.jpg new file mode 100644 index 000000000..3bc6ef91a Binary files /dev/null and b/static/texture/nb1/Station28032.jpg differ diff --git a/static/texture/nb1/Station28958.jpg b/static/texture/nb1/Station28958.jpg new file mode 100644 index 000000000..dfcd0a6f3 Binary files /dev/null and b/static/texture/nb1/Station28958.jpg differ diff --git a/static/texture/nb1/Station30520.jpg b/static/texture/nb1/Station30520.jpg new file mode 100644 index 000000000..d254b1f0a Binary files /dev/null and b/static/texture/nb1/Station30520.jpg differ diff --git a/static/texture/nb1/Station32955.jpg b/static/texture/nb1/Station32955.jpg new file mode 100644 index 000000000..88d659ced Binary files /dev/null and b/static/texture/nb1/Station32955.jpg differ diff --git a/static/texture/nb1/Station38286.jpg b/static/texture/nb1/Station38286.jpg new file mode 100644 index 000000000..4fca253a2 Binary files /dev/null and b/static/texture/nb1/Station38286.jpg differ diff --git a/static/texture/nb1/Station38674.jpg b/static/texture/nb1/Station38674.jpg new file mode 100644 index 000000000..57e06da7a Binary files /dev/null and b/static/texture/nb1/Station38674.jpg differ diff --git a/static/texture/nb1/Station44173.jpg b/static/texture/nb1/Station44173.jpg new file mode 100644 index 000000000..298f3788d Binary files /dev/null and b/static/texture/nb1/Station44173.jpg differ diff --git a/static/texture/nb1/Station63100.jpg b/static/texture/nb1/Station63100.jpg new file mode 100644 index 000000000..5ad5043ec Binary files /dev/null and b/static/texture/nb1/Station63100.jpg differ diff --git a/static/texture/nb1/Station69378.jpg b/static/texture/nb1/Station69378.jpg new file mode 100644 index 000000000..0bb07f545 Binary files /dev/null and b/static/texture/nb1/Station69378.jpg differ diff --git a/static/texture/nb1/Station72310.jpg b/static/texture/nb1/Station72310.jpg new file mode 100644 index 000000000..6037427ed Binary files /dev/null and b/static/texture/nb1/Station72310.jpg differ diff --git a/static/texture/nb1/Station72764.jpg b/static/texture/nb1/Station72764.jpg new file mode 100644 index 000000000..ff6e2fc4c Binary files /dev/null and b/static/texture/nb1/Station72764.jpg differ diff --git a/static/texture/nb1/Station75414.jpg b/static/texture/nb1/Station75414.jpg new file mode 100644 index 000000000..bb54f6ea9 Binary files /dev/null and b/static/texture/nb1/Station75414.jpg differ diff --git a/static/texture/nb1/Station75494.jpg b/static/texture/nb1/Station75494.jpg new file mode 100644 index 000000000..11002d948 Binary files /dev/null and b/static/texture/nb1/Station75494.jpg differ diff --git a/static/texture/nb1/Station75703.jpg b/static/texture/nb1/Station75703.jpg new file mode 100644 index 000000000..019359b10 Binary files /dev/null and b/static/texture/nb1/Station75703.jpg differ diff --git a/static/texture/nb1/Station78392.jpg b/static/texture/nb1/Station78392.jpg new file mode 100644 index 000000000..319573ca1 Binary files /dev/null and b/static/texture/nb1/Station78392.jpg differ diff --git a/static/texture/nb1/Station81700.jpg b/static/texture/nb1/Station81700.jpg new file mode 100644 index 000000000..f14321a29 Binary files /dev/null and b/static/texture/nb1/Station81700.jpg differ diff --git a/static/texture/nb1/Station84098.jpg b/static/texture/nb1/Station84098.jpg new file mode 100644 index 000000000..5d694525a Binary files /dev/null and b/static/texture/nb1/Station84098.jpg differ diff --git a/static/texture/nb1/Station86112.jpg b/static/texture/nb1/Station86112.jpg new file mode 100644 index 000000000..483ed9f7d Binary files /dev/null and b/static/texture/nb1/Station86112.jpg differ diff --git a/static/texture/nb1/Station99584.jpg b/static/texture/nb1/Station99584.jpg new file mode 100644 index 000000000..c7c1c849a Binary files /dev/null and b/static/texture/nb1/Station99584.jpg differ diff --git a/static/texture/nb1/devicelist.jpg b/static/texture/nb1/devicelist.jpg new file mode 100644 index 000000000..027ca487b Binary files /dev/null and b/static/texture/nb1/devicelist.jpg differ diff --git a/static/texture/nb1/nb1list.jpg b/static/texture/nb1/nb1list.jpg new file mode 100644 index 000000000..aa30db6a8 Binary files /dev/null and b/static/texture/nb1/nb1list.jpg differ diff --git a/static/texture/nb1/pingbimen.png b/static/texture/nb1/pingbimen.png new file mode 100644 index 000000000..30880b6d1 Binary files /dev/null and b/static/texture/nb1/pingbimen.png differ diff --git a/static/texture/xian3/xian3list.jpg b/static/texture/xian3/xian3list.jpg index 3b41ca721..9abd0688c 100644 Binary files a/static/texture/xian3/xian3list.jpg and b/static/texture/xian3/xian3list.jpg differ diff --git a/static/texture/xian3/xian3listold.jpg b/static/texture/xian3/xian3listold.jpg new file mode 100644 index 000000000..3b41ca721 Binary files /dev/null and b/static/texture/xian3/xian3listold.jpg differ diff --git a/static/texture/xian3/xian3listtest.jpg b/static/texture/xian3/xian3listtest.jpg deleted file mode 100644 index d21586e2d..000000000 Binary files a/static/texture/xian3/xian3listtest.jpg and /dev/null differ