From 725edff660fdcbe1c200cc36540cc8794622e724 Mon Sep 17 00:00:00 2001
From: cshenfu <men883234@gmail.com>
Date: 星期四, 03 十一月 2022 09:46:16 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai 合并 :wq

---
 js/changable_params.js             |    5 +++--
 widgetsTS/taxiRouteReplay2/view.js |    2 +-
 js/function_1001.js                |    2 +-
 widgetsTS/taxiRouteReplay/view.js  |    2 +-
 widgetsTS/widget_summary/view.js   |    2 +-
 widgetsTS/widget_search/view.js    |    2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/js/changable_params.js b/js/changable_params.js
index 70fe29b..88e151f 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -13,13 +13,14 @@
 // 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_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',"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']
diff --git a/js/function_1001.js b/js/function_1001.js
index 34de637..c0b3282 100644
--- a/js/function_1001.js
+++ b/js/function_1001.js
@@ -115,7 +115,7 @@
 
 function getGuokongPointFromServer(tmplayer) {
 
-  $.getJSON(mars3d.global_variables.nodejs_url_predix + "dataapi/Bdata?bid=get_1001_list&datatype=" + mars3d.global_variables.queryDataType + "&datatime=" + mars3d.global_variables.queryDataTStart + "&regionCode="+mars3d.global_variables.regionCode+"&qindex=pm25&pageno=1&pagesize=1000", (result) => {
+  $.getJSON(mars3d.global_variables.nodejs_url_predix + "dataapi/Bdata?bid=get_1001_list&datatype=" + mars3d.global_variables.queryDataType + "&datatime=" + mars3d.global_variables.queryDataTStart + "&userid=" + mars3d.global_variables.userid + "&regionCode="+mars3d.global_variables.regionCode+"&qindex=pm25&pageno=1&pagesize=1000", (result) => {
     data_list_1001 = result.data.result;
     addGuokongPointResutToLayer(tmplayer, result.data.result);
   });
diff --git a/widgetsTS/taxiRouteReplay/view.js b/widgetsTS/taxiRouteReplay/view.js
index 69217e7..6398d3b 100644
--- a/widgetsTS/taxiRouteReplay/view.js
+++ b/widgetsTS/taxiRouteReplay/view.js
@@ -59,7 +59,7 @@
     let str = $("#taxisn").val()
     let time_1 = thisWidget.appDateHourStart
     let time_2 = thisWidget.appDateHourEnd
-    $.getJSON(thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_single_path&siteid=" + $("#taxisn").val(), {
+    $.getJSON(thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_real&siteid=" + $("#taxisn").val(), {
     // $.getJSON(thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_single_path&siteid=" + thisWidget.taxi_sn, {
       datatime1: thisWidget.appDateHourStart,
       datatime2: thisWidget.appDateHourEnd
diff --git a/widgetsTS/taxiRouteReplay2/view.js b/widgetsTS/taxiRouteReplay2/view.js
index 66cd621..46ac74e 100644
--- a/widgetsTS/taxiRouteReplay2/view.js
+++ b/widgetsTS/taxiRouteReplay2/view.js
@@ -61,7 +61,7 @@
     let time_1 = thisWidget.appDateHourStart
     let time_2 = thisWidget.appDateHourEnd
     console.log(str,time_1,time_2,"鍙傛暟")
-    $.getJSON(thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_single_path&siteid=" + $("#taxisn").val(), {
+    $.getJSON(thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_real&siteid=" + $("#taxisn").val(), {
     // $.getJSON(thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_1004_single_path&siteid=" + thisWidget.taxi_sn, {
       datatime1: thisWidget.appDateHourStart,
       datatime2: thisWidget.appDateHourEnd
diff --git a/widgetsTS/widget_search/view.js b/widgetsTS/widget_search/view.js
index 505fe24..e28f03e 100644
--- a/widgetsTS/widget_search/view.js
+++ b/widgetsTS/widget_search/view.js
@@ -86,7 +86,7 @@
         error: function (request, textStatus) {
         }
     });
-    var backend_url_taxi = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + thisWidget.userid ;
+    var backend_url_taxi = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_count_all&userid=" + thisWidget.userid ;
     $.ajax({
         type: 'get',
         dataType: 'json',
diff --git a/widgetsTS/widget_summary/view.js b/widgetsTS/widget_summary/view.js
index c7d3f00..56aa219 100644
--- a/widgetsTS/widget_summary/view.js
+++ b/widgetsTS/widget_summary/view.js
@@ -76,7 +76,7 @@
             haoutil.msg("绯荤粺鍚庡彴閿欒锛岃鑱旂郴绠＄悊鍛樺鐞嗭紒");
         }
     });
-    var backend_url_taxi = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid" + thisWidget.userid;
+    var backend_url_taxi = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_count_all&userid=" + thisWidget.userid;
     $.ajax({
         type: 'get',
         dataType: 'json',

--
Gitblit v1.9.1