From d2e2df7c4805cc9c5e4e915202f304e0e9a53758 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 23 May 2025 09:49:31 +0800
Subject: [PATCH] 临川优化
---
src/pages/map/components/scomponents/layersControl.vue | 16 +++++++++++-----
src/views/rs/components/box/dataContent.vue | 6 +++---
src/views/space/components/box/dataContent.vue | 4 ++--
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index 587610b..be66e56 100644
--- a/src/pages/map/components/scomponents/layersControl.vue
+++ b/src/pages/map/components/scomponents/layersControl.vue
@@ -197,6 +197,7 @@
let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${attrParams.firmName}</div>
<div>作用：${attrParams.mainFuncName}</div>
+ <div>容量：${attrParams.capacity}(m³)</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -239,6 +240,7 @@
let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${attrParams.firmName}</div>
<div>作用：${attrParams.mainFuncName}</div>
+ <div>容量：${attrParams.capacity}(m³)</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -281,6 +283,7 @@
let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${attrParams.firmName}</div>
<div>作用：${attrParams.mainFuncName}</div>
+ <div>容量：${attrParams.capacity}(m³)</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -381,6 +384,7 @@
let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${attrParams.firmName}</div>
<div>作用：${attrParams.mainFuncName}</div>
+ <div>容量：${attrParams.capacity}(m³)</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -459,7 +463,7 @@
riskLevel: 1,
size: 1000
},
- showParams: 'category',
+ showParams: 'firmName',
className: 'fxy-ordinary',
backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-yb.png',
showPanel: false,
@@ -472,8 +476,9 @@
window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
<li>企业名称：${attrParams.firmName || ''}</li>
+ <li>行业类别：${attrParams.category || ''}</li>
<li>风险等级：${attrParams.riskLevelName || ''}</li>
- <li>行业类别：${attrParams.name || ''}</li>
+ <li>风险物资：${attrParams.name || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -499,7 +504,7 @@
riskLevel: 2,
size: 1000
},
- showParams: 'category',
+ showParams: 'firmName',
className: 'fxy-larger',
backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-jd.png',
showPanel: false,
@@ -512,8 +517,9 @@
window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
<li>企业名称：${attrParams.firmName || ''}</li>
+ <li>行业类别：${attrParams.category || ''}</li>
<li>风险等级：${attrParams.riskLevelName || ''}</li>
- <li>行业类别：${attrParams.name || ''}</li>
+ <li>风险物资：${attrParams.name || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -540,7 +546,7 @@
riskLevel: 9,
size: 1000
},
- showParams: 'category',
+ showParams: 'firmName',
className: 'fxy-zd',
backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-zd.png',
showPanel: false,
diff --git a/src/views/rs/components/box/dataContent.vue b/src/views/rs/components/box/dataContent.vue
index b418252..c27892f 100644
--- a/src/views/rs/components/box/dataContent.vue
+++ b/src/views/rs/components/box/dataContent.vue
@@ -145,8 +145,9 @@
window.$viewer.addLayer(addPupoLayers[row.firmName])
let iconEl = `<div class="marsBlueGradientPnl">
<li>企业名称：${row.firmName || ''}</li>
+ <li>行业类别：${row.category || ''}</li>
<li>风险等级：${row.riskLevelName || ''}</li>
- <li>行业类别：${row.name || ''}</li>
+ <li>风险物资：${row.name || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(row.lng, row.lat, row.ele || 64),
@@ -239,8 +240,7 @@
<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"
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index b876383..f5a61db 100644
--- a/src/views/space/components/box/dataContent.vue
+++ b/src/views/space/components/box/dataContent.vue
@@ -134,6 +134,7 @@
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),
@@ -217,8 +218,7 @@
<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)">
--
Gitblit v1.9.3