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 | 96 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 17 deletions(-)
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index f515d9e..be66e56 100644
--- a/src/pages/map/components/scomponents/layersControl.vue
+++ b/src/pages/map/components/scomponents/layersControl.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-31 10:47:29
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-12-27 14:45:27
+ * @LastEditTime: 2025-01-15 14:29:52
* @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
* @Description:
*
@@ -73,7 +73,9 @@
import { getList, getGouQu, updateSpace } from "@/api/space/space"
import { getList as getRiskList } from "@/api/riskSource/riskSource"
import { getPanoramaList } from "@/api/panorama/"
-import yqfw from "@/assets/json/yqfw"
+import yqfw from "@/assets/json/shape"
+import track from "@/assets/json/track"
+
// import gsgw from "@/assets/json/gsgw"
// import rqgw from "@/assets/json/rqgw"
import wsgw from "@/assets/json/wsgw"
@@ -120,9 +122,30 @@
url: '/3Dtile/lcmx/tile_01/tileset.json',
label: 'tile_01'
},
+
{
- url: '/3Dtile/lcmx/tile_02/tileset.json',
- label: 'tile_02'
+ url: '/3Dtile/lcmx/tile_03/tileset.json',
+ label: 'tile_03'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_04/tileset.json',
+ label: 'tile_04'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_05/tileset.json',
+ label: 'tile_05'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_06/tileset.json',
+ label: 'tile_06'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_07/tileset.json',
+ label: 'tile_07'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_08/tileset.json',
+ label: 'tile_08'
},
],
layerName: 'hgyq'
@@ -174,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),
@@ -216,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),
@@ -258,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),
@@ -358,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),
@@ -436,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,
@@ -449,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),
@@ -476,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,
@@ -489,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),
@@ -517,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,
@@ -585,6 +614,17 @@
panoramaUrl.value = attrParams.url
panoramaShow.value = true
}
+ },
+
+ {
+ id: '8',
+ label: '内外水系',
+ type: 'layer',
+ subType: 'geojsonPolyline',
+ layerName: 'track',
+ source: track,
+ color: DC.Color.BLUE.withAlpha(0.9),
+ height: 30,
},
/* {
@@ -768,8 +808,11 @@
if (item.incident) incident = item.incident
divIcon.on(DC.MouseEventType.CLICK, (e) => {
- moveEntity = e
- return
+ if (mapStore.editPoint) {
+ moveEntity = e
+ return
+ }
+
incident(e)
})
@@ -784,11 +827,9 @@
addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
window.$viewer.addLayer(addTileLayers[item.layerName])
- console.log(item.source.geometries, 906666)
-
- item.source.geometries.forEach(i => {
+ item.source.features.forEach(i => {
let wall = new DC.Wall(
- i.coordinates[0].map(d => [d[0], d[1], 125].join(',')).join(';')
+ i.geometry.coordinates[0].map(d => [d[0], d[1], 125].join(',')).join(';')
)
wall.setStyle({
@@ -888,7 +929,26 @@
} else {
addTileLayers[item.layerName].show = true
}
+ } else if (item.subType == 'geojsonPolyline') {
+ if (!addTileLayers[item.layerName]) {
+ addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
+ window.$viewer.addLayer(addTileLayers[item.layerName])
+
+ item.source.features.forEach(i => {
+ let Polyline = new DC.Polyline(i.geometry.coordinates.map(d => [...d, item.height].join(',')).join(';'))
+
+ Polyline.setStyle({
+ width: 3,
+ material: DC.Color.BLUE,
+ clampToGround: true
+ })
+ addTileLayers[item.layerName].addOverlay(Polyline)
+ })
+ } else {
+ addTileLayers[item.layerName].show = true
+ }
}
+
} else {
if (addTileLayers[item.layerName]) {
if (item.subType == '3Dtile') {
@@ -982,7 +1042,8 @@
const viewerMouseMove = (e) => {
if (mapStore.editPoint) {
if (moveEntity != null) {
- if (e.wgs84Position) {
+
+ if (e.wgs84Position && e.wgs84Position.alt > 0) {
moveEntity.overlay.position = new DC.Position(e.wgs84Position.lng, e.wgs84Position.lat, e.wgs84Position.alt)
} else {
moveEntity.overlay.position = new DC.Position(e.wgs84SurfacePosition.lng, e.wgs84SurfacePosition.lat, e.wgs84SurfacePosition.alt)
@@ -1003,8 +1064,9 @@
let lng, lat, ele
const { attrParams } = moveEntity.overlay
+ console.log(e, 2222)
- if (e.wgs84Position) {
+ if (e.wgs84Position && e.wgs84Position.alt > 0) {
lng = e.wgs84Position.lng
lat = e.wgs84Position.lat
ele = e.wgs84Position.alt
--
Gitblit v1.9.3