From 233f799d7659ad94a88632db79f54069074bf315 Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期五, 17 九月 2021 08:46:19 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai

---
 js/function.js                 |  737 +++++++++++++++++++++++++---
 widgetsTS/dataTime/widget.js   |   36 +
 widgets/toolBarRight/widget.js |    2 
 config/config.json             |  745 ----------------------------
 4 files changed, 699 insertions(+), 821 deletions(-)

diff --git a/config/config.json b/config/config.json
index 7b115d5..abee3ed 100644
--- a/config/config.json
+++ b/config/config.json
@@ -122,254 +122,8 @@
       },
       { "pid": 60, "type": "terrain", "name": "鏃犲湴褰�", "terrain": { "type": "none" }, "radio": true },
 
-      { "id": 40, "name": "鏍呮牸鏁版嵁", "type": "group" },
-      { "id": 4020, "pid": 40, "name": "OGC WMS鏈嶅姟", "type": "group" },
       {
-        "pid": 4020,
-        "name": "鏁欒偛璁炬柦鐐�",
-        "type": "wms",
-        "url": "//server.mars3d.cn/geoserver/mars/wms",
-        "layers": "mars:hfjy",
-        "crs": "EPSG:4326",
-        "parameters": { "transparent": "true", "format": "image/png" },
-        "highlight": { "type": "click", "clampToGround": true },
-        "center": { "lat": 31.743214, "lng": 117.277097, "alt": 47197.7, "heading": 0.3, "pitch": -78.8 },
-        "popup": "鍚嶇О锛歿椤圭洰鍚嶇О}<br />绫诲瀷锛歿璁炬柦绫诲瀷}<br />闈㈢Н锛歿鐢ㄥ湴闈㈢Н}浜�<br />浣嶇疆锛歿鍏蜂綋浣嶇疆}",
-        "mapSplit": false,
-        "show": false,
-        "flyTo": true
-      },
-      
-
-      {
-        "pid": 4020,
-        "name": "閬撹矾绾�",
-        "type": "wms",
-        "url": "//server.mars3d.cn/geoserver/mars/wms",
-        "layers": "mars:hfdl",
-        "crs": "EPSG:4326",
-        "parameters": { "transparent": "true", "format": "image/png" },
-        "center": { "lat": 31.743214, "lng": 117.277097, "alt": 47197.7, "heading": 0.3, "pitch": -78.8 },
-        "popup": "all",
-        "mapSplit": false,
-        "show": false,
-        "flyTo": true
-      },
-      {
-        "pid": 4020,
-        "name": "寤虹瓚鐗╅潰",
-        "type": "wms",
-        "url": "//server.mars3d.cn/geoserver/mars/wms",
-        "layers": "mars:hfjzw",
-        "crs": "EPSG:4326",
-        "parameters": { "transparent": "true", "format": "image/png" },
-        "highlight": {
-          "type": "click",
-          "showTime": 5000,
-          "fill": true,
-          "color": "#2deaf7",
-          "opacity": 0.6,
-          "outline": true,
-          "outlineWidth": 3,
-          "outlineColor": "#e000d9",
-          "outlineOpacity": 1.0,
-          "clampToGround": true
-        },
-        "center": { "lat": 31.79513, "lng": 117.236172, "alt": 3784.6, "heading": 0.7, "pitch": -42.2 },
-        "popup": "all",
-        "show": false,
-        "flyTo": true
-      },
-      {
-        "pid": 4020,
-        "name": "瑙勫垝闈�",
-        "type": "wms",
-        "url": "//server.mars3d.cn/geoserver/mars/wms",
-        "layers": "mars:hfgh",
-        "crs": "EPSG:4326",
-        "parameters": { "transparent": "true", "format": "image/png" },
-        "center": { "lat": 31.743214, "lng": 117.277097, "alt": 47197.7, "heading": 0.3, "pitch": -78.8 },
-        "popup": "all",
-        "show": false,
-        "flyTo": true
-      },
-      { "id": 4030, "pid": 40, "name": "ArcGIS 鐡︾墖", "type": "group" },
-      {
-        "pid": 4030,
-        "name": "鍚堣偉瑙勫垝鍥�",
-        "type": "arcgis_cache",
-        "url": "{dataServer}/arcgis_cache/hfgh/_alllayers/{z}/{y}/{x}.png",
-        "minimumLevel": 1,
-        "maximumLevel": 17,
-        "minimumTerrainLevel": 1,
-        "maximumTerrainLevel": 17,
-        "rectangle": { "xmin": 116.846, "xmax": 117.642, "ymin": 31.533, "ymax": 32.185 }
-      },
-      { "id": 4010, "pid": 40, "name": "ArcGIS Dynamic", "type": "group" },
-      {
-        "id": 401085,
-        "pid": 4010,
-        "type": "arcgis",
-        "name": "涓昏閬撹矾",
-        "url": "//server.mars3d.cn/arcgis/rest/services/mars/hefei/MapServer",
-        "layers": "24",
-        "highlight": { "type": "click", "clampToGround": true },
-        "center": { "lat": 31.814176, "lng": 117.225362, "alt": 5105.3, "heading": 359.2, "pitch": -83.1 },
-        "popup": "all",
-        "onWidget": "widgets/manageLayers-tuli/heatmap.js",
-        "mapSplit": false
-      },
-      {
-        "id": 401086,
-        "pid": 4010,
-        "type": "arcgis",
-        "name": "寤虹瓚鐗�",
-        "url": "//server.mars3d.cn/arcgis/rest/services/mars/hefei/MapServer",
-        "layers": "35,36,37,39",
-        "highlight": {
-          "type": "click",
-          "fill": true,
-          "color": "#2deaf7",
-          "opacity": 0.6,
-          "outline": true,
-          "outlineWidth": 3,
-          "outlineColor": "#e000d9",
-          "outlineOpacity": 1.0,
-          "clampToGround": true
-        },
-        "center": { "lat": 31.816951, "lng": 117.22898, "alt": 2916.7, "heading": 0.3, "pitch": -78.8 },
-        "popup": "鍚嶇О锛歿NAME}<br />灞傛暟锛歿floor}",
-        "onWidget": "widgets/manageLayers-tuli/heatmap.js"
-      },
-      {
-        "id": 401087,
-        "pid": 4010,
-        "type": "arcgis",
-        "name": "瑙勫垝",
-        "url": "//server.mars3d.cn/arcgis/rest/services/mars/guihua/MapServer",
-        "highlight": {
-          "type": "click",
-          "showTime": 5000,
-          "fill": true,
-          "color": "#2deaf7",
-          "opacity": 0.6,
-          "outline": true,
-          "outlineWidth": 3,
-          "outlineColor": "#e000d9",
-          "outlineOpacity": 1.0,
-          "clampToGround": true
-        },
-        "center": { "lat": 31.816951, "lng": 117.22898, "alt": 2916.7, "heading": 0.3, "pitch": -78.8 },
-        "popup": [
-          { "field": "鐢ㄥ湴鍚嶇О", "name": "鍚嶇О" },
-          { "field": "鐢ㄥ湴缂栧彿", "name": "缂栧彿" },
-          { "field": "瑙勫垝鐢ㄥ湴", "name": "瑙勫垝" },
-          { "type": "html", "html": "<div style='text-align: right;color: #ff0000;padding-right: 10px;'>鏁版嵁浠呬緵鍙傝��</div>" }
-        ],
-        "popupNoTitle": true,
-        "onWidget": "widgets/manageLayers-tuli/guihua.js"
-      },
-      { "id": 30, "name": "鐭㈤噺鏁版嵁", "type": "group" },
-      { "id": 3040, "pid": 30, "name": "骞冲彴鏍囩粯JSON", "type": "group" },
-      {
-        "id": 303011,
-        "pid": 3040,
-        "type": "geojson",
-        "name": "绀轰緥鏁版嵁",
-        "url": "{dataServer}/file/geojson/mars3d-draw.json",
-        "popup": "{type}{name}",
-        "show": false,
-        "flyTo": true
-      },
-      { "id": 3030, "pid": 30, "name": "GeoJSON鏁版嵁", "type": "group" },
-      {
-        "pid": 3030,
-        "type": "geojson",
-        "name": "鐢ㄥ湴瑙勫垝",
-        "url": "{dataServer}/file/geojson/guihua.json",
-        "symbol": {
-          "styleOptions": { "opacity": 0.6, "color": "#0000FF", "width": 3, "clampToGround": true },
-          "styleField": "绫诲瀷",
-          "styleFieldOptions": {
-            "涓�绫诲眳浣忕敤鍦�": { "color": "#FFDF7F" },
-            "浜岀被灞呬綇鐢ㄥ湴": { "color": "#FFFF00" },
-            "绀惧尯鏈嶅姟鐢ㄥ湴": { "color": "#FF6A38" },
-            "骞兼墭鐢ㄥ湴": { "color": "#FF6A38" },
-            "鍟嗕綇娣峰悎鐢ㄥ湴": { "color": "#FF850A" },
-            "琛屾斂鍔炲叕鐢ㄥ湴": { "color": "#FF00FF" },
-            "鏂囧寲璁炬柦鐢ㄥ湴": { "color": "#FF00FF" },
-            "灏忓鐢ㄥ湴": { "color": "#FF7FFF" },
-            "鍒濅腑鐢ㄥ湴": { "color": "#FF7FFF" },
-            "浣撹偛鍦虹敤鍦�": { "color": "#00A57C" },
-            "鍖婚櫌鐢ㄥ湴": { "color": "#A5527C" },
-            "绀句細绂忓埄鐢ㄥ湴": { "color": "#FF7F9F" },
-            "鍟嗕笟鐢ㄥ湴": { "color": "#FF0000" },
-            "鍟嗗姟鐢ㄥ湴": { "color": "#7F0000" },
-            "钀ヤ笟缃戠偣鐢ㄥ湴": { "color": "#FF7F7F" },
-            "涓�绫诲伐涓氱敤鍦�": { "color": "#A57C52" },
-            "绀句細鍋滆溅鍦虹敤鍦�": { "color": "#C0C0C0" },
-            "閫氫俊鐢ㄥ湴": { "color": "#007CA5" },
-            "鎺掓按鐢ㄥ湴": { "color": "#00BFFF" },
-            "鍏洯缁垮湴": { "color": "#00FF00" },
-            "闃叉姢缁垮湴": { "color": "#007F00" },
-            "娌虫祦姘村煙": { "color": "#7FFFFF" },
-            "閰嶅缓鍋滆溅鍦�": { "color": "#ffffff" },
-            "閬撹矾鐢ㄥ湴": { "color": "#ffffff" }
-          }
-        },
-        "popup": "{绫诲瀷}",
-        "show": false,
-        "flyTo": true
-      },
-      {
-        "pid": 3030,
-        "type": "geojson",
-        "name": "寤虹瓚鐗╅潰",
-        "url": "{dataServer}/file/geojson/buildings-demo.json",
-        "symbol": { "styleOptions": { "color": "#0d3685", "outlineColor": "#0d3685", "opacity": 0.8 } },
-        "buildings": { "cloumn": "floors", "height": "flo_height" },
-        "popup": "all",
-        "flyTo": true
-      },
-      {
-        "pid": 3030,
-        "type": "geojson",
-        "name": "瀹夊窘鍚勫競",
-        "url": "{dataServer}/file/geojson/areas/340000_full.json",
-        "symbol": {
-          "styleOptions": {
-            "fill": true,
-            "opacity": 0.5,
-            "outline": true,
-            "outlineColor": "#FED976",
-            "outlineWidth": 3,
-            "outlineOpacity": 1,
-            "perPositionHeight": false,
-            "label": {
-              "text": "{name}",
-              "opacity": 1,
-              "font_size": 30,
-              "color": "#ffffff",
-              "outline": true,
-              "outlineColor": "#000000",
-              "outlineWidth": 3,
-              "scaleByDistance": true,
-              "scaleByDistance_far": 2743804,
-              "scaleByDistance_farValue": 0.3,
-              "scaleByDistance_near": 10000,
-              "scaleByDistance_nearValue": 1,
-              "distanceDisplayCondition": true,
-              "distanceDisplayCondition_far": 2743804,
-              "distanceDisplayCondition_near": 0
-            }
-          }
-        },
-        "popup": "{name}",
-        "show": false,
-        "flyTo": true
-      },
-      {
-        "pid": 99,
+        "pid": 2040,
         "type": "geojson",
         "name": "涓婃捣閬撹矾",
         "url": "data/roads-gcj.json",
@@ -399,322 +153,8 @@
         "show": false,
         "flyTo": true
       },
