From 9707e3f2b23cacaa6d219f7a000865cda4ecb99c Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期五, 17 十二月 2021 16:46:53 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai

---
 js/changable_params.js |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/js/changable_params.js b/js/changable_params.js
index 13004fe..cbdbd81 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -7,6 +7,8 @@
 var color_list_1002 = ['#0dd4f7', '#078901', '#FFFF00', '#fe7c23', '#F70F0D', '#88041E'];
 var color_list_1003 = ['#0EE839', '#FEFE23', '#F70F0D'];
 var color_list_1004_and_other = ['#0dd4f7', '#23fe9f', '#078901', '#d4fe23', '#FFFF00', '#febf23', '#fe7c23', '#F70F0D', '#8A0B73', '#88041E'];
+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] };
@@ -47,7 +49,7 @@
   , 3003: ['#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,summary_topN_count :50};
+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,summary_topN_count :50, un_authorization_url: 'http://www.sohu.com'};
 var default_grid_camerview = {grid5000:{"lat":30.306622,"lng":121.251151,"alt":180451,"heading":2,"pitch":-61},grid3000:{"lat":31.076898,"lng":121.418675,"alt":36483,"heading":2,"pitch":-61},grid1000:{"lat":31.216173,"lng":121.350382,"alt":8883,"heading":2,"pitch":-60}};
 
 function bindPopupFunction(event) {
@@ -73,7 +75,7 @@
       "<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>";
+      "<br/><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a></p>";
 
 
 
@@ -93,7 +95,7 @@
       "<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>";
+      "<br /><br /><p><a href='#' onclick='javascript:showDetail(1002,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a></p>";
 
 
 
@@ -105,9 +107,9 @@
       item["name"] +
       "<br />鏁版嵁鏃堕棿锛�" +
       item["datatime"] +
-      "<br />TSP锛�" +
+      "<br />鎬绘偓娴绮掔墿锛圱SP锛夛細" +
       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>";
+      "<br /><br /><p><a href='#' onclick='javascript:showDetail(1003,\"" + item["code"] + "\",\"" + qindex + "\")' >璇︾粏淇℃伅</a></p>";
 
 
   } else if (layerid == 1004) {
@@ -130,9 +132,19 @@
 
 
   }else if(layerid == 3001 || layerid == 3002 || layerid == 3003 ) {
+    for(i = 0;i<=array.length;i++){
+      if(layerid == 3001){
+        grid = array[0]
+      }else if(layerid == 3002){
+        grid = array[1]
+      }else{
+        grid = array[2]
+      }
+    }
 
-    return "鏁版嵁鏃堕棿锛�" +
-      item["datatime"] +
+    return grid + "绫崇綉鏍�"+
+      "<br /><br />鏁版嵁鏃堕棿锛�" +
+      item["datatime"] + 
       "<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>" +

--
Gitblit v1.9.1