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 | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index c0611fa..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]
--
Gitblit v1.9.3