From 548dcb58164aaeb7ec8a4f3425953bcd25d83c65 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 15 Jan 2025 18:40:00 +0800
Subject: [PATCH] 应急空间位置更新

---
 src/views/space/components/box/dataContent.vue |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index 440a2dd..c8a859f 100644
--- a/src/views/space/components/box/dataContent.vue
+++ b/src/views/space/components/box/dataContent.vue
@@ -2,7 +2,7 @@
  * @Author: shuishen 1109946754@qq.com
  * @Date: 2023-03-13 14:54:26
  * @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-28 19:30:58
+ * @LastEditTime: 2024-12-16 18:50:06
  * @FilePath: \bigScreen\src\views\space\components\box\dataContent.vue
  * @Description:
  *
@@ -96,14 +96,20 @@
     type: curSelectTabType.value
   })
     .then((res) => {
-      const data = res.data.data
-      data.records.forEach(item => {
-        if(!item.firmName){
-          item.firmName = '吉水化工园区'
+      const data = res.data.data.records.filter(item => {
+        if ('name' in param && param.name != '') return item.type == curSelectTabType.value && item.name.indexOf(param.name) != -1
+
+        return item.type == curSelectTabType.value
+      })
+
+      data.forEach(item => {
+        if (!item.firmName) {
+          item.firmName = '新干化工园区'
         }
       })
-      tableData.value = data.records
-      pages.total = data.total
+
+      tableData.value = data
+      pages.total = data.length
       loading.value = false
     })
     .catch((err) => {
@@ -130,8 +136,8 @@
     addPupoLayers[row.name] = new DC.HtmlLayer(row.name)
     window.$viewer.addLayer(addPupoLayers[row.name])
     let iconEl = `<div class="marsBlueGradientPnl">
-            <div>${row.firmName}</div>
-            <div>${row.mainFuncName}</div>
+            <div>企业名称:${row.firmName}</div>
+            <div>作用:${row.mainFuncName}</div>
                 </div>`
     let divIcon = new DC.DivIcon(
       new DC.Position(row.lng, row.lat, row.ele || 64),
@@ -194,11 +200,11 @@
   let arr = Object.keys(addPupoLayers)
   if (arr.length > 0) {
     arr.forEach(i => {
-    addPupoLayers[i] && window.$viewer && window.$viewer.removeLayer(addPupoLayers[i])
-    addPupoLayers[i] = null
-    delete addPupoLayers[i]
-  })
-  addPupoLayers = {}
+      addPupoLayers[i] && window.$viewer && window.$viewer.removeLayer(addPupoLayers[i])
+      addPupoLayers[i] = null
+      delete addPupoLayers[i]
+    })
+    addPupoLayers = {}
   }
 }
 </script>

--
Gitblit v1.9.3