From 9a37c5e1b2190c3f6ec71483923922189091dd52 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 18 Dec 2024 09:42:01 +0800
Subject: [PATCH] 事件模拟更新

---
 src/pages/map/components/scomponents/layersControl.vue |  509 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 377 insertions(+), 132 deletions(-)

diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index ab32dbb..1694931 100644
--- a/src/pages/map/components/scomponents/layersControl.vue
+++ b/src/pages/map/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-12-02 22:20:32
+ * @LastEditTime: 2024-12-10 14:33:31
  * @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
  * @Description:
  *
@@ -55,6 +55,9 @@
 let tileLayers = new DC.TilesetLayer('tileLayers')
 window.$viewer.addLayer(tileLayers)
 
+let planToBuild = new DC.HtmlLayer('planToBuild')
+window.$viewer.addLayer(planToBuild)
+
 const {
   show: showLayerControl
 } = defineProps({
@@ -71,8 +74,8 @@
 import { getList as getRiskList } from "@/api/riskSource/riskSource"
 import { getPanoramaList } from "@/api/panorama/"
 import yqfw from "@/assets/json/yqfw"
-import gsgw from "@/assets/json/gsgw"
-import rqgw from "@/assets/json/rqgw"
+// import gsgw from "@/assets/json/gsgw"
+// import rqgw from "@/assets/json/rqgw"
 import wsgw from "@/assets/json/wsgw"
 import ysgw from "@/assets/json/ysgw"
 import { onUnmounted } from 'vue'
@@ -109,23 +112,23 @@
     subType: '3Dtile',
     urlData: [
       {
-        url: VITE_APP_BASE + 'newMx/mx/tile_01/tileset.json',
+        url: VITE_APP_BASE + 'mx/tile_01/tileset.json',
         label: 'tile_01'
       },
       {
-        url: VITE_APP_BASE + 'newMx/mx/tile_02/tileset.json',
+        url: VITE_APP_BASE + 'mx/tile_02/tileset.json',
         label: 'tile_02'
       },
       {
-        url: VITE_APP_BASE + 'newMx/mx/tile_03/tileset.json',
+        url: VITE_APP_BASE + 'mx/tile_03/tileset.json',
         label: 'tile_03'
       },
       {
-        url: VITE_APP_BASE + 'newMx/mx/tile_04/tileset.json',
+        url: VITE_APP_BASE + 'mx/tile_04/tileset.json',
         label: 'tile_04'
       },
       {
-        url: VITE_APP_BASE + 'newMx/mx/tile_05/tileset.json',
+        url: VITE_APP_BASE + 'mx/tile_05/tileset.json',
         label: 'tile_05'
       },
     ],
@@ -152,92 +155,197 @@
     label: '应急空间',
     children: [
       {
+        parentId: '3',
         id: '3-1',
         label: '应急池',
-        type: 'layer',
-        subType: 'labelPoint',
-        method: getList,
-        params: {
-          type: 1,
-          size: 1000
-        },
-        backgroundIcon: VITE_APP_BASE + 'img/mapicon/yjc.png',
-        className: 'yjc-box',
-        showPanel: false,
-        layerName: 'yjc',
-        incident: (e) => {
-          const { attrParams } = e.overlay
-          // 删除
-          destroyPop()
-          if (!attrParams.firmName) {
-            return
-          }
-          addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
-          window.$viewer.addLayer(addPopLayers[attrParams.id])
-          let iconEl = `<div class="marsBlueGradientPnl">
-            <div>${attrParams.firmName}</div>
-            <div>${attrParams.mainFuncName}</div>
+        children: [
+          {
+            parentId: '3-1',
+            id: '3-1-1',
+            label: '园区',
+            type: 'layer',
+            subType: 'labelPoint',
+            method: getList,
+            params: {
+              type: 1,
+              size: 1000,
+              category: 1
+            },
+            backgroundIcon: VITE_APP_BASE + 'img/mapicon/yjc.png',
+            className: 'yjc-box',
+            showPanel: false,
+            layerName: 'yjc-yq',
+            incident: (e) => {
+              const { attrParams } = e.overlay
+              // 删除
+              destroyPop()
+              if (!attrParams.firmName) {
+                return
+              }
+              addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
+              window.$viewer.addLayer(addPopLayers[attrParams.id])
+              let iconEl = `<div class="marsBlueGradientPnl">
+            <div>企业名称:${attrParams.firmName}</div>
+            <div>作用:${attrParams.mainFuncName}</div>
                 </div>`
-          let divIcon = new DC.DivIcon(
-            new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
-            `<div class="public-map-popup-two">
+              let divIcon = new DC.DivIcon(
+                new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
+                `<div class="public-map-popup-two">
                     ${iconEl}
                   </div>`
-          )
-          let incident = () => {
-            destroyPop()
-          }
-          divIcon.on(DC.MouseEventType.CLICK, incident)
-          addPopLayers[attrParams.id].addOverlay(divIcon)
-        }
-      },
-      {
-        id: '3-2',
-        label: '阀门',
-        type: 'layer',
-        subType: 'labelPoint',
-        method: getList,
-        params: {
-          type: 2,
-          size: 1000
-        },
-        backgroundIcon: VITE_APP_BASE + 'img/mapicon/ysf.png',
-        className: 'ysf-box',
-        showPanel: false,
-        layerName: 'fm',
-        incident: (e) => {
-          const { attrParams } = e.overlay
-          // 删除
-          destroyPop()
-          if (!attrParams.firmName) {
-            return
-          }
-          addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
-          window.$viewer.addLayer(addPopLayers[attrParams.id])
-          let iconEl = `<div class="marsBlueGradientPnl">
-            <div>${attrParams.firmName}</div>
-            <div>${attrParams.mainFuncName}</div>
+              )
+              let incident = () => {
+                destroyPop()
+              }
+              divIcon.on(DC.MouseEventType.CLICK, incident)
+              addPopLayers[attrParams.id].addOverlay(divIcon)
+            }
+          },
+          {
+            parentId: '3-1',
+            id: '3-1-2',
+            label: '企业',
+            type: 'layer',
+            subType: 'labelPoint',
+            method: getList,
+            params: {
+              type: 1,
+              size: 1000,
+              category: 2
+            },
+            backgroundIcon: VITE_APP_BASE + 'img/mapicon/yjc.png',
+            className: 'yjc-box',
+            showPanel: false,
+            layerName: 'yjc-qy',
+            incident: (e) => {
+              const { attrParams } = e.overlay
+              // 删除
+              destroyPop()
+              if (!attrParams.firmName) {
+                return
+              }
+              addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
+              window.$viewer.addLayer(addPopLayers[attrParams.id])
+              let iconEl = `<div class="marsBlueGradientPnl">
+            <div>企业名称:${attrParams.firmName}</div>
+            <div>作用:${attrParams.mainFuncName}</div>
                 </div>`
-          let divIcon = new DC.DivIcon(
-            new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
-            `<div class="public-map-popup-two">
+              let divIcon = new DC.DivIcon(
+                new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
+                `<div class="public-map-popup-two">
                     ${iconEl}
                   </div>`
-          )
-          let incident = () => {
-            destroyPop()
-          }
-          divIcon.on(DC.MouseEventType.CLICK, incident)
-          addPopLayers[attrParams.id].addOverlay(divIcon)
-        }
+              )
+              let incident = () => {
+                destroyPop()
+              }
+              divIcon.on(DC.MouseEventType.CLICK, incident)
+              addPopLayers[attrParams.id].addOverlay(divIcon)
+            }
+          },
+        ]
       },
 
       {
+        parentId: '3',
+        id: '3-2',
+        label: '阀门',
+        children: [
+          {
+            parentId: '3-2',
+            id: '3-2-1',
+            label: '园区',
+            type: 'layer',
+            subType: 'labelPoint',
+            method: getList,
+            params: {
+              type: 2,
+              size: 1000,
+              category: 1
+            },
+            backgroundIcon: VITE_APP_BASE + 'img/mapicon/ysf.png',
+            className: 'ysf-box',
+            showPanel: false,
+            layerName: 'fm-yq',
+            incident: (e) => {
+              const { attrParams } = e.overlay
+              // 删除
+              destroyPop()
+              if (!attrParams.firmName) {
+                return
+              }
+              addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
+              window.$viewer.addLayer(addPopLayers[attrParams.id])
+              let iconEl = `<div class="marsBlueGradientPnl">
+            <div>企业名称:${attrParams.firmName}</div>
+            <div>作用:${attrParams.mainFuncName}</div>
+                </div>`
+              let divIcon = new DC.DivIcon(
+                new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
+                `<div class="public-map-popup-two">
+                    ${iconEl}
+                  </div>`
+              )
+              let incident = () => {
+                destroyPop()
+              }
+              divIcon.on(DC.MouseEventType.CLICK, incident)
+              addPopLayers[attrParams.id].addOverlay(divIcon)
+            }
+          },
+          {
+            parentId: '3-2',
+            id: '3-2-2',
+            label: '企业',
+            type: 'layer',
+            subType: 'labelPoint',
+            method: getList,
+            params: {
+              type: 2,
+              size: 1000,
+              category: 2
+            },
+            backgroundIcon: VITE_APP_BASE + 'img/mapicon/ysf.png',
+            className: 'ysf-box',
+            showPanel: false,
+            layerName: 'fm-qy',
+            incident: (e) => {
+              const { attrParams } = e.overlay
+              // 删除
+              destroyPop()
+              if (!attrParams.firmName) {
+                return
+              }
+              addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
+              window.$viewer.addLayer(addPopLayers[attrParams.id])
+              let iconEl = `<div class="marsBlueGradientPnl">
+            <div>企业名称:${attrParams.firmName}</div>
+            <div>作用:${attrParams.mainFuncName}</div>
+                </div>`
+              let divIcon = new DC.DivIcon(
+                new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
+                `<div class="public-map-popup-two">
+                    ${iconEl}
+                  </div>`
+              )
+              let incident = () => {
+                destroyPop()
+              }
+              divIcon.on(DC.MouseEventType.CLICK, incident)
+              addPopLayers[attrParams.id].addOverlay(divIcon)
+            }
+          }
+        ]
+      },
+
+      {
+        parentId: '3',
         id: '3-3',
         label: '公共管网',
         children: [
           // 给水管网、污水管网、燃气管网、雨水管网
           {
+            parentId: '3-3',
             id: '3-3-2',
             label: '污水管网',
             type: 'layer',
@@ -248,6 +356,7 @@
             height: 60.2,
           },
           {
+            parentId: '3-3',
             id: '3-3-4',
             label: '雨水管网',
             type: 'layer',
@@ -257,30 +366,31 @@
             color: DC.Color.CYAN.withAlpha(0.9),
             height: 60,
           },
-          {
-            id: '3-3-1',
-            label: '给水管网',
-            type: 'layer',
-            subType: 'geojsonPipe',
-            layerName: 'gsgw',
-            source: gsgw,
-            color: DC.Color.BLUE.withAlpha(0.9),
-            height: 60.4,
-          },
-          {
-            id: '3-3-3',
-            label: '燃气管网',
-            type: 'layer',
-            subType: 'geojsonPipe',
-            layerName: 'rqgw',
-            source: rqgw,
-            color: DC.Color.RED.withAlpha(0.9),
-            height: 60.6,
-          },
+          // {
+          //   id: '3-3-1',
+          //   label: '给水管网',
+          //   type: 'layer',
+          //   subType: 'geojsonPipe',
+          //   layerName: 'gsgw',
+          //   source: gsgw,
+          //   color: DC.Color.BLUE.withAlpha(0.9),
+          //   height: 60.4,
+          // },
+          // {
+          //   id: '3-3-3',
+          //   label: '燃气管网',
+          //   type: 'layer',
+          //   subType: 'geojsonPipe',
+          //   layerName: 'rqgw',
+          //   source: rqgw,
+          //   color: DC.Color.RED.withAlpha(0.9),
+          //   height: 60.6,
+          // },
         ]
       },
 
       {
+        parentId: '3',
         id: '3-4',
         label: '污水提升泵站',
         type: 'layer',
@@ -324,6 +434,7 @@
       },
 
       {
+        parentId: '3',
         id: '3-5',
         label: '水库',
         type: 'layer',
@@ -365,6 +476,7 @@
       },
 
       {
+        parentId: '3',
         id: '3-6',
         label: '应急泵',
         type: 'layer',
@@ -388,8 +500,8 @@
           addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
           window.$viewer.addLayer(addPopLayers[attrParams.name])
           let iconEl = `<div class="marsBlueGradientPnl">
-            <div>${attrParams.firmName}</div>
-            <div>${attrParams.mainFuncName}</div>
+            <div>企业名称:${attrParams.firmName}</div>
+            <div>作用:${attrParams.mainFuncName}</div>
                 </div>`
           let divIcon = new DC.DivIcon(
             new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -406,6 +518,7 @@
       },
 
       {
+        parentId: '3',
         id: '3-8',
         label: '沟渠',
         type: 'layer',
@@ -437,6 +550,7 @@
       //   layerName: 'fsclz'
       // },
       {
+        parentId: '3',
         id: '3-10',
         label: '排水口',
         type: 'layer',
@@ -449,7 +563,32 @@
         backgroundIcon: VITE_APP_BASE + 'img/mapicon/psk.png',
         className: 'xfs-box',
         showPanel: false,
-        layerName: 'psk'
+        layerName: 'psk',
+        incident: (e) => {
+          const { attrParams } = e.overlay
+          // 删除
+          destroyPop()
+          if (!attrParams.firmName) {
+            return
+          }
+          addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
+          window.$viewer.addLayer(addPopLayers[attrParams.id])
+          let iconEl = `<div class="marsBlueGradientPnl">
+            <div>企业名称:${attrParams.firmName}</div>
+            <div>作用:${attrParams.mainFuncName}</div>
+                </div>`
+          let divIcon = new DC.DivIcon(
+            new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
+            `<div class="public-map-popup-two">
+                    ${iconEl}
+                  </div>`
+          )
+          let incident = () => {
+            destroyPop()
+          }
+          divIcon.on(DC.MouseEventType.CLICK, incident)
+          addPopLayers[attrParams.id].addOverlay(divIcon)
+        }
       },
       // {
       //   id: '3-11',
@@ -474,6 +613,7 @@
     label: '风险源',
     children: [
       {
+        parentId: '4',
         id: '4-1',
         label: '一般',
         type: 'layer',
@@ -495,9 +635,9 @@
           addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
           window.$viewer.addLayer(addPopLayers[attrParams.name])
           let iconEl = `<div class="marsBlueGradientPnl">
-            <li>${attrParams.firmName || ''}</li>
-            <li>${attrParams.name || ''}</li>
-            <li>${attrParams.riskLevelName || ''}</li>
+            <li>企业名称:${attrParams.firmName || ''}</li>
+            <li>风险等级:${attrParams.riskLevelName || ''}</li>
+            <li>行业类别:${attrParams.name || ''}</li>
             </div>`
           let divIcon = new DC.DivIcon(
             new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -513,6 +653,7 @@
         }
       },
       {
+        parentId: '4',
         id: '4-2',
         label: '较大',
         type: 'layer',
@@ -527,6 +668,46 @@
         backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-jd.png',
         showPanel: false,
         layerName: 'fxyLarger',
+        incident: (e) => {
+          const { attrParams } = e.overlay
+          // 删除
+          destroyPop()
+          addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
+          window.$viewer.addLayer(addPopLayers[attrParams.name])
+          let iconEl = `<div class="marsBlueGradientPnl"> 
+            <li>企业名称:${attrParams.firmName || ''}</li>
+            <li>风险等级:${attrParams.riskLevelName || ''}</li>
+            <li>行业类别:${attrParams.name || ''}</li>
+            </div>`
+          let divIcon = new DC.DivIcon(
+            new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
+            `<div class="public-map-popup-three">
+                    ${iconEl}
+                  </div>`
+          )
+          let incident = () => {
+            destroyPop()
+          }
+          divIcon.on(DC.MouseEventType.CLICK, incident)
+          addPopLayers[attrParams.name].addOverlay(divIcon)
+        }
+      },
+      {
+        parentId: '4',
+        id: '4-9',
+        label: '暂定',
+        type: 'layer',
+        subType: 'labelPoint',
+        method: getRiskList,
+        params: {
+          riskLevel: 9,
+          size: 1000
+        },
+        showParams: 'category',
+        className: 'fxy-zd',
+        backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-zd.png',
+        showPanel: false,
+        layerName: 'fxyZdLarger',
         incident: (e) => {
           const { attrParams } = e.overlay
           // 删除
@@ -672,6 +853,7 @@
 }
 
 const handleCheckChange = (data) => {
+
   let options = treeRef.value?.getCheckedNodes()
   collectedNodes.value = []
   collectNodesWithFlag(data)
@@ -695,13 +877,32 @@
           addTileLayers[item.layerName] = []
           item.urlData.forEach((m, ind) => {
             addTileLayers[item.layerName][ind] = new DC.Tileset(m.url, {
-              maximumMemoryUsage: 1024,
-              maximumScreenSpaceError: 8,
-              skipLevels: 5,
+              // maximumMemoryUsage: 1024,
+              // maximumScreenSpaceError: 8,
+              // skipLevels: 5,
+              // skipLevelOfDetail: true,
+              // skipScreenSpaceErrorFactor: 128,
+              // progressiveResolutionHeightFraction: 0.5,
+              // baseScreenSpaceError: 1024
+
+
               skipLevelOfDetail: true,
+              baseScreenSpaceError: 1024,
+              maximumScreenSpaceError: 16, // 数值加大,能让最终成像变模糊
               skipScreenSpaceErrorFactor: 128,
-              progressiveResolutionHeightFraction: 0.5,
-              baseScreenSpaceError: 1024
+              skipLevels: 5,
+              immediatelyLoadDesiredLevelOfDetail: false,
+              loadSiblings: true, // 如果为true则不会在已加载完概况房屋后,自动从中心开始超清化房屋
+              cullWithChildrenBounds: true,
+              cullRequestsWhileMoving: true,
+              cullRequestsWhileMovingMultiplier: 10, // 值越小能够更快的剔除
+              preloadWhenHidden: true,
+              preferLeaves: true,
+              maximumMemoryUsage: 64, // 内存分配变小有利于倾斜摄影数据回收,提升性能体验
+              progressiveResolutionHeightFraction: 0.5, // 数值偏于0能够让初始加载变得模糊
+              dynamicScreenSpaceErrorDensity: 0.5, // 数值加大,能让周边加载变快
+              dynamicScreenSpaceErrorFactor: 1, // 不知道起了什么作用没,反正放着吧先
+              dynamicScreenSpaceError: true, // 根据测试,有了这个后,会在真正的全屏加载完之后才清晰化房屋
             })
             // tile.setHeight(-420)
             tileLayers.addOverlay(addTileLayers[item.layerName][ind])
@@ -801,9 +1002,34 @@
               computeCircle(1.6)
             )
 
-            polylineVolume.setStyle({
-              material: item.color
-            })
+            if (i.properties.RefName.indexOf('拟建') != -1) {
+              polylineVolume.setStyle({
+                material: DC.Color.fromBytes(255, 0, 0, 230)
+              })
+
+              let features = window.$turf.featureCollection(
+                i.geometry.coordinates.map(d => window.$turf.point([d[0], d[1]]))
+              )
+
+              let planCenter = window.$turf.center(features)
+
+              let planDivIcon = new DC.DivIcon(
+                new DC.Position(planCenter.geometry.coordinates[0], planCenter.geometry.coordinates[1], 60.5),
+                `<div class="public-map-popup">
+                     <div class="map-name">拟建</div>
+                  <div class="map-icon">
+                    <img src="${VITE_APP_BASE + 'img/mapicon/nj-ys.png'}">
+                  </div>
+                  </div>`
+              )
+
+              planToBuild.addOverlay(planDivIcon)
+            } else {
+              polylineVolume.setStyle({
+                material: item.color
+              })
+            }
+
             addTileLayers[item.layerName].addOverlay(polylineVolume)
           })
         } else {
@@ -849,6 +1075,10 @@
           window.$viewer && window.$viewer.removeLayer(addTileLayers[item.layerName])
           addTileLayers[item.layerName] = null
           delete addTileLayers[item.layerName]
+
+          if (item.layerName == 'ysgw' && planToBuild) {
+            planToBuild.clear()
+          }
         }
       }
     }
@@ -890,14 +1120,20 @@
 }
 
 const restHandleDelChange = (key) => {
+
   let checkIds = treeRef.value?.getCheckedKeys()
 
   if (checkIds && !checkIds.some(i => i == key)) {
     return
   }
 
-  treeRef.value?.setCheckedKeys(checkIds.filter(i => i.indexOf(key)))
-  handleCheckChange([findObjectById(data, key)])
+  let selectData = findObjectById(data, key)
+
+  let parentId = null
+  if (selectData && 'parentId' in selectData) parentId = selectData.parentId
+
+  treeRef.value?.setCheckedKeys(checkIds.filter(i => i.indexOf(key) && i != parentId))
+  handleCheckChange([selectData])
 }
 
 // 飞到园区范围
