From c475cced2d83665f313a0bb380dad27a1556facb Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期一, 01 十一月 2021 15:28:23 +0800
Subject: [PATCH] 弹窗/图表颜色 bug fix
---
js/changable_params.js | 162 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 126 insertions(+), 36 deletions(-)
diff --git a/js/changable_params.js b/js/changable_params.js
index d4ad243..343d631 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -10,13 +10,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_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 = { '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']
, 1002: ['pm25', 'pm10', 'no2', 'co', 'so2']
- , 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']
@@ -29,7 +29,15 @@
, 1003: ['#00EE00']
, 1004: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
, 1005: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
- , 1006: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
+ , 100600: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
+ , 100601: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
+ , 100602: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
+ , 100603: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
+ , 100604: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
+ , 100605: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
+ , 100607: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
+ , 100610: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
+ , 100611: ['#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 };
@@ -43,23 +51,57 @@
return "";
}
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 "绔欑偣缂栧彿锛�" +
+ 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>";
- 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) {
- return "绔欑偣缂栧彿锛�" +
+ 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>" +
+ "</table>" +
+ "<br /><br /><p><a href='#' onclick='javascript:showDetail(1002,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a> <a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
+ }else{
+ return "绔欑偣缂栧彿锛�" +
item["code"] +
"<br />绔欑偣鍚嶇О锛�" +
item["name"] +
@@ -75,8 +117,21 @@
"</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) {
- return "绔欑偣缂栧彿锛�" +
+ 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 "绔欑偣缂栧彿锛�" +
item["code"] +
"<br />绔欑偣鍚嶇О锛�" +
item["name"] +
@@ -85,28 +140,62 @@
"<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 "缂栧彿锛�" +
+ 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>";
+ }
- 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>";
+
} else {
-
- return "绔欑偣缂栧彿锛�" +
+ 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 "绔欑偣缂栧彿锛�" +
item["code"] +
"<br />绔欑偣鍚嶇О锛�" +
item["name"] +
@@ -121,5 +210,6 @@
"<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>";
+ }
}
}
--
Gitblit v1.9.1