From 334441ca3ad8f64f516f1ec90fba1da3488f76d1 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Dec 2024 13:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/pages/map/components/scomponents/layersControl.vue | 77 +++++++++++++++++++++++++-------------
1 files changed, 51 insertions(+), 26 deletions(-)
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index 5adea68..56e6d9b 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-03 13:29:41
+ * @LastEditTime: 2024-12-03 13:44:43
* @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
* @Description:
*
@@ -71,8 +71,8 @@
import { getList as getRiskList } from "@/api/riskSource/riskSource"
import { getPanoramaList } from "@/api/panorama/"
import yqfw from "@/assets/json/yqfw"
-import gsgw from "@/assets/json/gsgw"
-import rqgw from "@/assets/json/rqgw"
+// import gsgw from "@/assets/json/gsgw"
+// import rqgw from "@/assets/json/rqgw"
import wsgw from "@/assets/json/wsgw"
import ysgw from "@/assets/json/ysgw"
import { onUnmounted } from 'vue'
@@ -257,26 +257,26 @@
color: DC.Color.CYAN.withAlpha(0.9),
height: 60,
},
- {
- id: '3-3-1',
- label: '给水管网',
- type: 'layer',
- subType: 'geojsonPipe',
- layerName: 'gsgw',
- source: gsgw,
- color: DC.Color.BLUE.withAlpha(0.9),
- height: 60.4,
- },
- {
- id: '3-3-3',
- label: '燃气管网',
- type: 'layer',
- subType: 'geojsonPipe',
- layerName: 'rqgw',
- source: rqgw,
- color: DC.Color.RED.withAlpha(0.9),
- height: 60.6,
- },
+ // {
+ // id: '3-3-1',
+ // label: '给水管网',
+ // type: 'layer',
+ // subType: 'geojsonPipe',
+ // layerName: 'gsgw',
+ // source: gsgw,
+ // color: DC.Color.BLUE.withAlpha(0.9),
+ // height: 60.4,
+ // },
+ // {
+ // id: '3-3-3',
+ // label: '燃气管网',
+ // type: 'layer',
+ // subType: 'geojsonPipe',
+ // layerName: 'rqgw',
+ // source: rqgw,
+ // color: DC.Color.RED.withAlpha(0.9),
+ // height: 60.6,
+ // },
]
},
@@ -449,7 +449,32 @@
backgroundIcon: VITE_APP_BASE + 'img/mapicon/psk.png',
className: 'xfs-box',
showPanel: false,
- layerName: 'psk'
+ layerName: 'psk',
+ incident: (e) => {
+ const { attrParams } = e.overlay
+ // 删除
+ destroyPop()
+ if (!attrParams.firmName) {
+ return
+ }
+ addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
+ window.$viewer.addLayer(addPopLayers[attrParams.id])
+ let iconEl = `<div class="marsBlueGradientPnl">
+ <div>${attrParams.firmName}</div>
+ <div>${attrParams.mainFuncName}</div>
+ </div>`
+ let divIcon = new DC.DivIcon(
+ new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
+ `<div class="public-map-popup-two">
+ ${iconEl}
+ </div>`
+ )
+ let incident = () => {
+ destroyPop()
+ }
+ divIcon.on(DC.MouseEventType.CLICK, incident)
+ addPopLayers[attrParams.id].addOverlay(divIcon)
+ }
},
// {
// id: '3-11',
@@ -991,9 +1016,9 @@
EventBus.emit('restHandleDelChange', `3-1`)
EventBus.emit('restHandleDelChange', `3-2`)
EventBus.emit('restHandleDelChange', `3-3`)
- EventBus.emit('restHandleDelChange', `3-3-1`)
+ // EventBus.emit('restHandleDelChange', `3-3-1`)
EventBus.emit('restHandleDelChange', `3-3-2`)
- EventBus.emit('restHandleDelChange', `3-3-3`)
+ // EventBus.emit('restHandleDelChange', `3-3-3`)
EventBus.emit('restHandleDelChange', `3-3-4`)
EventBus.emit('restHandleDelChange', `3-4`)
EventBus.emit('restHandleDelChange', `3-5`)
--
Gitblit v1.9.3