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 | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index d9290ce..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:
*
@@ -86,6 +86,7 @@
// 查询分页数据
const getLists = (param = {}) => {
+ destroyPupoLayers()
tableData.value = []
param.current = pages.page
param.size = pages.pageSize
@@ -95,9 +96,20 @@
type: curSelectTabType.value
})
.then((res) => {
- const data = res.data.data
- tableData.value = data.records
- pages.total = data.total
+ 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
+ pages.total = data.length
loading.value = false
})
.catch((err) => {
@@ -113,9 +125,10 @@
let addPupoLayers = {}
// 行点击
function rowClick (row, column, event) {
+ EventBus.emit('destroyPop', 'destroyPop')
if (row.lng && row.lat) {
window.$viewer.flyToPosition(new DC.Position(row.lng, row.lat, 600, 0, -90, 0))
- if (!row.imageUrl) {
+ if (!row.firmName) {
return
}
// 删除
@@ -123,8 +136,8 @@
addPupoLayers[row.name] = new DC.HtmlLayer(row.name)
window.$viewer.addLayer(addPupoLayers[row.name])
let iconEl = `<div class="marsBlueGradientPnl">
- <div>${row.fullName}</div>
- <img src="${row.imageUrl}" />
+ <div>企业名称：${row.firmName}</div>
+ <div>作用：${row.mainFuncName}</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(row.lng, row.lat, row.ele || 64),
@@ -185,12 +198,14 @@
// 销毁
function destroyPupoLayers () {
let arr = Object.keys(addPupoLayers)
- arr.forEach(i => {
- addPupoLayers[i] && window.$viewer && window.$viewer.removeLayer(addPupoLayers[i])
- addPupoLayers[i] = null
- delete addPupoLayers[i]
- })
- addPupoLayers = {}
+ if (arr.length > 0) {
+ arr.forEach(i => {
+ addPupoLayers[i] && window.$viewer && window.$viewer.removeLayer(addPupoLayers[i])
+ addPupoLayers[i] = null
+ delete addPupoLayers[i]
+ })
+ addPupoLayers = {}
+ }
}
</script>
--
Gitblit v1.9.3