From 8a4b8e1f0fc75d144ef4e48f0d0f9554502b4bf6 Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期二, 02 十一月 2021 17:14:06 +0800
Subject: [PATCH] 统一处理null和undefined
---
js/function.js | 30 +++++--
js/changable_params.js | 154 ++++++++++----------------------------
2 files changed, 61 insertions(+), 123 deletions(-)
diff --git a/js/changable_params.js b/js/changable_params.js
index 343d631..854fa92 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -8,19 +8,19 @@
var color_list_1003 = ['#0EE839', '#FEFE23', '#F70F0D'];
var color_list_1004_and_other = ['#0dd4f7', '#23fe9f', '#078901', '#d4fe23', '#FFFF00', '#febf23', '#fe7c23', '#F70F0D', '#8A0B73', '#88041E'];
-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_1003 = { ' ':[1,2], 'tsp': [0.2, 0.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_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_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']
- , 1003: ['','tsp']
- , 1004: ['pm25', 'pm10', 'no2', 'co','no', 'nox']
- , 1005: ['pm25', 'pm10', 'no2', 'co','no', 'nox']
- , 1006: ['pm25', 'pm10', 'no2', 'co','no', 'nox']
-}
+ , 1003: ['', 'tsp']
+ , 1004: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
+ , 1005: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
+ , 1006: ['pm25', 'pm10', 'no2', 'co', 'no', 'nox']
+}
var echart_lines_color_list =
{
@@ -50,58 +50,28 @@
if (!item) {
return "";
}
+ item = changeNullAndundefinedToEmpty(item);
if (layerid == 1001) {
- if(item["datatime"] == null){
- return "绔欑偣缂栧彿锛�" +
- item["code"] +
- "<br />绔欑偣鍚嶇О锛�" +
- item["name"] +
- "<br />鏁版嵁鏃堕棿锛�" + "/" +
- "<table>" +
- "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</sup></td></tr>" +
- "<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>NO<SUB>2</SUB>锛�</td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>CO锛�</td><td align= right>" + "/" + ' ' + "</td><td>mg/m鲁</td></tr>" +
- "<tr><td>SO<SUB>2</SUB>锛� </td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "</table>" +
- "<br/><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a> <a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
- }else{
- return "绔欑偣缂栧彿锛�" +
+ return "绔欑偣缂栧彿锛�" +
item["code"] +
"<br />绔欑偣鍚嶇О锛�" +
item["name"] +
"<br />鏁版嵁鏃堕棿锛�" +
item["datatime"] +
- "<table>" +
- "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + item["pm25"] + ' ' + "</td><td>渭g/m鲁</sup></td></tr>" +
- "<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + item["pm10"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<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>" +
- "</table>" +
- "<br/><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a> <a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
-
- }
-
-
- } else if (layerid == 1002) {
- if(item["datatime"] == null){
- return "绔欑偣缂栧彿锛�" +
- item["code"] +
- "<br />绔欑偣鍚嶇О锛�" +
- item["name"] +
- "<br />鏁版嵁鏃堕棿锛�" + "/" +
"<table>" +
- "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>NO<SUB>2</SUB>锛�</td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>CO锛�</td><td align= right>" + "/" + ' ' + "</td><td>mg/m鲁</td></tr>" +
- "<tr><td>SO<SUB>2</SUB>锛� </td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>O<SUB>3</SUB>锛� </td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + item["pm25"] + ' ' + "</td><td>渭g/m鲁</sup></td></tr>" +
+ "<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + item["pm10"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<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>" +
"</table>" +
- "<br /><br /><p><a href='#' onclick='javascript:showDetail(1002,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a> <a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
- }else{
- return "绔欑偣缂栧彿锛�" +
+ "<br/><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a> <a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
+
+
+
+ } else if (layerid == 1002) {
+
+ return "绔欑偣缂栧彿锛�" +
item["code"] +
"<br />绔欑偣鍚嶇О锛�" +
item["name"] +
@@ -111,27 +81,17 @@
"<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + item["pm25"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
"<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + item["pm10"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
"<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>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["o3"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
"</table>" +
"<br /><br /><p><a href='#' onclick='javascript:showDetail(1002,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a> <a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
- }
-
+
} else if (layerid == 1003) {
- if(item["datatime"] == null){
- return "绔欑偣缂栧彿锛�" +
- item["code"] +
- "<br />绔欑偣鍚嶇О锛�" +
- item["name"] +
- "<br />鏁版嵁鏃堕棿锛�" + "/" +
- "<br />TSP锛�" + "/" + ' ' + "mg/m鲁" +
- "<br /><br /><p><a href='#' onclick='javascript:showDetail(1003,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a> <a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
- }else{
- return "绔欑偣缂栧彿锛�" +
+ return "绔欑偣缂栧彿锛�" +
item["code"] +
"<br />绔欑偣鍚嶇О锛�" +
item["name"] +
@@ -140,76 +100,44 @@
"<br />TSP锛�" +
item["tsp"] + ' ' + "mg/m鲁" +
"<br /><br /><p><a href='#' onclick='javascript:showDetail(1003,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a> <a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
- }
-
+
} else if (layerid == 1004) {
- if(item["datatime"] == null){
- return "缂栧彿锛�" +
- item["code"] +
- "<br />鏃堕棿锛�" + "/" +
- "<br />杞﹂�燂細" + "/" +
- "<table>" +
- "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + "/" + ' '+ "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>NO锛�</td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>NO<SUB>2</SUB>锛�</td><td align= right>" +"/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>NO<SUB>x</SUB>: </td><td align= right>" + "/" + ' '+ "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>CO锛�</td><td align= right>" + "/" + ' ' + "</td><td>mg/m鲁</td></tr>" +
- "</table>" +
- "<br/><p><a href='#' onclick='javascript:showHistoryPathDetail(\"" + item["code"] + "\")' >杞ㄨ抗鍥炴斁</a></p>";
- }else{
- return "缂栧彿锛�" +
+
+ return "缂栧彿锛�" +
item["code"] +
"<br />鏃堕棿锛�" +
item["datatime"] +
"<br />杞﹂�燂細" +
item["speed"] +
"<table>" +
- "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + item["pm25"] + ' '+ "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + item["pm10"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>NO锛�</td><td align= right>" + item["no"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>NO<SUB>2</SUB>锛�</td><td align= right>" + item["no2"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>NO<SUB>x</SUB>: </td><td align= right>" + item["nox"] + ' '+ "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>CO锛�</td><td align= right>" + item["co"] + ' ' + "</td><td>mg/m鲁</td></tr>" +
- "</table>" +
- "<br/><p><a href='#' onclick='javascript:showHistoryPathDetail(\"" + item["code"] + "\")' >杞ㄨ抗鍥炴斁</a></p>";
- }
+ "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + item["pm25"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + item["pm10"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>NO锛�</td><td align= right>" + item["no"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>NO<SUB>2</SUB>锛�</td><td align= right>" + item["no2"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>NO<SUB>x</SUB>: </td><td align= right>" + item["nox"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>CO锛�</td><td align= right>" + item["co"] + ' ' + "</td><td>mg/m鲁</td></tr>" +
+ "</table>" +
+ "<br/><p><a href='#' onclick='javascript:showHistoryPathDetail(\"" + item["code"] + "\")' >杞ㄨ抗鍥炴斁</a></p>";
-
} else {
- if(item["datatime"] == null){
- return "绔欑偣缂栧彿锛�" +
- item["code"] +
- "<br />绔欑偣鍚嶇О锛�" +
- item["name"] +
- "<br />鏁版嵁鏃堕棿锛�" + "/" +
- "<table>" +
- "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + "/" + ' '+ "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>NO<SUB>2</SUB>锛�</td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>CO锛�</td><td align= right>" + "/" + ' ' + "</td><td>mg/m鲁</td></tr>" +
- "<tr><td>NO<SUB>x</SUB>锛�</td><td align= right>" + "/" + ' '+ "</td><td>渭g/m鲁</td></tr>" +
- "<tr><td>NO锛�</td><td align= right>" + "/" + ' ' + "</td><td>渭g/m鲁</td></tr>" +
- "</table>" +
- "<br /><br /><p><a href='#' onclick='javascript:showDetail(" + layerid + ",\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a> <a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
- }else{
- return "绔欑偣缂栧彿锛�" +
+
+ return "绔欑偣缂栧彿锛�" +
item["code"] +
"<br />绔欑偣鍚嶇О锛�" +
item["name"] +
"<br />鏁版嵁鏃堕棿锛�" +
item["datatime"] +
"<table>" +
- "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + item["pm25"] + ' '+ "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + item["pm25"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
"<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + item["pm10"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
"<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>NO<SUB>x</SUB>锛�</td><td align= right>" + item["nox"] + ' '+ "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>NO<SUB>x</SUB>锛�</td><td align= right>" + item["nox"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
"<tr><td>NO锛�</td><td align= right>" + item["no"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
"</table>" +
"<br /><br /><p><a href='#' onclick='javascript:showDetail(" + layerid + ",\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a> <a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
- }
}
}
+
diff --git a/js/function.js b/js/function.js
index 91f042a..1773dac 100644
--- a/js/function.js
+++ b/js/function.js
@@ -99,8 +99,8 @@
if ([layer.type] == 'wms') {
layer.options.layers = "konglu_58:" + layer.options.geoname_prefix + mars3d.global_variables.queryDataType;
- layer.options.parameters.viewparams = "userid:" + mars3d.global_variables.userid +";regiontype:" + layer.options.regiontype + ";datetime:" + mars3d.global_variables.queryDataTStartGeo
- layer.options.getFeatureInfoParameters.viewparams = "userid:" + mars3d.global_variables.userid +";regiontype:" + layer.options.regiontype + ";datetime:" + mars3d.global_variables.queryDataTStartGeo
+ layer.options.parameters.viewparams = "userid:" + mars3d.global_variables.userid + ";regiontype:" + layer.options.regiontype + ";datetime:" + mars3d.global_variables.queryDataTStartGeo
+ layer.options.getFeatureInfoParameters.viewparams = "userid:" + mars3d.global_variables.userid + ";regiontype:" + layer.options.regiontype + ";datetime:" + mars3d.global_variables.queryDataTStartGeo
layer.reload();
} else if ([layer.id] == 1001 && layer.options.show) {
var tmpguokong = map.getLayerById(1001);
@@ -122,12 +122,12 @@
function refreshWidgets() {
- refreshSingleWidget("widgetsTS/weather/widget.js",{});
- refreshSingleWidget("widgetsTS/widget_summary/widget.js",{});
+ refreshSingleWidget("widgetsTS/weather/widget.js", {});
+ refreshSingleWidget("widgetsTS/widget_summary/widget.js", {});
}
-function refreshSingleWidget(widget_path,params){
+function refreshSingleWidget(widget_path, params) {
if (mars3d.widget.isActivate(widget_path)) {
var tempWiget = mars3d.widget.getClass(widget_path);
@@ -137,7 +137,7 @@
}
function addGraphictoHighlightLayer() {
mars3d.global_variables.tmpHighlightGraphicLayer.addGraphic(mars3d.global_variables.tmpHighlightGraphic);
-
+
}
function addHighlightLayerClearButton() {
@@ -152,19 +152,19 @@
map.addControl(clearButton);
}
-function showDetail(layerid, itemCode,qindex) {
+function showDetail(layerid, itemCode, qindex) {
if (mars3d.widget.isActivate("widgetsTS/widget_detail/widget.js")) {
var detailWiget = mars3d.widget.getClass("widgetsTS/widget_detail/widget.js");
- detailWiget.reloadData({ "nodejs_url_predix": mars3d.global_variables.nodejs_url_predix, "datatype": mars3d.global_variables.queryDataType,"selected_qindex": qindex,"datatime": mars3d.global_variables.queryDataTStart, "layerid": layerid, "siteid": itemCode });
+ detailWiget.reloadData({ "nodejs_url_predix": mars3d.global_variables.nodejs_url_predix, "datatype": mars3d.global_variables.queryDataType, "selected_qindex": qindex, "datatime": mars3d.global_variables.queryDataTStart, "layerid": layerid, "siteid": itemCode });
} else {
mars3d.widget.activate({
uri: "widgetsTS/widget_detail/widget.js",
- params: { "nodejs_url_predix": mars3d.global_variables.nodejs_url_predix, "datatype": mars3d.global_variables.queryDataType,"selected_qindex": qindex,"datatime": mars3d.global_variables.queryDataTStart, "layerid": layerid, "siteid": itemCode },
+ params: { "nodejs_url_predix": mars3d.global_variables.nodejs_url_predix, "datatype": mars3d.global_variables.queryDataType, "selected_qindex": qindex, "datatime": mars3d.global_variables.queryDataTStart, "layerid": layerid, "siteid": itemCode },
});
}
}
-function showHistoryPathDetail(itemCode){
+function showHistoryPathDetail(itemCode) {
if (mars3d.widget.isActivate("widgetsTS/taxiRouteReplay/widget.js")) {
var detailWiget = mars3d.widget.getClass("widgetsTS/taxiRouteReplay/widget.js");
@@ -175,4 +175,14 @@
params: itemCode,
});
}
+}
+
+
+function changeNullAndundefinedToEmpty(json_in) {
+ for (var key in json_in) {
+ if (json_in[key] == null || json_in[key] == 'null' || json_in[key] == undefined || json_in[key] == 'undefined') {
+ json_in[key] = "";
+ }
+ }
+ return json_in;
}
\ No newline at end of file
--
Gitblit v1.9.1