From 2247152640a46fc5897ab95d8a7bd0141ca1f3cf Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期一, 20 十二月 2021 17:13:25 +0800
Subject: [PATCH] 分页bug fix

---
 widgetsTS/widget_search/view.js |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/widgetsTS/widget_search/view.js b/widgetsTS/widget_search/view.js
index 91a6c48..f1f9778 100644
--- a/widgetsTS/widget_search/view.js
+++ b/widgetsTS/widget_search/view.js
@@ -115,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 = 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,
@@ -135,11 +135,11 @@
                 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)*30);i<(page*30)&&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 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>"
@@ -271,11 +271,12 @@
     function highlightSelected() {
     
         var obj = document.getElementsByName('selectedItem'); //閫夋嫨鎵�鏈塶ame="'selectedItem'"鐨勫璞★紝杩斿洖鏁扮粍 
-        var first_value = document.getElementById('items').value; //閫夋嫨鎵�鏈塿alue="'鍊�'
+        // 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+(first_value-1)];
+                selectedItem[selectedItem.length] = tableData[i];
             }
         }
     

--
Gitblit v1.9.1