From 769f362f3d91ca4336c6cd74a78aa02e2c9ceb33 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Dec 2024 13:08:59 +0800
Subject: [PATCH] 应急空间调整
---
src/views/rs/components/box/dataContent.vue | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/views/rs/components/box/dataContent.vue b/src/views/rs/components/box/dataContent.vue
index 606f14d..3f96d6e 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) ||
@@ -89,6 +89,7 @@
onMounted(() => {
curTableHeight.value = TableContent.value.offsetHeight
EventBus.emit('flyToyqfw', 'flyToyqfw')
+ EventBus.emit('destroyPop', 'destroyPop')
})
// 分页改变
@@ -109,6 +110,11 @@
})
.then((res) => {
const data = res.data.data
+ data.records.forEach(item => {
+ if(!item.riskLevelName){
+ item.riskLevelName = '暂定'
+ }
+ })
tableData.value = data.records
pages.total = data.total
loading.value = false
@@ -124,7 +130,8 @@
})
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))
// 显示企业信息
@@ -134,10 +141,11 @@
window.$viewer.addLayer(addPupoLayers[row.firmName])
let iconEl = `<div class="marsBlueGradientPnl">
<li>${row.firmName || ''}</li>
+ <li>${row.name || ''}</li>
<li>${row.riskLevelName || ''}</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 +160,7 @@
// 查看详情
-function goDetail(row) { }
+function goDetail (row) { }
const searchBtn = (params) => {
resetPage()
@@ -210,13 +218,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 +235,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 +249,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