From 39d91d2b2042e86a45c8b56b53f35d4a8b53b365 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Dec 2024 13:09:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/views/rs/components/box/dataContent.vue | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/src/views/rs/components/box/dataContent.vue b/src/views/rs/components/box/dataContent.vue
index c725ace..3f96d6e 100644
--- a/src/views/rs/components/box/dataContent.vue
+++ b/src/views/rs/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-20 18:50:27
+ * @LastEditTime: 2024-11-27 14:26:33
* @FilePath: \bigScreen\src\views\rs\components\box\dataContent.vue
* @Description:
*
@@ -52,11 +52,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) ||
@@ -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')
})
// 分页改变
@@ -99,15 +100,21 @@
// 查询分页数据
const getLists = (param = {}) => {
+ tableData.value = []
param.current = pages.page
param.size = pages.pageSize
loading.value = true
getList({
...param,
- riskLevel: curSelectTabType.riskLevel
+ // riskLevel: curSelectTabType.riskLevel
})
.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
@@ -123,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))
// 显示企业信息
@@ -133,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>`
@@ -151,7 +160,7 @@
// 查看详情
-function goDetail(row) { }
+function goDetail (row) { }
const searchBtn = (params) => {
resetPage()
@@ -166,7 +175,7 @@
// 重置分页数据
const resetPage = () => {
pages.page = 1
- pages.pageSize = 10
+ pages.pageSize = 20
pages.total = 0
}
@@ -185,10 +194,9 @@
}
const tabClick = (item) => {
- console.log(item, 12312)
if (curSelect.value) EventBus.emit('restHandleDelChange', `4-${curSelect.value}`)
curSelect.value = item.value
- EventBus.emit('restHandleCheckChange', `4-${item.value}`)
+ EventBus.emit('restHandleCheckChange', `4`)
EventBus.emit('rsTabChange', item.value)
}
@@ -208,15 +216,18 @@
onUnmounted(() => {
EventBus.off('rsTabChange', spaceTabChange)
- if (curSelect.value) EventBus.emit('restHandleDelChange', `4-${curSelect.value}`)
+ 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,8 +235,9 @@
<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="cur-container">
+ <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"
@click="tabClick(item)">
@@ -234,10 +246,11 @@
</div>
</div>
</div>
- </div>
+ </div> -->
<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 }}
@@ -245,7 +258,7 @@
</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" show-overflow-tooltip prop="category" label="类别" width="92" /> -->
+ <el-table-column align="center" show-overflow-tooltip prop="riskLevelName" label="级别" width="72" />
<!-- <el-table-column align="center" show-overflow-tooltip prop="mainProduct" label="主要产品" width="112" /> -->
<!-- <el-table-column align="center" width="62" label="操作">
<template #default="scope">
--
Gitblit v1.9.3