From 52a059be9430b2f15a5f7260c1f508115ce8d777 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期四, 30 十二月 2021 17:32:53 +0800
Subject: [PATCH] bug fix
---
widgetsTS/widget_search/widget.js | 8 +++++++-
data/getLayerListByUserid.json | 4 ++--
js/changable_params.js | 10 ++++++----
widgetsTS/widget_search/view.js | 2 +-
widgetsTS/widget_summary/widget.js | 12 +++++++++++-
5 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/data/getLayerListByUserid.json b/data/getLayerListByUserid.json
index 375f110..11abd37 100644
--- a/data/getLayerListByUserid.json
+++ b/data/getLayerListByUserid.json
@@ -8,7 +8,7 @@
"geoname_prefix":"",
"style_prefix":"",
"style_selected":"pm25",
- "styleoptions": ["pm25", "pm10", "no2", "co"],
+ "styleoptions": ["pm25", "pm10", "no2", "co","so2","o31"],
"show":false
},
@@ -20,7 +20,7 @@
"geoname_prefix":"vis_weizhan_",
"style_prefix":"point_weizhan_",
"style_selected":"pm25",
- "styleoptions": ["pm25", "pm10","no2", "co"],
+ "styleoptions": ["pm25", "pm10","no2", "co","so2","o3"],
"regiontype":"00",
"show":false
},
diff --git a/js/changable_params.js b/js/changable_params.js
index 4b36281..8f233b1 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -10,14 +10,15 @@
var array = ['1000','3000','5000']
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] };
-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] };
+// 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 = { ' ': [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']
- , 1002: ['pm25', 'pm10', 'no2', 'co', 'so2']
+ 1001: ['pm25', 'pm10', 'no2', 'co', 'so2',"o31"]
+ , 1002: ['pm25', 'pm10', 'no2', 'co', 'so2',"o3"]
, 1003: ['', 'tsp']
, 1004: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
, 1005: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
@@ -74,6 +75,7 @@
"<tr><td>NO<SUB>2</SUB>锛�</td><td align= right>" + item["no2"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
"<tr><td>CO锛�</td><td align= right>" + item["co"] + ' ' + "</td><td>mg/m鲁</td></tr>" +
"<tr><td>SO<SUB>2</SUB>锛� </td><td align= right>" + item["so2"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>O<SUB>3</SUB>锛� </td><td align= right>" + item["o31"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
"</table>" +
"<br/><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a></p>";
diff --git a/widgetsTS/widget_search/view.js b/widgetsTS/widget_search/view.js
index 57a2ff4..5f72328 100644
--- a/widgetsTS/widget_search/view.js
+++ b/widgetsTS/widget_search/view.js
@@ -116,7 +116,7 @@
function reloadData(page){
$("#searchInfo").empty();
var avgnam = 30; //姣忛〉鏄剧ず涓暟
- var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list_keyword&datatype=" + thisWidget.datatype + "&datatime=" + thisWidget.datatime +"userid=" + thisWidget.userid+ "&qindex=" + current_selected_monitor_qindex +"&keyword=" + current_selected_monitor_keyword + "&pageno="+page+"&pagesize="+avgnam;
+ var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list_keyword&datatype=" + thisWidget.datatype + "&datatime=" + thisWidget.datatime +"&userid=" + thisWidget.userid+ "&qindex=" + current_selected_monitor_qindex +"&keyword=" + current_selected_monitor_keyword + "&pageno="+page+"&pagesize="+avgnam;
$.ajax({
type:"GET",
url:backend_url,
diff --git a/widgetsTS/widget_search/widget.js b/widgetsTS/widget_search/widget.js
index f91e8e0..b3bc433 100644
--- a/widgetsTS/widget_search/widget.js
+++ b/widgetsTS/widget_search/widget.js
@@ -73,12 +73,18 @@
if (layerid == 1001 || layerid == 1002 || layerid == 1003 || layerid == 1004) {
selectedItem.forEach(element => {
+ if(element.lon == "/" || element.lat == "/"){
+ return;
+ }
this.addPointToMap(layerid, qindex, element);
});
} else if (layerid == 1005 || layerid == 100500) {
selectedItem.forEach(element => {
var path = element.shape;
+ if(path == "/"){
+ return;
+ }
if (path.substring(0, 1) == "M") {
var paths = (path.substring(17, path.length - 2)).split("),(");
paths.forEach(element_path => {
@@ -97,7 +103,7 @@
}else if (layerid == 1006) {
selectedItem.forEach(element => {
var path = element.shape;
- if(path == null && path == "null" && path == undefined){
+ if(path == "/" ){
return;
}
if (path.substring(0, 1) == "M") {
diff --git a/widgetsTS/widget_summary/widget.js b/widgetsTS/widget_summary/widget.js
index 897a2ff..6f88aa5 100644
--- a/widgetsTS/widget_summary/widget.js
+++ b/widgetsTS/widget_summary/widget.js
@@ -69,12 +69,19 @@
if (layerid == 1001 || layerid == 1002 || layerid == 1003 || layerid == 1004) {
selectedItem.forEach(element => {
+ console.log(element)
+ if(element.lat == "/" || element.lon == "/"){
+ return;
+ }
this.addPointToMap(layerid, qindex, element);
});
} else if (layerid == 1005 || layerid == 100500) {
selectedItem.forEach(element => {
var path = element.shape;
+ if(path == "/" ){
+ return;
+ }
if (path.substring(0, 1) == "M") {
var paths = (path.substring(17, path.length - 2)).split("),(");
paths.forEach(element_path => {
@@ -97,9 +104,12 @@
selectedItem.forEach(element => {
var path = element.shape;
- if(path == null && path == "null" && path == undefined){
+ if(path == "/" ){
return;
}
+ // if(path == null && path == "null" && path == undefined){
+ // return;
+ // }
if (path.substring(0, 1) == "M") {
var paths = (path.substring(15, path.length - 3)).split(")),((");
paths.forEach(element_path => {
--
Gitblit v1.9.1