From 7d5f96e580b60801aab984125ea960dee6c8b809 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Mon, 13 Feb 2023 20:44:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

---
 src/components/map/index.vue |   48 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 12ad27b..5691b7a 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -2,7 +2,7 @@
  * @Author: shuishen 1109946754@qq.com
  * @Date: 2022-08-18 17:00:30
  * @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-02-09 14:52:36
+ * @LastEditTime: 2023-02-13 10:51:47
  * @FilePath: \srs-police-affairs\src\components\map\index.vue
  * @Description: 公用地图组件
  * 
@@ -218,15 +218,15 @@
             that.switchImg()
 
             // 外网
-            // global.viewer.imageryLayers.addImageryProvider(
-            //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
-            //         url: 'http://t{s}.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
-            //         subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
-            //         format: 'image/jpeg',
-            //         show: true,
-            //         maximumLevel: 18
-            //     })
-            // )
+            global.viewer.imageryLayers.addImageryProvider(
+                new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+                    url: 'http://t{s}.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
+                    subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+                    format: 'image/jpeg',
+                    show: true,
+                    maximumLevel: 18
+                })
+            )
 
             // 设置地图初始位置,角度等
             global.viewer.camera.setView({
@@ -556,7 +556,9 @@
             } else if (type == 'ClusterLayer') {
                 if (!layersObjcect[layerName]) layersObjcect[layerName] = null
 
-                layersObjcect[layerName] = new global.DC.ClusterLayer(layerName)
+                layersObjcect[layerName] = new global.DC.ClusterLayer(layerName, {
+                    pixelRange: 4
+                })
 
                 layersObjcect[layerName].addTo(global.viewer)
             } else if (type == 'HeatLayer') {
@@ -611,6 +613,7 @@
             }
 
             let pointElement
+            let labelElement
 
             if (type == "billboard") {
                 pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), Number(params.alt)), params.url)
@@ -619,8 +622,8 @@
                 layersObjcect[layerName].addOverlay(pointElement)
                 pointElement.on(global.DC.MouseEventType.CLICK, incident)
             } else if (type == "label") {
-                pointElement = new global.DC.Label(new global.DC.Position(Number(params.lng), Number(params.lat), Number(params.alt)), params.text)
-                pointElement.setStyle({
+                labelElement = new global.DC.Label(new global.DC.Position(Number(params.lng), Number(params.lat), Number(params.alt)), params.text)
+                labelElement.setStyle({
                     fillColor: global.DC.Color.CRIMSON,
                     style: global.DC.Namespace.Cesium.LabelStyle.FILL_AND_OUTLINE,
                     outlineColor: global.DC.Color.WHITE, // 边框颜色
@@ -629,9 +632,28 @@
                     pixelOffset: { x: 0, y: -30 },
                     distanceDisplayCondition: distanceDisplayCondition
                 })
+                labelElement.attrParams = params
+                layersObjcect[layerName].addOverlay(labelElement)
+                labelElement.on(global.DC.MouseEventType.CLICK, incident)
+            } else if (type == "billboardOrLabel") {
+                pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), Number(params.alt)), params.url)
+                pointElement.size = [32, 32]
                 pointElement.attrParams = params
                 layersObjcect[layerName].addOverlay(pointElement)
                 pointElement.on(global.DC.MouseEventType.CLICK, incident)
+
+                labelElement = new global.DC.Label(new global.DC.Position(Number(params.lng), Number(params.lat), Number(params.alt)), params.text)
+                labelElement.setStyle({
+                    fillColor: global.DC.Color.CRIMSON,
+                    style: global.DC.Namespace.Cesium.LabelStyle.FILL_AND_OUTLINE,
+                    outlineColor: global.DC.Color.WHITE, // 边框颜色
+                    outlineWidth: 4, // 边框大小,
+                    font: '16px sans-serif',
+                    pixelOffset: { x: 0, y: -30 }
+                })
+                labelElement.attrParams = params
+                layersObjcect[layerName].addOverlay(labelElement)
+                labelElement.on(global.DC.MouseEventType.CLICK, incident)
             } else if (type == 'HeatPoint') {
                 layersObjcect[layerName].setPositions(params.positions)
             }

--
Gitblit v1.9.3