From bf2a306685c07eb5e610669a17c4dd79651ecbe7 Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期日, 26 九月 2021 10:48:03 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai

---
 js/function.js |  186 +++++++++-------------------------------------
 1 files changed, 36 insertions(+), 150 deletions(-)

diff --git a/js/function.js b/js/function.js
index 35cdbfb..04ca61a 100644
--- a/js/function.js
+++ b/js/function.js
@@ -18,7 +18,6 @@
 mars3d.global_variables.queryDataTEnd = getDefaultDateTime();
 
 
-
 function initLayersByUserid() {
 
   //addMaskShanghai();
@@ -29,7 +28,6 @@
       if ([item['type']] == 'wms') {
         addWMSLayer(item);
       } else if ([item['type']] == 'wind') {
-        console.log('wind')
         addWindLayer(item);
       } else if ([item['type']] == 'graphic') {
         //addGuokongLayer(item);
@@ -43,7 +41,7 @@
 }
 
 function addWMSLayer(item) {
-
+ 
   var wmsLyer = new mars3d.layer.WmsLayer({
     id: item.id,
     pid: item.pid,
@@ -81,84 +79,35 @@
     style_options: item.styleoptions,
     flyTo: false
   });
-
+ 
   //鍗曞嚮浜嬩欢
   wmsLyer.on(mars3d.EventType.click, function (event) {
     console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
   });
-
+ 
   map.addLayer(wmsLyer);
-
+ 
 }
+function addMaskShanghai() {
 
-function addGuokongLayer(item) {
- //鍒涘缓鐭㈤噺鏁版嵁鍥惧眰
-  var guokongLayer =new mars3d.layer.GraphicLayer({
-    id: item.id,
-    pid: item.pid, //鍥惧眰绠$悊 涓娇鐢紝鐖惰妭鐐筰d
-    name: item.name,
-    style_options: item.styleoptions
+  //geojson 鍚堣偉杈圭晫绾�
+  geoJsonLayer = new mars3d.layer.GeoJsonLayer({
+    url: "//data.mars3d.cn/file/geojson/areas/340100.json",
+    mask: true, //鏍囪瘑涓洪伄缃╁眰銆愰噸鐐瑰弬鏁般��
+    symbol: {
+      styleOptions: {
+        fill: true,
+        color: "rgb(2,26,79)",
+        opacity: 0.9,
+        outline: false,
+        outlineColor: "#39E09B",
+        outlineWidth: 8,
+        outlineOpacity: 0.8,
+        arcType: Cesium.ArcType.GEODESIC,
+        clampToGround: true,
+      },
+    },
   });
-  map.addLayer(guokongLayer);
-
-
-  guokongLayer.on(mars3d.EventType.click, function (event) {
-    console.log("鐩戝惉layer锛屽崟鍑讳簡鐭㈤噺瀵硅薄", event);
-    console.log(event.graphic?.attr)
-    event.graphic.startBounce({
-      autoStop: true,
-      step: 2,
-      maxHeight: 90,
-    });
-    var item = event.graphic?.attr;
-  });
-
-  guokongLayer.bindPopup(function (event) {
-    let item = event.graphic?.attr;
-    var html =
-      "绔欑偣鍚嶇О锛�" +
-      item["SiteName"] +
-      "<br />鍒嗗尯锛�" +
-      item["RegionName"] +
-      "<br />AQI:" +
-      item["AQI"] +
-      "<br />PM25:" +
-      item["PM25"] + "ug/m3" +
-      "<br />SO2:" +
-      item["SO2"] + "ug/m3" +
-      "<br />O3:" +
-      item["O31"] + "ug/m3" +
-      "<br /><br /><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["SiteName"] + "\")' >璇︾粏淇℃伅</a></p>";
-    return html;
-  });
-
-
-  // add 鍥芥帶鐐�
-  $.getJSON("http://58.246.27.194:7012/dataapi/Bdata?bid=get_1001_list_hour&datatime=2021-09-06%2012:00:00&qindex=pm25", (result) => {
-    var pointColorArr = ["#f33349", "#fff000", "#33347f"];
-    for (var i = 0, len = result.data.result.length; i < len; i++) {
-      var item = result.data.result[i];
-      var graphic = new mars3d.graphic.BillboardEntity({
-        name: "璐村湴鍥炬爣",
-        position: [item.Longitude, item.Latitude],
-        style: {
-          image: "img/marker/di3.png",
-          scale: 0.2,
-          horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-          verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-          clampToGround: true,
-  
-          //楂樹寒鏃剁殑鏍峰紡锛堥粯璁や负榧犳爣绉诲叆锛屼篃鍙互鎸囧畾type:'click'鍗曞嚮楂樹寒锛夛紝鏋勯�犲悗涔熷彲浠penHighlight銆乧loseHighlight鏂规硶鏉ユ墜鍔ㄨ皟鐢�
-          highlight: {
-            scale: 0.8,
-          },
-        },
-        attr:item
-      });
-      guokongLayer.addGraphic(graphic);
-    }
-  });
-
 }
 
 function addGuokongLayerDIV(item) {
@@ -170,7 +119,6 @@
     style_options: item.styleoptions
   });
   map.addLayer(guokongLayer);
-
 
   guokongLayer.on(mars3d.EventType.click, function (event) {
     console.log("鐩戝惉layer锛屽崟鍑讳簡鐭㈤噺瀵硅薄", event);
@@ -197,49 +145,13 @@
       "<br /><br /><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["SiteName"] + "\")' >璇︾粏淇℃伅</a></p>";
     return html;
   });
-
-
-  // add 鍥芥帶鐐�
-  $.getJSON("http://58.246.27.194:7012/dataapi/Bdata?bid=get_1001_list_hour&datatime=2021-09-06%2012:00:00&qindex=pm25", (result) => {
-    var pointColorArr = ["#f33349", "#fff000", "#33347f"];
-    for (var i = 0, len = result.data.result.length; i < len; i++) {
-      var item = result.data.result[i];
-      var jd = result.data.result[i].Longitude;
-      var wd = result.data.result[i].Latitude;
-      var clr = pointColorArr[i % pointColorArr.length];
-      var graphic = new mars3d.graphic.DivLightPoint({
-        position: Cesium.Cartesian3.fromDegrees(jd, wd),
-        style: {
-          color: clr,
-          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-          // html: '<div class="mars3d-animation-point" style="color:' + clr + ';"><p></p></div>',
-          // html: '<div><p><img src="img/marker/mark1.png"></p></div>',
-          highlight: {
-            type: "divLightPoint",
-            diffHeight: 600,
-            material: mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.CircleWave, {
-              color: "#ffff00",
-              count: 3,
-              speed: 20,
-            }),
-          },
-          distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000), //鎸夎璺濊窛绂绘樉绀�
-        },
-        show: true,
-        attr: item,
-      });
-      guokongLayer.addGraphic(graphic);
-    }
-    
-  });
-
+  map.addLayer(guokongLayer);
 }
