From 87d93e1fc863648d3bbac17c28ed93e3f3763c31 Mon Sep 17 00:00:00 2001 From: sunleking Date: Mon, 2 Nov 2020 11:22:46 +0800 Subject: [PATCH 1/3] url --- src/utils/baseUrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 778caeb7b..bc9b3941d 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -1,8 +1,8 @@ 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://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'; // 张赛 From b55c98e60f06ab37ff79a303e4cd12558291deec Mon Sep 17 00:00:00 2001 From: sunleking Date: Fri, 13 Nov 2020 21:09:15 +0800 Subject: [PATCH 2/3] url --- src/utils/baseUrl.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 050bc5c2f..bc9b3941d 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -1,21 +1,12 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { -<<<<<<< HEAD BASE_API = 'https://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'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 -======= - // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; - // BASE_API = 'http://192.168.8.107:9000'; // 袁琪 - // BASE_API = 'http://192.168.8.144:9000'; // 旭强 - // BASE_API = 'http://192.168.3.175:9000'; // 张赛 - // BASE_API = 'http://192.168.8.110:9000'; // 杜康 ->>>>>>> 9f95af633a03accf4d89657def0976bc5b03a72b // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 From dd3de164d06e69db9b9725e95344cc055c85f9c1 Mon Sep 17 00:00:00 2001 From: sunleking Date: Fri, 13 Nov 2020 21:48:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=89=E7=BB=B4?= =?UTF-8?q?=E5=AE=A2=E6=B5=81=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jlmap3d/jl3dtrafficplan/loader/loader.js | 6 +++--- src/views/jlmap3d/trafficplan/jl3dtrafficplan.vue | 2 +- src/views/jlmap3d/trafficplan/jl3dtraffictrain.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jlmap3d/jl3dtrafficplan/loader/loader.js b/src/jlmap3d/jl3dtrafficplan/loader/loader.js index bf238562c..1fe0a8933 100644 --- a/src/jlmap3d/jl3dtrafficplan/loader/loader.js +++ b/src/jlmap3d/jl3dtrafficplan/loader/loader.js @@ -1,8 +1,10 @@ import { BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js'; +import store from '@/store/index_APP_TARGET'; //模型管理器 let mode = "0"; export function ModelManager(){ let scope = this; + this.man1 = { code:null, locateType:"01", @@ -100,6 +102,7 @@ export function ModelManager(){ Promise.all(initlist).then((result) => { console.log("success"); + store.dispatch('app/animationsClose'); resolve("success"); //['成功了', 'success'] }).catch((error) => { //console.log(error); @@ -113,11 +116,8 @@ export function ModelManager(){ function fbxpromise(asset,mixers,model){ return new Promise(function(resolve, reject){ var loader = new THREE.FBXLoader(); - if( mode == "2"){ - loader.load( asset.url, function ( object ) { - model.mesh = object; resolve(asset.deviceType); diff --git a/src/views/jlmap3d/trafficplan/jl3dtrafficplan.vue b/src/views/jlmap3d/trafficplan/jl3dtrafficplan.vue index 68e742aae..188281112 100644 --- a/src/views/jlmap3d/trafficplan/jl3dtrafficplan.vue +++ b/src/views/jlmap3d/trafficplan/jl3dtrafficplan.vue @@ -57,7 +57,7 @@ export default { group:'', mapId:'', lineCode:'', - loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts'] + loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts','bjd'] }; }, computed: { diff --git a/src/views/jlmap3d/trafficplan/jl3dtraffictrain.vue b/src/views/jlmap3d/trafficplan/jl3dtraffictrain.vue index 2b87b1a21..b302f8229 100644 --- a/src/views/jlmap3d/trafficplan/jl3dtraffictrain.vue +++ b/src/views/jlmap3d/trafficplan/jl3dtraffictrain.vue @@ -105,7 +105,7 @@