@@ -929,13 +1165,11 @@
 // 关闭所有选中的,除了倾斜,园区分布,空中全景
 const closeAll = () => {
   EventBus.emit('restHandleDelChange', `2`)
-  EventBus.emit('restHandleDelChange', `3`)
   EventBus.emit('restHandleDelChange', `3-1`)
   EventBus.emit('restHandleDelChange', `3-2`)
-  EventBus.emit('restHandleDelChange', `3-3`)
-  EventBus.emit('restHandleDelChange', `3-3-1`)
+  // EventBus.emit('restHandleDelChange', `3-3-1`)
   EventBus.emit('restHandleDelChange', `3-3-2`)
-  EventBus.emit('restHandleDelChange', `3-3-3`)
+  // EventBus.emit('restHandleDelChange', `3-3-3`)
   EventBus.emit('restHandleDelChange', `3-3-4`)
   EventBus.emit('restHandleDelChange', `3-4`)
   EventBus.emit('restHandleDelChange', `3-5`)
@@ -943,9 +1177,10 @@
   EventBus.emit('restHandleDelChange', `3-7`)
   EventBus.emit('restHandleDelChange', `3-8`)
   // EventBus.emit('restHandleDelChange', `3-9`)
-  EventBus.emit('restHandleDelChange', `4`)
   EventBus.emit('restHandleDelChange', `4-1`)
   EventBus.emit('restHandleDelChange', `4-2`)
+  EventBus.emit('restHandleDelChange', `4-9`)
+
   EventBus.emit('restHandleDelChange', `8`)
   destroyPop()
 }