-      {
-        "pid": 3030,
-        "type": "geojson",
-        "name": "瑗胯棌鍨彛",
-        "url": "{dataServer}/file/geojson/xizangyakou.json",
-        "symbol": {
-          "styleOptions": {
-            "image": "img/marker/mark1.png",
-            "scale": 1,
-            "scaleByDistance": true,
-            "scaleByDistance_far": 5000000,
-            "scaleByDistance_farValue": 0.5,
-            "scaleByDistance_near": 1000,
-            "scaleByDistance_nearValue": 1,
-            "verticalOrigin": 1,
-            "horizontalOrigin": 0,
-            "clampToGround": true,
-            "label": {
-              "text": "{NAME}",
-              "font_size": 25,
-              "color": "#ffff00",
-              "font_family": "寰蒋闆呴粦",
-              "outline": true,
-              "outlineColor": "#000000",
-              "pixelOffsetY": -40,
-              "scaleByDistance": true,
-              "scaleByDistance_far": 1000000,
-              "scaleByDistance_farValue": 0.5,
-              "scaleByDistance_near": 1000,
-              "scaleByDistance_nearValue": 1,
-              "distanceDisplayCondition": true,
-              "distanceDisplayCondition_far": 1000000,
-              "distanceDisplayCondition_near": 0,
-              "visibleDepth": true
-            }
-          }
-        },
-        "popup": [
-          { "field": "NAME", "name": "鍚嶇О" },
-          { "type": "details", "callback": "showPopupDetails", "field": "鍥剧墖" }
-        ],
-        "show": false,
-        "flyTo": true
-      },
-      {
-        "pid": 3030,
-        "type": "geojson",
-        "name": "浣撹偛璁炬柦鐐�",
-        "url": "{dataServer}/file/geojson/hfty-point.json",
-        "symbol": {
-          "styleOptions": {
-            "image": "img/marker/mark1.png",
-            "scale": 1,
-            "scaleByDistance": true,
-            "scaleByDistance_far": 20000,
-            "scaleByDistance_farValue": 0.5,
-            "scaleByDistance_near": 1000,
-            "scaleByDistance_nearValue": 1,
-            "verticalOrigin": 1,
-            "horizontalOrigin": 0,
-            "clampToGround": true,
-            "label": {
-              "text": "{椤圭洰鍚嶇О}",
-              "font_size": 25,
-              "color": "#ffffff",
-              "outline": true,
-              "outlineColor": "#000000",
-              "pixelOffsetY": -25,
-              "scaleByDistance": true,
-              "scaleByDistance_far": 80000,
-              "scaleByDistance_farValue": 0.5,
-              "scaleByDistance_near": 1000,
-              "scaleByDistance_nearValue": 1,
-              "distanceDisplayCondition": true,
-              "distanceDisplayCondition_far": 80000,
-              "distanceDisplayCondition_near": 0
-            }
-          }
-        },
-        "popup": [
-          { "field": "椤圭洰鍚嶇О", "name": "椤圭洰鍚嶇О" },
-          { "field": "寤鸿鎬ц川", "name": "寤鸿鎬ц川" },
-          { "field": "璁炬柦绾у埆", "name": "璁炬柦绾у埆" },
-          { "field": "鎵�灞炲尯鍘�", "name": "鎵�灞炲尯鍘�" },
-          { "field": "寤虹瓚鍐呭鍙�", "name": "寤虹瓚鍐呭" },
-          { "field": "鏂板鐢ㄥ湴锛�", "name": "鏂板鐢ㄥ湴" },
-          { "field": "寮�宸�", "name": "寮�宸�" },
-          { "field": "鎬绘姇璧勶紙涓�", "name": "鎬绘姇璧�" },
-          { "field": "璧勯噾鏉ユ簮", "name": "璧勯噾鏉ユ簮" },
-          { "field": "鍒濇閫夊潃", "name": "鍒濇閫夊潃" },
-          { "field": "璁炬柦绫诲瀷", "name": "璁炬柦绫诲瀷" },
-          { "field": "璁炬柦绛夌骇", "name": "璁炬柦绛夌骇" },
-          { "field": "鎵�鍦ㄥ尯鍘�", "name": "鎵�鍦ㄥ尯鍘�" },
-          { "field": "鍏蜂綋浣嶇疆", "name": "鍏蜂綋浣嶇疆" },
-          { "field": "寤鸿鍐呭锛�", "name": "寤鸿鍐呭" },
-          { "field": "鐢ㄥ湴闈㈢Н锛�", "name": "鐢ㄥ湴闈㈢Н", "format": "mars3d.MeasureUtil.formatArea" },
-          { "field": "璁炬柦瑙勬ā锛�", "name": "璁炬柦瑙勬ā" },
-          { "field": "涓惧姙鑰呯被鍨�", "name": "涓惧姙鑰呯被鍨�" },
-          { "field": "寮�宸ユ椂闂�", "name": "寮�宸ユ椂闂�" },
-          { "field": "鎬绘姇璧勯锛�", "name": "鎬绘姇璧勯", "unit": "浜垮厓" },
-          { "field": "椤圭洰鎺ㄨ繘涓�", "name": "椤圭洰鎺ㄨ繘涓讳綋" },
-          { "field": "椤圭洰杩涘害", "name": "椤圭洰杩涘害" },
-          { "field": "椤圭洰鏉ユ簮", "name": "椤圭洰鏉ユ簮" },
-          { "field": "澶囨敞", "name": "澶囨敞" }
-        ],
-        "show": false,
-        "flyTo": true
-      },
-      { "id": 3070, "pid": 30, "name": "GeoServer WFS", "type": "group" },
-      {
-        "pid": 3070,
-        "type": "wfs",
-        "name": "寤虹瓚鐗╅潰",
-        "url": "//server.mars3d.cn/geoserver/mars/ows",
-        "layer": "mars:hfjzw",
-        "parameters": { "maxFeatures": 500 },
-        "minimumLevel": 15,
-        "symbol": {
-          "type": "polygonP",
-          "styleOptions": { "color": "#00469c", "outline": false, "opacity": 1 }
-        },
-        "buildings": { "cloumn": "floor" },
-        "center": { "lat": 31.818396, "lng": 117.229083, "alt": 2554.4, "heading": 359.2, "pitch": -83.1 },
-        "popup": "鍚嶇О锛歿NAME}<br />灞傛暟锛歿floor}"
-      },
-      {
-        "pid": 3070,
-        "name": "鏁欒偛璁炬柦鐐�",
-        "type": "wfs",
-        "url": "//server.mars3d.cn/geoserver/mars/ows",
-        "layer": "mars:hfjy",
-        "parameters": { "maxFeatures": 500 },
-        "minimumLevel": 13,
-        "symbol": {
-          "type": "billboardP",
-          "styleOptions": {
-            "image": "img/marker/mark1.png",
-            "scale": 0.7,
-            "scaleByDistance": true,
-            "scaleByDistance_far": 20000,
-            "scaleByDistance_farValue": 0.5,
-            "scaleByDistance_near": 1000,
-            "scaleByDistance_nearValue": 1,
-            "clampToGround": true,
-            "label": {
-              "text": "{椤圭洰鍚嶇О}",
-              "font_size": 15,
-              "color": "#ffffff",
-              "outline": true,
-              "outlineColor": "#000000",
-              "pixelOffsetY": -30,
-              "distanceDisplayCondition": true,
-              "distanceDisplayCondition_far": 2000,
-              "distanceDisplayCondition_near": 0
-            }
-          }
-        },
-        "center": { "lat": 31.812256, "lng": 117.229873, "alt": 4683.91, "heading": 357.4, "pitch": -65.4 },
-        "popup": "all"
-      },
-      { "id": 3010, "pid": 30, "name": "ArcGIS WFS", "type": "group" },
-      {
-        "pid": 3010,
-        "type": "arcgis_wfs",
-        "name": "鍏磋叮鐐�",
-        "url": "//server.mars3d.cn/arcgis/rest/services/mars/hefei/MapServer/1",
-        "where": " 1=1 ",
-        "minimumLevel": 15,
-        "center": { "lat": 31.818396, "lng": 117.229083, "alt": 2554.4, "heading": 359.2, "pitch": -83.1 },
-        "symbol": {
-          "type": "billboardP",
-          "styleOptions": {
-            "image": "img/marker/mark3.png",
-            "scale": 0.7,
-            "scaleByDistance": true,
-            "scaleByDistance_far": 20000,
-            "scaleByDistance_farValue": 0.5,
-            "scaleByDistance_near": 1000,
-            "scaleByDistance_nearValue": 1,
-            "clampToGround": true,
-            "label": {
-              "text": "{NAME}",
-              "font_size": 15,
-              "color": "#ffffff",
-              "outline": true,
-              "outlineColor": "#000000",
-              "pixelOffsetY": -30,
-              "distanceDisplayCondition": true,
-              "distanceDisplayCondition_far": 3000,
-              "distanceDisplayCondition_near": 0
-            }
-          },
-          "styleField": "address",
-          "styleFieldOptions": {
-            "AB03": { "image": "img/marker/mark1.png" },
-            "A980": { "image": "img/marker/mark2.png" },
-            "A900": { "image": "img/marker/mark4.png" }
-          }
-        },
-        "popup": "鍚嶇О锛歿NAME}<br />鍦板潃锛歿address}",
-        "show": false
-      },
-      {
-        "pid": 3010,
-        "type": "arcgis_wfs",
-        "name": "閬撹矾",
-        "url": "//server.mars3d.cn/arcgis/rest/services/mars/hefei/MapServer/28",
-        "minimumLevel": 14,
-        "symbol": {
-          "type": "polylineP",
-          "styleOptions": { "color": "#3388ff", "width": 3, "clampToGround": true },
-          "styleField": "NAME",
-          "styleFieldOptions": {
-            "绁侀棬璺�": { "color": "#8744c0", "width": 3 },
-            "涓滄祦璺�": { "color": "#f7ba2a", "width": 3 },
-            "缈$繝璺�": { "color": "#20a0ff", "width": 3 },
-            "宀宠タ璺�": { "color": "#50bfff", "width": 3 }
-          }
-        },
-        "popup": "鍚嶇О锛歿NAME}",
-        "center": { "lat": 31.814176, "lng": 117.225362, "alt": 5105.3, "heading": 359.2, "pitch": -83.1 }
-      },
-      {
-        "pid": 3010,
-        "type": "arcgis_wfs",
-        "name": "寤虹瓚鐗╅潰",
-        "url": "//server.mars3d.cn/arcgis/rest/services/mars/hefei/MapServer/37",
-        "minimumLevel": 15,
-        "symbol": { "styleOptions": { "color": "#0d3685", "outlineColor": "#0d3685", "opacity": 0.8 } },
-        "buildings": { "cloumn": "floor" },
-        "debuggerTileInfo": false,
-        "center": { "lat": 31.816951, "lng": 117.22898, "alt": 1916.7, "heading": 0.3, "pitch": -78.8 },
-        "popup": "鍚嶇О锛歿NAME}<br />灞傛暟锛歿floor}"
-      },
-      { "id": 3060, "pid": 30, "name": "CZML鏁版嵁", "type": "group" },
-      {
-        "pid": 3060,
-        "type": "czml",
-        "name": "姹借溅",
-        "url": "{dataServer}/file/czml/car.czml",
-        "center": { "lat": 40.894745, "lng": 121.920252, "alt": 904, "heading": 64, "pitch": -67 },
-        "flyTo": true
-      },
-      {
-        "id": 306011,
-        "pid": 3060,
-        "type": "czml",
-        "name": "椋炶缂栭槦",
-        "url": "{dataServer}/file/czml/flight.czml",
-        "popup": "all",
-        "flyTo": true
-      },
-      {
-        "id": 306012,
-        "pid": 3060,
-        "type": "czml",
-        "name": "鑸硅埗缂栭槦",
-        "url": "{dataServer}/file/czml/ship.czml",
-        "popup": "all",
-        "flyTo": true
-      },
-      { "id": 3050, "pid": 30, "name": "KML鏁版嵁", "type": "group" },
-      { "pid": 3050, "type": "kml", "name": "娴蜂笂瀹夊叏璀﹀憡", "url": "{dataServer}/file/kml/NAVWARN.kmz", "popup": "all" },
-      {
-        "pid": 3050,
-        "type": "kml",
-        "name": "鍥藉绾�",
-        "url": "{dataServer}/file/kml/countryboundary.kml",
-        "symbol": { "styleOptions": { "color": "#FED976", "width": 2 } }
-      },
-      {
-        "pid": 3050,
-        "type": "kml",
-        "name": "鐪佺晫绾�",
-        "url": "{dataServer}/file/kml/province.kml",
-        "symbol": { "styleOptions": { "color": "#00FF00", "width": 2 } }
-      },
-      { "id": 20, "name": "涓夌淮妯″瀷", "type": "group" },
-      { "id": 2010, "pid": 20, "name": "gltf妯″瀷", "type": "group" },
-      {
-        "pid": 2010,
-        "type": "gltf",
-        "name": "椋庡姏鍙戠數鏈�",
-        "url": "{dataServer}/gltf/mars/fengche.gltf",
-        "position": { "lng": 117.219071, "lat": 31.828783, "alt": 39.87 },
-        "style": { "scale": 50, "heading": -93 },
-        "popup": "绀轰緥淇℃伅锛岃繖鏄竴涓鍔涘彂鐢垫満",
-        "center": { "lat": 31.821083, "lng": 117.21832, "alt": 832.64, "heading": 2.3, "pitch": -39.2 }
-      },
-      {
-        "pid": 2010,
-        "type": "gltf",
-        "name": "璧烽噸杞�",
-        "url": "{dataServer}/gltf/mars/qzcar/GKZY_anim.gltf",
-        "position": { "lng": 117.217458, "lat": 31.815349, "alt": 35.03 },
-        "style": { "scale": 2, "heading": -95, "clampToGround": true },
-        "center": { "lat": 31.815363, "lng": 117.215958, "alt": 107.35, "heading": 90.7, "pitch": -26.1 }
-      },
-      { "id": 2040, "pid": 20, "name": "鍩庡競鐧芥ā", "type": "group" },
-      {
-        "id": 204011,
-        "pid": 2040,
-        "type": "3dtiles",
-        "name": "鍚堣偉甯傚尯",
-        "url": "{dataServer}/3dtiles/jzw-hefei/tileset.json",
-        "maximumScreenSpaceError": 1,
-        "maximumMemoryUsage": 1024,
-        "marsJzwStyle": true,
-        "highlight": { "type": "click", "color": "#FFFF00" },
-        "popup": [
-          { "field": "objectid", "name": "缂栧彿" },
-          { "field": "name", "name": "鍚嶇О" },
-          { "field": "height", "name": "妤奸珮", "unit": "绫�" }
-        ],
-        "center": { "lat": 31.786281, "lng": 117.223716, "alt": 3718, "heading": 2, "pitch": -45 }
-      },
+     
+      { "id": 2040, "pid": 20, "name": "鍩庡競鐧芥ā", "type": "group" }, 
       {
         "id": 204012,
         "pid": 2040,
@@ -743,182 +183,9 @@
         ],
         "center": { "lat": 31.257341, "lng": 121.466139, "alt": 2170.8, "heading": 122.2, "pitch": -31.8 }
       },
