Merge branch 'test'

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);

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: {

src/views/jlmap3d/trafficplan/jl3dtraffictrain.vue

@@ -105,7 +105,7 @@
 <script>
 import Vue from 'vue';
 import { Jl3dTrafficTrain } from '@/jlmap3d/jl3dtrafficplan/jl3dtraffictrain.js';
-import { ProjectIcon, loginInfo } from '@/scripts/ProjectConfig';
+
 import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 export default {
     name: 'TrafficTrain',
@@ -135,7 +135,7 @@ export default {
         value:'',
         isCctv:true,
         allPassers:0,
-        loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts']
+        loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts','bjd']
       };
     },
     computed: {