From 0bfff4dc529cc7c20e1cad96e570bf61f3809e9b Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期一, 27 九月 2021 13:12:03 +0800
Subject: [PATCH] change name

---
 js/function.js      |   64 ---------------------
 js/function_1001.js |   72 +++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 67 deletions(-)

diff --git a/js/function.js b/js/function.js
index 440288f..8d12e33 100644
--- a/js/function.js
+++ b/js/function.js
@@ -71,71 +71,7 @@
 
 }
 
-function addWMSLayer(item) {
 
-  var wmsLyer = new mars3d.layer.WmsLayer({
-    id: item.id,
-    pid: item.pid,
-    name: item.name,
-    type: "wms",
-    url: mars3d.global_variables.geoserver_url_predix + "/geoserver/konglu_58/wms",
-    layers: "konglu_58:" + item.geoname_prefix + mars3d.global_variables.queryDataType,
-    crs: "EPSG:4326",
-    parameters: {
-      "styles": item.style_prefix + item.style_selected,
-      "transparent": "true",
-      "format": "image/png",
-      "viewparams": "userid:" + mars3d.global_variables.userid + ";datatime:" + mars3d.global_variables.queryDataTStartGeo
-    },
-    center: { "lat": 30.487351, "lng": 121.613269, "alt": 54033, "heading": 359, "pitch": -40 },
-    noCenter: true,
-    maxLength: 35000,
-    getFeatureInfoParameters: {
-      feature_count: 10
-    },
-    //鍗曞嚮楂樹寒鍙婂叾鏍峰紡
-    highlight: {
-      type: "wallP",
-      diffHeight: 300,
-      material: mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.LineFlow, {
-        image: "img/textures/fence.png",
-        color: "#ffff00",
-        speed: 10, //閫熷害锛屽缓璁彇鍊艰寖鍥�1-100
-        axisY: true,
-      }),
-    },
-    popup: "all",
-    show: item.show,
-    geoname_prefix: item.geoname_prefix,
-    style_prefix: item.style_prefix,
-    style_selected:item.style_selected,
-    style_options: item.styleoptions,
-    flyTo: false
-  });
-
-  //鍗曞嚮浜嬩欢
-  wmsLyer.on(mars3d.EventType.click, function (event) {
-    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
-    console.log(event.layer.options.style_selected);
-
-
-    console.log(event.graphic);
-    /*
-    event.graphic.style.diffHeight = 
-
-      diffHeight: 300,
-      material: mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.LineFlow, {
-        image: "img/textures/fence.png",
-        color: "#ffff00",
-        speed: 10, //閫熷害锛屽缓璁彇鍊艰寖鍥�1-100
-        axisY: true,
-      }),
-      */
-  });
-
-  map.addLayer(wmsLyer);
-
-}
 
 function reLoadLayers() {
   var layers = map.getLayers({ layers: true });
diff --git a/js/function_1001.js b/js/function_1001.js
index 6097328..5d12bc6 100644
--- a/js/function_1001.js
+++ b/js/function_1001.js
@@ -1,11 +1,78 @@
 "use script"; //寮�鍙戠幆澧冨缓璁紑鍚弗鏍兼ā寮�
 //绯荤粺 鍔熻兘鍏ュ彛
 
+
+var allLayer_color_nodata = '#C0C0C0';
 var guokong_color_list = ['#0EE839', '#FEFE23', '#FD9D00', '#F70F0D', '#8A0B73', '#88041E'];
-var guokong_color_nodata = '#C0C0C0';
 var guokong_qindex_color_list = { 'pm25': [35, 75, 115, 150, 250], 'pm10': [50, 150, 250, 350, 420], 'no2': [100, 200, 700, 1200, 2340], 'co': [5, 10, 35, 60, 90] };
 var guokong_data_list;
 
+
+function addWMSLayer(item) {
+
+  var wmsLyer = new mars3d.layer.WmsLayer({
+    id: item.id,
+    pid: item.pid,
+    name: item.name,
+    type: "wms",
+    url: mars3d.global_variables.geoserver_url_predix + "/geoserver/konglu_58/wms",
+    layers: "konglu_58:" + item.geoname_prefix + mars3d.global_variables.queryDataType,
+    crs: "EPSG:4326",
+    parameters: {
+      "styles": item.style_prefix + item.style_selected,
+      "transparent": "true",
+      "format": "image/png",
+      "viewparams": "userid:" + mars3d.global_variables.userid + ";datatime:" + mars3d.global_variables.queryDataTStartGeo
+    },
+    center: { "lat": 30.487351, "lng": 121.613269, "alt": 54033, "heading": 359, "pitch": -40 },
+    noCenter: true,
+    maxLength: 35000,
+    getFeatureInfoParameters: {
+      feature_count: 10
+    },
+    //鍗曞嚮楂樹寒鍙婂叾鏍峰紡
+    highlight: {
+      type: "wallP",
+      diffHeight: 300,
+      material: mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.LineFlow, {
+        image: "img/textures/fence.png",
+        color: "#ffff00",
+        speed: 10, //閫熷害锛屽缓璁彇鍊艰寖鍥�1-100
+        axisY: true,
+      }),
+    },
+    popup: "all",
+    show: item.show,
+    geoname_prefix: item.geoname_prefix,
+    style_prefix: item.style_prefix,
+    style_selected:item.style_selected,
+    style_options: item.styleoptions,
+    flyTo: false
+  });
+
+  //鍗曞嚮浜嬩欢
+  wmsLyer.on(mars3d.EventType.click, function (event) {
+    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+    console.log(event.layer.options.style_selected);
+
+
+    console.log(event.graphic);
+    /*
+    event.graphic.style.diffHeight = 
+
+      diffHeight: 300,
+      material: mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.LineFlow, {
+        image: "img/textures/fence.png",
+        color: "#ffff00",
+        speed: 10, //閫熷害锛屽缓璁彇鍊艰寖鍥�1-100
+        axisY: true,
+      }),
+      */
+  });
+
+  map.addLayer(wmsLyer);
+
+}
 
 function addGuokongLayerDIV(item) {
 
@@ -102,11 +169,10 @@
 
 }
 
-
 function getGuokongPointColor(qindex, value) {
 
   if (!value || value == null || value == 'null') {
-    return guokong_color_nodata;
+    return allLayer_color_nodata;
   }
   for (var key in guokong_qindex_color_list) {
     if (key == qindex) {

--
Gitblit v1.9.1