-      { "id": 2060, "pid": 20, "name": "BIM妯″瀷", "type": "group" },
-      {
-        "id": 20601121,
-        "pid": 2060,
-        "type": "3dtiles",
-        "name": "澶у鏁欏妤�",
-        "url": "{dataServer}/3dtiles/bim-daxue/tileset.json",
-        "position": { "lng": 117.251229, "lat": 31.844015, "alt": 31.2 },
-        "highlight": { "type": "click", "color": "#FFFF00" },
-        "popup": "all",
-        "scenetree": "scenetree.json",
-        "center": { "lat": 31.842516, "lng": 117.25107, "alt": 145, "heading": 8, "pitch": -39 }
-      },
-      {
-        "pid": 2060,
-        "type": "3dtiles",
-        "name": "杞昏建鍦伴搧绔�",
-        "url": "{dataServer}/3dtiles/bim-ditiezhan/tileset.json",
-        "position": { "lng": 117.203994, "lat": 31.857999, "alt": 28.9 },
-        "rotation": { "z": 168.1 },
-        "highlight": { "type": "click", "color": "#00FF00" },
-        "popup": "all",
-        "scenetree": "scenetree.json",
-        "center": { "lat": 31.856125, "lng": 117.204513, "alt": 155, "heading": 350, "pitch": -31 }
-      },
-      {
-        "id": 206012,
-        "pid": 2060,
-        "type": "3dtiles",
-        "name": "妗ユ",
-        "url": "{dataServer}/3dtiles/bim-qiaoliang/tileset.json",
-        "position": { "lng": 117.096906, "lat": 31.851564, "alt": 45 },
-        "rotation": { "z": 17.5 },
-        "maximumScreenSpaceError": 16,
-        "maximumMemoryUsage": 1024,
-        "skipLevelOfDetail": true,
-        "loadSiblings": true,
-        "cullRequestsWhileMoving": true,
-        "cullRequestsWhileMovingMultiplier": 10,
-        "preferLeaves": true,
-        "progressiveResolutionHeightFraction": 0.5,
-        "dynamicScreenSpaceError": true,
-        "preloadWhenHidden": true,
-        "center": { "lat": 31.849357, "lng": 117.099194, "alt": 306.2, "heading": 327.1, "pitch": -30.9 },
-        "scenetree": "scenetree.json",
-        "highlight": { "type": "click", "color": "#00FF00" },
-        "popup": "all"
-      },
-      { "id": 2020, "pid": 20, "name": "浜哄伐寤烘ā", "type": "group" },
-      {
-        "id": 202013,
-        "pid": 2020,
-        "type": "3dtiles",
-        "name": "鍦颁笅绠$綉",
-        "url": "{dataServer}/3dtiles/max-piping/tileset.json",
-        "position": { "lng": 117.215457, "lat": 31.843363, "alt": -3.6 },
-        "rotation": { "z": 336.7 },
-        "maximumScreenSpaceError": 2,
-        "maximumMemoryUsage": 1024,
-        "highlight": { "type": "click", "color": "#00FF00" },
-        "popup": "all",
-        "center": { "lat": 31.838821, "lng": 117.216402, "alt": 461, "heading": 0, "pitch": -46 },
-        "msg": "婕旂ず鏁版嵁锛屽湴涓嬫暟鎹嫋鍔ㄦ椂浼氬湪鍦伴潰婕傜Щ"
-      },
-      {
-        "id": 202012,
-        "pid": 2020,
-        "type": "3dtiles",
-        "name": "鐭冲寲宸ュ巶",
-        "url": "{dataServer}/3dtiles/max-shihua/tileset.json",
-        "position": { "lng": 117.077158, "lat": 31.659116, "alt": 24.6 },
-        "maximumScreenSpaceError": 1,
-        "maximumMemoryUsage": 1024,
-        "highlight": { "type": "click", "color": "#00FF00" },
-        "popup": "all",
-        "scenetree": "scenetree.json",
-        "center": { "lat": 31.654916, "lng": 117.08278, "alt": 279, "heading": 316, "pitch": -29 }
-      },
-      {
-        "id": 202030,
-        "pid": 2020,
-        "name": "姘村埄闂搁棬",
-        "type": "group",
-        "center": { "lat": 29.794301, "lng": 121.47998, "alt": 262, "heading": 191, "pitch": -35 }
-      },
-      {
-        "pid": 202030,
-        "type": "gltf",
-        "name": "闂搁棬",
-        "url": "{dataServer}/gltf/mars/zhamen.glb",
-        "position": { "lng": 121.479813, "lat": 29.791278, "alt": 16 },
-        "style": { "heading": 105 },
-        "center": { "lat": 29.791607, "lng": 121.479925, "alt": 27, "heading": 198, "pitch": -18 }
-      },
-      {
-        "id": 202011,
-        "pid": 202030,
-        "type": "3dtiles",
-        "name": "鏁翠綋",
-        "url": "{dataServer}/3dtiles/max-fsdzm/tileset.json",
-        "position": { "alt": 15.2 },
-        "maximumScreenSpaceError": 1,
-        "maximumMemoryUsage": 1024,
-        "center": { "lat": 29.792675, "lng": 121.480207, "alt": 190.8, "heading": 196.1, "pitch": -49 }
-      },
-      { "id": 2030, "pid": 20, "name": "鍊炬枩鎽勫奖", "type": "group" },
-      {
-        "id": 203014,
-        "pid": 2030,
-        "type": "3dtiles",
-        "name": "鍘垮煄绀惧尯",
-        "url": "{dataServer}/3dtiles/qx-shequ/tileset.json",
-        "position": { "alt": 11.5 },
-        "maximumScreenSpaceError": 2,
-        "maximumMemoryUsage": 2048,
-        "dynamicScreenSpaceError": true,
-        "cullWithChildrenBounds": false,
-        "center": { "lat": 28.440864, "lng": 119.486477, "alt": 588.23, "heading": 268.6, "pitch": -37.8 },
-        "show": false,
-        "flyTo": false
-      },
-      {
-        "id": 203015,
-        "pid": 2030,
-        "type": "3dtiles",
-        "name": "灏忓尯",
-        "url": "{dataServer}/3dtiles/qx-xiaoqu/tileset.json",
-        "maximumScreenSpaceError": 6,
-        "maximumMemoryUsage": 2048,
-        "dynamicScreenSpaceError": true,
-        "cullWithChildrenBounds": false,
-        "skipLevelOfDetail": true,
-        "preferLeaves": true,
-        "center": { "lat": 25.078322, "lng": 102.653514, "alt": 3006, "heading": 29, "pitch": -45 }
-      },
-      {
-        "id": 203013,
-        "pid": 2030,
-        "type": "geojson",
-        "name": "鏂囧簷-鍗曚綋鍖�",
-        "url": " {dataServer}/file/geojson/dth-wm.json",
-        "symbol": {
-          "type": "polygonP",
-          "styleOptions": {
-            "color": "rgba(255, 255, 255, 0.01)",
-            "clampToGround": true,
-            "classification": true,
-            "buffer": 1,
-            "highlight": {
-              "color": "rgba(255,255,0,0.5)"
-            }
-          }
-        },
-        "popup": [
-          { "field": "name", "name": "鎴垮眿鍚嶇О" },
-          { "field": "jznf", "name": "寤洪�犲勾浠�" },
-          { "field": "ssdw", "name": "鎵�灞炲崟浣�" },
-          { "field": "remark", "name": "澶囨敞淇℃伅" }
-        ]
-      },
-      {
-        "id": 203012,
-        "pid": 2030,
-        "type": "3dtiles",
-        "name": "鏂囧簷",
-        "url": "{dataServer}/3dtiles/qx-simiao/tileset.json",
-        "position": { "alt": 80.6 },
-        "maximumScreenSpaceError": 2,
-        "maximumMemoryUsage": 2048,
-        "dynamicScreenSpaceError": true,
-        "cullWithChildrenBounds": false,
-        "skipLevelOfDetail": true,
-        "preferLeaves": true,
-        "center": { "lat": 33.589536, "lng": 119.032216, "alt": 145.08, "heading": 3.1, "pitch": -22.9 }
-      },
-      { "id": 99, "name": "鏁版嵁鍥惧眰", "type": "group" }
+     
+      { "id": 99, "name": "鏁版嵁鍥惧眰", "type": "group" },
+      { "id": 1006, "pid": 99, "name": "鐩戞祴鍖哄煙", "type": "group" }
     ]
   }
 }
