From b281c6ae60ad3afd5aef084080410e8fa949706e Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期三, 15 九月 2021 09:50:17 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai

---
 js/function.js |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/js/function.js b/js/function.js
index 7654949..67b5dda 100644
--- a/js/function.js
+++ b/js/function.js
@@ -65,6 +65,7 @@
   });
   map.addLayer(layer_1001_guokong);
 
+
   layer_1001_guokong.on(mars3d.EventType.click, function (event) {
     console.log("鐩戝惉layer锛屽崟鍑讳簡鐭㈤噺瀵硅薄", event);
 
@@ -93,7 +94,6 @@
     return html;
   });
 
-
   // add 鍥芥帶鐐�
   //鏄剧ず楂樻牎鐐�
   $.getJSON("//data.mars3d.cn/file/apidemo/gaoxiao.json", (result) => {
@@ -109,20 +109,38 @@
       var jd = Number(jwd[0]);
       var wd = Number(jwd[1]);
       var clr = pointColorArr[i % pointColorArr.length];
-
       var graphic = new mars3d.graphic.DivGraphic({
         position: Cesium.Cartesian3.fromDegrees(jd, wd),
         style: {
           html: '<div class="mars3d-animation-point" style="color:' + clr + ';"><p></p></div>',
-          //html: '<div><p><img src="img/marker/mark1.png"></p></div>',
+          // html: '<div><p><img src="img/marker/mark1.png"></p></div>',
+        //   scaleByDistance_far: 1100, // 鐭崐杞� 鍗婂緞
+        //   scaleByDistance_near: 2000, //闀垮崐杞� 鍗婂緞
+        //   height: 200,
+        //   material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.CircleWave, {
+        //     color: "#ffff00",
+        //     count: 3,
+        //     speed: 20,
+        //   }),
+        //   highlight: {
+        //     type: "click",
+        //     diffHeight: 600,
+        //     material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.CircleWave, {
+        //     color: "#ffff00",
+        //     count: 3,
+        //     speed: 20,
+        //   }),
+        //  },
           distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000), //鎸夎璺濊窛绂绘樉绀�
         },
+
         attr: item,
       });
       layer_1001_guokong.addGraphic(graphic);
-
     }
   });
+
+  
 
 }
 function addRoadLayer() {
@@ -238,7 +256,7 @@
   addTDTAnnoLayer();
 
   // 娣诲姞涓氬姟鍥惧眰
-  addfunctionLayers();
+  addguokongLayers();
 
   addRoadLayer();
 

--
Gitblit v1.9.1