剔除项目三维本地模型

src/jlmap3d/edit/connect/newgetmodels.js

@@ -1,262 +0,0 @@
-//import request from '@/utils/request';
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-
-export function getmodels(data) {
-    let postmap = {
-        id:data.mapdata.id,
-        mapId:data.mapdata.mapId,
-        assets:"null",
-        sections:"null",
-        signals:"null",
-        trains:"null",
-        stands:"null",
-        switchs:"null"
-    };
-    console.log(data.mapdata);
-    if(data.mapdata.sectionlist.sections== undefined){
-      return postmap;
-    }
-
-
-    if(data == undefined){
-
-      return postmap;
-    }else{
-
-      let models = {
-        stationtexture:"0",
-        istexture:false,
-        assets:[],
-      };
-      //资源
-      let assets = [];
-      // for(let i=0;i<data.assetloader.modellist.length;i++){
-      //   let asset = {
-      //     id:data.assetloader.modellist[i].id,
-      //     name:data.assetloader.modellist[i].name,
-      //     deviceType:data.assetloader.modellist[i].deviceType,
-      //     type:data.assetloader.modellist[i].type,
-      //     assetUrl:data.assetloader.modellist[i].assetUrl
-      //   }
-      //   assets.push(asset);
-      // }
-      //信号机资源
-      let assetsignal = {
-        assetname:"信号机模型",
-        id:"1",
-        packageName:"高位三灯信号机",
-        deviceType:"SimulationSignal",
-        type:"signal",
-        url:JL3D_LOCAL_STATIC+"/MODEL/signal/d3d.FBX"
-      }
-      assets.push(assetsignal);
-
-      //列车资源
-      let assettrain = {
-        assetname:"列车模型",
-        id:"2",
-        packageName:"6节列车",
-        deviceType:"SimulationTrain",
-        type:"train",
-        url:JL3D_LOCAL_STATIC+"/MODEL/train/train.FBX"
-      }
-      assets.push(assettrain);
-
-      let assetneicestation = {
-        assetname:"内侧车站",
-        id:"3",
-        packageName:"沙盘驾驶内侧站台",
-        deviceType:"SimulationStation",
-        type:"stationInside",
-        url:JL3D_LOCAL_STATIC+"/MODEL/station/fuzhou.FBX"
-      }//JL3D_LOCAL_STATIC+"/MODEL/station/fuzhou/fuzhou.FBX"
-      assets.push(assetneicestation);
-
-      let assetswitch = {
-        assetname:"道岔模型",
-        id:"4",
-        packageName:"轨道通用道岔",
-        deviceType:"SimulationSwitch",
-        type:"switch",
-        url:JL3D_LOCAL_STATIC+"/MODEL/auto/autoswitch.FBX"
-      }
-      assets.push(assetswitch);
-
-      let assetwaicestation = {
-        assetname:"外侧车站",
-        id:"5",
-        packageName:"沙盘驾驶外侧站台",
-        deviceType:"SimulationStation",
-        type:"stationOutside",
-        url:JL3D_LOCAL_STATIC+"/MODEL/station/waicestation.FBX"
-      }
-      assets.push(assetwaicestation);
-
-      let assetstation3 = {
-        assetname:"特殊站台",
-        id:"6",
-        packageName:"沙盘驾驶特殊站台",
-        deviceType:"SimulationStation",
-        type:"stationThree",
-        url:JL3D_LOCAL_STATIC+"/MODEL/station/station3.FBX"
-      }
-      assets.push(assetstation3);
-
-      let backgroundmodel = {
-        assetname:"隧道背景",
-        id:"7",
-        packageName:"隧道背景",
-        deviceType:"SimulationBg",
-        type:"suidao",
-        url:JL3D_LOCAL_STATIC+"/MODEL/suidao/xiansuidao.FBX"
-      }
-      assets.push(backgroundmodel);
-
-      models.assets = assets;
-      models.stationtexture = "xian3";
-      models.istexture = true;
-      console.log(models);
-      postmap.assets = JSON.stringify(models);
-      //link轨道
-      // let links = [];
-      // for(let i=0;i<data.mapdata.linklist.linksgroup.children.length;i++){
-      //   let link = {
-      //     uuid:data.mapdata.linklist.linksgroup.children[i].uuid,
-      //     code:data.mapdata.linklist.linksgroup.children[i].code,
-      //     name:data.mapdata.linklist.linksgroup.children[i].name,
-      //     lengthfact:data.mapdata.linklist.linksgroup.children[i].lengthfact,
-      //     position:data.mapdata.linklist.linksgroup.children[i].position,
-      //     rotation:data.mapdata.linklist.linksgroup.children[i].rotation,
-      //     scale:data.mapdata.linklist.linksgroup.children[i].scale,
-      //     rightlist:data.mapdata.linklist.linksgroup.children[i].rightlist,
-      //     leftlist:data.mapdata.linklist.linksgroup.children[i].leftlist,
-      //     lp:data.mapdata.linklist.linksgroup.children[i].lp,
-      //     rp:data.mapdata.linklist.linksgroup.children[i].rp,
-      //     rail:data.mapdata.linklist.linksgroup.children[i].rail,
-      //   }
-      //   links.push(link);
-      // }
-      // postmap.sections.link = JSON.stringify(links);
-
-      //section隧道
-      let sections = [];
-      // console.log(data.mapdata.sectionlist.sections.datalist);
-      for(let i in data.mapdata.sectionlist.sections.datalist){
-        let section = {
-          // uuid:data.mapdata.sectionlist.sections.modellist[i].uuid,
-          code:data.mapdata.sectionlist.sections.datalist[i].code,
-          name:data.mapdata.sectionlist.sections.datalist[i].name,
-          lengthFact:data.mapdata.sectionlist.sections.datalist[i].mesh.lengthFact,
-          standTrack:data.mapdata.sectionlist.sections.datalist[i].standTrack,
-          rp:data.mapdata.sectionlist.sections.datalist[i].rp,
-          lp:data.mapdata.sectionlist.sections.datalist[i].lp,
-          railpoint:data.mapdata.sectionlist.sections.datalist[i].mesh.railpoint,
-          rail:data.mapdata.sectionlist.sections.datalist[i].rail,
-          position:data.mapdata.sectionlist.sections.datalist[i].mesh.position,
-          rotation:data.mapdata.sectionlist.sections.datalist[i].mesh.rotation,
-          scale:data.mapdata.sectionlist.sections.datalist[i].mesh.scale,
-        }
-        let nowmesh =  data.mapdata.sectionlist.sectiongroup.getObjectByProperty("code",section.code);
-        section.railpoint = nowmesh.railpoint
-        // console.log(nowmesh.railpoint);
-        // if(data.mapdata.sectionlist.sections.datalist[i].rsection){
-        //   section.rsection = data.mapdata.sectionlist.sections.datalist[i].rsection;
-        // }
-        // if(data.mapdata.sectionlist.sections.datalist[i].lsection){
-        //   section.lsection = data.mapdata.sectionlist.sections.datalist[i].lsection;
-        // }
-        // if(data.mapdata.sectionlist.sections.datalist[i].csection){
-        //   section.csection = data.mapdata.sectionlist.sections.datalist[i].csection;
-        // }
-
-        // testmesh1.position.z = link.position.z;
-
-        sections.push(section);
-      }
-      let arrray = {
-          section:sections,
-      };
-      postmap.sections = JSON.stringify(arrray);
-      //道岔
-      let switchs = [];
-
-      for(let i=0;i<data.mapdata.switchlist.switchs.datalist.length;i++){
-        let switcha = {
-          // uuid:data.mapdata.switchlist.switchs.modellist[i].uuid,
-          code:data.mapdata.switchlist.switchs.datalist[i].code,
-          name:data.mapdata.switchlist.switchs.datalist[i].name,
-          pa:data.mapdata.switchlist.switchs.datalist[i].pa,
-          pb:data.mapdata.switchlist.switchs.datalist[i].pb,
-          pc:data.mapdata.switchlist.switchs.datalist[i].pc,
-          position:data.mapdata.switchlist.switchs.modellist[i].position,
-          rotation:data.mapdata.switchlist.switchs.modellist[i].rotation,
-          scale:data.mapdata.switchlist.switchs.modellist[i].scale
-        }
-        switchs.push(switcha);
-      }
-      postmap.switchs = JSON.stringify(switchs);
-      //信号
-      let signals = [];
-      for(let i=0;i<data.mapdata.signallist.list.length;i++){
-
-
-        let signal = {
-          // uuid:data.mapdata.signallist.list[i].mesh.uuid,
-          name:data.mapdata.signallist.list[i].mesh.name,
-          modelid:data.mapdata.signallist.list[i].mesh.modelid,
-          code:data.mapdata.signallist.list[i].mesh.code,
-          right:data.mapdata.signallist.list[i].mesh.right,
-          position:data.mapdata.signallist.list[i].mesh.position,
-          rotation:data.mapdata.signallist.list[i].mesh.rotation,
-          scale:data.mapdata.signallist.list[i].mesh.scale
-        }
-
-        signals.push(signal);
-      }
-      postmap.signals = JSON.stringify(signals);
-      //车站
-      let stands = [];
-
-      for(let i=0;i<data.mapdata.stationstandlist.list.length;i++){
-        let station = {
-          // uuid:data.mapdata.stationstandlist.list[i].uuid,
-          code:data.mapdata.stationstandlist.list[i].code,
-          name:data.mapdata.stationstandlist.list[i].name,
-          modelid:data.mapdata.stationstandlist.list[i].modelid,
-          position:data.mapdata.stationstandlist.list[i].mesh.position,
-          rotation:data.mapdata.stationstandlist.list[i].mesh.rotation,
-          scale:data.mapdata.stationstandlist.list[i].mesh.scale,
-          inside:data.mapdata.stationstandlist.list[i].inside,
-          direction1:{
-            name:data.mapdata.stationstandlist.list[i].direction1.name,
-            code:data.mapdata.stationstandlist.list[i].direction1.code
-          },
-          direction2:{
-            name:data.mapdata.stationstandlist.list[i].direction2.name,
-            code:data.mapdata.stationstandlist.list[i].direction2.code
-          }
-        }
-        stands.push(station);
-      }
-        postmap.stands  = JSON.stringify(stands);
-      //列车
-      let trains = [];
-      for(let i=0;i<data.assetloader.modellist.length;i++){
-        if(data.assetloader.modellist[i].deviceType == "train"){
-          let train = {
-            id:data.assetloader.modellist[i].id,
-            name:data.assetloader.modellist[i].name,
-            deviceType:data.assetloader.modellist[i].deviceType,
-            type:data.assetloader.modellist[i].type,
-            assetUrl:data.assetloader.modellist[i].assetUrl
-          }
-
-          trains.push(train);
-        }
-      }
-      postmap.trains = JSON.stringify(trains);
-
-      return postmap;
-    }
-
-  }