-
 function addWindLayer(item) {
-
+ 
   $.getJSON("data/getWindParametersByTime.json", { datatype: mars3d.global_variables.queryDataType, datatime: mars3d.global_variables.queryDataTStart }, (result) => {
     console.log(result);
-
+ 
     var layer_wind = new mars3d.layer.CanvasWindLayer({
       id: item.id,
       pid: item.pid,
@@ -254,21 +166,21 @@
     });
     layer_wind.show = item.show;
     map.addLayer(layer_wind);
-
+ 
     layer_wind.data = convertWindData(result.data);
   });
 }
-
+ 
 function convertWindData(arr) {
-
+ 
   var arrU = [];
   var arrV = [];
-
+ 
   var xmin = arr[0].x;
   var xmax = arr[0].x;
   var ymin = arr[0].y;
   var ymax = arr[0].y;
-
+ 
   // 椋庡悜鏄互y杞存鏂瑰悜涓洪浂搴﹂『鏃堕拡杞紝0搴﹁〃绀哄寳椋庛��90搴﹁〃绀轰笢椋庛��
   // u琛ㄧず缁忓害鏂瑰悜涓婄殑椋庯紝u涓烘锛岃〃绀鸿タ椋庯紝浠庤タ杈瑰惞鏉ョ殑椋庛��
   // v琛ㄧず绾害鏂瑰悜涓婄殑椋庯紝v涓烘锛岃〃绀哄崡椋庯紝浠庡崡杈瑰惞鏉ョ殑椋庛��
@@ -286,17 +198,17 @@
     if (ymax < item.y) {
       ymax = item.y;
     }
-
+ 
     var u = mars3d.WindUtil.getU(item.speed, item.dir);
     arrU.push(u);
-
+ 
     var v = mars3d.WindUtil.getV(item.speed, item.dir);
     arrV.push(v);
   }
-
+ 
   var rows = getKeyNumCount(arr, "y"); //璁$畻 琛屾暟
   var cols = getKeyNumCount(arr, "x"); //璁$畻 鍒楁暟
-
+ 
   return {
     xmin: xmin,
     xmax: xmax,
@@ -308,20 +220,19 @@
     vdata: arrV, //绾靛悜椋庨��
   };
 }
-
+ 
 function getKeyNumCount(arr, key) {
   var obj = {};
   arr.forEach((item) => {
     obj[item[key]] = true;
   });
-
+ 
   var count = 0;
   for (let col in obj) {
     count++;
   }
   return count;
 }
-
 
 function addTaxiLayer(item) {
 
@@ -474,31 +385,6 @@
   Vec_annoTileLayer.pid = 50;
   map.addLayer(Vec_annoTileLayer);
 }
-
-function addMaskShanghai() {
-
-  //geojson 鍚堣偉杈圭晫绾�
-  geoJsonLayer = new mars3d.layer.GeoJsonLayer({
-    url: "//data.mars3d.cn/file/geojson/areas/340100.json",
-    mask: true, //鏍囪瘑涓洪伄缃╁眰銆愰噸鐐瑰弬鏁般��
-    symbol: {
-      styleOptions: {
-        fill: true,
-        color: "rgb(2,26,79)",
-        opacity: 0.9,
-        outline: false,
-        outlineColor: "#39E09B",
-        outlineWidth: 8,
-        outlineOpacity: 0.8,
-        arcType: Cesium.ArcType.GEODESIC,
-        clampToGround: true,
-      },
-    },
-  });
-  map.addLayer(geoJsonLayer);
-
-}
-
 
 function showDetail(layerid, itemCode) {
   haoutil.msg('鍗曞嚮浜嗭細' + layerid + ',' + itemCode);

--
Gitblit v1.9.1