From a57dcbd7b9cbdc17a53ce3cdbabc8fb72c472693 Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期一, 20 十二月 2021 18:31:36 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai

---
 widgetsTS/widget_search/view.js |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/widgetsTS/widget_search/view.js b/widgetsTS/widget_search/view.js
index c98adac..f1f9778 100644
--- a/widgetsTS/widget_search/view.js
+++ b/widgetsTS/widget_search/view.js
@@ -24,14 +24,14 @@
     //寮�濮嬫煡璇㈡暟鎹�
     $("#btn").click(function () {
         current_selected_monitor_keyword = $('#search').val();
-        reloadData(1);
+        throttling();
     });
 
     //缁戝畾enter鍥炶溅閿簨浠�
     $('#search').bind('keypress', function (event) {
         if (event.keyCode == "13") {
             current_selected_monitor_keyword = $('#search').val();
-            reloadData(1);
+            throttling();
         }
       })
 
@@ -47,6 +47,17 @@
             });
         }  
     });
+}
+
+// 鑺傛祦锛岄槻姝㈢敤鎴风偣鍑诲娆¤姹傚娆�
+let timeout;
+//闇�瑕佸畾涔夊湪鏂规硶澶�
+function throttling(){
+	//鍏堟竻鐞�
+	clearTimeout(timeout)	
+	timeout = setTimeout(() => {
+		reloadData(1)
+	}, 500)
 }
 
 //鍔犺浇count
@@ -104,8 +115,8 @@
 
 function reloadData(page){
     $("#searchInfo").empty();
-    var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list_keyword&datatype=" + thisWidget.datatype + "&datatime=" + thisWidget.datatime + "&qindex=" + current_selected_monitor_qindex +"&keyword=" + current_selected_monitor_keyword+ "&pageno=1&pagesize=10";
-    var avgnam = 10; //姣忛〉鏄剧ず涓暟
+    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 + "&qindex=" + current_selected_monitor_qindex +"&keyword=" + current_selected_monitor_keyword + "&pageno="+page+"&pagesize="+avgnam;
         $.ajax({
           type:"GET",
           url:backend_url,
@@ -124,14 +135,14 @@
                 haoutil.msg("鏃犳煡璇㈢粨鏋滐紝璇锋洿鎹㈡煡璇㈡潯浠讹紒")
                 return;
             }          
-            var newsTotalNum = data.data.result.length; //璁板綍鐨勬�绘潯鏁�
+            var newsTotalNum = data.data.counter.counter; //璁板綍鐨勬�绘潯鏁�
             var pageNum = Math.ceil(newsTotalNum/avgnam); //鍒嗛〉鐨勬�婚〉鏁�
             
-            for(var i=((page-1)*10);i<(page*10)&&i<newsTotalNum;i++){
-                var j = i+1; 
+            for(var i=0;i<avgnam;i++){
+                var j = (page-1)*avgnam + i + 1;
                 var topObj = tableData[i];
                 topObj = changeNullAndundefinedToEmpty(topObj);
-                var content = "<tr _siteid='" + topObj.code + "' _lon='" + topObj.lon + "' _lat='" + topObj.lat + "' onmouseover='over(this)' onmouseout='out(this)' ><td><input type='checkbox' name='selectedItem' value='" + j + "' /></td><td>" + j + "</td><td onclick='locateAndShowDetail(this)'>" + topObj.code + "</td><td onclick='locateAndShowDetail(this)'>" + topObj.name + "</td><td><font color='" + getLayerPointColorByQindexandValue(current_selected_monitor_type, current_selected_monitor_qindex, topObj[current_selected_monitor_qindex]) + "'>" + topObj[current_selected_monitor_qindex] + "</font></td></tr>"
+                var content = "<tr _siteid='" + topObj.code + "' _lon='" + topObj.lon + "' _lat='" + topObj.lat + "' onmouseover='over(this)' onmouseout='out(this)' ><td><input id='items' type='checkbox' name='selectedItem' value='" + j + "' /></td><td>" + j + "</td><td onclick='locateAndShowDetail(this)'>" + topObj.code + "</td><td onclick='locateAndShowDetail(this)'>" + topObj.name + "</td><td><font color='" + getLayerPointColorByQindexandValue(current_selected_monitor_type, current_selected_monitor_qindex, topObj[current_selected_monitor_qindex]) + "'>" + topObj[current_selected_monitor_qindex] + "</font></td></tr>"
                 $("#searchInfo").append(content);
             }
             var content1 = '<div class="am-cf">' +
@@ -222,7 +233,7 @@
             $("#page").append(content2);
           }
         });
-      }
+    }
 
       function over(obj) {
         $('#searchInfo tr').removeClass("over_tr");
@@ -260,9 +271,11 @@
     function highlightSelected() {
     
         var obj = document.getElementsByName('selectedItem'); //閫夋嫨鎵�鏈塶ame="'selectedItem'"鐨勫璞★紝杩斿洖鏁扮粍 
+        // var first_value = document.getElementById('items').value; //閫夋嫨鎵�鏈塿alue="'鍊�'
         var selectedItem = [];
         for (var i = 0; i < obj.length; ++i) {
             if (obj[i].checked) {
+                // selectedItem[selectedItem.length] = tableData[i+(first_value-1)];
                 selectedItem[selectedItem.length] = tableData[i];
             }
         }

--
Gitblit v1.9.1