diff --git a/js/function.js b/js/function.js
index d6600b0..534dd82 100644
--- a/js/function.js
+++ b/js/function.js
@@ -16,8 +16,19 @@
 var layer_1002_weizhan;
 var layer_1003_jiance;
 var layer_1004_taxi;
-var layer_1005_region;
-var layer_1006_roadsection;
+var layer_1005_roadsection;
+
+var layer_1006_region;
+var layer_100600_jichang;
+var layer_100601_matou;
+var layer_100602_huanxian;
+var layer_100603_yuanqu;
+var layer_100604_jinbo;
+var layer_100605_bianjie;
+var layer_100607_quan;
+var layer_100610_qu;
+var layer_100611_jiedao;
+
 
 var layer_wind;
 var layer_grid_100;
@@ -59,7 +70,6 @@
   layer_1001_guokong = new mars3d.layer.DivLayer({
     name: '鍥芥帶鐐�',
     pid: 99, //鍥惧眰绠$悊 涓娇鐢紝鐖惰妭鐐筰d
-    show: false,
     selectedMapStyleOptions:'pm25',
     hasMapStyleOptions:['pm25','pm10','no','no2','nox','co']
   });
@@ -80,85 +90,122 @@
   layer_1001_guokong.bindPopup(function (event) {
     let item = event.graphic?.attr;
     var html =
-      "楂樻牎鍚嶇О锛�" +
-      item["楂樻牎鍚嶇О"] +
-      "<br />鎵�灞炲湴鍖猴細" +
-      item["鍦板尯"] +
-      "<br />涓荤閮ㄩ棬锛�" +
-      item["涓荤閮ㄩ棬"] +
-      "<br />鍔炲灞傛锛�" +
-      item["鍔炲灞傛"] +
-      "<br />鐜嬬墝涓撲笟锛�" +
-      item["鐜嬬墝涓撲笟"] +
-      "<br /><br /><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["楂樻牎鍚嶇О"] + "\")' >璇︾粏淇℃伅</a></p>";
-    return 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["楂樻牎鍚嶇О"]+"\")' >璇︾粏淇℃伅</a></p>";
+  return html;
   });
