From 8a8eb9fbd4b887b782f2ba5c409241138b6be3f0 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期五, 31 十二月 2021 18:14:25 +0800
Subject: [PATCH] 添加500米网格
---
data/getLayerListByUserid.json | 16 +++++++++++++++-
js/changable_params.js | 12 ++++++++----
widgetsTS/widget_detail/view.js | 2 +-
widgetsTS/widget_grid/view.html | 7 ++++---
widgetsTS/widget_grid/widget.js | 11 ++++++++++-
widgetsTS/widget_grid/view.js | 5 ++++-
6 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/data/getLayerListByUserid.json b/data/getLayerListByUserid.json
index 11abd37..450c2af 100644
--- a/data/getLayerListByUserid.json
+++ b/data/getLayerListByUserid.json
@@ -168,6 +168,20 @@
"show":false
},
{
+ "id": 3000,
+ "pid":1006,
+ "name": "",
+ "type": "wms",
+ "geoname_prefix":"vis_grid500_",
+ "style_prefix":"vis_grid100_1000_5000_",
+ "style_selected":"pm25",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "regiontype":"00",
+ "minimumLevel":15,
+ "maximumLevel":19,
+ "show":false
+ },
+ {
"id": 3001,
"pid":1006,
"name": "",
@@ -178,7 +192,7 @@
"styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
"regiontype":"00",
"minimumLevel":13,
- "maximumLevel":19,
+ "maximumLevel":14,
"show":false
},
{
diff --git a/js/changable_params.js b/js/changable_params.js
index 8f233b1..73f1caa 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -7,7 +7,7 @@
var color_list_1002 = ['#0dd4f7', '#078901', '#FFFF00', '#fe7c23', '#F70F0D', '#88041E'];
var color_list_1003 = ['#0EE839', '#FEFE23', '#F70F0D'];
var color_list_1004_and_other = ['#0dd4f7', '#23fe9f', '#078901', '#d4fe23', '#FFFF00', '#febf23', '#fe7c23', '#F70F0D', '#8A0B73', '#88041E'];
-var array = ['1000','3000','5000']
+var array = ['1000','3000','5000','500']
var grid;
// 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] };
@@ -26,6 +26,7 @@
, 3001: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
, 3002: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
, 3003: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
+ , 3000: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
}
var echart_lines_color_list =
@@ -48,10 +49,11 @@
, 3001: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
, 3002: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
, 3003: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
+ , 3000: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
}
var default_system_params = { geoserver_url_predix: 'http://58.246.27.194:7011/', nodejs_url_predix: 'http://58.246.27.194:7012/', 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};
-var default_grid_camerview = {grid5000:{"lat":30.306622,"lng":121.251151,"alt":180451,"heading":2,"pitch":-61},grid3000:{"lat":31.076898,"lng":121.418675,"alt":36483,"heading":2,"pitch":-61},grid1000:{"lat":31.216173,"lng":121.350382,"alt":8883,"heading":2,"pitch":-60}};
+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) {
@@ -133,14 +135,16 @@
"<br/><p><a href='#' onclick='javascript:showHistoryPathDetail(\"" + item["code"] + "\")' >杞ㄨ抗鏌ヨ</a></p>";
- }else if(layerid == 3001 || layerid == 3002 || layerid == 3003 ) {
+ }else if(layerid == 3001 || layerid == 3002 || layerid == 3003 || layerid == 3000) {
for(i = 0;i<=array.length;i++){
if(layerid == 3001){
grid = array[0]
}else if(layerid == 3002){
grid = array[1]
- }else{
+ }else if(layerid == 3003){
grid = array[2]
+ }else{
+ grid = array[3]
}
}
diff --git a/widgetsTS/widget_detail/view.js b/widgetsTS/widget_detail/view.js
index b0c7dbb..f513188 100644
--- a/widgetsTS/widget_detail/view.js
+++ b/widgetsTS/widget_detail/view.js
@@ -295,7 +295,7 @@
$('#appDateHourEnd').datetimepicker('setDate', new Date(params.appDateHourEnd));
//loadLineChartbySiteid(params);
queryEchartDataByTimePeriod();
- if(tmpQueryParams.layerid == 3001 || tmpQueryParams.layerid == 3002 || tmpQueryParams.layerid == 3003){
+ if(tmpQueryParams.layerid == 3001 || tmpQueryParams.layerid == 3002 || tmpQueryParams.layerid == 3003 || tmpQueryParams.layerid == 3000){
loadDetailedInfobyGrid(params)
}else{
loadDetailedInfobySiteid(params);
diff --git a/widgetsTS/widget_grid/view.html b/widgetsTS/widget_grid/view.html
index 84d5502..c385b96 100644
--- a/widgetsTS/widget_grid/view.html
+++ b/widgetsTS/widget_grid/view.html
@@ -16,12 +16,13 @@
<!-- 闈㈡澘 -->
<div class="infoview">
<div>
- <label><input type='checkbox' id='show_gridmap' checked/>缃戞牸鍥�</label>
- </div>
- <div>
<span style="padding-left:10px;"><a href="#" id="grid5000">5000绫崇綉鏍�</a></span>
<span style="padding-left:10px;"><a href="#" id="grid3000">3000绫崇綉鏍�</a></span>
<span style="padding-left:10px;"><a href="#" id="grid1000">1000绫崇綉鏍�</a></span>
+ <span style="padding-left:10px;"><a href="#" id="grid500">500绫崇綉鏍�</a></span>
+ </div>
+ <div>
+ <label><input type='checkbox' id='show_gridmap' checked/>缃戞牸鍥�</label>
</div>
<div>
<div id="style_radio"></div>
diff --git a/widgetsTS/widget_grid/view.js b/widgetsTS/widget_grid/view.js
index ad8a174..92e1e62 100644
--- a/widgetsTS/widget_grid/view.js
+++ b/widgetsTS/widget_grid/view.js
@@ -6,7 +6,7 @@
var current_heatmap_alpha_value = 0.5;
var current_heatmap_qindex = "pm25";
-var grid_level_list = [{ layer: null, level: 5000, min: 8, max: 10, data: [], image: "", show: false }, { layer: null, level: 3000, min: 11, max: 12, data: [], image: "", show: false }, { layer: null, level: 1000, min: 13, max: 15, data: [], image: "", show: false }];
+var grid_level_list = [{ layer: null, level: 5000, min: 8, max: 10, data: [], image: "", show: false }, { layer: null, level: 3000, min: 11, max: 12, data: [], image: "", show: false }, { layer: null, level: 1000, min: 13, max: 14, data: [], image: "", show: false }, { layer: null, level: 500, min: 15, max: 19, data: [], image: "", show: false }];
//var grid_level_list = [{ layer: null, level: 3000, min: 8, max: 15, data: [], image: "", show: false }];
@@ -32,6 +32,9 @@
$("#grid1000").click(function () {
thisWidget.changeCamerView("grid1000");
});
+ $("#grid500").click(function () {
+ thisWidget.changeCamerView("grid500");
+ });
thisWidget.style_options.forEach(element => {
$("#style_radio").append('<label style="padding-left: 10px;"><input type="radio" name="style_option" value="' + element + '" ' + (element == thisWidget.style_selected ? "checked" : "") + '/>' + element + '</label>')
diff --git a/widgetsTS/widget_grid/widget.js b/widgetsTS/widget_grid/widget.js
index 36078a7..f3f3e77 100644
--- a/widgetsTS/widget_grid/widget.js
+++ b/widgetsTS/widget_grid/widget.js
@@ -9,7 +9,7 @@
type: "window",
url: "view.html",
windowOptions: {
- width: 360,
+ width: 400,
height: 320,
left: 5,
top: 120
@@ -18,6 +18,7 @@
}
//鍒濆鍖朳浠呮墽琛�1娆
create() {
+ this.grid_500 = this.map.getLayerById(3000);
this.grid_1000 = this.map.getLayerById(3001);
this.grid_3000 = this.map.getLayerById(3002);
this.grid_5000 = this.map.getLayerById(3003);
@@ -33,6 +34,7 @@
//姣忎釜绐楀彛鍒涘缓瀹屾垚鍚庤皟鐢�
winCreateOK(opt, result) {
+ this.grid_500.show = true;
this.grid_1000.show = true;
this.grid_3000.show = true;
this.grid_5000.show = true;
@@ -42,6 +44,7 @@
}
showGridmapLayers() {
+ this.grid_500.show = true;
this.grid_1000.show = true;
this.grid_3000.show = true;
this.grid_5000.show = true;
@@ -49,6 +52,7 @@
}
hideGridmapLayers() {
+ this.grid_500.show = true;
this.grid_1000.show = false;
this.grid_3000.show = false;
this.grid_5000.show = false;
@@ -79,6 +83,7 @@
}
//鍏抽棴閲婃斁
disable() {
+ this.grid_500.show = true;
this.grid_1000.show = false;
this.grid_3000.show = false;
this.grid_5000.show = false;
@@ -88,6 +93,9 @@
}
update_grid_style(new_style) {
+ this.grid_500.options.parameters.styles = this.grid_500.options.style_prefix + new_style;
+ this.grid_500.options.style_selected = new_style;
+ this.grid_500.reload();
this.grid_1000.options.parameters.styles = this.grid_1000.options.style_prefix + new_style;
this.grid_1000.options.style_selected = new_style;
this.grid_1000.reload();
@@ -105,6 +113,7 @@
});
}
setGridmapAlpha(value) {
+ this.grid_500.opacity = value;
this.grid_1000.opacity = value;
this.grid_3000.opacity = value;
this.grid_5000.opacity = value;
--
Gitblit v1.9.1