diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov.js b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov.js index 50d0badd..16d0fc19 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov.js +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov.js @@ -234,14 +234,14 @@ function complaint_type(deptId,beginTime,endTime) { } /** 被检查企业次数排行 */ -function reg_order(deptId,beginTime,endTime) { +function reg_order(deptId,beginTime,endTime, pageSize) { $.ajax({ url: ctx + "code/statisticalPanel/staisticalRegistration_order", type: "get", - data: {deptId: deptId,beginTime: beginTime,endTime: endTime}, + data: {deptId: deptId,beginTime: beginTime,endTime: endTime, pageSize: pageSize}, success: function(res) { var datas = res.data; - var top_num = 10; + var top_num = pageSize; if (datas.length < top_num) top_num = datas.length; var names = []; var nums = []; @@ -261,14 +261,14 @@ function reg_order(deptId,beginTime,endTime) { } /** 被投诉单位排行 */ -function complaint_order(deptId,beginTime,endTime) { +function complaint_order(deptId,beginTime,endTime, pageSize) { $.ajax({ url: ctx + "code/statisticalPanel/staisticalComplaint_order", type: "get", - data: {deptId: deptId,beginTime: beginTime,endTime: endTime}, + data: {deptId: deptId,beginTime: beginTime,endTime: endTime, pageSize: pageSize}, success: function(res) { var datas = res.data; - var top_num = 10; + var top_num = pageSize; if (datas.length < top_num) top_num = datas.length; var names = []; var nums = []; @@ -289,14 +289,14 @@ function complaint_order(deptId,beginTime,endTime) { } /** 执法检查数量排行 */ -function bureau_order(deptId,beginTime,endTime) { +function bureau_order(deptId,beginTime,endTime, pageSize) { $.ajax({ url: ctx + "code/statisticalPanel/staisticalBureau_order", type: "get", - data: {deptId: deptId, beginTime: beginTime,endTime: endTime}, + data: {deptId: deptId, beginTime: beginTime,endTime: endTime, pageSize: pageSize}, success: function(res) { var datas = res.data; - var top_num = 10; + var top_num = pageSize; if (datas.length < top_num) top_num = datas.length; var names = []; var nums = []; diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html index d3a07bc1..a8967317 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html @@ -359,21 +359,21 @@ function area_registration() { base_html += '