diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 64f99c6df..148e2349a 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,10 +2,10 @@ 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.152:9000'; // 袁琪 // BASE_API = 'http://192.168.8.177:9000'; // 旭强 - // BASE_API = 'http://192.168.8.109:9000'; // 张赛 + BASE_API = 'http://192.168.8.109: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/jl3ddrive.vue b/src/views/jlmap3d/drive/jl3ddrive.vue index bb764ba8d..6b67a4793 100644 --- a/src/views/jlmap3d/drive/jl3ddrive.vue +++ b/src/views/jlmap3d/drive/jl3ddrive.vue @@ -577,10 +577,10 @@ export default { } }, jl3dUpdatePslCode(newPslCode){ - if(newPslCode != undefined){ - this.pslShow = true; - }else{ + if(newPslCode == null){ this.pslShow = false; + }else{ + this.pslShow = true; } this.pslCode = newPslCode; }, diff --git a/src/views/jlmap3d/drive/sceneview/mmiview.vue b/src/views/jlmap3d/drive/sceneview/mmiview.vue index 3944578ea..401dca7ae 100644 --- a/src/views/jlmap3d/drive/sceneview/mmiview.vue +++ b/src/views/jlmap3d/drive/sceneview/mmiview.vue @@ -246,11 +246,15 @@ export default { this.updateM7(newdata.doorMode); } - if(newdata.standCode != this.standCode){ - this.standCode = newdata.standCode; - jl3dUpdatePslCode(this.standCode); + if(typeof(newdata.standCode) != "undefined"){ + if(newdata.standCode != this.standCode){ + this.standCode = newdata.standCode; + + jl3dUpdatePslCode(this.standCode); + } } + if(newdata.nextStation){ this.updateMmiNextStation(newdata.nextStation); } @@ -621,7 +625,6 @@ export default { }, jl3dUpdateMmiMsg(msg,type){ - console.log(type); this.mmimsgcolor = "#000"; if(type){ this.mmimsgcolor = "#FFFF6F";