From 34d2f0552647611410e0b2d5ad706ab0f44bd0a0 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期四, 17 二月 2022 12:17:08 +0800
Subject: [PATCH] min bug fix
---
js/changable_params.js | 59 +++++++++++++----------------
widgetsTS/widget_detail/view.js | 2
widgetsTS/taxiRouteReplay/widget.js | 8 ++--
widgetsTS/widget_summary/widget.js | 4 +-
4 files changed, 33 insertions(+), 40 deletions(-)
diff --git a/js/changable_params.js b/js/changable_params.js
index e463b93..38ccc6c 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 = { ' ': [1, 2], 'tsp': [0.2, 0.5] };
+var qindex_range_list_1003 = {'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']
@@ -72,16 +72,14 @@
"<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>PM鈧�.鈧咃細</td><td align= right>" + item["pm25"] + ' ' + "</td><td>渭g/m鲁</sup></td></tr>" +
+ "<tr><td>PM鈧佲個锛�</td><td align= right>" + item["pm10"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>NO鈧傦細</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>" +
+ "<tr><td>SO鈧傦細</td><td align= right>" + item["so2"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>O鈧冿細</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>";
-
-
} else if (layerid == 1002) {
@@ -92,16 +90,14 @@
"<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>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>PM鈧�.鈧咃細</td><td align= right>" + item["pm25"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>PM鈧佲個锛�</td><td align= right>" + item["pm10"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>NO鈧傦細</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["o3"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>SO鈧傦細</td><td align= right>" + item["so2"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>O鈧冿細</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></p>";
-
-
} else if (layerid == 1003) {
@@ -115,7 +111,6 @@
item["tsp"] + ' ' + "mg/m鲁" +
"<br /><br /><p><a href='#' onclick='javascript:showDetail(1003,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a></p>";
-
} else if (layerid == 1004) {
return "缂栧彿锛�" +
@@ -125,11 +120,11 @@
"<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>PM鈧�.鈧咃細</td><td align= right>" + item["pm25"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>PM鈧佲個锛�</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>NO鈧傦細</td><td align= right>" + item["no2"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>NO鈧�: </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>";
@@ -147,21 +142,19 @@
grid = array[3]
}
}
-
return grid + "绫崇綉鏍�"+
- "<br /><br />鏁版嵁鏃堕棿锛�" +
+ "<br /><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>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>PM鈧�.鈧咃細</td><td align= right>" + item["pm25"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>PM鈧佲個锛�</td><td align= right>" + item["pm10"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>NO鈧傦細</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鈧擄細</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>";
- } else {
-
+ } else{
return "绔欑偣缂栧彿锛�" +
item["code"] +
"<br />绔欑偣鍚嶇О锛�" +
@@ -169,11 +162,11 @@
"<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>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>PM鈧�.鈧咃細</td><td align= right>" + item["pm25"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>PM鈧佲個锛�</td><td align= right>" + item["pm10"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>NO鈧傦細</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鈧擄細</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/widgetsTS/taxiRouteReplay/widget.js b/widgetsTS/taxiRouteReplay/widget.js
index 529ad61..182bc93 100644
--- a/widgetsTS/taxiRouteReplay/widget.js
+++ b/widgetsTS/taxiRouteReplay/widget.js
@@ -104,11 +104,11 @@
"<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>PM鈧�.鈧咃細</td><td align= right>" + item["pm25"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>PM鈧佲個锛�</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>NO鈧傦細</td><td align= right>" + item["no2"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
+ "<tr><td>NO鈧�: </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>"
});
diff --git a/widgetsTS/widget_detail/view.js b/widgetsTS/widget_detail/view.js
index 0d437d0..ffac05a 100644
--- a/widgetsTS/widget_detail/view.js
+++ b/widgetsTS/widget_detail/view.js
@@ -151,7 +151,7 @@
success: function (data) {
var tableData = data.data.result;
tableData = data.data.result;
- var _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' class='headerInfo'><td>" + '搴�' + "</td><td onclick='locateAndShowDetail(this)'>" + "road_id" + "</td><td>" + "閬撹矾璺(鍖�-琛楅亾)" + "</td><td>" + "PM<sub>2.5</sub>" + "</td><td>" + "PM<sub>10</sub>" + "</td><td>" + "NO" + "</td><td>" + "NO<sub>x</sub>" + "</td><td>" + "NO<sub>2</sub>" + "</td><td>" + "CO" + "</td></tr>"
+ var _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' class='headerInfo'><td>" + '搴�' + "</td><td onclick='locateAndShowDetail(this)'>" + "road_id" + "</td><td>" + "閬撹矾璺(鍖�-琛楅亾)" + "</td><td>" + "PM鈧�.鈧�" + "</td><td>" + "PM鈧佲個" + "</td><td>" + "NO" + "</td><td>" + "NO鈧�" + "</td><td>" + "NO鈧�" + "</td><td>" + "CO" + "</td></tr>"
$("#indexTb").append(_tr);
if (tableData != null && tableData.length > 0) {
diff --git a/widgetsTS/widget_summary/widget.js b/widgetsTS/widget_summary/widget.js
index 6f88aa5..0215d89 100644
--- a/widgetsTS/widget_summary/widget.js
+++ b/widgetsTS/widget_summary/widget.js
@@ -69,8 +69,8 @@
if (layerid == 1001 || layerid == 1002 || layerid == 1003 || layerid == 1004) {
selectedItem.forEach(element => {
- console.log(element)
- if(element.lat == "/" || element.lon == "/"){
+ // console.log(element)
+ if(element.lon == "/" || element.lat == "/"){
return;
}
this.addPointToMap(layerid, qindex, element);
--
Gitblit v1.9.1