|
@@ -2674,10 +2674,16 @@ function load4dkkMedias(model){//加载四维看看的一些媒体物品
|
|
let {sceneJsonPath,surveillancePath} = model.props.raw
|
|
let {sceneJsonPath,surveillancePath} = model.props.raw
|
|
console.log(sceneJsonPath,surveillancePath)
|
|
console.log(sceneJsonPath,surveillancePath)
|
|
if(sceneJsonPath){//box图片视频 /oss/scene_view_data/SG-jm-Xwq0FwSkFy4/data/scene.json
|
|
if(sceneJsonPath){//box图片视频 /oss/scene_view_data/SG-jm-Xwq0FwSkFy4/data/scene.json
|
|
|
|
+
|
|
|
|
+ sceneJsonPath = `${Potree.settings.urls.getPrefix(8,{})}/${sceneJsonPath}`
|
|
|
|
+
|
|
Potree.loadFile(sceneJsonPath+ '?m='+Date.now(),null,(json)=>{
|
|
Potree.loadFile(sceneJsonPath+ '?m='+Date.now(),null,(json)=>{
|
|
//console.log(model.name, 'sceneJson', json, json.surveillances)
|
|
//console.log(model.name, 'sceneJson', json, json.surveillances)
|
|
-
|
|
|
|
|
|
+
|
|
if(json.surveillances){//监控
|
|
if(json.surveillances){//监控
|
|
|
|
+
|
|
|
|
+ surveillancePath = `${Potree.settings.urls.getPrefix(8,{})}/${surveillancePath}`
|
|
|
|
+
|
|
Potree.loadFile(surveillancePath + '?m='+Date.now(),null,(monitorJson)=>{
|
|
Potree.loadFile(surveillancePath + '?m='+Date.now(),null,(monitorJson)=>{
|
|
//console.log(model.name, 'surveillance', monitorJson)
|
|
//console.log(model.name, 'surveillance', monitorJson)
|
|
monitorJson.forEach((e)=>{
|
|
monitorJson.forEach((e)=>{
|