From a18d81c9485e7f92f82761dec91355dfe24250d9 Mon Sep 17 00:00:00 2001
From: cshenfu <men883234@gmail.com>
Date: 星期一, 24 十月 2022 14:26:21 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai

---
 js/function_1001.js             |    2 +-
 widgetsTS/widget_search/view.js |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/js/function_1001.js b/js/function_1001.js
index 5ecfa38..406ef56 100644
--- a/js/function_1001.js
+++ b/js/function_1001.js
@@ -120,7 +120,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 + "&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 + "&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/widget_search/view.js b/widgetsTS/widget_search/view.js
index 3af59b9..f93751e 100644
--- a/widgetsTS/widget_search/view.js
+++ b/widgetsTS/widget_search/view.js
@@ -62,7 +62,7 @@
 
 //鍔犺浇count
 function loadCountByUserid() {
-    var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + thisWidget.userid;
+    var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + thisWidget.userid + "&regionCode="+mars3d.global_variables.regionCode;
     $.ajax({
         type: 'get',
         dataType: 'json',
@@ -86,7 +86,7 @@
         error: function (request, textStatus) {
         }
     });
-    var backend_url_taxi = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_count_all&datatype=" + thisWidget.datatype + "&datatime="+ thisWidget.datatime;
+    var backend_url_taxi = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_count_all&datatype=" + thisWidget.datatype + "&datatime="+ thisWidget.datatime+"regionCode"+mars3d.global_variables.regionCode;
     $.ajax({
         type: 'get',
         dataType: 'json',
@@ -153,7 +153,10 @@
 function reloadData(page){
     $("#searchInfo").empty();
     var avgnam = 30; //姣忛〉鏄剧ず涓暟
-    var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list_keyword&datatype=" + thisWidget.datatype + "&datatime=" + thisWidget.datatime +"&userid=" + thisWidget.userid+ "&qindex=" + current_selected_monitor_qindex +"&keyword=" + current_selected_monitor_keyword + "&pageno="+page+"&pagesize="+avgnam;
+    var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list_keyword&datatype=" + thisWidget.datatype 
+            + "&datatime=" + thisWidget.datatime +"&userid=" + thisWidget.userid+ "&qindex=" + current_selected_monitor_qindex 
+            + "&keyword=" + current_selected_monitor_keyword + "&pageno="+page+"&pagesize="+avgnam
+            + "regionCode="+mars3d.global_variables.regionCode;
         $.ajax({
           type:"GET",
           url:backend_url,

--
Gitblit v1.9.1