diff --git a/src/api/jlmap3d/assets3d.js b/src/api/jlmap3d/assets3d.js index c657678b2..a31956717 100644 --- a/src/api/jlmap3d/assets3d.js +++ b/src/api/jlmap3d/assets3d.js @@ -7,7 +7,7 @@ let uploadurl = null; let asseturl = null; if(BASE_API == "https://test.joylink.club/jlcloud"){ uploadurl = "https://test.joylink.club/jlfile"; - asseturl = "https://test.joylink.club/oss/joylink" + asseturl = "../static" }else if(BASE_API == "https://joylink.club/jlcloud"){ uploadurl = "https://joylink.club/jlfile"; asseturl = "https://joylink.club/oss/joylink" diff --git a/src/jlmap3d/main/loaders/SimulationLoad.js b/src/jlmap3d/main/loaders/SimulationLoad.js index cbba4d6ff..a25f2ce42 100644 --- a/src/jlmap3d/main/loaders/SimulationLoad.js +++ b/src/jlmap3d/main/loaders/SimulationLoad.js @@ -66,6 +66,7 @@ export function SimulationLoad(data,scope,netdata,mapdata,camera,controls,scene, let switchdata = JSON.parse(netdata.switchs); let signaldata = JSON.parse(netdata.signals); let standsdata = JSON.parse(netdata.stands); + // console.log(netdata.assets); assetloader.setmodellist(netdata.assets,1); diff --git a/src/jlmap3d/main/loaders/SimulationLoadNew.js b/src/jlmap3d/main/loaders/SimulationLoadNew.js index 136405a5b..7f83a4312 100644 --- a/src/jlmap3d/main/loaders/SimulationLoadNew.js +++ b/src/jlmap3d/main/loaders/SimulationLoadNew.js @@ -70,6 +70,7 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce let signaldata = JSON.parse(netdata.signals); let standsdata = JSON.parse(netdata.stands); let psddata = data.psdList; + console.log(JSON.parse(netdata.assets)); assetloader.setModelListOver(JSON.parse(netdata.assets).sceneAssetList); // assetloader.setmodellistnew(netdata.assets); diff --git a/static/PICTURE/2020-07-20/100-16830.jpg b/static/PICTURE/2020-07-20/100-16830.jpg new file mode 100644 index 000000000..61440d4a1 Binary files /dev/null and b/static/PICTURE/2020-07-20/100-16830.jpg differ diff --git a/static/PICTURE/2020-07-20/101-14805.jpg b/static/PICTURE/2020-07-20/101-14805.jpg new file mode 100644 index 000000000..0d30b550c Binary files /dev/null and b/static/PICTURE/2020-07-20/101-14805.jpg differ diff --git a/static/PICTURE/2020-07-20/75-41548.jpg b/static/PICTURE/2020-07-20/75-41548.jpg new file mode 100644 index 000000000..74cdbafcc Binary files /dev/null and b/static/PICTURE/2020-07-20/75-41548.jpg differ diff --git a/static/PICTURE/2020-07-20/76-53172.jpg b/static/PICTURE/2020-07-20/76-53172.jpg new file mode 100644 index 000000000..cff1fc865 Binary files /dev/null and b/static/PICTURE/2020-07-20/76-53172.jpg differ diff --git a/static/PICTURE/2020-07-20/77-47609.jpg b/static/PICTURE/2020-07-20/77-47609.jpg new file mode 100644 index 000000000..a2398c7ba Binary files /dev/null and b/static/PICTURE/2020-07-20/77-47609.jpg differ diff --git a/static/PICTURE/2020-07-20/78-81521.jpg b/static/PICTURE/2020-07-20/78-81521.jpg new file mode 100644 index 000000000..6771f3e67 Binary files /dev/null and b/static/PICTURE/2020-07-20/78-81521.jpg differ diff --git a/static/PICTURE/2020-07-20/79-13094.jpg b/static/PICTURE/2020-07-20/79-13094.jpg new file mode 100644 index 000000000..ce7e12f6c Binary files /dev/null and b/static/PICTURE/2020-07-20/79-13094.jpg differ diff --git a/static/PICTURE/2020-07-20/80-74123.jpg b/static/PICTURE/2020-07-20/80-74123.jpg new file mode 100644 index 000000000..fd35c8552 Binary files /dev/null and b/static/PICTURE/2020-07-20/80-74123.jpg differ diff --git a/static/PICTURE/2020-07-20/81-7009.jpg b/static/PICTURE/2020-07-20/81-7009.jpg new file mode 100644 index 000000000..3e11ddebe Binary files /dev/null and b/static/PICTURE/2020-07-20/81-7009.jpg differ diff --git a/static/PICTURE/2020-07-20/82-8857.jpg b/static/PICTURE/2020-07-20/82-8857.jpg new file mode 100644 index 000000000..91f07f8d9 Binary files /dev/null and b/static/PICTURE/2020-07-20/82-8857.jpg differ diff --git a/static/PICTURE/2020-07-20/83-53872.jpg b/static/PICTURE/2020-07-20/83-53872.jpg new file mode 100644 index 000000000..04e0b0e4b Binary files /dev/null and b/static/PICTURE/2020-07-20/83-53872.jpg differ diff --git a/static/PICTURE/2020-07-20/84-35706.jpg b/static/PICTURE/2020-07-20/84-35706.jpg new file mode 100644 index 000000000..c67b4c94f Binary files /dev/null and b/static/PICTURE/2020-07-20/84-35706.jpg differ diff --git a/static/PICTURE/2020-07-20/85-71321.jpg b/static/PICTURE/2020-07-20/85-71321.jpg new file mode 100644 index 000000000..163a36183 Binary files /dev/null and b/static/PICTURE/2020-07-20/85-71321.jpg differ diff --git a/static/PICTURE/2020-07-20/86-39921.jpg b/static/PICTURE/2020-07-20/86-39921.jpg new file mode 100644 index 000000000..eba8f84a3 Binary files /dev/null and b/static/PICTURE/2020-07-20/86-39921.jpg differ diff --git a/static/PICTURE/2020-07-20/87-77035.jpg b/static/PICTURE/2020-07-20/87-77035.jpg new file mode 100644 index 000000000..a153b8959 Binary files /dev/null and b/static/PICTURE/2020-07-20/87-77035.jpg differ diff --git a/static/PICTURE/2020-07-20/88-87315.jpg b/static/PICTURE/2020-07-20/88-87315.jpg new file mode 100644 index 000000000..059cae0b3 Binary files /dev/null and b/static/PICTURE/2020-07-20/88-87315.jpg differ diff --git a/static/PICTURE/2020-07-20/89-91350.jpg b/static/PICTURE/2020-07-20/89-91350.jpg new file mode 100644 index 000000000..f39912fa9 Binary files /dev/null and b/static/PICTURE/2020-07-20/89-91350.jpg differ diff --git a/static/PICTURE/2020-07-20/90-98085.jpg b/static/PICTURE/2020-07-20/90-98085.jpg new file mode 100644 index 000000000..2713c81db Binary files /dev/null and b/static/PICTURE/2020-07-20/90-98085.jpg differ diff --git a/static/PICTURE/2020-07-20/91-9804.jpg b/static/PICTURE/2020-07-20/91-9804.jpg new file mode 100644 index 000000000..d6a468721 Binary files /dev/null and b/static/PICTURE/2020-07-20/91-9804.jpg differ diff --git a/static/PICTURE/2020-07-20/92-68962.jpg b/static/PICTURE/2020-07-20/92-68962.jpg new file mode 100644 index 000000000..f9171fbf5 Binary files /dev/null and b/static/PICTURE/2020-07-20/92-68962.jpg differ diff --git a/static/PICTURE/2020-07-20/93-82875.jpg b/static/PICTURE/2020-07-20/93-82875.jpg new file mode 100644 index 000000000..01281241e Binary files /dev/null and b/static/PICTURE/2020-07-20/93-82875.jpg differ diff --git a/static/PICTURE/2020-07-20/94-22117.png b/static/PICTURE/2020-07-20/94-22117.png new file mode 100644 index 000000000..c059bcba7 Binary files /dev/null and b/static/PICTURE/2020-07-20/94-22117.png differ diff --git a/static/PICTURE/2020-07-20/95-40723.jpg b/static/PICTURE/2020-07-20/95-40723.jpg new file mode 100644 index 000000000..e95024ce1 Binary files /dev/null and b/static/PICTURE/2020-07-20/95-40723.jpg differ diff --git a/static/PICTURE/2020-07-20/96-30683.jpg b/static/PICTURE/2020-07-20/96-30683.jpg new file mode 100644 index 000000000..a2e170622 Binary files /dev/null and b/static/PICTURE/2020-07-20/96-30683.jpg differ diff --git a/static/PICTURE/2020-07-20/97-36744.jpg b/static/PICTURE/2020-07-20/97-36744.jpg new file mode 100644 index 000000000..912503a6a Binary files /dev/null and b/static/PICTURE/2020-07-20/97-36744.jpg differ diff --git a/static/PICTURE/2020-07-20/98-14311.jpg b/static/PICTURE/2020-07-20/98-14311.jpg new file mode 100644 index 000000000..b6b517cc5 Binary files /dev/null and b/static/PICTURE/2020-07-20/98-14311.jpg differ diff --git a/static/PICTURE/2020-07-20/99-5021.jpg b/static/PICTURE/2020-07-20/99-5021.jpg new file mode 100644 index 000000000..98d353b8e Binary files /dev/null and b/static/PICTURE/2020-07-20/99-5021.jpg differ diff --git a/static/model/2020-07-02/1-29889.FBX b/static/model/2020-07-02/1-29889.FBX new file mode 100644 index 000000000..799d458c8 Binary files /dev/null and b/static/model/2020-07-02/1-29889.FBX differ diff --git a/static/model/2020-07-02/2-24518.FBX b/static/model/2020-07-02/2-24518.FBX new file mode 100644 index 000000000..02d01e591 Binary files /dev/null and b/static/model/2020-07-02/2-24518.FBX differ diff --git a/static/model/2020-07-10/13-42231.FBX b/static/model/2020-07-10/13-42231.FBX new file mode 100644 index 000000000..2b92550d3 Binary files /dev/null and b/static/model/2020-07-10/13-42231.FBX differ diff --git a/static/model/2020-07-10/16-73439.FBX b/static/model/2020-07-10/16-73439.FBX new file mode 100644 index 000000000..4d0bc58b8 Binary files /dev/null and b/static/model/2020-07-10/16-73439.FBX differ diff --git a/static/model/2020-07-10/17-43789.FBX b/static/model/2020-07-10/17-43789.FBX new file mode 100644 index 000000000..1da09c2f5 Binary files /dev/null and b/static/model/2020-07-10/17-43789.FBX differ diff --git a/static/model/2020-07-10/18-80826.FBX b/static/model/2020-07-10/18-80826.FBX new file mode 100644 index 000000000..8bf389b6f Binary files /dev/null and b/static/model/2020-07-10/18-80826.FBX differ diff --git a/static/model/2020-07-10/19-86699.FBX b/static/model/2020-07-10/19-86699.FBX new file mode 100644 index 000000000..53986c315 Binary files /dev/null and b/static/model/2020-07-10/19-86699.FBX differ diff --git a/static/model/2020-07-10/20-43014.FBX b/static/model/2020-07-10/20-43014.FBX new file mode 100644 index 000000000..3b468ffcd Binary files /dev/null and b/static/model/2020-07-10/20-43014.FBX differ diff --git a/static/model/2020-07-10/21-35677.FBX b/static/model/2020-07-10/21-35677.FBX new file mode 100644 index 000000000..d413cd29f Binary files /dev/null and b/static/model/2020-07-10/21-35677.FBX differ diff --git a/static/model/2020-07-16/1-9933.FBX b/static/model/2020-07-16/1-9933.FBX new file mode 100644 index 000000000..f3025720c Binary files /dev/null and b/static/model/2020-07-16/1-9933.FBX differ diff --git a/static/model/2020-07-16/2-87850.FBX b/static/model/2020-07-16/2-87850.FBX new file mode 100644 index 000000000..eb7542588 Binary files /dev/null and b/static/model/2020-07-16/2-87850.FBX differ diff --git a/static/model/2020-07-16/23-63435.FBX b/static/model/2020-07-16/23-63435.FBX new file mode 100644 index 000000000..e4ba41ef7 Binary files /dev/null and b/static/model/2020-07-16/23-63435.FBX differ diff --git a/static/model/2020-07-16/24-34137.FBX b/static/model/2020-07-16/24-34137.FBX new file mode 100644 index 000000000..97e9798a7 Binary files /dev/null and b/static/model/2020-07-16/24-34137.FBX differ diff --git a/static/model/2020-07-16/25-44466.FBX b/static/model/2020-07-16/25-44466.FBX new file mode 100644 index 000000000..4f7fcf14e Binary files /dev/null and b/static/model/2020-07-16/25-44466.FBX differ diff --git a/static/model/2020-07-16/26-83232.FBX b/static/model/2020-07-16/26-83232.FBX new file mode 100644 index 000000000..72a69eb88 Binary files /dev/null and b/static/model/2020-07-16/26-83232.FBX differ diff --git a/static/model/2020-07-16/27-44671.FBX b/static/model/2020-07-16/27-44671.FBX new file mode 100644 index 000000000..21c1b51e4 Binary files /dev/null and b/static/model/2020-07-16/27-44671.FBX differ diff --git a/static/model/2020-07-16/28-97842.FBX b/static/model/2020-07-16/28-97842.FBX new file mode 100644 index 000000000..1f8988c9f Binary files /dev/null and b/static/model/2020-07-16/28-97842.FBX differ diff --git a/static/model/2020-07-16/3-7001.FBX b/static/model/2020-07-16/3-7001.FBX new file mode 100644 index 000000000..4d7f11cd7 Binary files /dev/null and b/static/model/2020-07-16/3-7001.FBX differ diff --git a/static/model/2020-07-17/4-88613.FBX b/static/model/2020-07-17/4-88613.FBX new file mode 100644 index 000000000..408b4a08c Binary files /dev/null and b/static/model/2020-07-17/4-88613.FBX differ diff --git a/static/model/2020-07-17/6-57173.FBX b/static/model/2020-07-17/6-57173.FBX new file mode 100644 index 000000000..0f2fb43f7 Binary files /dev/null and b/static/model/2020-07-17/6-57173.FBX differ diff --git a/static/model/2020-07-20/39-95136.FBX b/static/model/2020-07-20/39-95136.FBX new file mode 100644 index 000000000..9455948ba Binary files /dev/null and b/static/model/2020-07-20/39-95136.FBX differ diff --git a/static/model/2020-07-20/40-13561.FBX b/static/model/2020-07-20/40-13561.FBX new file mode 100644 index 000000000..0a20e2e34 Binary files /dev/null and b/static/model/2020-07-20/40-13561.FBX differ diff --git a/static/model/2020-07-20/41-53542.FBX b/static/model/2020-07-20/41-53542.FBX new file mode 100644 index 000000000..19cedafea Binary files /dev/null and b/static/model/2020-07-20/41-53542.FBX differ diff --git a/static/model/2020-07-20/42-7172.FBX b/static/model/2020-07-20/42-7172.FBX new file mode 100644 index 000000000..62fc3da27 Binary files /dev/null and b/static/model/2020-07-20/42-7172.FBX differ diff --git a/static/model/2020-07-20/43-8227.FBX b/static/model/2020-07-20/43-8227.FBX new file mode 100644 index 000000000..e8e7b62c7 Binary files /dev/null and b/static/model/2020-07-20/43-8227.FBX differ diff --git a/static/model/2020-07-20/44-24100.FBX b/static/model/2020-07-20/44-24100.FBX new file mode 100644 index 000000000..6bdd99342 Binary files /dev/null and b/static/model/2020-07-20/44-24100.FBX differ diff --git a/static/model/2020-07-20/45-36330.FBX b/static/model/2020-07-20/45-36330.FBX new file mode 100644 index 000000000..49f7eca9b Binary files /dev/null and b/static/model/2020-07-20/45-36330.FBX differ