Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

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);

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+"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.01,true,leni-i-1);
+        scope.initanimate(scope.animatelist[switchmodel.animacode+"off"],modelon,switchmodel.animacode+modelon.name+"off",pointsoff,0.03,true,leni-i-1);
         // }else if((i+1)<leni){
-        //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"on",pointson,0.01,true,switchmodel.animacode+orderdata[i+1].name+"on");
+        //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"on",pointson,0.03,true,switchmodel.animacode+orderdata[i+1].name+"on");
-        //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"off",pointsoff,0.01,true,switchmodel.animacode+orderdata[i-1].name+"off");
+        //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"off",pointsoff,0.03,true,switchmodel.animacode+orderdata[i-1].name+"off");
         // }else{
-        //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"on",pointson,0.01,true);
+        //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"on",pointson,0.03,true);
-        //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"off",pointsoff,0.01,true,switchmodel.animacode+orderdata[i-1].name+"off");
+        //   scope.initanimate(modelon,switchmodel.animacode+modelon.name+"off",pointsoff,0.03,true,switchmodel.animacode+orderdata[i-1].name+"off");
         // }
 
         // if(switchmodel.children[i].name == "xinpian"){

src/jlmap3d/jl3ddevice/jl3ddeviceNew.js

@@ -148,7 +148,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 		scope.modelmanager.loadpromise(Staticmodel, scope.mixers).then(function (data) {
 			moveanima.initlistnew(scope.modelmanager.switchmodel.mesh);
 			daochamodel = scope.modelmanager.switchmodel.mesh.getObjectByName("DAOCHA");
-			console.log(scope.stationtexture);
 			if(scope.stationtexture["stationlist"]){
 				scope.modelmanager.standmodel.mesh.getObjectByName("zhantailiebiao").material.map =scope.stationtexture["stationlist"];
 				scope.modelmanager.standmodel.mesh.getObjectByName("zhantailiebiao").material.map.needsUpdate = true;

src/jlmap3d/jl3ddevice/standtextureload.js

@@ -63,6 +63,42 @@ export function Standtextureload(jlmap3dedit,assettype){
      }
    }
 
+   if(assettype.stationtexture == "nb1"){
+     if(jlmap3dedit.stationtexture){
+       setstationtexture(jlmap3dedit.stationtexture,"stationlist",'../../static/texture/nb1/devicelist.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"pingbimen",'../../static/texture/nb1/pingbimen.png');
+
+       setstationtexture(jlmap3dedit.stationtexture,"Station1533",'../../static/texture/nb1/Station1533.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station11231",'../../static/texture/nb1/Station11231.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station12421",'../../static/texture/nb1/Station12421.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station16356",'../../static/texture/nb1/Station16356.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station18678",'../../static/texture/nb1/Station18678.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station19817",'../../static/texture/nb1/Station19817.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station23567",'../../static/texture/nb1/Station23567.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station24903",'../../static/texture/nb1/Station24903.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station26416",'../../static/texture/nb1/Station26416.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station27207",'../../static/texture/nb1/Station27207.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station28032",'../../static/texture/nb1/Station28032.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station28958",'../../static/texture/nb1/Station28958.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station30520",'../../static/texture/nb1/Station30520.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station32955",'../../static/texture/nb1/Station32955.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station38286",'../../static/texture/nb1/Station38286.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station38674",'../../static/texture/nb1/Station38674.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station44173",'../../static/texture/nb1/Station44173.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station63100",'../../static/texture/nb1/Station63100.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station69378",'../../static/texture/nb1/Station69378.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station72310",'../../static/texture/nb1/Station72310.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station72764",'../../static/texture/nb1/Station72764.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station75414",'../../static/texture/nb1/Station75414.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station75494",'../../static/texture/nb1/Station75494.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station75703",'../../static/texture/nb1/Station75703.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station78392",'../../static/texture/nb1/Station78392.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station81700",'../../static/texture/nb1/Station81700.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station84098",'../../static/texture/nb1/Station84098.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station86112",'../../static/texture/nb1/Station86112.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"Station99584",'../../static/texture/nb1/Station99584.jpg');
+     }
+   }
    //console.log(jlmap3dedit.materiallist);
 }
 

src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js

@@ -185,6 +185,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
 			if(data.code != trainmodel.code){
 				trainmodel.code = data.code;
 				trainmodel.nowcode = data.code;
+				updatedoorlight(false,false);
 			}
 
 			if(data.section != trainmodel.nowsection){
@@ -205,6 +206,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
 
 					if(trainmodel.openleft == "1"){
 						trainmodel.openleft = "0";
+						updatedoorlight(false,true);
 						for(let an=actions["traindoor"].top.length-1;an>=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;i<trainlisttest.group.children.length;i++){
 			trainlisttest.group.children[i].dispose = true;
 			trainlisttest.group.children[i].stopstation = null;

src/jlmap3d/main/loaders/Materialload.js

@@ -12,6 +12,7 @@ export function Materialload(jlmap3dedit,assettype){
      if(assettype.stationtexture == "xian3"){
        if(jlmap3dedit.stationtexture){
          setstationtexture(jlmap3dedit.stationtexture,"stationlist",'../../static/texture/xian3/xian3list.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"pingbimen",'../../static/texture/xian3/pingbimen.png');
          setstationtexture(jlmap3dedit.stationtexture,"Station18000",'../../static/texture/xian3/Station18000.jpg');
          setstationtexture(jlmap3dedit.stationtexture,"Station61238",'../../static/texture/xian3/Station61238.jpg');
          setstationtexture(jlmap3dedit.stationtexture,"Station41790",'../../static/texture/xian3/Station41790.jpg');
@@ -43,7 +44,7 @@ export function Materialload(jlmap3dedit,assettype){
      if(assettype.stationtexture == "haerbin1"){
        if(jlmap3dedit.stationtexture){
          setstationtexture(jlmap3dedit.stationtexture,"stationlist",'../../static/texture/heb/haerbinlist.jpg');
-
+         setstationtexture(jlmap3dedit.stationtexture,"pingbimen",'../../static/texture/heb/pingbimen.png');
          setstationtexture(jlmap3dedit.stationtexture,"Station5361",'../../static/texture/heb/Station5361.jpg');
          setstationtexture(jlmap3dedit.stationtexture,"Station11094",'../../static/texture/heb/Station11094.jpg');
          setstationtexture(jlmap3dedit.stationtexture,"Station11136",'../../static/texture/heb/Station11136.jpg');
@@ -69,7 +70,41 @@ export function Materialload(jlmap3dedit,assettype){
          setstationtexture(jlmap3dedit.stationtexture,"Station96090",'../../static/texture/heb/Station96090.jpg');
        }
      }
-
+     if(assettype.stationtexture == "nb1"){
+       if(jlmap3dedit.stationtexture){
+         setstationtexture(jlmap3dedit.stationtexture,"stationlist",'../../static/texture/nb1/nb1list.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"pingbimen",'../../static/texture/nb1/pingbimen.png');
+         setstationtexture(jlmap3dedit.stationtexture,"Station1533",'../../static/texture/nb1/Station1533.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station11231",'../../static/texture/nb1/Station11231.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station12421",'../../static/texture/nb1/Station12421.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station16356",'../../static/texture/nb1/Station16356.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station18678",'../../static/texture/nb1/Station18678.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station19817",'../../static/texture/nb1/Station19817.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station23567",'../../static/texture/nb1/Station23567.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station24903",'../../static/texture/nb1/Station24903.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station26416",'../../static/texture/nb1/Station26416.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station27207",'../../static/texture/nb1/Station27207.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station28032",'../../static/texture/nb1/Station28032.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station28958",'../../static/texture/nb1/Station28958.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station30520",'../../static/texture/nb1/Station30520.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station32955",'../../static/texture/nb1/Station32955.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station38286",'../../static/texture/nb1/Station38286.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station38674",'../../static/texture/nb1/Station38674.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station44173",'../../static/texture/nb1/Station44173.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station63100",'../../static/texture/nb1/Station63100.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station69378",'../../static/texture/nb1/Station69378.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station72310",'../../static/texture/nb1/Station72310.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station72764",'../../static/texture/nb1/Station72764.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station75414",'../../static/texture/nb1/Station75414.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station75494",'../../static/texture/nb1/Station75494.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station75703",'../../static/texture/nb1/Station75703.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station78392",'../../static/texture/nb1/Station78392.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station81700",'../../static/texture/nb1/Station81700.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station84098",'../../static/texture/nb1/Station84098.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station86112",'../../static/texture/nb1/Station86112.jpg');
+         setstationtexture(jlmap3dedit.stationtexture,"Station99584",'../../static/texture/nb1/Station99584.jpg');
+     }
+     }
    }
 
    //console.log(jlmap3dedit.materiallist);

src/jlmap3d/main/loaders/SimulationLoadNew.js

@@ -114,6 +114,12 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
               let stationname = stationstandlist.group.children[mm].name;
               stationstandlist.group.children[mm].getObjectByName("zhantailiebiao").material.map =scope.stationtexture["stationlist"];
               stationstandlist.group.children[mm].getObjectByName("zhantailiebiao").material.map.needsUpdate = true;
+              // console.log(stationstandlist.group.children[mm].getObjectByName("menkuangyanse"));
+              if(stationstandlist.group.children[mm].getObjectByName("menkuangyanse")){
+                stationstandlist.group.children[mm].getObjectByName("menkuangyanse").material.map =scope.stationtexture["pingbimen"];
+                stationstandlist.group.children[mm].getObjectByName("menkuangyanse").material.map.needsUpdate = true;
+              }
+
 
               let newmaterial = stationstandlist.group.children[mm].getObjectByName("zhantaiming").material.clone();
               newmaterial.map =scope.stationtexture[stationname];
@@ -123,6 +129,8 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
 
           }
 
+
+
         }
         for(let mn=0;mn<scope.assetloader.modellist.length;mn++){
           if(scope.assetloader.modellist[mn].deviceType && scope.assetloader.modellist[mn].deviceType == "suidaobg"){

src/utils/baseUrl.js

@@ -2,7 +2,7 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛

src/views/jlmap3d/drive/drivecontrol/centerpane.vue

@@ -214,14 +214,14 @@
 						this.moveheight=159;
 						this.movex=153+"px";
 					}
-					if(this.moveheight<82&&this.moveheight>73){
+					if(this.moveheight<86&&this.moveheight>73){
-						this.movex=75+"px";
+						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;
 						}
 

src/views/jlmap3d/drive/drivecontrol/toprightpane.vue

@@ -25,7 +25,7 @@
 		</div>
 		<!-- 关左门 -->
 		<div id="dlclose" class="panebutton" style="top:8%;left:45%;" @click="dlcclick">
-			<img class="buttonimg" :src="greenimg" />
+			<img class="buttonimg" :src="doorleftimg" />
 			<div class="buttontext">{{ $t('jlmap3d.closeLeftDoor') }}</div>
 		</div>
 		<!-- 开左门A -->
@@ -116,7 +116,7 @@
 			<div class="buttontext">{{ $t('jlmap3d.openRightDoor') }}</div>
 		</div>
 		<div id="drclose" class="panebutton" style="bottom:6%;left:59%;" @click="drcclick">
-			<img class="buttonimg" :src="greenimg" />
+			<img class="buttonimg" :src="doorrightimg" />
 			<div class="buttontext">{{ $t('jlmap3d.closeRightDoor') }}</div>
 		</div>
 		<div id="urgestop" class="panebutton" style="bottom:6%;left:73%;">
@@ -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){