From f55ea1cfc0b5f60b01552e8b96f95e8a33c45bb8 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 15 Nov 2024 09:12:53 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/pages/layout/components/scomponents/layersControl.vue | 148 +++----------------------------------------------
1 files changed, 10 insertions(+), 138 deletions(-)
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index 071cf79..92c4fc5 100644
--- a/src/pages/layout/components/scomponents/layersControl.vue
+++ b/src/pages/layout/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-11-12 18:15:54
+ * @LastEditTime: 2024-11-14 18:32:01
* @FilePath: \bigScreen\src\pages\layout\components\scomponents\layersControl.vue
* @Description:
*
@@ -120,6 +120,7 @@
size: 1000
},
backgroundIcon: VITE_APP_BASE + 'img/mapicon/qy.png',
+ className: 'qyfb-box',
showPanel: false,
layerName: 'qyfb'
},
@@ -230,6 +231,7 @@
size: 1000
},
showParams: 'category',
+ className: 'fxy-box',
backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy.png',
showPanel: false,
layerName: 'fxy'
@@ -418,7 +420,7 @@
let divIcon = new DC.DivIcon(
new DC.Position(i.lng, i.lat, 0),
- `<div class="public-map-popup">
+ `<div class="public-map-popup ${item.className || ''}">
${iconEl}
</div>`
)
@@ -463,9 +465,9 @@
addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
window.$viewer.addLayer(addTileLayers[item.layerName])
- function computeCircle(radius) {
+ function computeCircle (radius) {
var positions = []
- for (var i = 0; i < 1080; i++) {
+ for (var i = 0; i < 360; i++) {
var radians = DC.Math.toRadians(i)
positions.push({
x: radius * Math.cos(radians),
@@ -506,7 +508,7 @@
})
}
-function findObjectById(data, id) {
+function findObjectById (data, id) {
// 遍历数据数组
for (let i = 0; i < data.length; i++) {
const item = data[i]
@@ -558,141 +560,11 @@
handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
})
-const sharedData = computed(() => pointStore.sharedData);
-//
-watch(sharedData, (newValue) => {
- let companyInfo = JSON.parse(localStorage.getItem('companyInfo'))
+// const sharedData = computed(() => pointStore.sharedData);
+// watch(sharedData, (newValue) => {
+// });
- if (newValue === '1') {
- // 处理切换了应急空间页面，把图标隐藏
- if (indexPoint.value.includes('3')) {
- let allList = data.filter(i => indexPoint.value.includes(i.id))
- let temp = indexPoint.value.filter(ie => ie != '3')
- // console.log(temp, '***************************************')
- let checkList = data.filter(i => temp.includes(i.id))
- treeRef.value?.setCheckedNodes(checkList)
- handleCheckChangeTwo(allList, companyInfo.id)
- }
- return
- }
- // 处理切换到应急空间页面，把图标显示
- console.log('sharedData changed to:', newValue);
- // 获取缓存里面的企业id
- indexPoint.value.includes(newValue) ? '' : indexPoint.value.push(newValue)
- let checkList = data.filter(i => indexPoint.value.includes(i.id))
- treeRef.value?.setCheckedNodes(checkList)
- handleCheckChangeTwo(checkList, companyInfo.id)
-});
-const handleCheckChangeTwo = (data, firmId) => {
- let options = treeRef.value?.getCheckedNodes()
- // console.log(options, "*************222222***********")
- collectedNodes.value = []
- collectNodesWithFlag(data)
- collectedNodes.value.forEach(item => {
- let layerName = item.layerName + '_' + firmId
- console.log(layerName, "**************************************")
- if (options.some(i => i.id == item.id)) {
- if (item.subType == 'labelPoint') {
- if (!addTileLayers[layerName]) {
- addTileLayers[layerName] = new DC.HtmlLayer(addTileLayers[layerName])
- window.$viewer.addLayer(addTileLayers[layerName])
- let params = { ...item.params }
- params.firmId = firmId
- item.method(params).then(res => {
- let data = res.data.data.records
- data.filter(i => i.lng && i.lng != '' && i.lat && i.lat != '').forEach(i => {
- let iconEl = ''
- if ('showPanel' in item && item.showPanel == false) {
- if (item.backgroundIcon) {
- iconEl = `
- <div class="map-name">${i[item.showParams] || i.name}</div>
- <div class="map-icon">
- <img src="${item.backgroundIcon}">
- </div>
- `
- }
- } else {
- iconEl = `<div class="marsBlueGradientPnl">
- <div>${i[item.showParams] || i.name}</div>
- </div>`
- }
- let divIcon = new DC.DivIcon(
- new DC.Position(i.lng, i.lat, 0),
- `<div class="public-map-popup">
- ${iconEl}
- </div>`
- )
- addTileLayers[layerName].addOverlay(divIcon)
- })
- })
- } else {
- addTileLayers[layerName].show = true
- }
- }
- } else {
- if (addTileLayers[layerName]) {
- if (item.subType == 'labelPoint') {
- addTileLayers[layerName].show = false
- }
- }
- }
- })
-}
-// const handleCheckChangeTwo = (data, firmId) => {
-// let options = treeRef.value?.getCheckedNodes()
-// console.log(options, "*************222222***********")
-// collectedNodes.value = []
-// collectNodesWithFlag(data)
-// collectedNodes.value.forEach(item => {
-// if (options.some(i => i.id == item.id)) {
-
-// if (item.subType == 'labelPoint') {
-// if (!addTileLayers[item.layerName]) {
-// addTileLayers[item.layerName] = new DC.HtmlLayer(addTileLayers[item.layerName])
-// window.$viewer.addLayer(addTileLayers[item.layerName])
-// let params = { ...item.params }
-// params.firmId = firmId
-// item.method(params).then(res => {
-// let data = res.data.data.records
-// data.filter(i => i.lng && i.lng != '' && i.lat && i.lat != '').forEach(i => {
-// let iconEl = ''
-// if ('showPanel' in item && item.showPanel == false) {
-// if (item.backgroundIcon) {
-// iconEl = `
-// <div class="map-name">${i[item.showParams] || i.name}</div>
-// <div class="map-icon">
-// <img src="${item.backgroundIcon}">
-// </div>
-// `
-// }
-// } else {
-// iconEl = `<div class="marsBlueGradientPnl">
-// <div>${i[item.showParams] || i.name}</div>
-// </div>`
-// }
-// let divIcon = new DC.DivIcon(
-// new DC.Position(i.lng, i.lat, 0),
-// `<div class="public-map-popup">
-// ${iconEl}
-// </div>`
-// )
-// addTileLayers[item.layerName].addOverlay(divIcon)
-// })
-// })
-// } else {
-// addTileLayers[item.layerName].show = true
-// }
-// }
-// } else {
-// if (addTileLayers[item.layerName]) {
-// if (item.subType == 'labelPoint') {
-// addTileLayers[item.layerName].show = false
-// }
-// }
-// }
-// })
-// }
onUnmounted(() => {
tileLayers && window.$viewer.removeLayer(tileLayers)
--
Gitblit v1.9.3