@@ -964,14 +1199,16 @@
 
 // 销毁
 function destroyPop () {
-  let arr = Object.keys(addPopLayers)
-  if(arr.length > 0){
-    arr.forEach(i => {
-    addPopLayers[i] && window.$viewer && window.$viewer.removeLayer(addPopLayers[i])
-    addPopLayers[i] = null
-    delete addPopLayers[i]
-  })
-  addPopLayers = {}
+  if (addPopLayers && addPopLayers != null) {
+    let arr = Object.keys(addPopLayers)
+    if (arr.length > 0) {
+      arr.forEach(i => {
+        addPopLayers[i] && window.$viewer && window.$viewer.removeLayer(addPopLayers[i])
+        addPopLayers[i] = null
+        delete addPopLayers[i]
+      })
+      addPopLayers = {}
+    }
   }
 }
 
@@ -979,14 +1216,15 @@
   let arr = Object.keys(addTileLayers)
   arr.forEach(i => {
     if (i == 'hgyq') {
-      tileLayers.removeOverlay(addTileLayers[i])
-      addTileLayers[i] = null
-      delete addTileLayers[i]
+      addTileLayers[i].forEach(t => {
+        tileLayers.removeOverlay(t)
+        t = null
+      })
     } else {
       addTileLayers[i] && window.$viewer && window.$viewer.removeLayer(addTileLayers[i])
-      addTileLayers[i] = null
-      delete addTileLayers[i]
     }
+    addTileLayers[i] = null
+    delete addTileLayers[i]
   })
   addTileLayers = null
 
@@ -995,6 +1233,13 @@
     window.$viewer && window.$viewer.removeLayer(tileLayers)
     tileLayers = null
   }
+
+  if (planToBuild) {
+    planToBuild.remove()
+    window.$viewer && window.$viewer.removeLayer(planToBuild)
+    planToBuild = null
+  }
+
   // 弹窗销毁
   destroyPop()
   addPopLayers = null

--
Gitblit v1.9.3