From 8a959ef878ac6c6e6dbd8affb4dd086383716cfb Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 23 Nov 2024 20:25:02 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/pages/layout/components/scomponents/layersControl.vue | 68 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index a1d7103..26d275a 100644
--- a/src/pages/layout/components/scomponents/layersControl.vue
+++ b/src/pages/layout/components/scomponents/layersControl.vue
@@ -482,29 +482,6 @@
const { attrParams } = e.overlay
// 删除
destroy()
- // if (!attrParams.imageUrl) {
- // return
- // }
- // addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
- // window.$viewer.addLayer(addPupoLayers[attrParams.name])
- // let iconEl = `<div class="marsBlueGradientPnl">
- // <div>${attrParams.fullName}</div>
- // <img src="${attrParams.imageUrl}" width="160" height="160" />
- // </div>`
- // let divIcon = new DC.DivIcon(
- // new DC.Position(attrParams.lng, attrParams.lat, 64),
- // `<div class="public-map-popup-two">
- // ${iconEl}
- // </div>`
- // )
- // let incident = () => {
- // destroy()
- // }
- // divIcon.on(DC.MouseEventType.CLICK, incident)
- // addPupoLayers[attrParams.name].addOverlay(divIcon)
-
- // 删除
- destroy()
addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
window.$viewer.addLayer(addPupoLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
@@ -538,12 +515,41 @@
{
id: '7',
- label: '地图全景点位分布',
+ label: '空中全景分布',
type: 'layer',
subType: 'labelPoint',
method: getPanoramaList,
params: {
- size: 1000
+ size: 1000,
+ remark: '1'
+ },
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/qj.png',
+ showPanel: false,
+ layerName: 'kzqjdwfb',
+ incident: (e) => {
+ const { attrParams } = e.overlay
+ panoramaTitle.value = attrParams.name
+ if (
+ attrParams.url.indexOf("http://vr.jxpskj.com:180") != -1
+ ) {
+ attrParams.url = attrParams.url.replace(
+ "http://vr.jxpskj.com:180",
+ "/panorama"
+ )
+ }
+ panoramaUrl.value = attrParams.url
+ panoramaShow.value = true
+ }
+ },
+ {
+ id: '8',
+ label: '地面全景分布',
+ type: 'layer',
+ subType: 'labelPoint',
+ method: getPanoramaList,
+ params: {
+ size: 1000,
+ remark: '2'
},
backgroundIcon: VITE_APP_BASE + 'img/mapicon/qj.png',
showPanel: false,
@@ -594,12 +600,14 @@
if (checkType(nodes) == 'arr') {
nodes.forEach(item => {
- if (item.type == 'layer') {
- collectedNodes.value.push(item)
- }
+ if (item) {
+ if (item.type == 'layer') {
+ collectedNodes.value.push(item)
+ }
- if (item.children && item.children.length > 0) {
- collectNodesWithFlag(item.children)
+ if (item.children && item.children.length > 0) {
+ collectNodesWithFlag(item.children)
+ }
}
})
}
--
Gitblit v1.9.3