From af1e2244d0e3375f61e0ef1636dfd1ad0fbe18b4 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Nov 2024 17:31:41 +0800
Subject: [PATCH] 代码优化

---
 src/pages/layout/components/scomponents/layersControl.vue |   84 +++++++++++++++++++++++-------------------
 1 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index f9c83f5..627b41a 100644
--- a/src/pages/layout/components/scomponents/layersControl.vue
+++ b/src/pages/layout/components/scomponents/layersControl.vue
@@ -2,7 +2,7 @@
  * @Author: shuishen 1109946754@qq.com
  * @Date: 2024-10-31 10:47:29
  * @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-22 15:37:11
+ * @LastEditTime: 2024-11-23 01:26:55
  * @FilePath: \bigScreen\src\pages\layout\components\scomponents\layersControl.vue
  * @Description:
  *
@@ -103,23 +103,23 @@
     subType: '3Dtile',
     urlData: [
       {
-        url: VITE_APP_BASE + 'mx/tile_01/tileset.json',
+        url: VITE_APP_BASE + 'mx/tile_01/Data/tileset.json',
         label: 'tile_01'
       },
       {
-        url: VITE_APP_BASE + 'mx/tile_02/tileset.json',
+        url: VITE_APP_BASE + 'mx/tile_02/Data/tileset.json',
         label: 'tile_02'
       },
       {
-        url: VITE_APP_BASE + 'mx/tile_03/tileset.json',
+        url: VITE_APP_BASE + 'mx/tile_03/Data/tileset.json',
         label: 'tile_03'
       },
       {
-        url: VITE_APP_BASE + 'mx/tile_04/tileset.json',
+        url: VITE_APP_BASE + 'mx/tile_04/Data/tileset.json',
         label: 'tile_04'
       },
       {
-        url: VITE_APP_BASE + 'mx/tile_05/tileset.json',
+        url: VITE_APP_BASE + 'mx/tile_05/Data/tileset.json',
         label: 'tile_05'
       },
     ],
@@ -498,29 +498,6 @@
           const { attrParams } = e.overlay
           // 删除
           destroy()
-          // if (!attrParams.imageUrl) {
-          //   return
-          // }
-          // addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
-          // window.$viewer.addLayer(addPupoLayers[attrParams.name])
-          // let iconEl = `<div class="marsBlueGradientPnl">
-          //         <div>${attrParams.fullName}</div>
-          //         <img src="${attrParams.imageUrl}" width="160" height="160" />
-          //       </div>`
-          // let divIcon = new DC.DivIcon(
-          //   new DC.Position(attrParams.lng, attrParams.lat, 64),
-          //   `<div class="public-map-popup-two">
-          //           ${iconEl}
-          //         </div>`
-          // )
-          // let incident = () => {
-          //   destroy()
-          // }
-          // divIcon.on(DC.MouseEventType.CLICK, incident)
-          // addPupoLayers[attrParams.name].addOverlay(divIcon)
-
-          // 删除
-          destroy()
           addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
           window.$viewer.addLayer(addPupoLayers[attrParams.name])
           let iconEl = `<div class="marsBlueGradientPnl">
@@ -554,12 +531,41 @@
 
   {
     id: '7',
-    label: '地图全景点位分布',
+    label: '空中全景分布',
     type: 'layer',
     subType: 'labelPoint',
     method: getPanoramaList,
     params: {
-      size: 1000
+      size: 1000,
+      remark: '1'
+    },
+    backgroundIcon: VITE_APP_BASE + 'img/mapicon/qj.png',
+    showPanel: false,
+    layerName: 'kzqjdwfb',
+    incident: (e) => {
+      const { attrParams } = e.overlay
+      panoramaTitle.value = attrParams.name
+      if (
+        attrParams.url.indexOf("http://vr.jxpskj.com:180") != -1
+      ) {
+        attrParams.url = attrParams.url.replace(
+          "http://vr.jxpskj.com:180",
+          "/panorama"
+        )
+      }
+      panoramaUrl.value = attrParams.url
+      panoramaShow.value = true
+    }
+  },
+  {
+    id: '8',
+    label: '地面全景分布',
+    type: 'layer',
+    subType: 'labelPoint',
+    method: getPanoramaList,
+    params: {
+      size: 1000,
+      remark: '2'
     },
     backgroundIcon: VITE_APP_BASE + 'img/mapicon/qj.png',
     showPanel: false,
@@ -610,12 +616,14 @@
 
   if (checkType(nodes) == 'arr') {
     nodes.forEach(item => {
-      if (item.type == 'layer') {
-        collectedNodes.value.push(item)
-      }
+      if (item) {
+        if (item.type == 'layer') {
+          collectedNodes.value.push(item)
+        }
 
-      if (item.children && item.children.length > 0) {
-        collectNodesWithFlag(item.children)
+        if (item.children && item.children.length > 0) {
+          collectNodesWithFlag(item.children)
+        }
       }
     })
   }
@@ -652,8 +660,8 @@
 
           window.addTileLayers[item.layerName] = item.urlData.map(i => {
             let tile = new DC.Tileset(i.url, {
-              maximumMemoryUsage: 1024 * 1024 * 1024,
-              maximumScreenSpaceError: 48,
+              // maximumMemoryUsage: 1024 * 1024 * 1024,
+              maximumScreenSpaceError: 2,
               skipLevels: 5,
               skipLevelOfDetail: true,
               skipScreenSpaceErrorFactor: 128

--
Gitblit v1.9.3