From 4ad7f3d9d2d791c3e901002e98ba97c6d76e7d69 Mon Sep 17 00:00:00 2001 From: sunzhenyu Date: Fri, 30 Jul 2021 19:04:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/jlmap3d/drive/sceneview/mmiview.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/jlmap3d/drive/sceneview/mmiview.vue b/src/views/jlmap3d/drive/sceneview/mmiview.vue index 521a5ac75..af27b5c74 100644 --- a/src/views/jlmap3d/drive/sceneview/mmiview.vue +++ b/src/views/jlmap3d/drive/sceneview/mmiview.vue @@ -215,7 +215,6 @@ export default { }, updatetrainstatus(newdata){ - console.log(newdata); if(typeof(newdata.eb) != "undefined"){ this.updateEbStatus(newdata.eb); @@ -344,7 +343,7 @@ export default { }, updateM4(newdata){ - console.log(newdata ); + if(newdata.parking != undefined){ if(newdata.parking == true){ this.m4image = this.images.m4['in']; @@ -361,7 +360,7 @@ export default { } }, updateTiaoting(newdata){ - console.log(newdata); + if(newdata.jump != undefined){ if(newdata.jump == true){ this.tiaotingimage = this.images.n['tiaoting']; @@ -550,7 +549,6 @@ export default { } }, updatemmic1(tow){ - console.log("tow:"+tow); if(tow == "1"){ this.c1image = this.images.c1["qianyin"]; } From b7819fb259142c3b7240c4f29dcdbbfd73a8604a Mon Sep 17 00:00:00 2001 From: sunzhenyu Date: Mon, 2 Aug 2021 10:40:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E6=BC=94=E7=BB=83=E6=8D=A2=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js | 1 + src/utils/baseUrl.js | 4 ++-- src/views/jlmap3d/drive/drivecontrol/centerpane.vue | 6 +++--- src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js index d5116bccd..17937be43 100644 --- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js +++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js @@ -994,6 +994,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri } function signalupdate(data) { code = data.code; + console.log(data); if(data.red == 1){ signallist.list[code].mesh.getObjectByName("red").material.map = materials[0]; signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true; diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 8b75cd8e6..bc303bcc8 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,11 +2,11 @@ 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.8.107:9000'; // 袁琪 // BASE_API = 'http://192.168.2.175:9000'; // 旭强 有线 // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线 - BASE_API = 'http://192.168.2.183:9000'; // 张赛 + // BASE_API = 'http://192.168.2.183:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 diff --git a/src/views/jlmap3d/drive/drivecontrol/centerpane.vue b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue index 6e465e7da..2ac2b97a1 100644 --- a/src/views/jlmap3d/drive/drivecontrol/centerpane.vue +++ b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue @@ -320,8 +320,8 @@ if(mx46){ if(angle<63 && angle>46){ if(this.touchstate != "Drive"){ @@ -330,7 +330,7 @@ gear:"Drive" }; trainSimulationGear(this.group,data).then(netdata => { - console.log(netdata); + // console.log(netdata); if(netdata.code == "200"){ this.toutransform = "rotate(140deg)"; this.touchstate = "Drive"; diff --git a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue index 97b21c6ba..87d406f07 100644 --- a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue +++ b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue @@ -141,7 +141,7 @@ import axios from 'axios'; methods: { changeTrainSelect(mode){ if(mode == "isTraining"){ - this.isTraining = false; + // this.isTraining = false; } }, currentsel(selVal){ From dd64abb10f3f702d436836b342cc8d2cbc655a68 Mon Sep 17 00:00:00 2001 From: sunzhenyu Date: Mon, 2 Aug 2021 11:08:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E5=92=8C=E6=B2=99=E7=9B=98=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E6=9C=BA=E8=B4=B4=E5=9B=BE=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jl3ddrive/moveupdate/DrivingConnectNew.js | 13 ++++++------- .../jl3dsimulation/connect/Jlmap3dSubscribeNew.js | 12 ++++++------ src/jlmap3d/main/loaders/Materialload.js | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js index 17937be43..c74e4166e 100644 --- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js +++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js @@ -994,31 +994,30 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri } function signalupdate(data) { code = data.code; - console.log(data); if(data.red == 1){ - signallist.list[code].mesh.getObjectByName("red").material.map = materials[0]; + signallist.list[code].mesh.getObjectByName("red").material.map = materials["red"]; signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true; }else{ - signallist.list[code].mesh.getObjectByName("red").material.map = materials[3]; + signallist.list[code].mesh.getObjectByName("red").material.map = materials["black"]; signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true; } if(data.yellow == 1){ - signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[1]; + signallist.list[code].mesh.getObjectByName("yellow").material.map = materials["yellow"]; signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true; }else{ - signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3]; + signallist.list[code].mesh.getObjectByName("yellow").material.map = materials["black"]; signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true; } if(data.green == 1){ - signallist.list[code].mesh.getObjectByName("green").material.map = materials[2]; + signallist.list[code].mesh.getObjectByName("green").material.map = materials["green"]; signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true; }else{ - signallist.list[code].mesh.getObjectByName("green").material.map = materials[3]; + signallist.list[code].mesh.getObjectByName("green").material.map = materials["black"]; signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true; } diff --git a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js index 4f0bbb622..3f5b1d6f3 100644 --- a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js +++ b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js @@ -798,29 +798,29 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) { code = data.code; if(signallist.list[code]){ if(data.red == 1){ - signallist.list[code].mesh.getObjectByName("red").material.map = materials[0]; + signallist.list[code].mesh.getObjectByName("red").material.map = materials["red"]; signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true; }else{ - signallist.list[code].mesh.getObjectByName("red").material.map = materials[3]; + signallist.list[code].mesh.getObjectByName("red").material.map = materials["black"]; signallist.list[code].mesh.getObjectByName("red").material.map.needsUpdate = true; } if(data.yellow == 1){ - signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[1]; + signallist.list[code].mesh.getObjectByName("yellow").material.map = materials["yellow"]; signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true; }else{ - signallist.list[code].mesh.getObjectByName("yellow").material.map = materials[3]; + signallist.list[code].mesh.getObjectByName("yellow").material.map = materials["black"]; signallist.list[code].mesh.getObjectByName("yellow").material.map.needsUpdate = true; } if(data.green == 1){ - signallist.list[code].mesh.getObjectByName("green").material.map = materials[2]; + signallist.list[code].mesh.getObjectByName("green").material.map = materials["green"]; signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true; }else{ - signallist.list[code].mesh.getObjectByName("green").material.map = materials[3]; + signallist.list[code].mesh.getObjectByName("green").material.map = materials["black"]; signallist.list[code].mesh.getObjectByName("green").material.map.needsUpdate = true; } diff --git a/src/jlmap3d/main/loaders/Materialload.js b/src/jlmap3d/main/loaders/Materialload.js index 9f41014e1..21eccc0db 100644 --- a/src/jlmap3d/main/loaders/Materialload.js +++ b/src/jlmap3d/main/loaders/Materialload.js @@ -33,7 +33,7 @@ function settexture(materiallist,name,textureurl){ // onLoad回调 function ( texture ) { texture.name = name; - materiallist.push(texture); + materiallist[name] = texture; }, // 目前暂不支持onProgress的回调