Преглед на файлове

fix: 漫游点加载好了

xzw преди 1 година
родител
ревизия
8b64938861
променени са 5 файла, в които са добавени 29909 реда и са изтрити 29150 реда
  1. 28955 28837
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 848 0
      public/test-case/model-list - 副本.json
  4. 58 301
      public/test-case/model-list.json
  5. 47 11
      src/sdk/cover/index.js

Файловите разлики са ограничени, защото са твърде много
+ 28955 - 28837
public/lib/potree/potree.js


Файловите разлики са ограничени, защото са твърде много
+ 1 - 1
public/lib/potree/potree.js.map


+ 848 - 0
public/test-case/model-list - 副本.json

@@ -0,0 +1,848 @@
+{
+    "code": 0,
+    "message": "操作成功",
+    "data": [
+        {
+            "caseId": null,
+            "fusionNumId": 1097,
+            "fusionId": 221,
+            "modelId": 1252,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": -147.32228,
+                    "y": -48.50493,
+                    "z": 0.0
+                },
+                "rotation": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1252,
+                "modelTitle": null,
+                "modelDateType": "obj",
+                "modelSize": null,
+                "type": 2,
+                "modelObjUrl": null,
+                "modelGlbUrl": null,
+                "userName": null,
+                "modelType": "pointcloud",
+                "num": "SS-t-Rv7vsJ0R219",
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-03-27 14:52:33",
+                "updateTime": "2024-07-17 14:18:53",
+                "deptId": "DEP000011759420653032312832",
+                "deptName": "数据统计总队",
+                "fileNewName": null,
+                "id": 3796,
+                "buildObjStatus": 1,
+                "name": "场景1",
+                "payStatus": 1,
+                "sceneName": null,
+                "snCode": "A0IA7R137",
+                "status": 2,
+                "thumb": "https://laser-oss.4dkankan.com/static/img_default/pc.jpg",
+                "title": "场景1",
+                "viewCount": 50,
+                "isLaser": true,
+                "phone": "18819272201",
+                "bind": true,
+                "location": 4
+            }
+        },
+        {
+            "caseId": null,
+            "fusionNumId": 1997,
+            "fusionId": 221,
+            "modelId": 1252,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": -147.32228,
+                    "y": -48.50493,
+                    "z": 0.0
+                },
+                "rotation": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1252,
+                "modelTitle": null,
+                "modelDateType": "obj",
+                "modelSize": null,
+                "type": 2,
+                "modelObjUrl": null,
+                "modelGlbUrl": null,
+                "userName": null,
+                "modelType": "pointcloud",
+                "num": "SS-t-Rv7vsJ0R219",
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-03-27 14:52:33",
+                "updateTime": "2024-07-17 14:18:53",
+                "deptId": "DEP000011759420653032312832",
+                "deptName": "数据统计总队",
+                "fileNewName": null,
+                "id": 3796,
+                "buildObjStatus": 1,
+                "name": "场景2",
+                "payStatus": 1,
+                "sceneName": null,
+                "snCode": "A0IA7R137",
+                "status": 2,
+                "thumb": "https://laser-oss.4dkankan.com/static/img_default/pc.jpg",
+                "title": "场景2",
+                "viewCount": 50,
+                "isLaser": true,
+                "phone": "18819272201",
+                "bind": true,
+                "location": 4
+            }
+        },
+        {
+            "caseId": null,
+            "fusionNumId": 1098,
+            "fusionId": 221,
+            "modelId": 1307,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": 0.16552170253057596,
+                    "y": -11.152602403,
+                    "z": 0.10249640482
+                },
+                "rotation": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1307,
+                "modelTitle": "las",
+                "modelDateType": "las",
+                "modelSize": "5.11MB",
+                "type": 3,
+                "modelObjUrl": null,
+                "modelGlbUrl": "[\"https://4dkk.4dage.com/fusion/xj/model/modelId_1307/webcloud\"]",
+                "userName": "88888888888",
+                "modelType": "las",
+                "num": null,
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-07-19 10:52:32",
+                "updateTime": "2024-07-19 10:52:35",
+                "deptId": "0",
+                "deptName": "超管组织",
+                "fileNewName": "https://4dkk.4dage.com/fusion/xj/model/modelId_1307/3af7984d9c1d4cb99998b14a54346008.zip",
+                "id": null,
+                "buildObjStatus": null,
+                "name": null,
+                "payStatus": null,
+                "sceneName": null,
+                "snCode": null,
+                "status": 2,
+                "thumb": null,
+                "title": null,
+                "viewCount": null,
+                "isLaser": null,
+                "phone": null,
+                "bind": true,
+                "location": null
+            }
+        },
+        {
+            "caseId": null,
+            "fusionNumId": 1096,
+            "fusionId": 221,
+            "modelId": 1309,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": -57.43192,
+                    "y": -25.28869,
+                    "z": 2.31154
+                },
+                "rotation": {
+                    "x": 1.5708,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1309,
+                "modelTitle": null,
+                "modelDateType": "b3dm",
+                "modelSize": null,
+                "type": 6,
+                "modelObjUrl": null,
+                "modelGlbUrl": "[\"https://4dkk.4dage.com/scene_view_data/SG-t-D0hJSjOGkfX/images/3dtiles/tileset.json\"]",
+                "userName": null,
+                "modelType": "b3dm",
+                "num": "SG-t-D0hJSjOGkfX",
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-07-23 17:40:50",
+                "updateTime": "2024-07-23 20:39:46",
+                "deptId": "DEP000011456505791239610368",
+                "deptName": "广州市消防救援支队",
+                "fileNewName": null,
+                "id": 3007940,
+                "buildObjStatus": 0,
+                "name": "非文保app拍摄的深光场景",
+                "payStatus": 1,
+                "sceneName": "非文保app拍摄的深光场景",
+                "snCode": "BPVT00019",
+                "status": 2,
+                "thumb": "https://4dkk.4dage.com/scene_view_data/SG-t-D0hJSjOGkfX/images/floor_0.png?t=1721727650730",
+                "title": "非文保app拍摄的深光场景",
+                "viewCount": 7,
+                "isLaser": false,
+                "phone": null,
+                "bind": true,
+                "location": null
+            }
+        },
+        {
+            "caseId": null,
+            "fusionNumId": 1095,
+            "fusionId": 221,
+            "modelId": 1312,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": 1.98693,
+                    "y": 30.13181,
+                    "z": 1.4882
+                },
+                "rotation": {
+                    "x": 1.5708,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1312,
+                "modelTitle": null,
+                "modelDateType": "b3dm",
+                "modelSize": null,
+                "type": 6,
+                "modelObjUrl": null,
+                "modelGlbUrl": "[\"https://4dkk.4dage.com/scene_view_data/SG-t-2C1XCwY8XeW/images/3dtiles/tileset.json\"]",
+                "userName": null,
+                "modelType": "b3dm",
+                "num": "SG-t-2C1XCwY8XeW",
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-02-26 17:09:24",
+                "updateTime": "2024-07-24 11:09:03",
+                "deptId": "DEP000011456505791239610368",
+                "deptName": "广州市消防救援支队",
+                "fileNewName": null,
+                "id": 3006122,
+                "buildObjStatus": 0,
+                "name": "删除第一个",
+                "payStatus": 1,
+                "sceneName": "删除第一个",
+                "snCode": "BPVT00019",
+                "status": 2,
+                "thumb": "https://4dkk.4dage.com/scene_view_data/SG-t-2C1XCwY8XeW/images/floor_0.png?t=1708938564010",
+                "title": "删除第一个",
+                "viewCount": 27,
+                "isLaser": false,
+                "phone": null,
+                "bind": true,
+                "location": null
+            }
+        },
+        {
+            "caseId": null,
+            "fusionNumId": 1094,
+            "fusionId": 221,
+            "modelId": 1311,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 2.0
+                },
+                "rotation": {
+                    "x": 1.570796326794896,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1311,
+                "modelTitle": null,
+                "modelDateType": "b3dm",
+                "modelSize": null,
+                "type": 6,
+                "modelObjUrl": null,
+                "modelGlbUrl": "[\"https://4dkk.4dage.com/scene_view_data/SG-t-Wm2b883yI4z/images/3dtiles/tileset.json\"]",
+                "userName": null,
+                "modelType": "b3dm",
+                "num": "SG-t-Wm2b883yI4z",
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-02-26 16:06:11",
+                "updateTime": "2024-07-24 11:09:03",
+                "deptId": "DEP000011456505791239610368",
+                "deptName": "广州市消防救援支队",
+                "fileNewName": null,
+                "id": 3006111,
+                "buildObjStatus": 0,
+                "name": "项目0226.16.05",
+                "payStatus": 1,
+                "sceneName": "项目0226.16.05",
+                "snCode": "BPVT00019",
+                "status": 2,
+                "thumb": "https://4dkk.4dage.com/scene_view_data/SG-t-Wm2b883yI4z/images/floor_0.png?t=1708934771617",
+                "title": "项目0226.16.05",
+                "viewCount": 3,
+                "isLaser": false,
+                "phone": null,
+                "bind": true,
+                "location": null
+            }
+        },
+        {
+            "caseId": null,
+            "fusionNumId": 1092,
+            "fusionId": 221,
+            "modelId": 1310,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": -23.968,
+                    "y": 17.2930920851,
+                    "z": 0.81291
+                },
+                "rotation": {
+                    "x": 1.5708,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1310,
+                "modelTitle": null,
+                "modelDateType": "b3dm",
+                "modelSize": null,
+                "type": 6,
+                "modelObjUrl": null,
+                "modelGlbUrl": "[\"https://4dkk.4dage.com/scene_view_data/SG-t-99gxNsfKHSR/images/3dtiles/tileset.json\"]",
+                "userName": null,
+                "modelType": "b3dm",
+                "num": "SG-t-99gxNsfKHSR",
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-07-16 10:46:49",
+                "updateTime": "2024-07-24 11:09:03",
+                "deptId": "DEP000011456505791239610368",
+                "deptName": "广州市消防救援支队",
+                "fileNewName": null,
+                "id": 3007801,
+                "buildObjStatus": 0,
+                "name": "pll716 测试",
+                "payStatus": 1,
+                "sceneName": "pll716 测试",
+                "snCode": "BPVT00019",
+                "status": 2,
+                "thumb": "https://4dkk.4dage.com/scene_view_data/SG-t-99gxNsfKHSR/images/floor_0.png?t=1721098009591",
+                "title": "pll716 测试",
+                "viewCount": 4,
+                "isLaser": false,
+                "phone": null,
+                "bind": true,
+                "location": null
+            }
+        },
+        {
+            "caseId": null,
+            "fusionNumId": 1198,
+            "fusionId": 221,
+            "modelId": 1307,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": 0.0,
+                    "y": 100.0,
+                    "z": 10.0
+                },
+                "rotation": {
+                    "x": -2.22346,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1307,
+                "modelTitle": "高斯模型",
+                "modelDateType": "3dgs",
+                "modelSize": "20.8MB",
+                "type": 3,
+                "modelObjUrl": null,
+                "model3dgsUrl": "[\"/test-case/gaussian/bonsai.ksplat\"]",
+                "userName": "88888888888",
+                "modelType": "3dgs",
+                "num": null,
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-07-19 10:52:32",
+                "updateTime": "2024-07-19 10:52:35",
+                "deptId": "0",
+                "deptName": "超管组织",
+                "fileNewName": "https://4dkk.4dage.com/fusion/xj/model/modelId_1307/3af7984d9c1d4cb99998b14a54346008.zip",
+                "id": null,
+                "buildObjStatus": null,
+                "name": null,
+                "payStatus": null,
+                "sceneName": null,
+                "snCode": null,
+                "status": 2,
+                "thumb": null,
+                "title": null,
+                "viewCount": null,
+                "isLaser": null,
+                "phone": null,
+                "bind": true,
+                "location": null
+            }
+        },
+        {
+            "caseId": null,
+            "fusionNumId": 1198,
+            "fusionId": 221,
+            "modelId": 1307,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 10.0
+                },
+                "rotation": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1307,
+                "modelTitle": "矢量数据",
+                "modelDateType": "shp",
+                "modelSize": "20.8MB",
+                "type": 3,
+                "modelObjUrl": null,
+                "modelShpUrl": "[\"/test-case/shape/jiangmen.shp\"]",
+                "userName": "88888888888",
+                "modelType": "shp",
+                "num": null,
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-07-19 10:52:32",
+                "updateTime": "2024-07-19 10:52:35",
+                "deptId": "0",
+                "deptName": "超管组织",
+                "fileNewName": "https://4dkk.4dage.com/fusion/xj/model/modelId_1307/3af7984d9c1d4cb99998b14a54346008.zip",
+                "id": null,
+                "buildObjStatus": null,
+                "name": null,
+                "payStatus": null,
+                "sceneName": null,
+                "snCode": null,
+                "status": 2,
+                "thumb": null,
+                "title": null,
+                "viewCount": null,
+                "isLaser": null,
+                "phone": null,
+                "bind": true,
+                "location": null
+            }
+        },
+        {
+            "caseId": null,
+            "fusionNumId": 1099,
+            "fusionId": 222,
+            "modelId": 1309,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 0.0
+                },
+                "rotation": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1309,
+                "modelTitle": null,
+                "modelDateType": "b3dm",
+                "modelSize": null,
+                "type": 6,
+                "modelObjUrl": null,
+                "modelGlbUrl": "[\"https://4dkk.4dage.com/scene_view_data/SG-t-D0hJSjOGkfX/images/3dtiles/tileset.json\"]",
+                "userName": null,
+                "modelType": "b3dm",
+                "num": "SG-t-D0hJSjOGkfX",
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-07-23 17:40:50",
+                "updateTime": "2024-07-23 20:39:46",
+                "deptId": "DEP000011456505791239610368",
+                "deptName": "广州市消防救援支队",
+                "fileNewName": null,
+                "id": 3007940,
+                "buildObjStatus": 0,
+                "name": "非文保app拍摄的深光场景",
+                "payStatus": 1,
+                "sceneName": "非文保app拍摄的深光场景",
+                "snCode": "BPVT00019",
+                "status": 2,
+                "thumb": "https://4dkk.4dage.com/scene_view_data/SG-t-D0hJSjOGkfX/images/floor_0.png?t=1721727650730",
+                "title": "非文保app拍摄的深光场景",
+                "viewCount": 10,
+                "isLaser": false,
+                "phone": null,
+                "bind": true,
+                "location": null
+            }
+        },
+        {
+            "caseId": null,
+            "fusionNumId": 1100,
+            "fusionId": 223,
+            "modelId": 1196,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 3.67381
+                },
+                "rotation": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1196,
+                "modelTitle": null,
+                "modelDateType": "b3dm",
+                "modelSize": "1.10MB",
+                "type": 1,
+                "modelObjUrl": null,
+                "modelGlbUrl": "[\"https://4dkk.4dage.com/fusion/xj/model/KJ-t-gYp3LoN2DtK/mesh/b3dm/tileset.json\"]",
+                "userName": null,
+                "modelType": "b3dm",
+                "num": "KJ-t-gYp3LoN2DtK",
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-07-04 15:05:07",
+                "updateTime": "2024-07-17 09:28:54",
+                "deptId": "DEP000011808851599099564032",
+                "deptName": "新疆某大队",
+                "fileNewName": null,
+                "id": 3007618,
+                "buildObjStatus": 0,
+                "name": "某住房宿舍火灾",
+                "payStatus": 1,
+                "sceneName": "某住房宿舍火灾",
+                "snCode": "HDMI00001",
+                "status": 2,
+                "thumb": "https://4dkk.4dage.com/scene_edit_data/KJ-t-gYp3LoN2DtK/user/thumb-1k.jpg",
+                "title": "某住房宿舍火灾",
+                "viewCount": 5,
+                "isLaser": false,
+                "phone": null,
+                "bind": true,
+                "location": null
+            }
+        },
+        {
+            "caseId": null,
+            "fusionNumId": 1101,
+            "fusionId": 224,
+            "modelId": 1315,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 0.0
+                },
+                "rotation": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1315,
+                "modelTitle": null,
+                "modelDateType": "obj",
+                "modelSize": null,
+                "type": 5,
+                "modelObjUrl": null,
+                "modelGlbUrl": null,
+                "userName": null,
+                "modelType": "pointcloud",
+                "num": "SG-t-D0hJSjOGkfX",
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-07-23 17:40:50",
+                "updateTime": "2024-08-02 11:27:12",
+                "deptId": "DEP000011456505791239610368",
+                "deptName": "广州市消防救援支队",
+                "fileNewName": null,
+                "id": 4404,
+                "buildObjStatus": 1,
+                "name": "非文保app拍摄的深光场景",
+                "payStatus": 1,
+                "sceneName": null,
+                "snCode": "BPVT00019",
+                "status": 2,
+                "thumb": "https://laser-oss.4dkankan.com/static/img_default/pc.jpg",
+                "title": "非文保app拍摄的深光场景",
+                "viewCount": 12,
+                "isLaser": true,
+                "phone": "15915816041",
+                "bind": true,
+                "location": 4
+            }
+        },
+        {
+            "caseId": null,
+            "fusionNumId": 1102,
+            "fusionId": 225,
+            "modelId": 1252,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 0.0
+                },
+                "rotation": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1252,
+                "modelTitle": null,
+                "modelDateType": "obj",
+                "modelSize": null,
+                "type": 2,
+                "modelObjUrl": null,
+                "modelGlbUrl": null,
+                "userName": null,
+                "modelType": "pointcloud",
+                "num": "SS-t-Rv7vsJ0R219",
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-03-27 14:52:33",
+                "updateTime": "2024-07-17 14:18:53",
+                "deptId": "DEP000011759420653032312832",
+                "deptName": "数据统计总队",
+                "fileNewName": null,
+                "id": 3796,
+                "buildObjStatus": 1,
+                "name": "场景1",
+                "payStatus": 1,
+                "sceneName": null,
+                "snCode": "A0IA7R137",
+                "status": 2,
+                "thumb": "https://laser-oss.4dkankan.com/static/img_default/pc.jpg",
+                "title": "场景1",
+                "viewCount": 56,
+                "isLaser": true,
+                "phone": "18819272201",
+                "bind": true,
+                "location": 4
+            }
+        },
+        {
+            "caseId": null,
+            "fusionNumId": 1103,
+            "fusionId": 222,
+            "modelId": 1128,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": 11.54761,
+                    "y": 27.06429,
+                    "z": 83.2928
+                },
+                "rotation": {
+                    "x": 1.5708,
+                    "y": 0.0,
+                    "z": 0.0
+                }
+            },
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1128,
+                "modelTitle": null,
+                "modelDateType": "obj",
+                "modelSize": "15.04MB",
+                "type": 4,
+                "modelObjUrl": "/home/tomcat/jar-fusion-8808/xj/model/SS-t-KcsO9dK5leV/mesh.obj",
+                "modelGlbUrl": "[\"https://4dkk.4dage.com/fusion/xj/model/SS-t-KcsO9dK5leV/mesh/floor_0/lod_0/mesh.glb\"]",
+                "userName": null,
+                "modelType": "glb",
+                "num": "SS-t-KcsO9dK5leV",
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-07-05 17:27:17",
+                "updateTime": "2024-07-11 15:32:17",
+                "deptId": "DEP000011808851599099564032",
+                "deptName": "新疆某大队",
+                "fileNewName": null,
+                "id": 3007659,
+                "buildObjStatus": 0,
+                "name": "某能源厂房火灾",
+                "payStatus": 1,
+                "sceneName": "某能源厂房火灾",
+                "snCode": "HDSS00001",
+                "status": 2,
+                "thumb": "https://4dkk.4dage.com/scene_view_data/SS-t-KcsO9dK5leV/images/floor_0.png?t=1720171637632",
+                "title": "某能源厂房火灾",
+                "viewCount": 10,
+                "isLaser": false,
+                "phone": null,
+                "bind": true,
+                "location": null
+            }
+        }
+    ],
+    "success": true,
+    "timestamp": 1722216629620
+}

