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 | 65 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index f0070ea..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-19 17:41:11
+ * @LastEditTime: 2024-12-16 18:50:06
* @FilePath: \bigScreen\src\views\space\components\box\dataContent.vue
* @Description:
*
@@ -44,7 +44,7 @@
total: 0,
}
-function positionColor() {
+function positionColor () {
return (row) => {
if (
(row.X && row.X != 0) ||
@@ -59,7 +59,7 @@
}
}
-function positionDisabled() {
+function positionDisabled () {
return (row) => {
if (
(row.X && row.X != 0) ||
@@ -86,6 +86,8 @@
// 查询分页数据
const getLists = (param = {}) => {
+ destroyPupoLayers()
+ tableData.value = []
param.current = pages.page
param.size = pages.pageSize
loading.value = true
@@ -94,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) => {
@@ -111,10 +124,11 @@
let addPupoLayers = {}
// 行点击
-function rowClick(row, column, event) {
+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
}
// 删除
@@ -122,11 +136,11 @@
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, 64),
+ new DC.Position(row.lng, row.lat, row.ele || 64),
`<div class="public-map-popup-two">
${iconEl}
</div>`
@@ -141,7 +155,7 @@
// 查看详情
-function goDetail(row) { }
+function goDetail (row) { }
const searchBtn = (params) => {
resetPage()
@@ -178,33 +192,40 @@
onUnmounted(() => {
EventBus.off('spaceTabChange', spaceTabChange)
destroyPupoLayers()
+ addPupoLayers = null
})
// 销毁
-function destroyPupoLayers() {
+function destroyPupoLayers () {
let arr = Object.keys(addPupoLayers)
- arr.forEach(i => {
- addPupoLayers[i] && window.$viewer.removeLayer(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>
<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="h0 flex-1 table-content" ref="TableContent" v-loading="loading"
element-loading-background="rgba(46, 81, 136, 0.9)">
- <el-table @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 }}
</template>
</el-table-column>
- <el-table-column align="center" show-overflow-tooltip prop="firmName" label="企业名称" />
- <el-table-column align="center" show-overflow-tooltip prop="name" label="名称" />
- <el-table-column align="center" prop="mainFuncName" label="作用" width="62" />
+ <el-table-column show-overflow-tooltip prop="firmName" label="企业名称" />
+ <el-table-column show-overflow-tooltip prop="name" label="名称" width="100" />
+ <el-table-column prop="mainFuncName" label="作用" width="55" />
<!-- <el-table-column align="center" width="62" label="操作">
<template #default="scope">
<el-button link type="primary" size="small" :disabled="scope.row.lng == ''" @click="rowClick(scope.row)">
--
Gitblit v1.9.3