+  
 
   // add 鍥芥帶鐐�
-  //鏄剧ず楂樻牎鐐�
-  $.getJSON("//data.mars3d.cn/file/apidemo/gaoxiao.json", (result) => {
-    //$.getJSON("http://58.246.27.194:7012/dataapi/Bdata?bid=get_guokong_hour&datatime="+datatime, (result) => {
-    var pointColorArr = ["#f33349", "#f79a2c", "#f2fa19", "#95e40c", "#1ffee6"];
-    for (var i = 0, len = result.length; i < len; i++) {
-      var item = result[i];
-      var jwd = item["缁忕含搴�"].split(",");
-      if (jwd.length !== 2) {
-        continue;
-      }
-
-      var jd = Number(jwd[0]);
-      var wd = Number(jwd[1]);
+  $.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.DivGraphic({
+      var graphic = new mars3d.graphic.DivLightPoint({
         position: Cesium.Cartesian3.fromDegrees(jd, wd),
         style: {
-          html: '<div class="mars3d-animation-point" style="color:' + clr + ';"><p></p></div>',
+          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>',
-        //   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,
-        //   }),
-        //  },
+          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,
       });
       layer_1001_guokong.addGraphic(graphic);
     }
   });
 
-  
-
 }
-function addRoadLayer() {
+
+function addWeizhanLayer() {
 
   //鏂瑰紡2锛氬湪鍒涘缓鍦扮悆鍚庤皟鐢╝ddLayer娣诲姞鍥惧眰(鐩存帴new瀵瑰簲type绫诲瀷鐨勫浘灞傜被)
-  layer_1006_roadsection = new mars3d.layer.WmsLayer({
+  layer_1002_weizhan = new mars3d.layer.WmsLayer({
     pid: 99,
-    name: "涓婃捣甯傞亾璺�",
+    name: "寰珯",
     type: "wms",
     url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
-    layers: "konglu_58:v_test",
+    layers: "konglu_58:vis_weizhan_hour",
     crs: "EPSG:4326",
     parameters: {
+      "Styles":"point_weizhan_pm25",
       "transparent": "true",
       "format": "image/png",
-      "sld": "http://127.0.0.1:8080/geoserver/styles/pm10_ten.sld"
+      "sld": "http://127.0.0.1:8080/geoserver/styles/point_weizhan_pm25.sld"
     },
-    center: { "lat": 31.162801, "lng": 121.543277, "alt": 50000, "heading": 359.2, "pitch": -39.5 },
+    center: {"lat":30.429987,"lng":121.590473,"alt":58635,"heading":359,"pitch":-40},
+    getFeatureInfoParameters: {
+      feature_count: 10
+    },
+    //鍗曞嚮楂樹寒鍙婂叾鏍峰紡
+    highlight: {
+      type: "click",
+      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: false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
+    flyTo: true
+  });
+
+  //鍗曞嚮浜嬩欢
+  layer_1002_weizhan.on(mars3d.EventType.click, function (event) {
+    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+  });
+
+  map.addLayer(layer_1002_weizhan);
+
+}
+
+function addJianceLayer() {
+
+  //鏂瑰紡2锛氬湪鍒涘缓鍦扮悆鍚庤皟鐢╝ddLayer娣诲姞鍥惧眰(鐩存帴new瀵瑰簲type绫诲瀷鐨勫浘灞傜被)
+  layer_1003_jiance = new mars3d.layer.WmsLayer({
+    pid: 99,
+    name: "鐩戞祴鐐�",
+    type: "wms",
+    url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
+    layers: "konglu_58:vis_weizhan_hour",
+    crs: "EPSG:4326",
+    parameters: {
+      "Styles":"point_weizhan_pm25",
+      "transparent": "true",
+      "format": "image/png",
+      "sld": "http://127.0.0.1:8080/geoserver/styles/point_weizhan_pm25.sld"
+    },
+    center: {"lat":30.429987,"lng":121.590473,"alt":58635,"heading":359,"pitch":-40},
     getFeatureInfoParameters: {
       feature_count: 10
     },
@@ -175,18 +222,501 @@
     },
     popup: "all",
     show: false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
     flyTo: true
   });
 
   //鍗曞嚮浜嬩欢
-  layer_1006_roadsection.on(mars3d.EventType.click, function (event) {
+  layer_1003_jiance.on(mars3d.EventType.click, function (event) {
     console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
   });
 
-  map.addLayer(layer_1006_roadsection);
+  map.addLayer(layer_1003_jiance);
 
 }
 
+
+function addRoadLayer() {
+
+  //鏂瑰紡2锛氬湪鍒涘缓鍦扮悆鍚庤皟鐢╝ddLayer娣诲姞鍥惧眰(鐩存帴new瀵瑰簲type绫诲瀷鐨勫浘灞傜被)
+  layer_1005_roadsection = new mars3d.layer.WmsLayer({
+    pid: 99,
+    name: "涓婃捣甯傞亾璺�",
+    type: "wms",
+    url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
+    layers: "konglu_58:vis_roadsection_hour",
+    crs: "EPSG:4326",
+    parameters: {
+      "Stayle":"polyline_road_pm25",
+      "transparent": "true",
+      "format": "image/png",
+      "sld": "http://127.0.0.1:8080/geoserver/styles/polyline_road_pm25.sld"
+    },
+    center:{"lat":30.487351,"lng":121.613269,"alt":54033,"heading":359,"pitch":-40},
+    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: false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
+    flyTo: true
+  });
+
+  //鍗曞嚮浜嬩欢
+  layer_1005_roadsection.on(mars3d.EventType.click, function (event) {
+    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+  });
+
+  map.addLayer(layer_1005_roadsection);
+
+}
+
+
+
+function addJichangLayer() {
+
+  //鏂瑰紡2锛氬湪鍒涘缓鍦扮悆鍚庤皟鐢╝ddLayer娣诲姞鍥惧眰(鐩存帴new瀵瑰簲type绫诲瀷鐨勫浘灞傜被)
+  layer_100600_jichang = new mars3d.layer.WmsLayer({
+    // id : 10,
+    pid: 1006,
+    name: "鏈哄満",
+    type: "wms",
+    url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
+    layers: "konglu_58:vis_region_100600_hour",
+    crs: "EPSG:4326",
+    parameters: {
+      "transparent": "true",
+      "format": "image/png",
+      "sld": "http://127.0.0.1:8080/geoserver/styles/polygon_region_co.sld"
+    },
+    center: {"lat":30.756467,"lng":121.614552,"alt":73242,"heading":360,"pitch":-56},
+    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: false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
+    flyTo: true
+  });
+
+  //鍗曞嚮浜嬩欢
+  layer_100600_jichang.on(mars3d.EventType.click, function (event) {
+    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+  });
+
+  map.addLayer(layer_100600_jichang);
+
+}
+
+function addMatouLayer() {
+
+  //鏂瑰紡2锛氬湪鍒涘缓鍦扮悆鍚庤皟鐢╝ddLayer娣诲姞鍥惧眰(鐩存帴new瀵瑰簲type绫诲瀷鐨勫浘灞傜被)
+  layer_100601_matou = new mars3d.layer.WmsLayer({
+    // id : 10,
+    pid: 1006,
+    name: "鐮佸ご",
+    type: "wms",
+    url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
+    layers: "konglu_58:vis_region_100601_hour",
+    crs: "EPSG:4326",
+    parameters: {
+      "transparent": "true",
+      "format": "image/png",
+      "sld": "http://127.0.0.1:8080/geoserver/styles/polygon_region_co.sld"
+    },
+    center: {"lat":30.577234,"lng":121.664644,"alt":84121,"heading":360,"pitch":-56},
+    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: false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
+    flyTo: true
+  });
+
+  //鍗曞嚮浜嬩欢
+  layer_100601_matou.on(mars3d.EventType.click, function (event) {
+    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+  });
+
+  map.addLayer(layer_100601_matou);
+
+}
+
+function addHuanxianLayer() {
+
+  //鏂瑰紡2锛氬湪鍒涘缓鍦扮悆鍚庤皟鐢╝ddLayer娣诲姞鍥惧眰(鐩存帴new瀵瑰簲type绫诲瀷鐨勫浘灞傜被)
+  layer_100602_huanxian = new mars3d.layer.WmsLayer({
+    // id : 10,
+    pid: 1006,
+    name: "鐜嚎",
+    type: "wms",
+    url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
+    layers: "konglu_58:vis_region_100602_hour",
+    crs: "EPSG:4326",
+    parameters: {
+      "transparent": "true",
+      "format": "image/png",
+      "sld": "http://127.0.0.1:8080/geoserver/styles/polygon_region_co.sld"
+    },
+    center: {"lat":30.687288,"lng":121.623785,"alt":88144,"heading":360,"pitch":-56},
+    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: false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
+    flyTo: true
+  });
+
+  //鍗曞嚮浜嬩欢
+  layer_100602_huanxian.on(mars3d.EventType.click, function (event) {
+    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+  });
+
+  map.addLayer(layer_100602_huanxian);
+
+}
+
+
+function addYuanyuLayer() {
+
+  //鏂瑰紡2锛氬湪鍒涘缓鍦扮悆鍚庤皟鐢╝ddLayer娣诲姞鍥惧眰(鐩存帴new瀵瑰簲type绫诲瀷鐨勫浘灞傜被)
+  layer_100603_yuanqu = new mars3d.layer.WmsLayer({
+    // id : 10,
+    pid: 1006,
+    name: "宸ヤ笟鍥尯",
+    type: "wms",
+    url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
+    layers: "konglu_58:vis_region_100603_hour",
+    crs: "EPSG:4326",
+    parameters: {
+      "transparent": "true",
+      "format": "image/png",
+      "sld": "http://127.0.0.1:8080/geoserver/styles/polygon_region_co.sld"
+    },
+    center:{"lat":30.393398,"lng":121.534777,"alt":91038,"heading":360,"pitch":-56},
+    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: false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
+    flyTo: true
+  });
+
+  //鍗曞嚮浜嬩欢
+  layer_100603_yuanqu.on(mars3d.EventType.click, function (event) {
+    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+  });
+
+  map.addLayer(layer_100603_yuanqu);
+
+}
+
+function addJinboLayer() {
+
+  //鏂瑰紡2锛氬湪鍒涘缓鍦扮悆鍚庤皟鐢╝ddLayer娣诲姞鍥惧眰(鐩存帴new瀵瑰簲type绫诲瀷鐨勫浘灞傜被)
+  layer_100604_jinbo = new mars3d.layer.WmsLayer({
+    // id : 10,
+    pid: 1006,
+    name: "杩涘崥浼�",
+    type: "wms",
+    url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
+    layers: "konglu_58:vis_region_100604_hour",
+    crs: "EPSG:4326",
+    parameters: {
+      "transparent": "true",
+      "format": "image/png",
+      "sld": "http://127.0.0.1:8080/geoserver/styles/polygon_region_co.sld"
+    },
+    center: {"lat":30.839605,"lng":121.372945,"alt":52000,"heading":360,"pitch":-56},
+    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: false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
+    flyTo: true
+  });
+
+  //鍗曞嚮浜嬩欢
+  layer_100604_jinbo.on(mars3d.EventType.click, function (event) {
+    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+  });
+
+  map.addLayer(layer_100604_jinbo);
+
+}
+
+function addBianjieLayer() {
+
+  //鏂瑰紡2锛氬湪鍒涘缓鍦扮悆鍚庤皟鐢╝ddLayer娣诲姞鍥惧眰(鐩存帴new瀵瑰簲type绫诲瀷鐨勫浘灞傜被)
+  layer_100605_bianjie = new mars3d.layer.WmsLayer({
+    // id : 10,
+    pid: 1006,
+    name: "杈圭晫",
+    type: "wms",
+    url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
+    layers: "konglu_58:vis_region_100605_hour",
+    crs: "EPSG:4326",
+    parameters: {
+      "transparent": "true",
+      "format": "image/png",
+      "sld": "http://127.0.0.1:8080/geoserver/styles/polygon_region_co.sld"
+    },
+    center: {"lat":30.880665,"lng":121.305298,"alt":69363,"heading":360,"pitch":-56},
+    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: false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
+    flyTo: true
+  });
+
+  //鍗曞嚮浜嬩欢
+  layer_100605_bianjie.on(mars3d.EventType.click, function (event) {
+    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+  });
+
+  map.addLayer(layer_100605_bianjie);
+
+}
+
+function addQuanLayer() {
+
+  //鏂瑰紡2锛氬湪鍒涘缓鍦扮悆鍚庤皟鐢╝ddLayer娣诲姞鍥惧眰(鐩存帴new瀵瑰簲type绫诲瀷鐨勫浘灞傜被)
+  layer_100607_quan = new mars3d.layer.WmsLayer({
+    // id : 10,
+    pid: 1006,
+    name: "瀹濆北鍦�",
+    type: "wms",
+    url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
+    layers: "konglu_58:vis_region_100607_hour",
+    crs: "EPSG:4326",
+    parameters: {
+      "transparent": "true",
+      "format": "image/png",
+      "sld": "http://127.0.0.1:8080/geoserver/styles/polygon_region_co.sld"
+    },
+    center:{"lat":30.736361,"lng":121.566128,"alt":83811,"heading":360,"pitch":-56},
+    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: false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
+    flyTo: true
+  });
+
+  //鍗曞嚮浜嬩欢
+  layer_100607_quan.on(mars3d.EventType.click, function (event) {
+    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+  });
+
+  map.addLayer(layer_100607_quan);
+
+}
+
+
+function addXinzhenquLayer() {
+
+  //鏂瑰紡2锛氬湪鍒涘缓鍦扮悆鍚庤皟鐢╝ddLayer娣诲姞鍥惧眰(鐩存帴new瀵瑰簲type绫诲瀷鐨勫浘灞傜被)
+  layer_100610_qu = new mars3d.layer.WmsLayer({
+    // id : 10,
+    pid: 1006,
+    name: "琛屾斂鍖�",
+    type: "wms",
+    url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
+    layers: "konglu_58:vis_region_100610_hour",
+    crs: "EPSG:4326",
+    parameters: {
+      "Stayle":"polyline_road_pm25",
+      "transparent": "true",
+      "format": "image/png",
+      "sld": "http://127.0.0.1:8080/geoserver/styles/polygon_region_pm25.sld"
+    },
+    center:{"lat":30.594533,"lng":121.581681,"alt":93405,"heading":359,"pitch":-61},
+    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: false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
+    flyTo: true
+  });
+
+  //鍗曞嚮浜嬩欢
+  layer_100610_qu.on(mars3d.EventType.click, function (event) {
+    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+  });
+
+  map.addLayer(layer_100610_qu);
+
+}
+
+
+function addJiedaoLayer() {
+
+  //鏂瑰紡2锛氬湪鍒涘缓鍦扮悆鍚庤皟鐢╝ddLayer娣诲姞鍥惧眰(鐩存帴new瀵瑰簲type绫诲瀷鐨勫浘灞傜被)
+  layer_100611_jiedao = new mars3d.layer.WmsLayer({
+    // id : 10,
+    pid: 1006,
+    name: "琛楅亾",
+    type: "wms",
+    url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
+    layers: "konglu_58:vis_region_100611_hour",
+    crs: "EPSG:4326",
+    parameters: {
+      "Stayle":"polyline_road_pm25",
+      "transparent": "true",
+      "format": "image/png",
+      "sld": "http://127.0.0.1:8080/geoserver/styles/polygon_region_pm25.sld"
+    },
+    center: {"lat":30.466245,"lng":121.562803,"alt":107679,"heading":356,"pitch":-58},
+    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: false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
+    flyTo: true
+  });
+
+  //鍗曞嚮浜嬩欢
+  layer_100611_jiedao.on(mars3d.EventType.click, function (event) {
+    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+  });
+
+  map.addLayer(layer_100611_jiedao);
+
+}
+
+
+
+/////////
 function addMaskShanghai() {
 
   //geojson 鍚堣偉杈圭晫绾�
@@ -211,25 +741,29 @@
 
 }
 
-function addGridLayers() {
+function addGrid5Layers() {
 
   layer_grid_5000 = new mars3d.layer.WmsLayer({
     pid: 99,
     name: "缃戞牸鍥惧眰5000",
     type: "wms",
     url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
-    layers: "konglu_58:vis_grid1000_hour",
+    layers: "konglu_58:vis_grid5000_hour",
     crs: "EPSG:4326",
     parameters: {
+      "Stayle":"vis_grid100_1000_5000_co",
       "transparent": "true",
       "format": "image/png",
-      "sld": "http://127.0.0.1:8080/geoserver/styles/vis_grid1000_5000_co.sld"
+      "sld": "http://127.0.0.1:8080/geoserver/styles/vis_grid100_1000_5000_co.sld"
     },
+    show: false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
   });
   map.addLayer(layer_grid_5000);
 
   layer_grid_5000.reloadLayers = function (){
-    layer_grid_5000.options.layers ="konglu_58:vis_grid1000_day";
+    layer_grid_5000.options.layers ="konglu_58:vis_grid5000_day";
     layer_grid_5000.options.parameters.sld ="http://127.0.0.1:8080/geoserver/styles/"+layer_grid_5000.options.selectedMapStyleOptions+".sld";
     layer_grid_5000.options.parameters.viewparams="id1:0;id2:10";
     console.log(layer_grid_5000);
@@ -241,41 +775,82 @@
     console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
   });
 
+  map.addLayer(layer_grid_5000);
 
 }
-function reLoadLayers(){
-  console.log(mars3d.globel_variables.queryDataTStart);
-  console.log(mars3d.globel_variables.queryDataType);
-  console.log('starting to reload layer .');
+
+
+
+
+
+
+
+function addGrid1Layers() {
+
+  layer_grid_1000 = new mars3d.layer.WmsLayer({
+    pid: 99,
+    name: "缃戞牸鍥惧眰1000",
+    type: "wms",
+    url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
+    layers: "konglu_58:vis_grid1000_hour",
+    crs: "EPSG:4326",
+    parameters: {
+      "Stayle":"vis_grid100_1000_5000_co",
+      "transparent": "true",
+      "format": "image/png",
+      "sld": "http://127.0.0.1:8080/geoserver/styles/vis_grid100_1000_5000_co.sld"
+    },
+    show:false,
+    selectedMapStyleOptions:'pm25',
+    hasMapStyleOptions:['pm25','pm10','no','no2','nox','co'],
+
+  });
+  map.addLayer(layer_grid_1000);
+
+  layer_grid_1000.reloadLayers = function (){
+    layer_grid_1000.options.layers ="konglu_58:vis_grid1000_day";
+    layer_grid_1000.options.parameters.sld ="http://127.0.0.1:8080/geoserver/styles/"+layer_grid_1000.options.selectedMapStyleOptions+".sld";
+    layer_grid_1000.options.parameters.viewparams="id1:0;id2:10";
+    console.log(layer_grid_1000);
+    layer_grid_1000.reload();
+  }
+
+  //鍗曞嚮浜嬩欢
+  layer_grid_1000.on(mars3d.EventType.click, function (event) {
+    console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+  });
+  map.addLayer(layer_grid_1000);
+
 
 }
-function refreshWidgets(){
-  console.log(mars3d.globel_variables.queryDataTStart);
-  console.log(mars3d.globel_variables.queryDataType);
-  console.log('starting to reload widget if widget has been opened.');
-}
+
 
 
 
 function addFunctionalLayers() {
-
-
   // add mask 
   //addMaskShanghai();
-
   addTDTAnnoLayer();
 
   // 娣诲姞涓氬姟鍥惧眰
   addguokongLayers();
-
+  addWeizhanLayer();
+  addJianceLayer();
   addRoadLayer();
-
+  // addRegionLayer();
+  addJichangLayer();
+  addMatouLayer();
+  addHuanxianLayer();
+  addYuanyuLayer();
+  addJinboLayer();
+  addBianjieLayer();
+  addQuanLayer();
+  addXinzhenquLayer();
+  addJiedaoLayer();
+  
   addWindLayer();
-
-  addGridLayers();
-
-
-
+  addGrid5Layers();
+  addGrid1Layers();
 
 }
 
diff --git a/widgets/toolBarRight/widget.js b/widgets/toolBarRight/widget.js
index de05ba9..b94d5d9 100644
--- a/widgets/toolBarRight/widget.js
+++ b/widgets/toolBarRight/widget.js
@@ -15,7 +15,7 @@
     create() {
       //姝ゆ暟鎹篃鍙互鏀惧湪widget.json鐨勯厤缃腑锛屼絾鏄彂鐜板緢澶氫汉瀹规槗寮曡捣鍚屽悕璇В锛屾墍浠ヨ繕鏄斁鍦ㄨ繖閲�
       this.data = this.config.data || [
-        { name: "鐩戞祴涓氬姟", icon: "fa fa-tasks", widget: "widgets/manageLayers/widget.js" },
+        { name: "鐩戞祴涓氬姟", icon: "fa fa-tasks", widget: "widgets/manageLayers_style/widget.js" },
         { name: "鍦板浘搴曞浘", icon: "fa fa-map", widget: "widgets/manageBasemaps/widget.js" },
         {
           name: "鍦板浘宸ュ叿",
diff --git a/widgetsTS/dataTime/widget.js b/widgetsTS/dataTime/widget.js
index 47b0dbb..8bcc35f 100644
--- a/widgetsTS/dataTime/widget.js
+++ b/widgetsTS/dataTime/widget.js
@@ -92,6 +92,25 @@
         console.log(mars3d.globel_variables.queryDataTStart);
 
         // 鍦� function.js 涓畾涔夌殑 function
+        addguokongLayers();
+        addWeizhanLayer();
+        addJianceLayer();
+        addRoadLayer();
+        // addRegionLayer();
+        addJichangLayer();
+        addMatouLayer();
+        addHuanxianLayer();
+        addYuanyuLayer();
+        addJinboLayer();
+        addBianjieLayer();
+        addQuanLayer();
+        addXinzhenquLayer();
+        addJiedaoLayer();
+        // addWindLayer();
+        addGrid5Layers();
+        addGrid1Layers();
+
+
         reLoadLayers();
         refreshWidgets();
 
@@ -116,6 +135,23 @@
         mars3d.globel_variables.queryDataTStart = $('#appDateHour').val();
         console.log(mars3d.globel_variables.queryDataTStart);
         // 鍦� function.js 涓畾涔夌殑 function
+        addguokongLayers();
+        addWeizhanLayer();
+        addJianceLayer();
+        addRoadLayer();
+        // addRegionLayer();
+        addJichangLayer();
+        addMatouLayer();
+        addHuanxianLayer();
+        addYuanyuLayer();
+        addJinboLayer();
+        addBianjieLayer();
+        addQuanLayer();
+        addXinzhenquLayer();
+        addJiedaoLayer();
+        // addWindLayer();
+        addGrid5Layers();
+        addGrid1Layers();
         reLoadLayers();
         refreshWidgets();
       });

--
Gitblit v1.9.1