diff --git a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js index 4a2177905..3ccd587ff 100644 --- a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js +++ b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js @@ -219,7 +219,9 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) { scope.scene.remove(scope.showmodel); scope.showmodel = null scope.nowcode = data.code; - + if(scope.nowobject){ + scope.resetmodel(); + } if (data._type == "Switch") { // scope.modelmanager.switchmodel.locateType = data.body.locateType; scope.modelmanager.switchmodel.code = data.code; @@ -230,8 +232,9 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) { updatemenulist(scope.devicetext.devicelist); scope.raycasterstatus = true; }else{ + scope.raycasterstatus = false; - scope.nowobject = ""; + scope.nowobject = null; updatemenulist(); } if (data._type == "Signal") { @@ -306,7 +309,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) { //设备分解、归位动画按钮 this.disperdevice1 = function(){ - if(scope.nowobject.animacode){ + if(scope.nowobject){ if(moveanima.status == true){ if(scope.animastats == false){ scope.animastats = true; @@ -322,7 +325,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) { }; this.disperdevice2 = function(){ - if(scope.nowobject.animacode){ + if(scope.nowobject){ if(moveanima.status == true){ if(scope.animastats == false){ scope.animastats = true; @@ -337,7 +340,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) { }; this.resetmodel = function(){ - if(scope.nowobject.animacode){ + if(scope.nowobject){ scope.animastats = false; moveanima.setplaylist(moveanima.animatelist[scope.nowobject.animacode+"fuwei"],true); } diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index c59924e25..778caeb7b 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,9 +2,9 @@ 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.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 2a76dbc9b..9b9d57665 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -413,7 +413,6 @@ export default { }; setSessionStorage('projectDevice', JSON.stringify(res.data.deviceVO)); if (this.$route.query.type == 'LSW') { - console.log('进入', `/bigSplitScreen/${resp.data.map.id}`); this.$router.push({ path: `/bigSplitScreen/${resp.data.map.id}`, query: query }); } else if (this.$route.query.type === 'ISCS_LW' || this.$route.query.type === 'ISCS_CW') { this.$router.push({ path: `/displayIscs/system`, query: { diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 49a14e1e0..467d7af69 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -206,6 +206,9 @@ export default { if (this.$route.query.type === 'VR_PSD') { this.deviceShow = true; } + if (this.$route.query.type === 'DRIVE') { + this.hidepanel(); + } }, '$store.state.socket.memberChangeCount': function () { this.initMemberUserInfo(); @@ -566,7 +569,7 @@ export default { }); window.open(routeData.href, '_blank', 'noopener noreferrer'); }, - hidepanel() { + hidepanel() { // 司机视角 this.panelShow = false; this.drivingShow = true; this.ibpShow = false;