From b67f46b4a768b4cd72d4e463c5dffefe977ddeb7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 02 Dec 2024 22:04:27 +0800
Subject: [PATCH] 应急空间及全局图层去除废水处理站、污水池

---
 src/views/rs/components/box/dataContent.vue |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/views/rs/components/box/dataContent.vue b/src/views/rs/components/box/dataContent.vue
index 606f14d..37b89d4 100644
--- a/src/views/rs/components/box/dataContent.vue
+++ b/src/views/rs/components/box/dataContent.vue
@@ -56,7 +56,7 @@
   total: 0,
 }
 
-function positionColor() {
+function positionColor () {
   return (row) => {
     if (
       (row.X && row.X != 0) ||
@@ -71,7 +71,7 @@
   }
 }
 
-function positionDisabled() {
+function positionDisabled () {
   return (row) => {
     if (
       (row.X && row.X != 0) ||
@@ -124,7 +124,7 @@
 })
 let addPupoLayers = {}
 // 行点击
-function rowClick(row, column, event) {
+function rowClick (row, column, event) {
   if (row.lng && row.lat) {
     window.$viewer.flyToPosition(new DC.Position(row.lng, row.lat, 600, 0, -90, 0))
     // 显示企业信息
@@ -133,11 +133,10 @@
     addPupoLayers[row.firmName] = new DC.HtmlLayer(row.firmName)
     window.$viewer.addLayer(addPupoLayers[row.firmName])
     let iconEl = `<div class="marsBlueGradientPnl">
-            <li>${row.firmName || ''}</li>
-            <li>${row.riskLevelName || ''}</li>
+            <li>${row.name || ''}</li>
             </div>`
     let divIcon = new DC.DivIcon(
-      new DC.Position(row.lng, row.lat, 64),
+      new DC.Position(row.lng, row.lat, row.ele || 64),
       `<div class="public-map-popup-three">
                     ${iconEl}
                   </div>`
@@ -152,7 +151,7 @@
 
 
 // 查看详情
-function goDetail(row) { }
+function goDetail (row) { }
 
 const searchBtn = (params) => {
   resetPage()
@@ -210,13 +209,16 @@
   EventBus.off('rsTabChange', spaceTabChange)
   if (curSelect.value) EventBus.emit('restHandleDelChange', `4`)
   destroyPupoLayers()
+  addPupoLayers = null
 })
 
 // 销毁
-function destroyPupoLayers() {
+function destroyPupoLayers () {
   let arr = Object.keys(addPupoLayers)
   arr.forEach(i => {
-    addPupoLayers[i] && window.$viewer.removeLayer(addPupoLayers[i])
+    addPupoLayers[i] && window.$viewer && window.$viewer.removeLayer(addPupoLayers[i])
+    addPupoLayers[i] = null
+    delete addPupoLayers[i]
   })
   addPupoLayers = {}
 }
@@ -224,7 +226,8 @@
 
 <template>
   <div class="w100 h0 flex-1 flex f-d-c">
-    <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn" ref="SeachBarCondition"></global-search>
+    <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn"
+      ref="SeachBarCondition"></global-search>
     <!-- <div class="cur-container">
       <div class="tablist">
         <div class="cursor-p" :class="{ on: showOn(item) }" v-for="item, index in resData.data" :key="index"
@@ -237,7 +240,8 @@
     </div> -->
     <div class="h0 flex-1 table-content" ref="TableContent" v-loading="loading"
       element-loading-background="rgba(46, 81, 136, 0.9)">
-      <el-table empty-text="暂无数据"  @row-click="rowClick" border :data="tableData" :height="curTableHeight" style="width: 100%">
+      <el-table empty-text="暂无数据" @row-click="rowClick" border :data="tableData" :height="curTableHeight"
+        style="width: 100%">
         <el-table-column align="center" label="ID" width="42" prop="rank">
           <template #default="{ $index, row }">
             {{ (pages.page - 1) * pages.pageSize + $index + 1 }}

--
Gitblit v1.9.3