joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

修改三维设备点击道岔bug

Browse Source
This commit is contained in:
sunzhenyu 2020-10-22 15:42:57 +08:00
parent 9e93958224
commit bd6fc3b077
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
View File

@ -161,7 +161,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
}
}
}
console.log(psdVoiceStationList);
});
document.addEventListener( "mousedown", onselect, false );
@ -176,8 +175,8 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
}
function callback(Response) {
let data = JSON.parse(Response.body);
// }else{
if(data.type == "DeviceCtrl_3D"){
if(data.body.code == scope.nowcode){
scope.updateaction(data.body);
@ -225,7 +224,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
scope.camera.updateProjectionMatrix();
scope.renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
console.log(scope.windowstatus);
if(scope.windowstatus == "0"){
let changeelement = document.getElementById('jl3d');
changeelement.style.width = '100%';
@ -274,7 +272,15 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
}
})
animate();
let checkobject = setInterval(function(){
if(scope.modelmanager.switchmodel.mesh){
clearInterval(checkobject);
animate();
}
},1000);
});
function setpsdstationmap(stationlist){
@ -318,7 +324,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
}
this.selectmodel = function (data) {
scope.modelmanager
// scope.modelmanager
if (scope.showmodel) {
if (scope.showmodel.code != data.code) {
@ -374,10 +380,15 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
}
} else {
scope.nowcode = data.code;
if (data._type == "Switch") {
scope.modelmanager.switchmodel.normalPosition = "0";
scope.showmodel = scope.modelmanager.switchmodel.mesh;
scope.scene.add(scope.showmodel);
scope.devicetext.initdevicetext(scope.modelmanager.switchmodel.mesh);
scope.nowobject = scope.modelmanager.switchmodel.mesh;
updatemenulist(scope.devicetext.devicelist);
scope.raycasterstatus = true;
// scope.scene.add(scope.showmodel);
if (data.normalPosition == "0") {
scope.modelmanager.switchmodel.normalPosition = "0";

4
src/utils/baseUrl.js
View File

@ -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.3.5:9000'; // 袁琪
// BASE_API = 'http://192.168.3.169:9000'; // 旭强
// BASE_API = 'http://192.168.3.175:9000'; // 张赛
BASE_API = 'http://192.168.3.82:9008'; // 杜康
// BASE_API = 'http://192.168.3.82:9008'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