+ 58 - 301
public/test-case/model-list.json

@@ -2,309 +2,66 @@
   "code": 0,
   "message": "操作成功",
   "data": [
-      {
-          "caseId": null,
-          "fusionNumId": 1097,
-          "fusionId": 221,
-          "modelId": 1252,
-          "hide": 0,
-          "transform": {
-              "scale": [
-                  100.0,
-                  100.0,
-                  100.0
-              ],
-              "position": {
-                  "x": -147.32228,
-                  "y": -48.50493,
-                  "z": 0.0
-              },
-              "rotation": {
-                  "x": 0.0,
-                  "y": 0.0,
-                  "z": 0.0
-              }
-          },
-          "opacity": 100.0,
-          "bottom": 0.0,
-          "token": null,
-          "sceneData": {
-              "modelId": 1252,
-              "modelTitle": null,
-              "modelDateType": "obj",
-              "modelSize": null,
-              "type": 2,
-              "modelObjUrl": null,
-              "modelGlbUrl": null,
-              "userName": null,
-              "modelType": "pointcloud",
-              "num": "SS-t-Rv7vsJ0R219",
-              "tbStatus": 0,
-              "createStatus": 1,
-              "createTime": "2024-03-27 14:52:33",
-              "updateTime": "2024-07-17 14:18:53",
-              "deptId": "DEP000011759420653032312832",
-              "deptName": "数据统计总队",
-              "fileNewName": null,
-              "id": 3796,
-              "buildObjStatus": 1,
-              "name": "场景1",
-              "payStatus": 1,
-              "sceneName": null,
-              "snCode": "A0IA7R137",
-              "status": 2,
-              "thumb": "https://laser-oss.4dkankan.com/static/img_default/pc.jpg",
-              "title": "场景1",
-              "viewCount": 50,
-              "isLaser": true,
-              "phone": "18819272201",
-              "bind": true,
-              "location": 4
-          }
-      },
-      {
-          "caseId": null,
-          "fusionNumId": 1098,
-          "fusionId": 221,
-          "modelId": 1307,
-          "hide": 0,
-          "transform": {
-              "scale": [
-                  100.0,
-                  100.0,
-                  100.0
-              ],
-              "position": { 
-                  "x": 0.16552170253057596, 
-                  "y": -11.152602403,
-                  "z": 0.10249640482
-              },
-              "rotation": {
-                  "x": 0.0,
-                  "y": 0.0,
-                  "z": 0.0
-              }
-          },
-          "opacity": 100.0,
-          "bottom": 0.0,
-          "token": null,
-          "sceneData": {
-              "modelId": 1307,
-              "modelTitle": "las",
-              "modelDateType": "las",
-              "modelSize": "5.11MB",
-              "type": 3,
-              "modelObjUrl": null,
-              "modelGlbUrl": "[\"https://4dkk.4dage.com/fusion/xj/model/modelId_1307/webcloud\"]",
-              "userName": "88888888888",
-              "modelType": "las",
-              "num": null,
-              "tbStatus": 0,
-              "createStatus": 1,
-              "createTime": "2024-07-19 10:52:32",
-              "updateTime": "2024-07-19 10:52:35",
-              "deptId": "0",
-              "deptName": "超管组织",
-              "fileNewName": "https://4dkk.4dage.com/fusion/xj/model/modelId_1307/3af7984d9c1d4cb99998b14a54346008.zip",
-              "id": null,
-              "buildObjStatus": null,
-              "name": null,
-              "payStatus": null,
-              "sceneName": null,
-              "snCode": null,
-              "status": 2,
-              "thumb": null,
-              "title": null,
-              "viewCount": null,
-              "isLaser": null,
-              "phone": null,
-              "bind": true,
-              "location": null
-          }
-      },
-      {
-          "caseId": null,
-          "fusionNumId": 1096,
-          "fusionId": 221,
-          "modelId": 1309,
-          "hide": 0,
-          "transform": {
-              "scale": [
-                  100.0,
-                  100.0,
-                  100.0
-              ],
-              "position": {
-                  "x": -57.43192,
-                  "y": -25.28869,
-                  "z": 2.31154
-              },
-              "rotation": {
-                  "x": 1.5708,
-                  "y": 0.0,
-                  "z": 0.0
-              }
-          },
-          "opacity": 100.0,
-          "bottom": 0.0,
-          "token": null,
-          "sceneData": {
-              "modelId": 1309,
-              "modelTitle": null,
-              "modelDateType": "b3dm",
-              "modelSize": null,
-              "type": 6,
-              "modelObjUrl": null,
-              "modelGlbUrl": "[\"https://4dkk.4dage.com/scene_view_data/SG-t-D0hJSjOGkfX/images/3dtiles/tileset.json\"]",
-              "userName": null,
-              "modelType": "b3dm",
-              "num": "SG-t-D0hJSjOGkfX",
-              "tbStatus": 0,
-              "createStatus": 1,
-              "createTime": "2024-07-23 17:40:50",
-              "updateTime": "2024-07-23 20:39:46",
-              "deptId": "DEP000011456505791239610368",
-              "deptName": "广州市消防救援支队",
-              "fileNewName": null,
-              "id": 3007940,
-              "buildObjStatus": 0,
-              "name": "非文保app拍摄的深光场景",
-              "payStatus": 1,
-              "sceneName": "非文保app拍摄的深光场景",
-              "snCode": "BPVT00019",
-              "status": 2,
-              "thumb": "https://4dkk.4dage.com/scene_view_data/SG-t-D0hJSjOGkfX/images/floor_0.png?t=1721727650730",
-              "title": "非文保app拍摄的深光场景",
-              "viewCount": 7,
-              "isLaser": false,
-              "phone": null,
-              "bind": true,
-              "location": null
-          }
-      },
-       
-       
-       
-      {
-        "caseId": null,
-        "fusionNumId": 1198,
-        "fusionId": 221,
-        "modelId": 1307,
-        "hide": 0,
-        "transform": {
-            "scale": [
-                100.0,
-                100.0,
-                100.0
-            ],
-            "position": {
-                "x": 0.0,
-                "y": 100.0,
-                "z": 10.0
+        {
+            "caseId": null,
+            "fusionNumId": 1094,
+            "fusionId": 221,
+            "modelId": 1311,
+            "hide": 0,
+            "transform": {
+                "scale": [
+                    100.0,
+                    100.0,
+                    100.0
+                ],
+                "position": {
+                    "x": 0.0,
+                    "y": 0.0,
+                    "z": 2.0
+                },
+                "rotation": {
+                    "x": 1.570796326794896,
+                    "y": 0.0,
+                    "z": 0.0
+                }
             },
-            "rotation": {
-                "x": -2.22346,
-                "y": 0.0,
-                "z": 0.0
+            "opacity": 100.0,
+            "bottom": 0.0,
+            "token": null,
+            "sceneData": {
+                "modelId": 1311,
+                "modelTitle": null,
+                "modelDateType": "b3dm",
+                "modelSize": null,
+                "type": 6,
+                "modelObjUrl": null,
+                "modelGlbUrl": "[\"https://4dkk.4dage.com/scene_view_data/SG-t-Wm2b883yI4z/images/3dtiles/tileset.json\"]",
+                "userName": null,
+                "modelType": "b3dm",
+                "num": "SG-t-Wm2b883yI4z",
+                "tbStatus": 0,
+                "createStatus": 1,
+                "createTime": "2024-02-26 16:06:11",
+                "updateTime": "2024-07-24 11:09:03",
+                "deptId": "DEP000011456505791239610368",
+                "deptName": "广州市消防救援支队",
+                "fileNewName": null,
+                "id": 3006111,
+                "buildObjStatus": 0,
+                "name": "项目0226.16.05",
+                "payStatus": 1,
+                "sceneName": "项目0226.16.05",
+                "snCode": "BPVT00019",
+                "status": 2,
+                "thumb": "https://4dkk.4dage.com/scene_view_data/SG-t-Wm2b883yI4z/images/floor_0.png?t=1708934771617",
+                "title": "项目0226.16.05",
+                "viewCount": 3,
+                "isLaser": false,
+                "phone": null,
+                "bind": true,
+                "location": null
             }
-        },
-        "opacity": 100.0,
-        "bottom": 0.0,
-        "token": null,
-        "sceneData": {
-            "modelId": 1307,
-            "modelTitle": "高斯模型",
-            "modelDateType": "3dgs",
-            "modelSize": "20.8MB",
-            "type": 3,
-            "modelObjUrl": null,
-            "model3dgsUrl": "[\"/test-case/gaussian/bonsai.ksplat\"]",
-            "userName": "88888888888",
-            "modelType": "3dgs",
-            "num": null,
-            "tbStatus": 0,
-            "createStatus": 1,
-            "createTime": "2024-07-19 10:52:32",
-            "updateTime": "2024-07-19 10:52:35",
-            "deptId": "0",
-            "deptName": "超管组织",
-            "fileNewName": "https://4dkk.4dage.com/fusion/xj/model/modelId_1307/3af7984d9c1d4cb99998b14a54346008.zip",
-            "id": null,
-            "buildObjStatus": null,
-            "name": null,
-            "payStatus": null,
-            "sceneName": null,
-            "snCode": null,
-            "status": 2,
-            "thumb": null,
-            "title": null,
-            "viewCount": null,
-            "isLaser": null,
-            "phone": null,
-            "bind": true,
-            "location": null
-        }
-    },
-    {
-      "caseId": null,
-      "fusionNumId": 1198,
-      "fusionId": 221,
-      "modelId": 1307,
-      "hide": 0,
-      "transform": {
-          "scale": [
-              100.0,
-              100.0,
-              100.0
-          ],
-          "position": {
-              "x": 0.0,
-              "y": 0.0,
-              "z": 10.0
-          },
-          "rotation": {
-              "x": 0.0,
-              "y": 0.0,
-              "z": 0.0
-          }
-      },
-      "opacity": 100.0,
-      "bottom": 0.0,
-      "token": null,
-      "sceneData": {
-          "modelId": 1307,
-          "modelTitle": "矢量数据",
-          "modelDateType": "shp",
-          "modelSize": "20.8MB",
-          "type": 3,
-          "modelObjUrl": null,
-          "modelShpUrl": "[\"/test-case/shape/jiangmen.shp\"]",
-          "userName": "88888888888",
-          "modelType": "shp",
-          "num": null,
-          "tbStatus": 0,
-          "createStatus": 1,
-          "createTime": "2024-07-19 10:52:32",
-          "updateTime": "2024-07-19 10:52:35",
-          "deptId": "0",
-          "deptName": "超管组织",
-          "fileNewName": "https://4dkk.4dage.com/fusion/xj/model/modelId_1307/3af7984d9c1d4cb99998b14a54346008.zip",
-          "id": null,
-          "buildObjStatus": null,
-          "name": null,
-          "payStatus": null,
-          "sceneName": null,
-          "snCode": null,
-          "status": 2,
-          "thumb": null,
-          "title": null,
-          "viewCount": null,
-          "isLaser": null,
-          "phone": null,
-          "bind": true,
-          "location": null
-      }
-  }
+        } 
   ],
   "success": true,
   "timestamp": 1722216629620

+ 47 - 11
src/sdk/cover/index.js

@@ -26,7 +26,7 @@ export const enter = ({dom, mapDom, isLocal, lonlat, scenes }) => {
         Potree.settings.urls.prefix = Potree.settings.urls.prefix7  
         Potree.settings.webSite = 'datav1' 
     }
-    const mapBus = mitt(), sceneBus = mitt()
+    const mapBus = mitt(), sceneBus = mitt() 
      
     
     const tagLimitDis = 8;
@@ -650,6 +650,7 @@ export const enter = ({dom, mapDom, isLocal, lonlat, scenes }) => {
                 //if(autoLoads.filter(e=>e.loaded).length>1)return console.log('取消加载', prop), prop.onError()
                  
                 //return prop.onError()
+                prop.unlit = props.renderType != 'normal' 
                 prop.maximumScreenSpaceError = 60
                 Potree.addModel(prop,  prop.done , prop.progressFun, prop.onError)
                 prop.loading = true
@@ -715,15 +716,21 @@ export const enter = ({dom, mapDom, isLocal, lonlat, scenes }) => {
                 }) 
                 spliceFromArr(model,true)
                 
-                                
+                  
+
+                model.addEventListener('changeSelect',(e)=>{
+                     e.selected ? MergeEditor.transformControls.attach(model) : MergeEditor.transformControls.detach()
+                })
+
+                  
                 if(props.mode == 'single'){//模型查看页
                     MergeEditor.noNeedSelection = true
                     setTimeout(()=>{
                         MergeEditor.focusOn([model], 1000, true, true)
                     },1) 
                 } 
-                if(props.fromType == 6){ 
-                    Potree.load4dkkPanos(props.url, model,()=>{
+                if(props.fromType == 6 || props.fromType == 4 || props.fromType == 0 || props.fromType == 1){ 
+                    load4dkkPanos(props.url, model,()=>{
                         bus.emit('loadDone')
                     })
                 }else{
@@ -969,29 +976,45 @@ export const enter = ({dom, mapDom, isLocal, lonlat, scenes }) => {
                         })
                         viewer.setControls(viewer.fpControls)
                         viewer.images360.flyToPano(pano) 
-                        viewer.images360.addEventListener('endChangeMode',()=>{ 
+                        /* viewer.images360.addEventListener('endChangeMode',()=>{ 
                             Potree.Utils.updateVisible(viewer.objs, 'showPanos', false)
-                        },{once:true})
+                        },{once:true}) */
+                        let changeVisi = (object)=>{
+                            Potree.Utils.updateVisible(viewer.objs, 'showPanos', object == model)
+                        }
+                        viewer.objs.children.forEach(changeVisi)
+                        
                         
                         Potree.settings.displayMode = 'showPanos' 
+                        MergeEditor.transformControls.detach(model)
+                        Potree.Utils.updateVisible(MergeEditor.boxHelper,'showPanos',false)
+                        viewer.removeEventListener('camera_changed', this.camera_changed)
                         
                     }
                 },
                 flyOutPano(){//  飞出全景图(就是切换到正常融合视角)
                     let panoPos = viewer.images360.position.clone()
-                    Potree.Utils.updateVisible(viewer.objs, 'showPanos', true)
+                    //Potree.Utils.updateVisible(viewer.objs, 'showPanos', true)
+                    let changeVisi = (object)=>{
+                        Potree.Utils.updateVisible(viewer.objs, 'showPanos', true)
+                    }
+                    viewer.objs.children.forEach(changeVisi)
+                    viewer.images360.panos.forEach(pano=>{
+                        pano.setEnable(true)
+                    })
                     setTimeout(()=>{//在下一帧再变,因为3dtiles需要更新一下才会显示tiles
                         Potree.settings.displayMode = 'showPointCloud'
+                        Potree.Utils.updateVisible(MergeEditor.boxHelper,'showPanos',true)
                     },20) 
-                    let camera_changed = (e)=>{
+                    this.camera_changed = (e)=>{
                         if (e.viewport.name == 'MainView' && e.changeInfo.positionChanged ) {
                             //viewer.mainViewport.camera.position
                             viewer.mainViewport.view.radius = 0.1 //使pivot在面前一丢丢距离
                             viewer.setControls(viewer.orbitControls)
-                            viewer.removeEventListener('camera_changed',camera_changed)
+                            viewer.removeEventListener('camera_changed', this.camera_changed)
                         }
                     }
-                    viewer.addEventListener('camera_changed',camera_changed)
+                    viewer.addEventListener('camera_changed', this.camera_changed)
                         
                    
                     
@@ -1197,7 +1220,20 @@ export const enter = ({dom, mapDom, isLocal, lonlat, scenes }) => {
     return sdk 
 }
 
- 
+function load4dkkPanos(url, model, done){
+    let sceneCode 
+    if(url.includes('4dkk.4dage.com/scene_view_data/')){
+        sceneCode = url.split('https://4dkk.4dage.com/scene_view_data/')[1].split('/images/')[0]
+    }else if(url.includes('4dkk.4dage.com/fusion/xj/model/')){
+        sceneCode = url.split('https://4dkk.4dage.com/fusion/xj/model/')[1].split('/mesh/')[0]
+    }else{
+        return console.error('未知url,无法获得sceneCode',url)
+    }
+    
+    
+    
+    Potree.load4dkkPanos(sceneCode, model, done)
+} 
 /* 
 
     暂定不同场景间的漫游点不能互通。虽然它们可能是摆放正确的,如果是组成一整个场景的话还是要打通……