From 0a85166b655d377cb01b212cfecf7eeb4b6d6001 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期三, 27 十月 2021 11:41:19 +0800
Subject: [PATCH] 弹窗样式 bug fix

---
 data/getLayerListByUserid.json |    4 +-
 js/changable_params.js         |  108 ++++++++++++++++++++++++++---------------------------
 2 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/data/getLayerListByUserid.json b/data/getLayerListByUserid.json
index 74774ee..9f22aab 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","so2"],
+            "styleoptions": ["pm25", "pm10", "no2", "co"],
             "show":true
 
         },
@@ -20,7 +20,7 @@
             "geoname_prefix":"vis_weizhan_",
             "style_prefix":"point_weizhan_",
             "style_selected":"pm25",
-            "styleoptions": ["pm25", "pm10","no2", "co","so2","o3"],
+            "styleoptions": ["pm25", "pm10","no2", "co"],
             "regiontype":"00",
             "show":false
         },
diff --git a/js/changable_params.js b/js/changable_params.js
index a3a082b..d4ad243 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -8,24 +8,24 @@
 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], 'so2':[50, 150, 650, 800, 1600], 'o3':[160, 200, 300, 400,800] };
-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], 'o3':[10, 35, 65, 100, 200]};
+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_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','O3']
-  , 1002: ['PM25', 'PM10', 'NO2', 'CO', 'SO2', 'O3']
-  , 1003: ['TSP']
-  , 1004: ['PM25', 'PM10', 'NO2', 'CO','NO', 'NOX']
-  , 1005: ['PM25', 'PM10', 'NO2', 'CO','NO', 'NOX']
-  , 1006: ['PM25', 'PM10', 'NO2', 'CO','NO', 'NOX']
+  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']
 } 
 
 var echart_lines_color_list =
 {
-  1001: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
-  , 1002: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
+  1001: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066']
+  , 1002: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066']
   , 1003: ['#00EE00']
   , 1004: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
   , 1005: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
@@ -44,15 +44,18 @@
   }
   if (layerid == 1001) {
 
-    return "<table>" +
-      "<tr><td>缂栧彿锛�</td><td>" + item["code"] + "</td><td></td></tr>" +
-      "<tr><td>鍚嶇О锛�</td><td>" + item["name"] + "</td><td></td></tr>" +
-      "<tr><td>鏃堕棿锛�</td><td>" + item["datatime"] + "</td><td></td></tr>" +
-      "<tr><td>PM2.5锛�</td><td>" + item["pm25"] + "</td><td>ug/m3</td></tr>" +
-      "<tr><td>PM10锛�</td><td>" + item["pm10"] + "</td><td>ug/m3</td></tr>" +
-      "<tr><td>NO2锛�</td><td>" + item["no2"] + "</td><td>ug/m3</td></tr>" +
-      "<tr><td>CO锛�</td><td>" + item["co"] + "</td><td>mg/m3</td></tr>" +
-      "<tr><td>SO2</td><td>" + item["so2"] + "</td><td>ug/m3</td></tr>" +
+    return "绔欑偣缂栧彿锛�" +
+    item["code"] +
+    "<br />绔欑偣鍚嶇О锛�" +
+    item["name"] +
+    "<br />鏁版嵁鏃堕棿锛�" +
+    item["datatime"] +
+      "<table>" +
+      "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + item["pm25"] + '&nbsp' + "</td><td>渭g/m鲁</sup></td></tr>" +
+      "<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + item["pm10"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>NO<SUB>2</SUB>锛�</td><td align= right>" + item["no2"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>CO锛�</td><td align= right>" + item["co"] + '&nbsp' +  "</td><td>mg/m鲁</td></tr>" +
+      "<tr><td>SO<SUB>2</SUB>锛� </td><td align= right>" + item["so2"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
       "</table>" +
       "<br/><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a>&nbsp;&nbsp;&nbsp;<a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
   } else if (layerid == 1002) {
@@ -62,18 +65,14 @@
       item["name"] +
       "<br />鏁版嵁鏃堕棿锛�" +
       item["datatime"] +
-      "<br />PM2.5: " +
-      item["pm25"] + '&nbsp'+"ug/m3" +
-      "<br />PM10: " +
-      item["pm10"] + '&nbsp'+"ug/m3" +
-      "<br />NO2:" +
-      item["no2"] + '&nbsp'+"ug/m3" +
-      "<br />CO: " +
-      item["co"] + '&nbsp'+"mg/m3" +
-      "<br />SO2: " +
-      item["so2"] +'&nbsp'+ "ug/m3" +
-      "<br />O3: " +
-      item["o3"] + '&nbsp'+"ug/m3" +
+      "<table>" +
+      "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + item["pm25"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + item["pm10"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>NO<SUB>2</SUB>锛�</td><td align= right>" + item["no2"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>CO锛�</td><td align= right>" + item["co"] + '&nbsp' +  "</td><td>mg/m鲁</td></tr>" +
+      "<tr><td>SO<SUB>2</SUB>锛� </td><td align= right>" + item["so2"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>O<SUB>3</SUB>锛� </td><td align= right>" + item["o3"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
+      "</table>" +
       "<br /><br /><p><a href='#' onclick='javascript:showDetail(1002,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a>&nbsp;&nbsp;&nbsp;<a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
 
   } else if (layerid == 1003) {
@@ -83,22 +82,25 @@
       item["name"] +
       "<br />鏁版嵁鏃堕棿锛�" +
       item["datatime"] +
-      "<br />TSP: " +
-      item["tsp"] + "ug/m3" +
+      "<br />TSP锛�" +
+      item["tsp"] + '&nbsp' + "mg/m鲁" +
       "<br /><br /><p><a href='#' onclick='javascript:showDetail(1003,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a>&nbsp;&nbsp;&nbsp;<a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
 
   } else if (layerid == 1004) {
 
-    return "<table>" +
-      "<tr><td>缂栧彿锛�</td><td>" + item["code"] + "</td><td></td></tr>" +
-      "<tr><td>鏃堕棿锛�</td><td>" + item["datatime"] + "</td><td></td></tr>" +
-      "<tr><td>杞﹂�燂細</td><td>" + item["speed"] + "</td><td>km/h</td></tr>" +
-      "<tr><td>PM2.5锛�</td><td>" + item["pm25"] + "</td><td>ug/m3</td></tr>" +
-      "<tr><td>PM10锛�</td><td>" + item["pm10"] + "</td><td>ug/m3</td></tr>" +
-      "<tr><td>NO锛�</td><td>" + item["no"] + "</td><td>ug/m3</td></tr>" +
-      "<tr><td>NO2锛�</td><td>" + item["no2"] + "</td><td>ug/m3</td></tr>" +
-      "<tr><td>NOx</td><td>" + item["nox"] + "</td><td>ug/m3</td></tr>" +
-      "<tr><td>CO锛�</td><td>" + item["co"] + "</td><td>mg/m3</td></tr>" +
+    return "缂栧彿锛�" +
+    item["code"] +
+    "<br />鏃堕棿锛�" +
+    item["datatime"] +
+    "<br />杞﹂�燂細" +
+    item["speed"] +
+    "<table>" +
+      "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + item["pm25"]  + '&nbsp'+ "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + item["pm10"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>NO锛�</td><td align= right>" + item["no"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>NO<SUB>2</SUB>锛�</td><td align= right>" + item["no2"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>NO<SUB>x</SUB>: </td><td align= right>" + item["nox"]  + '&nbsp'+ "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>CO锛�</td><td align= right>" + item["co"] + '&nbsp' + "</td><td>mg/m鲁</td></tr>" +
       "</table>" +
       "<br/><p><a href='#' onclick='javascript:showHistoryPathDetail(\"" + item["code"] + "\")' >杞ㄨ抗鍥炴斁</a></p>";
 
@@ -110,18 +112,14 @@
       item["name"] +
       "<br />鏁版嵁鏃堕棿锛�" +
       item["datatime"] +
-      "<br />PM2.5: " +
-      item["pm25"] + '&nbsp'+ "ug/m3" +
-      "<br />PM10: " +
-      item["pm10"] +  '&nbsp'+ "ug/m3" +
-      "<br />NO2: " +
-      item["no2"] + '&nbsp'+  "ug/m3" +
-      "<br />CO: " +
-      item["co"]+ '&nbsp'+  "ug/m3" +
-      "<br />NOX: " +
-      item["nox"] + '&nbsp'+  "ug/m3" +
-      "<br />NO: " +
-      item["no"]+ '&nbsp'+  "ug/m3" +
+      "<table>" +
+      "<tr><td>PM<SUB>2.5</SUB>锛�</td><td align= right>" + item["pm25"]  + '&nbsp'+ "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>PM<SUB>10</SUB>锛�</td><td align= right>" + item["pm10"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>NO<SUB>2</SUB>锛�</td><td align= right>" + item["no2"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>CO锛�</td><td align= right>" + item["co"] + '&nbsp' + "</td><td>mg/m鲁</td></tr>" +
+      "<tr><td>NO<SUB>x</SUB>锛�</td><td align= right>" + item["nox"]  + '&nbsp'+ "</td><td>渭g/m鲁</td></tr>" +
+      "<tr><td>NO锛�</td><td align= right>" + item["no"] + '&nbsp' + "</td><td>渭g/m鲁</td></tr>" +
+      "</table>" +
       "<br /><br /><p><a href='#' onclick='javascript:showDetail(" + layerid + ",\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a>&nbsp;&nbsp;&nbsp;<a href='#' onclick='javascript:addGraphictoHighlightLayer()' >淇濇寔楂樹寒鏄剧ず</a></p>";
   }
 }

--
Gitblit v1.9.1