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/pages/map/components/scomponents/layersControl.vue | 259 ++++++++++++++++++++++++++++-----------------------
1 files changed, 143 insertions(+), 116 deletions(-)
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index 1e3cc43..b226603 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-02 21:12:23
+ * @LastEditTime: 2024-12-03 12:51:24
* @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
* @Description:
*
@@ -50,7 +50,7 @@
</template>
<script setup>
-let addPupoLayers = {}
+let addPopLayers = {}
let addTileLayers = {}
let tileLayers = new DC.TilesetLayer('tileLayers')
window.$viewer.addLayer(tileLayers)
@@ -79,12 +79,12 @@
import EventBus from 'utils/bus'
import { usePointStore } from 'store/usepoint'
const pointStore = usePointStore()
-import { useRouter } from 'vue-router';
-const router = useRouter();
+import { useRouter } from 'vue-router'
+const router = useRouter()
const { VITE_APP_BASE } = import.meta.env
// , '7',
-let indexPoint = ref(['1', '5'])
+let indexPoint = ref(['1', '5', '7'])
const treeRef = ref(null)
@@ -109,23 +109,23 @@
subType: '3Dtile',
urlData: [
{
- url: VITE_APP_BASE + 'newMx/mx/tile_01/tileset.json',
+ url: VITE_APP_BASE + 'mx/tile_01/tileset.json',
label: 'tile_01'
},
{
- url: VITE_APP_BASE + 'newMx/mx/tile_02/tileset.json',
+ url: VITE_APP_BASE + 'mx/tile_02/tileset.json',
label: 'tile_02'
},
{
- url: VITE_APP_BASE + 'newMx/mx/tile_03/tileset.json',
+ url: VITE_APP_BASE + 'mx/tile_03/tileset.json',
label: 'tile_03'
},
{
- url: VITE_APP_BASE + 'newMx/mx/tile_04/tileset.json',
+ url: VITE_APP_BASE + 'mx/tile_04/tileset.json',
label: 'tile_04'
},
{
- url: VITE_APP_BASE + 'newMx/mx/tile_05/tileset.json',
+ url: VITE_APP_BASE + 'mx/tile_05/tileset.json',
label: 'tile_05'
},
],
@@ -168,14 +168,15 @@
incident: (e) => {
const { attrParams } = e.overlay
// 删除
- destroy()
- // if (!attrParams.imageUrl) {
- // return
- // }
- addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
- window.$viewer.addLayer(addPupoLayers[attrParams.name])
+ 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.fullName}</div>
+ <div>${attrParams.firmName}</div>
+ <div>${attrParams.mainFuncName}</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -184,10 +185,10 @@
</div>`
)
let incident = () => {
- destroy()
+ destroyPop()
}
divIcon.on(DC.MouseEventType.CLICK, incident)
- addPupoLayers[attrParams.name].addOverlay(divIcon)
+ addPopLayers[attrParams.id].addOverlay(divIcon)
}
},
{
@@ -207,15 +208,15 @@
incident: (e) => {
const { attrParams } = e.overlay
// 删除
- destroy()
- if (!attrParams.imageUrl) {
+ destroyPop()
+ if (!attrParams.firmName) {
return
}
- addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
- window.$viewer.addLayer(addPupoLayers[attrParams.name])
+ addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
+ window.$viewer.addLayer(addPopLayers[attrParams.id])
let iconEl = `<div class="marsBlueGradientPnl">
- <div>${attrParams.fullName}</div>
- <img src="${attrParams.imageUrl}" width="160" height="160" />
+ <div>${attrParams.firmName}</div>
+ <div>${attrParams.mainFuncName}</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -224,10 +225,10 @@
</div>`
)
let incident = () => {
- destroy()
+ destroyPop()
}
divIcon.on(DC.MouseEventType.CLICK, incident)
- addPupoLayers[attrParams.name].addOverlay(divIcon)
+ addPopLayers[attrParams.id].addOverlay(divIcon)
}
},
@@ -285,20 +286,25 @@
type: 'layer',
subType: 'labelPoint',
method: getList,
+ // className: 'sk-box',
+ // showPanel: false,
params: {
type: 4,
size: 1000
},
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/wstsb.png',
+ className: 'yjc-box',
+ showPanel: false,
layerName: 'wstsbz',
incident: (e) => {
const { attrParams } = e.overlay
// 删除
- destroy()
+ destroyPop()
if (!attrParams.imageUrl) {
return
}
- addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
- window.$viewer.addLayer(addPupoLayers[attrParams.name])
+ addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
+ window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
<div>${attrParams.fullName}</div>
<img src="${attrParams.imageUrl}" width="160" height="160" />
@@ -310,10 +316,10 @@
</div>`
)
let incident = () => {
- destroy()
+ destroyPop()
}
divIcon.on(DC.MouseEventType.CLICK, incident)
- addPupoLayers[attrParams.name].addOverlay(divIcon)
+ addPopLayers[attrParams.name].addOverlay(divIcon)
}
},
@@ -334,14 +340,14 @@
incident: (e) => {
const { attrParams } = e.overlay
// 删除
- destroy()
+ destroyPop()
if (!attrParams.imageUrl) {
return
}
- addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
- window.$viewer.addLayer(addPupoLayers[attrParams.name])
+ addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
+ window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
- <div>${attrParams.fullName}</div>
+ <div>${attrParams.firmName}</div>
<img src="${attrParams.imageUrl}" width="160" height="160" />
</div>`
let divIcon = new DC.DivIcon(
@@ -351,10 +357,10 @@
</div>`
)
let incident = () => {
- destroy()
+ destroyPop()
}
divIcon.on(DC.MouseEventType.CLICK, incident)
- addPupoLayers[attrParams.name].addOverlay(divIcon)
+ addPopLayers[attrParams.name].addOverlay(divIcon)
}
},
@@ -375,15 +381,15 @@
incident: (e) => {
const { attrParams } = e.overlay
// 删除
- destroy()
- if (!attrParams.imageUrl) {
+ destroyPop()
+ if (!attrParams.firmName) {
return
}
- addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
- window.$viewer.addLayer(addPupoLayers[attrParams.name])
+ addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
+ window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
- <div>${attrParams.fullName}</div>
- <img src="${attrParams.imageUrl}" width="160" height="160" />
+ <div>${attrParams.firmName}</div>
+ <div>${attrParams.mainFuncName}</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -392,10 +398,10 @@
</div>`
)
let incident = () => {
- destroy()
+ destroyPop()
}
divIcon.on(DC.MouseEventType.CLICK, incident)
- addPupoLayers[attrParams.name].addOverlay(divIcon)
+ addPopLayers[attrParams.name].addOverlay(divIcon)
}
},
@@ -414,22 +420,22 @@
showPanel: false,
layerName: 'gouqu'
},
- {
- id: '3-9',
- label: '废水处理站',
- type: 'layer',
- subType: 'labelPoint',
- method: getList,
- params: {
- type: 9,
- size: 1000
- // name: '吉水县绿源污水处理厂',
- },
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsclc.png',
- className: 'xfs-box',
- showPanel: false,
- layerName: 'fsclz'
- },
+ // {
+ // id: '3-9',
+ // label: '废水处理站',
+ // type: 'layer',
+ // subType: 'labelPoint',
+ // method: getList,
+ // params: {
+ // type: 9,
+ // size: 1000
+ // // name: '吉水县绿源污水处理厂',
+ // },
+ // backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsclc.png',
+ // className: 'xfs-box',
+ // showPanel: false,
+ // layerName: 'fsclz'
+ // },
{
id: '3-10',
label: '排水口',
@@ -445,21 +451,21 @@
showPanel: false,
layerName: 'psk'
},
- {
- id: '3-11',
- label: '污水池',
- type: 'layer',
- subType: 'labelPoint',
- method: getList,
- params: {
- type: 11,
- size: 1000
- },
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsc.png',
- className: 'xfs-box',
- showPanel: false,
- layerName: 'wsc'
- }
+ // {
+ // id: '3-11',
+ // label: '污水池',
+ // type: 'layer',
+ // subType: 'labelPoint',
+ // method: getList,
+ // params: {
+ // type: 11,
+ // size: 1000
+ // },
+ // backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsc.png',
+ // className: 'xfs-box',
+ // showPanel: false,
+ // layerName: 'wsc'
+ // }
]
},
@@ -485,11 +491,13 @@
incident: (e) => {
const { attrParams } = e.overlay
// 删除
- destroy()
- addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
- window.$viewer.addLayer(addPupoLayers[attrParams.name])
+ destroyPop()
+ addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
+ window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
+ <li>${attrParams.firmName || ''}</li>
<li>${attrParams.name || ''}</li>
+ <li>${attrParams.riskLevelName || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -498,10 +506,10 @@
</div>`
)
let incident = () => {
- destroy()
+ destroyPop()
}
divIcon.on(DC.MouseEventType.CLICK, incident)
- addPupoLayers[attrParams.name].addOverlay(divIcon)
+ addPopLayers[attrParams.name].addOverlay(divIcon)
}
},
{
@@ -522,11 +530,13 @@
incident: (e) => {
const { attrParams } = e.overlay
// 删除
- destroy()
- addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
- window.$viewer.addLayer(addPupoLayers[attrParams.name])
+ destroyPop()
+ addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
+ window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
+ <li>${attrParams.firmName || ''}</li>
<li>${attrParams.name || ''}</li>
+ <li>${attrParams.riskLevelName || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -535,10 +545,10 @@
</div>`
)
let incident = () => {
- destroy()
+ destroyPop()
}
divIcon.on(DC.MouseEventType.CLICK, incident)
- addPupoLayers[attrParams.name].addOverlay(divIcon)
+ addPopLayers[attrParams.name].addOverlay(divIcon)
}
}
]
@@ -685,20 +695,35 @@
addTileLayers[item.layerName] = []
item.urlData.forEach((m, ind) => {
addTileLayers[item.layerName][ind] = new DC.Tileset(m.url, {
- maximumMemoryUsage: 1024,
- maximumScreenSpaceError: 8,
- skipLevels: 5,
+ // maximumMemoryUsage: 1024,
+ // maximumScreenSpaceError: 8,
+ // skipLevels: 5,
+ // skipLevelOfDetail: true,
+ // skipScreenSpaceErrorFactor: 128,
+ // progressiveResolutionHeightFraction: 0.5,
+ // baseScreenSpaceError: 1024
+
+
skipLevelOfDetail: true,
+ baseScreenSpaceError: 1024,
+ maximumScreenSpaceError: 16, // 数值加大，能让最终成像变模糊
skipScreenSpaceErrorFactor: 128,
- progressiveResolutionHeightFraction: 0.5,
- baseScreenSpaceError: 1024
+ skipLevels: 5,
+ immediatelyLoadDesiredLevelOfDetail: false,
+ loadSiblings: true, // 如果为true则不会在已加载完概况房屋后，自动从中心开始超清化房屋
+ cullWithChildrenBounds: true,
+ cullRequestsWhileMoving: true,
+ cullRequestsWhileMovingMultiplier: 10, // 值越小能够更快的剔除
+ preloadWhenHidden: true,
+ preferLeaves: true,
+ maximumMemoryUsage: 64, // 内存分配变小有利于倾斜摄影数据回收，提升性能体验
+ progressiveResolutionHeightFraction: 0.5, // 数值偏于0能够让初始加载变得模糊
+ dynamicScreenSpaceErrorDensity: 0.5, // 数值加大，能让周边加载变快
+ dynamicScreenSpaceErrorFactor: 1, // 不知道起了什么作用没，反正放着吧先
+ dynamicScreenSpaceError: true, // 根据测试，有了这个后，会在真正的全屏加载完之后才清晰化房屋
})
- addTileLayers[item.layerName][ind].setSplitDirection(1)
// tile.setHeight(-420)
- // tile.setSplitDirection(-1)
- window.$viewer.sceneSplit.addTileset(addTileLayers[item.layerName][ind])
tileLayers.addOverlay(addTileLayers[item.layerName][ind])
- window.$viewer.sceneSplit.enable = false
})
} else {
addTileLayers[item.layerName].forEach(m => m.show = true)
@@ -910,11 +935,10 @@
EventBus.on('restHandleCheckChange', restHandleCheckChange)
EventBus.on('restHandleDelChange', restHandleDelChange)
EventBus.on('flyToyqfw', flyToyqfw)
+EventBus.on('destroyPop', destroyPop)
onMounted(() => {
- setTimeout(() => {
- // handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
- }, 3000)
+ handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
})
// const sharedData = computed(() => pointStore.sharedData);
@@ -937,12 +961,12 @@
EventBus.emit('restHandleDelChange', `3-6`)
EventBus.emit('restHandleDelChange', `3-7`)
EventBus.emit('restHandleDelChange', `3-8`)
- EventBus.emit('restHandleDelChange', `3-9`)
+ // EventBus.emit('restHandleDelChange', `3-9`)
EventBus.emit('restHandleDelChange', `4`)
EventBus.emit('restHandleDelChange', `4-1`)
EventBus.emit('restHandleDelChange', `4-2`)
EventBus.emit('restHandleDelChange', `8`)
- destroy()
+ destroyPop()
}
// const sharedData = computed(() => pointStore.sharedData);
@@ -951,35 +975,38 @@
// 监听当前路由路径的变化
watch(() => router.currentRoute.value.path,
(newPath, oldPath) => {
- console.log(`Current path changed from ${oldPath} to ${newPath}`);
+ console.log(`Current path changed from ${oldPath} to ${newPath}`)
closeAll()
},
{ immediate: true }
)
// 销毁
-function destroy () {
- let arr = Object.keys(addPupoLayers)
- arr.filter(i => i != 'hgyq').forEach(i => {
- addPupoLayers[i] && window.$viewer && window.$viewer.removeLayer(addPupoLayers[i])
- addPupoLayers[i] = null
- delete addPupoLayers[i]
+function destroyPop () {
+ let arr = Object.keys(addPopLayers)
+ if(arr.length > 0){
+ arr.forEach(i => {
+ addPopLayers[i] && window.$viewer && window.$viewer.removeLayer(addPopLayers[i])
+ addPopLayers[i] = null
+ delete addPopLayers[i]
})
- addPupoLayers = {}
+ addPopLayers = {}
+ }
}
onUnmounted(() => {
let arr = Object.keys(addTileLayers)
arr.forEach(i => {
if (i == 'hgyq') {
- tileLayers.removeOverlay(addTileLayers[i])
- addTileLayers[i] = null
- delete addTileLayers[i]
+ addTileLayers[i].forEach(t => {
+ tileLayers.removeOverlay(t)
+ t = null
+ })
} else {
addTileLayers[i] && window.$viewer && window.$viewer.removeLayer(addTileLayers[i])
- addTileLayers[i] = null
- delete addTileLayers[i]
}
+ addTileLayers[i] = null
+ delete addTileLayers[i]
})
addTileLayers = null
@@ -989,8 +1016,8 @@
tileLayers = null
}
// 弹窗销毁
- destroy()
- addPupoLayers = null
+ destroyPop()
+ addPopLayers = null
EventBus.off('restHandleCheckChange', restHandleCheckChange)
EventBus.off('restHandleDelChange', restHandleDelChange)
--
Gitblit v1.9.3