From 6145fd59187409f7c62585887ea1e0c692179bd4 Mon Sep 17 00:00:00 2001
From: zhaoxing <zhaoxing@shsening.com>
Date: 星期三, 28 九月 2022 15:16:13 +0800
Subject: [PATCH] 图层与标注在电子地图上显示；去掉图例单位，单位记录在树目录；增加上海市遮罩，辅助图层增加行政区与街道
---
js/function.js | 2
data/getLayerListByUserid.json | 27 ++++++++++++-
js/changable_params.js | 10 +---
js/function_wind.js | 22 +----------
widgets/manageLayers_style/view.js | 22 +++++-----
js/function_1004.js | 2
js/index.js | 2
7 files changed, 44 insertions(+), 43 deletions(-)
diff --git a/data/getLayerListByUserid.json b/data/getLayerListByUserid.json
index e13dbf7..6872ed1 100644
--- a/data/getLayerListByUserid.json
+++ b/data/getLayerListByUserid.json
@@ -172,7 +172,7 @@
"styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
"regiontype":"10",
"show":false,
- "zIndex":1
+ "zIndex":22
},
{
@@ -186,7 +186,7 @@
"styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
"regiontype":"11",
"show":false,
- "zIndex":2
+ "zIndex":21
},
{
@@ -263,6 +263,29 @@
"styleoptions": [],
"show":false,
"color":"#ffffff"
+ },
+ {
+ "pid":50,
+ "name": "琛屾斂鍖�",
+ "type": "wms",
+ "geoname_prefix":"vis_region_",
+ "style_prefix":"assist_region_",
+ "style_selected":"pm25",
+ "regiontype":"10",
+ "show":false,
+ "zIndex":23
+
+ },
+ {
+ "pid":50,
+ "name": "琛楅亾",
+ "type": "wms",
+ "geoname_prefix":"vis_region_",
+ "style_prefix":"assist_region_",
+ "style_selected":"pm25",
+ "regiontype":"11",
+ "show":false,
+ "zIndex":24
}
]
}
\ No newline at end of file
diff --git a/js/changable_params.js b/js/changable_params.js
index 0013ed5..46ff413 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -13,13 +13,13 @@
// var qindex_range_list_1001 = { '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 qindex_range_list_1001 = { 'pm25': [10, 20, 50, 80, 100], 'pm10': [20, 50, 80, 150, 200], 'no2': [25, 50, 100, 150, 300], 'co': [0.5, 0.6, 0.8, 1, 1.5], 'so2': [5, 8, 10, 12, 15], 'no2': [10, 35, 65, 100, 200] };
var qindex_range_list_1002 = { 'pm25': [10, 20, 50, 80, 100], 'pm10': [20, 50, 80, 150, 200], 'no2': [25, 50, 100, 150, 300], 'co': [0.5, 0.6, 0.8, 1, 1.5], 'so2': [5, 8, 10, 12, 15], 'no2': [10, 35, 65, 100, 200] };
-var qindex_range_list_1003 = {'tsp': [0.2, 0.5] };
+var qindex_range_list_1003 = { ' ': [1, 2], 'tsp': [0.2, 0.5] };
var qindex_range_list_1004_and_other = { 'pm25': [15, 35, 50, 75, 150, 250, 350, 500, 700], 'pm10': [20, 50, 100, 150, 200, 300, 500, 800, 1000], 'no': [10, 30, 60, 100, 200, 500, 1000, 2000, 3500], 'no2': [20, 80, 110, 150, 200, 250, 300, 400, 500], 'nox': [80, 110, 130, 150, 200, 500, 1000, 2000, 5000], 'co': [0.2, 0.4, 0.6, 0.8, 1, 1.5, 2.5, 4, 6] };
var all_layer_legends = {
1001: ['pm25', 'pm10', 'no2', 'co', 'so2',"o31"]
, 1002: ['pm25', 'pm10', 'no2', 'co', 'so2',"o3"]
- , 1003: ['tsp']
+ , 1003: ['','tsp']
, 1004: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
, 1005: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
, 1006: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
@@ -51,12 +51,8 @@
, 3003: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
, 3000: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
}
-
var tiandituArr = ['51915011aa0997aa2ddd7e38504fa8bc', '51915011aa0997aa2ddd7e38504fa8bc']
-
-// var default_system_params = { geoserver_url_predix: 'http://58.246.27.194:7011/', nodejs_url_predix: 'http://58.246.27.194:7012/', userid: 13, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false,summary_topN_count :50, un_authorization_url: 'http://223.167.111.168:8016/PollutionData/loginpage.aspx?returnurl=http://223.167.111.168:8004/shanghai/index.html',regionCode:2,timetype:"min"};
-
-var default_system_params = { geoserver_url_predix: 'http://112.74.77.127:8080', nodejs_url_predix: 'http://112.74.77.127:8090', userid: 2, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false,summary_topN_count :50, un_authorization_url: 'http://223.167.111.168:8016/PollutionData/loginpage.aspx?returnurl=http://223.167.111.168:8004/shanghai/index.html',regionCode:0,timetype:"min"};
+var default_system_params = { geoserver_url_predix: 'http://223.167.111.168:7001/', nodejs_url_predix: 'http://112.74.77.127:8090/', userid: 2, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false,summary_topN_count :50, un_authorization_url: 'http://223.167.111.168:8016/PollutionData/loginpage.aspx?returnurl=http://223.167.111.168:8004/shanghai/index.html',regionCode:2};
var default_grid_camerview = {grid5000:{"lat":30.367931,"lng":121.518409,"alt":128482,"heading":2,"pitch":-57},grid3000:{"lat":30.902475,"lng":121.487751,"alt":38716,"heading":2,"pitch":-57},grid1000:{"lat":31.066346,"lng":121.462529,"alt":10026,"heading":2,"pitch":-57},grid500:{"lat":31.112561,"lng":121.458433,"alt":2483,"heading":2,"pitch":-57}};
function bindPopupFunction(event) {
diff --git a/js/function.js b/js/function.js
index 22f4b4e..57f8544 100644
--- a/js/function.js
+++ b/js/function.js
@@ -237,7 +237,7 @@
//geojson 鍚勮鏀垮尯杈圭晫绾�
geoJsonLayer = new mars3d.layer.GeoJsonLayer({
url: "./data/"+regionCode+".geojson",
- mask: true, //鏍囪瘑涓洪伄缃╁眰銆愰噸鐐瑰弬鏁般��
+ mask: true, //鏍囪瘑涓洪伄缃╁眰銆愰噸鐐瑰弬鏁般��
symbol: {
styleOptions: {
fill: true,
diff --git a/js/function_1004.js b/js/function_1004.js
index f448def..e8f9397 100644
--- a/js/function_1004.js
+++ b/js/function_1004.js
@@ -195,7 +195,7 @@
style: {
url: "gltf/" + (result.data.result[0]["code"]).substring(0, 2) + ".gltf",
scale: 0.5,
- minimumPixelSize: 20,
+ minimumPixelSize: 40,
highlight: {
type: mars3d.EventType.click,
silhouette: true,
diff --git a/js/function_wind.js b/js/function_wind.js
index 913fa87..3e372f8 100644
--- a/js/function_wind.js
+++ b/js/function_wind.js
@@ -64,6 +64,7 @@
name: "褰卞儚娉ㄨ",
layer: "img_z",
key: tiandituArr,
+ zIndex: 999
});
Img_annoTileLayer.show = false;
Img_annoTileLayer.pid = 50;
@@ -73,6 +74,7 @@
name: "鐭㈤噺鍥炬敞璁�",
layer: "vec_z",
key: tiandituArr,
+ zIndex: 998
});
Vec_annoTileLayer.show = false;
Vec_annoTileLayer.pid = 50;
@@ -88,24 +90,4 @@
});
// mars3d.global_variables.tmpHighlightGraphicLayer.bindPopup(bindPopupFunction);
map.addLayer(mars3d.global_variables.tmpHighlightGraphicLayer);
-}
-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,
- },
- },
- });
}
\ No newline at end of file
diff --git a/js/index.js b/js/index.js
index 301a9d5..7c9c155 100644
--- a/js/index.js
+++ b/js/index.js
@@ -111,7 +111,6 @@
styleOptions: {
fill: true,
color: "rgb(2,26,79)",
- opacity: 0.9,
outline: true,
outlineColor: "#39E09B",
outlineWidth: 8,
@@ -120,6 +119,7 @@
clampToGround: true,
},
},
+ zIndex: 99999999999,
});
map.addLayer(geoJsonLayer);
diff --git a/widgets/manageLayers_style/view.js b/widgets/manageLayers_style/view.js
index 8ea1164..547f9a3 100644
--- a/widgets/manageLayers_style/view.js
+++ b/widgets/manageLayers_style/view.js
@@ -307,18 +307,18 @@
}
$("#treeOverlays").each(function(){
- $("label").find("input[value='pm25']").next().text("PM鈧�.鈧�");
- $("label").find("input[value='pm10']").next().text("PM鈧佲個");
- $("label").find("input[value='no']").next().text("NO");
- $("label").find("input[value='nox']").next().text("NO鈧�");
- $("label").find("input[value='no2']").next().text("NO鈧�");
- $("label").find("input[value='co']").next().text("CO");
- $("label").find("input[value='so2']").next().text("SO鈧�");
- $("label").find("input[value='o3']").next().text("O鈧�");
- $("label").find("input[value='o31']").next().text("O鈧冣倎");
- $("label").find("input[value='o38']").next().text("O鈧冣倛");
+ $("label").find("input[value='pm25']").next().text("PM鈧�.鈧� (渭g/m鲁)");
+ $("label").find("input[value='pm10']").next().text("PM鈧佲個 (渭g/m鲁)");
+ $("label").find("input[value='no']").next().text("NO (渭g/m鲁)");
+ $("label").find("input[value='nox']").next().text("NO鈧� (渭g/m鲁)");
+ $("label").find("input[value='no2']").next().text("NO鈧� (渭g/m鲁)");
+ $("label").find("input[value='co']").next().text("CO (mg/m鲁)");
+ $("label").find("input[value='so2']").next().text("SO鈧� (渭g/m鲁)");
+ $("label").find("input[value='o3']").next().text("O鈧� (渭g/m鲁)");
+ $("label").find("input[value='o31']").next().text("O鈧冣倎 (渭g/m鲁)");
+ $("label").find("input[value='o38']").next().text("O鈧冣倛 (渭g/m鲁)");
$("label").find("input[value='aqi']").next().text("AQI");
- $("label").find("input[value='tsp']").next().text("TSP");
+ $("label").find("input[value='tsp']").next().text("TSP (mg/m鲁)");
})
}
--
Gitblit v1.9.1