From 17a81d641608545682e3f79f7c6090cac48fe81a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 15 Sep 2025 18:10:01 +0800
Subject: [PATCH] feat:去除高亮
---
src/views/space/components/box/dataContent.vue | 151 ++++++++++++++++++++++++++++++++------------------
1 files changed, 96 insertions(+), 55 deletions(-)
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index b40461b..70d81ff 100644
--- a/src/views/space/components/box/dataContent.vue
+++ b/src/views/space/components/box/dataContent.vue
@@ -2,18 +2,20 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-03-13 14:54:26
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-12 18:31:08
+ * @LastEditTime: 2025-01-15 14:39:41
* @FilePath: \bigScreen\src\views\space\components\box\dataContent.vue
- * @Description:
- *
- * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
+ * @Description:
+ *
+ * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
-->
<script setup>
+import { useMap } from 'store/map'
import EventBus from 'utils/bus'
import publicContent from "./publicContent.vue"
import { getList } from "@/api/space/space"
import { nextTick, onUnmounted, reactive } from "vue"
+const store = useMap()
const SeachBarCondition = ref(null)
const loading = ref(false)
const TableContent = ref(null)
@@ -28,7 +30,6 @@
exportBtn: false,
columns: [
{
- label: "名称",
type: 'input',
props: 'name',
placeholder: '请输入名称',
@@ -41,11 +42,11 @@
const tableData = ref([])
const pages = {
page: 1,
- pageSize: 10,
+ pageSize: 20,
total: 0,
}
-function positionColor() {
+function positionColor () {
return (row) => {
if (
(row.X && row.X != 0) ||
@@ -60,7 +61,7 @@
}
}
-function positionDisabled() {
+function positionDisabled () {
return (row) => {
if (
(row.X && row.X != 0) ||
@@ -87,6 +88,8 @@
// 查询分页数据
const getLists = (param = {}) => {
+ destroyPupoLayers()
+ tableData.value = []
param.current = pages.page
param.size = pages.pageSize
loading.value = true
@@ -96,6 +99,11 @@
})
.then((res) => {
const data = res.data.data
+ data.records.forEach(item => {
+ if (!item.firmName) {
+ item.firmName = '瑞昌化工集中区'
+ }
+ })
tableData.value = data.records
pages.total = data.total
loading.value = false
@@ -110,36 +118,41 @@
layer: {}
})
-
+let addPupoLayers = {}
// 行点击
-function rowClick(row) {
-
- // if (state.layer) {
- // window.$viewer.removeLayer(state.layer)
- // }
- // let layer = new DC.HtmlLayer(`${row.id}`)
- // state.layer = layer
- // window.$viewer.addLayer(layer)
- // let iconEl = `<div class="marsBlueGradientPnl">
- // <div>${row.name}</div>
- // </div>`
- // let divIcon = new DC.DivIcon(
- // new DC.Position(row.lng, row.lat, 0),
- // `<div class="public-map-popup">
- // ${iconEl}
- // </div>`
- // )
- // let incident = () => { }
- // divIcon.on(DC.MouseEventType.CLICK, incident)
- // layer.addOverlay(divIcon)
-
- window.$viewer.flyToPosition(new DC.Position(row.lng, row.lat, 600, 0, -90, 0))
-
+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.firmName) {
+ return
+ }
+ // 删除
+ destroyPupoLayers()
+ 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.capacity}(m³)</div>
+ </div>`
+ let divIcon = new DC.DivIcon(
+ new DC.Position(row.lng, row.lat, row.ele || 64),
+ `<div class="public-map-popup-two">
+ ${iconEl}
+ </div>`
+ )
+ let incident = () => {
+ destroyPupoLayers()
+ }
+ divIcon.on(DC.MouseEventType.CLICK, incident)
+ addPupoLayers[row.name].addOverlay(divIcon)
+ }
}
// 查看详情
-function goDetail(row) { }
+function goDetail (row) { }
const searchBtn = (params) => {
resetPage()
@@ -154,7 +167,7 @@
// 重置分页数据
const resetPage = () => {
pages.page = 1
- pages.pageSize = 10
+ pages.pageSize = 20
pages.total = 0
}
@@ -166,7 +179,6 @@
const spaceTabChange = (type) => {
curSelectTabType.value = type
-
nextTick(() => {
searchBtn(SeachBarCondition.value.getSeachCondition())
})
@@ -174,30 +186,68 @@
EventBus.on('spaceTabChange', spaceTabChange)
+let tooltip = window.$viewer.tooltip
+// 当前点编辑
+const editClick = (row) => {
+ if (row.lng && row.lat) {
+ window.$viewer.flyToPosition(new DC.Position(row.lng, row.lat, 300, 0, -90, 0))
+ tooltip.enable = true
+ store.setEditPoint(true)
+ }
+}
+
onUnmounted(() => {
EventBus.off('spaceTabChange', spaceTabChange)
+ destroyPupoLayers()
+ addPupoLayers = null
})
+
+// 销毁
+function destroyPupoLayers () {
+ 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 = {}
+ }
+}
</script>
<template>
<div class="w100 h0 flex-1 flex f-d-c">
<global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn" ref="SeachBarCondition"></global-search>
- <div class="h0 flex-1 table-content" ref="TableContent">
- <el-table :data="tableData" :height="curTableHeight" style="width: 100%" v-loading="loading">
- <el-table-column prop="name" label="名称" />
- <el-table-column prop="emergencySpaceType" label="类型" width="70" />
- <el-table-column prop="mainFuncName" label="作用" width="60" />
- <el-table-column width="60" label="操作" align="center">
+ <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-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 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 prop="capacity" label="容量(m³)" width="70" />
+ <el-table-column v-if="curSelectTabType != 9" align="center" width="62" label="操作">
+ <template #default="scope">
+ <el-button link type="primary" size="small" :disabled="scope.row.lng == ''"
+ @click.stop="editClick(scope.row)">
+ 编辑
+ </el-button>
+ </template>
+ </el-table-column>
+ <!-- <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)">
定位
</el-button>
- <!-- <el-button link type="primary" size="small" @click="goDetail">
- <i class="el-icon-document" style="color: #66b1ff"></i>详情
- </el-button> -->
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</div>
@@ -217,13 +267,4 @@
flex-basis: auto;
height: calc(100% - 40px);
}
-
-.el-page {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 100%;
- height: 40px;
- line-height: 40px;
-}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3