src/jlmap3d/jl3ddevice/component/signallight.js

@@ -3,13 +3,13 @@ import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 //信号机贴图
 export function Signallightload(lights) {
 
-  settexture(lights, "red", JL3D_LOCAL_STATIC+'/MODEL/device/signal/1.jpg');
+  settexture(lights, "red", JL3D_LOCAL_STATIC+'/device/signal/1.jpg');
 
-  settexture(lights, "yellow", JL3D_LOCAL_STATIC+'/MODEL/device/signal/2.jpg');
+  settexture(lights, "yellow", JL3D_LOCAL_STATIC+'/device/signal/2.jpg');
 
-  settexture(lights, "green", JL3D_LOCAL_STATIC+'/MODEL/device/signal/3.jpg');
+  settexture(lights, "green", JL3D_LOCAL_STATIC+'/device/signal/3.jpg');
 
-  settexture(lights, "black", JL3D_LOCAL_STATIC+'/MODEL/device/signal/4.jpg');
+  settexture(lights, "black", JL3D_LOCAL_STATIC+'/device/signal/4.jpg');
 }
 
 //加载贴图

src/jlmap3d/jl3ddevice/config.js

@@ -7,7 +7,7 @@ var Staticmodel = {
 		deviceType: "Switch",
 		type: "fuzhou",
 		picUrl: "",
-		assetUrl: JL3D_LOCAL_STATIC+"/MODEL/device/switch/ZD6D.FBX"
+		assetUrl: JL3D_LOCAL_STATIC+"/device/switch/ZD6D.FBX"
 	},//"https://joylink.club/oss/wx/switch/switch.FBX"
 
 	Signal: {
@@ -16,7 +16,7 @@ var Staticmodel = {
 		deviceType: "Signal",
 		type: "low",
 		picUrl: "",
-		assetUrl: JL3D_LOCAL_STATIC+"/MODEL/device/signal/signal.FBX"
+		assetUrl: JL3D_LOCAL_STATIC+"/device/signal/signal.FBX"
 	},
 	stationstand: {
 		id: "3",
@@ -24,7 +24,7 @@ var Staticmodel = {
 		deviceType: "stationstand",
 		type: "low",
 		picUrl: "",
-		assetUrl: JL3D_LOCAL_STATIC+"/MODEL/device/stationstand/stationstand.FBX"
+		assetUrl: JL3D_LOCAL_STATIC+"/device/stationstand/stationstand.FBX"
 		//https://joylink.club/oss/wx/stationstand/stationstand.FBX
 
 
@@ -35,7 +35,7 @@ var Staticmodel = {
 		deviceType: "section",
 		type: "low",
 		picUrl: "",
-		assetUrl: JL3D_LOCAL_STATIC+"/MODEL/device/section/section.FBX"
+		assetUrl: JL3D_LOCAL_STATIC+"/device/section/section.FBX"
 		//https://joylink.club/oss/wx/stationstand/stationstand.FBX
 
 
@@ -46,7 +46,7 @@ var Staticmodel = {
 		deviceType: "room",
 		type: "low",
 		picUrl: "",
-		assetUrl: JL3D_LOCAL_STATIC+"/MODEL/device/room/room.FBX"
+		assetUrl: JL3D_LOCAL_STATIC+"/device/room/room.FBX"
 		//https://joylink.club/oss/wx/stationstand/stationstand.FBX
 
 

src/jlmap3d/jl3ddevice/jl3ddeviceNew.js

@@ -1,4 +1,4 @@
-import { Staticmodel } from '@/jlmap3d/jl3ddevice/config.js';
+
 import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 
 //loader
@@ -729,7 +729,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 		}
 
 	}
-	
+
 	this.updatewindowstatus = function(nowwindowstatus){
 		scope.windowstatus == nowwindowstatus;
 	}

src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js

@@ -1,4 +1,4 @@
-import { Staticmodel } from '@/jlmap3d/jl3ddevice/config.js';
+
 import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 //loader
 import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';

src/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/jl3dFaultDeviceVr.js

@@ -1,4 +1,4 @@
-import { Staticmodel } from '@/jlmap3d/jl3ddevice/config.js';
+// import { Staticmodel } from '@/jlmap3d/jl3ddevice/config.js';
 import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 //loader
 import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';

src/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/vrloader.js

@@ -1,48 +1,41 @@
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+import { JL3D_LOCAL_STATIC,BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js';
 
 export function ModelManagerVR(){
   let scope = this;
-  //
-  // this.testmodel = {
-  //   code:"test",
-  //   locateType:"01",
-  //   mesh:null,
-  //   url:JL3D_LOCAL_STATIC+"/vrtest/vrtest.FBX"
-  // };
 
   this.stationIn = {
     code:"stationIn",
     locateType:"1",
     mesh:null,
-    url:JL3D_LOCAL_STATIC+"/vrtest/stationIn.FBX"
+    url:BASE_ASSET_API+"/MODEL/2020-11-23/71-16438.FBX"
   };
 
   this.stationOut = {
     code:"stationOut",
     locateType:"2",
     mesh:null,
-    url:JL3D_LOCAL_STATIC+"/vrtest/stationIn.FBX"
+    url:BASE_ASSET_API+"/MODEL/2020-11-23/71-16438.FBX"
   };
 
   this.otherDevice = {
     code:"otherDevice",
     locateType:"3",
     mesh:null,
-    url:JL3D_LOCAL_STATIC+"/vrtest/otherDevice.FBX"
+    url:BASE_ASSET_API+"/MODEL/2020-11-23/1-56188.FBX"
   };
 
   this.train = {
     code:"train",
     locateType:"4",
     mesh:null,
-    url:JL3D_LOCAL_STATIC+"/vrtest/vrTrain.FBX"
+    url:BASE_ASSET_API+"/MODEL/2020-11-23/72-72266.FBX"
   };
 
   this.human = {
     code:"human",
     locateType:"5",
     mesh:null,
-    url:JL3D_LOCAL_STATIC+"/vrtest/vrHuman.FBX"
+    url:BASE_ASSET_API+"/MODEL/2020-11-23/73-61142.FBX"
   };
 
   this.loadpromise = function (mixers){

src/jlmap3d/jl3dmaintainer/jl3dOtherVr/Jl3dothervr.js

@@ -1,4 +1,4 @@
-import { Staticmodel } from '@/jlmap3d/jl3ddevice/config.js';
+// import { Staticmodel } from '@/jlmap3d/jl3ddevice/config.js';
 import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 
 //loader
@@ -9,8 +9,6 @@ import { ModelManagerVR } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils
 import { TrainControl } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/trainControl.js';
 import { MoveanimateVr } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/moveanimatevr.js';
 
-
-
 import { Textconfig } from '@/jlmap3d/jl3ddevice/component/textconfig.js';
 
 import {Materialload} from '@/jlmap3d/main/loaders/Materialload.js';

src/jlmap3d/jl3dmaintainer/jl3dTrainRescue/trainrescueconfig.js

@@ -1,39 +1,39 @@
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+import { JL3D_LOCAL_STATIC,BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js';
 var TrainRescueStatic = {
 	animatemodel: {
 		id: "1",
 		name: "动画模型",
 		deviceType: "animatemodel",
 		type: "animatemodel",
-		url: JL3D_LOCAL_STATIC+"/vrtest/trainrescue/DH923.FBX"
+		url: BASE_ASSET_API+"/MODEL/2020-11-23/74-28231.FBX"
 	},//"https://joylink.club/oss/wx/switch/switch.FBX"
 	floorplane: {
 		id: "2",
 		name: "行走范围",
 		deviceType: "runplane",
 		type: "runplane",
-		url: JL3D_LOCAL_STATIC+"/vrtest/trainrescue/diban.FBX"
+		url: BASE_ASSET_API+"/MODEL/2020-11-23/75-84310.FBX"
 	},
 	controlmodel: {
 		id: "3",
 		name: "控制台",
 		deviceType: "controlmodel",
 		type: "controlmodel",
-		url: JL3D_LOCAL_STATIC+"/vrtest/trainrescue/kongzhigan.FBX"
+		url: BASE_ASSET_API+"/MODEL/2020-11-23/77-45640.FBX"
 	},
 	other: {
 		id: "4",
 		name: "其他",
 		deviceType: "other",
 		type: "other",
-		url: JL3D_LOCAL_STATIC+"/vrtest/trainrescue/TK.FBX"
+		url: BASE_ASSET_API+"/MODEL/2020-11-23/78-39158.FBX"
 	},
 	handR: {
 		id: "5",
 		name: "handr",
 		deviceType: "handr",
 		type: "handr",
-		url: JL3D_LOCAL_STATIC+"/vrtest/trainrescue/handr.FBX"
+		url: BASE_ASSET_API+"/MODEL/2020-11-23/76-34528.FBX"
 	}
 
 }

src/jlmap3d/jl3dpassflow/config.js

@@ -1,71 +0,0 @@
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-var Staticmodel = {
-	man1: {
-		id: "1",
-		name: "人物1",
-		deviceType: "man",
-		type: "man",
-		picUrl: "",
-		assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/man1.FBX"
-	},//"https://joylink.club/oss/wx/switch/switch.FBX"
-	man2: {
-		id: "2",
-		name: "人物2",
-		deviceType: "man",
-		type: "man",
-		picUrl: "",
-		assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/man2.FBX"
-	},
-	station: {
-		id: "3",
-		name: "车站",
-		deviceType: "station",
-		type: "hrb",
-		picUrl: "",
-		assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/station.FBX"
-	},
-	zhajiin: {
-		id: "4",
-		name: "闸机",
-		deviceType: "zhajiin",
-		type: "hrb",
-		picUrl: "",
-		assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/zhajiin.FBX"
-	},
-	zhajiout: {
-		id: "5",
-		name: "闸机",
-		deviceType: "zhajiout",
-		type: "hrb",
-		picUrl: "",
-		assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/zhajiout.FBX"
-	},
-	monitor: {
-		id: "6",
-		name: "摄像机",
-		deviceType: "monitor",
-		type: "hrb",
-		picUrl: "",
-		assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/monitor.FBX"
-	},
-	train: {
-		id: "7",
-		name: "列车",
-		deviceType: "train",
-		type: "hrb",
-		picUrl: "",
-		assetUrl: JL3D_LOCAL_STATIC+"/MODEL/train/train.FBX"
-	},
-	section: {
-		id: "8",
-		name: "区段",
-		deviceType: "section",
-		type: "hrb",
-		picUrl: "",
-		assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/section.FBX"
-	},
-
-
-}
-
-export { Staticmodel }

src/jlmap3d/jl3dpassflow/jl3dpassflownew.js

@@ -1,4 +1,3 @@
-import { Staticmodel } from '@/jlmap3d/jl3dpassflow/config.js';
 //静态资源文件路劲
 import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 //loader

src/jlmap3d/jl3dtrafficplan/loader/stationconfig.js

@@ -1,53 +1,53 @@
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+import { JL3D_LOCAL_STATIC,BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js';
 var Staticmodel = [
 	{
 		id: "1",
 		name: "人物1",
 		deviceType: "man1",
 		type: "man1",
-		url: "/cbtc/static/MODEL/passflow/man1.FBX"
+		url: BASE_ASSET_API + "/MODEL/2020-07-16/1-9933.FBX"
 	},{
 		id: "2",
 		name: "人物2",
 		deviceType: "man2",
 		type: "man2",
-		url: "/cbtc/static/MODEL/passflow/man2.FBX"
+		url: BASE_ASSET_API + "/MODEL/2020-07-16/2-87850.FBX"
 	},{
 		id: "3",
 		name: "车站",
 		deviceType: "cctvStation",
 		type: "cctvStation",
-		url: "/cbtc/static/trafficplan/station.FBX"
+		url: BASE_ASSET_API + "/MODEL/2020-11-23/79-95086.FBX"
 	},{
 		id: "4",
 		name: "闸机",
 		deviceType: "cctvGateIn",
 		type: "cctvGateIn",
-		url: "/cbtc/static/MODEL/passflow/zhajiin.FBX"
+		url: BASE_ASSET_API + "/MODEL/2020-07-20/42-7172.FBX"
 	},{
 		id: "5",
 		name: "闸机",
 		deviceType: "cctvGateOut",
 		type: "cctvGateOut",
-		url: "/cbtc/static/MODEL/passflow/zhajiout.FBX"
+		url: BASE_ASSET_API + "/MODEL/2020-07-20/43-8227.FBX"
 	},{
 		id: "6",
 		name: "摄像机",
 		deviceType: "cctvMonitor",
 		type: "cctvMonitor",
-		url: "/cbtc/static/MODEL/passflow/monitor.FBX"
+		url: BASE_ASSET_API + "/MODEL/2020-07-20/44-24100.FBX"
 	},{
 		id: "7",
 		name: "列车",
 		deviceType: "cctvTrain",
 		type: "cctvTrain",
-		url: "/cbtc/static/trafficplan/normaltrain.FBX"
+		url: BASE_ASSET_API + "/MODEL/2020-11-23/80-14604.FBX"
 	},{
 		id: "8",
 		name: "区段",
 		deviceType: "cctvSection",
 		type: "cctvSection",
-		url: "/cbtc/static/MODEL/passflow/section.FBX"
+		url: BASE_ASSET_API + "/MODEL/2020-07-20/45-36330.FBX"
 	}
 
 

src/jlmap3d/jl3dtrafficplan/loader/trainconfig.js

@@ -1,25 +1,25 @@
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+import { JL3D_LOCAL_STATIC,BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js';
 var Staticmodel = [
 	{
 		id: "1",
 		name: "人物1",
 		deviceType: "man1",
 		type: "man1",
-		url: "/cbtc/static/trafficplan/man1.FBX"
+		url: BASE_ASSET_API + "/MODEL/2020-07-16/1-9933.FBX"
 	},
 	{
 		id: "2",
 		name: "人物2",
 		deviceType: "man2",
 		type: "man2",
-		url: "/cbtc/static/trafficplan/man2.FBX"
+		url: BASE_ASSET_API + "/MODEL/2020-07-16/2-87850.FBX"
 	},
 	{
 		id: "7",
 		name: "列车",
 		deviceType: "train",
 		type: "cctvTrain",
-		url: "/cbtc/static/trafficplan/train.FBX"
+		url: BASE_ASSET_API + "/MODEL/2020-11-16/48-14909.FBX"
 	},
 ];
 

src/jlmap3d/main/loaders/AssetLoader.js

@@ -2,9 +2,8 @@ import { AssetModel } from '@/jlmap3d/main/loaders/model/Assetmodel';
 import { Assetmaterial } from '@/jlmap3d/main/loaders/model/Assetmaterial';
 import { getBaseUrl } from '@/utils/baseUrl';
 import { Loading } from 'element-ui';
-import { BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js';
 const BASE_API = getBaseUrl();
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+import { JL3D_LOCAL_STATIC,BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js';
 
 let defaultsignal = {
   id:"3",
@@ -12,7 +11,7 @@ let defaultsignal = {
   deviceType:"signal",
   type:"low",
   picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/signal/d3d.FBX"
+  url:BASE_ASSET_API+"/MODEL/signal/d3d.FBX"
 }
 
 let defaulttrain = {
@@ -21,7 +20,7 @@ let defaulttrain = {
   deviceType:"train",
   type:"num4",
   picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/train/train.FBX"
+  url:BASE_ASSET_API+"/MODEL/train/train.FBX"
 }
 
 
@@ -31,34 +30,24 @@ let defaultstation = {
   deviceType:"stand",
   type:"num4",
   picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/station/fuzhou.FBX"
-}//JL3D_LOCAL_STATIC+"/MODEL/station/fuzhou/fuzhou.FBX"
+  url:BASE_ASSET_API+"/MODEL/station/fuzhou.FBX"
+}
 let waicestation = {
   id:"10",
   name:"外侧车站",
   deviceType:"standwaice",
   type:"num4",
   picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/station/waicestation.FBX"
+  url:BASE_ASSET_API+"/MODEL/station/waicestation.FBX"
 }
-let station3 = {
-  id:"10000",
-  name:"特殊站台",
-  deviceType:"station3",
-  type:"num4",
-  picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/station/station3.FBX"
-}
-//JL3D_LOCAL_STATIC+"/MODEL/station/fuzhou/fuzhou.FBX"
-//https://test.joylink.club/oss/station/fuzhou/fuzhou.FBX
-//https://joylink.club/oss/station/fuzhou/fuzhou.FBX
+
 let defaultswitch = {
   id:"11",
   name:"道岔",
   deviceType:"switch",
   type:"fuzhou",
   picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/daocha/daocha.FBX"
+  url:BASE_ASSET_API+"/MODEL/daocha/daocha.FBX"
 }
 
 
@@ -68,37 +57,19 @@ let defaultsuidao = {
   deviceType:"suidao",
   type:"suidao",
   picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/suidao/suidao.FBX"
+  url:BASE_ASSET_API+"/MODEL/suidao/suidao.FBX"
 }
 
-let hebsuidao = {
-  id:"1010",
-  name:"hebsuidao",
-  deviceType:"hebsuidao",
-  type:"hebsuidao",
-  picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/suidao/hebsuidao.FBX"
-}
-let nbsuidao = {
-  id:"1010",
-  name:"nbsuidao",
-  deviceType:"nbsuidao",
-  type:"nbsuidao",
-  picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/suidao/nbsuidao.FBX"
-}
+
+
 let defaultbackground = {
   id:"16",
   name:"background",
   deviceType:"background",
   type:"background",
   picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/suidao/background.FBX"
+  url:BASE_ASSET_API+"/MODEL/suidao/background.FBX"
 }
-//JL3D_LOCAL_STATIC+"/MODEL/suidao/suidao.FBX"
-//https://test.joylink.club/oss/suidao/suidao.FBX
-//https://joylink.club/oss/suidao/suidao.FBX
-
 
 let defaultautorail = {
   id:"100",
@@ -106,7 +77,7 @@ let defaultautorail = {
   deviceType:"autorail",
   type:"autorail",
   picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/auto/rail.FBX"
+  url:BASE_ASSET_API+"/MODEL/auto/rail.FBX"
 }
 
 let autoswitch = {
@@ -115,7 +86,7 @@ let autoswitch = {
   deviceType:"autoswitch",
   type:"fuzhou",
   picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/auto/autoswitch.FBX"
+  url:BASE_ASSET_API+"/MODEL/auto/autoswitch.FBX"
 }
 
 let autoswitch1 = {
@@ -124,7 +95,7 @@ let autoswitch1 = {
   deviceType:"autoswitch1",
   type:"fuzhou",
   picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/auto/switch1.FBX"
+  url:BASE_ASSET_API+"/MODEL/auto/switch1.FBX"
 }
 
 let autoswitch2 = {
@@ -133,7 +104,7 @@ let autoswitch2 = {
   deviceType:"autoswitch2",
   type:"fuzhou",
   picUrl:"",
-  url:JL3D_LOCAL_STATIC+"/MODEL/auto/switch2.FBX"
+  url:BASE_ASSET_API+"/MODEL/auto/switch2.FBX"
 }
 
 export function AssetLoader(){

src/views/jlmap3d/jl3dassetmanager/component/modellist.vue

@@ -2,7 +2,7 @@
 
   <div class="jl3dmanager">
     <el-table
-    :data="tableData"
+    :data="handlesearch(tableData)"
     style="width: 100%"
     :default-sort = "{prop: 'date', order: 'descending'}"
     >
@@ -23,7 +23,12 @@
       </el-table-column>
       <el-table-column
         prop="uploaderId"
-        label="上传用户"
+        label="上传用户ID"
+        >
+      </el-table-column>
+      <el-table-column
+        prop="assetUrl"
+        label="资源路径"
         >
       </el-table-column>
       <el-table-column
@@ -93,7 +98,19 @@ export default {
     data() {
         return {
           tableData: [
-
+            {
+              id: '',
+              packageName: '',
+              name: '',
+              uploaderId: '',
+              assetUrl: '',
+              resourceType:'',
+              deviceType:'',
+              remarks:'',
+              modelurl:'',
+              newuploaddate:'',
+              uploadTime:'',
+            }
           ],
           search: ''
         };
@@ -123,6 +140,7 @@ export default {
                 packageName: netdata.data[i].packageName,
                 name: netdata.data[i].name,
                 uploaderId: netdata.data[i].uploaderId,
+                assetUrl: netdata.data[i].url,
                 resourceType:netdata.data[i].resourceType,
                 deviceType:netdata.data[i].deviceType,
                 remarks:netdata.data[i].remarks,
@@ -149,6 +167,13 @@ export default {
         console.log(row);
         this.$emit('replaceAsset', row);
       },
+      handlesearch: function() {
+				return this.tableData.filter(item => {
+					if (item.resourceType.includes(this.search) || item.deviceType.includes(this.search)) {
+						return item;
+					}
+				})
+			},
       handleDelete(index, row) {
 
         console.log(row);

src/views/jlmap3d/jl3dassetmanager/component/uploadmodel.vue

@@ -13,6 +13,9 @@
               <el-option label="单体设备展示场景" value="DeviceScene"></el-option>
               <el-option label="通号维修场景" value="MaintainerScene"></el-option>
               <el-option label="cctv场景" value="CctvScene"></el-option>
+              <el-option label="编辑器默认模型" value="EditModel"></el-option>
+              <el-option label="VR模型" value="VrModel"></el-option>
+              <el-option label="客流场景" value="客流模型"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="设备类型">
@@ -37,6 +40,8 @@
               <el-option label="cctv铁轨" value="CctvSection"></el-option>
 
               <el-option label="通号设备间" value="MaintainerRoom"></el-option>
+
+              <el-option label="静态模型" value="静态模型"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="模型信息">