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 += '
'; base_html += '
'; base_html += ' '; base_html += '
'; base_html += '
'; base_html += '
' base_html += ' '; base_html += '
'; diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/overall-analysis.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/overall-analysis.html index 7c989097..c8d2b763 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/overall-analysis.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/overall-analysis.html @@ -213,11 +213,11 @@

被检查企业次数排行

- + + + +
@@ -225,11 +225,11 @@

被投诉单位被投诉数量排行

- + + + +
@@ -237,11 +237,11 @@

执法检查数量排行

- + + + +
@@ -489,9 +489,9 @@ reg_type(deptId,beginTime,endTime); enterprise_type(deptId,beginTime,endTime); complaint_type(deptId,beginTime,endTime); - reg_order(deptId,beginTime,endTime); - complaint_order(deptId,beginTime,endTime); - bureau_order(deptId,beginTime,endTime); + reg_order(deptId,beginTime,endTime,10); + complaint_order(deptId,beginTime,endTime,10); + bureau_order(deptId,beginTime,endTime,10); if (null == deptName) deptName = "全区" $("#dept_flag").html(deptName+"") } @@ -504,9 +504,9 @@ reg_type(deptId,beginTime,endTime); enterprise_type(deptId,beginTime,endTime); complaint_type(deptId,beginTime,endTime); - reg_order(deptId,beginTime,endTime); - complaint_order(deptId,beginTime,endTime); - bureau_order(deptId,beginTime,endTime); + reg_order(deptId,beginTime,endTime,10); + complaint_order(deptId,beginTime,endTime,10); + bureau_order(deptId,beginTime,endTime,10); if (null == deptName) deptName = "全区" $("#dept_flag").html(deptName+"") } @@ -566,6 +566,10 @@ }); } + function chege_reg_order(val){ reg_order(deptId,beginTime,endTime,val); } + function chege_complaint_order(val){ complaint_order(deptId,beginTime,endTime,val); } + function chege_bureau_order(val){ bureau_order(deptId,beginTime,endTime,val); } + /**********数据子项折叠************/ $(".select_item > label").each(function (i) { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SixAnalysisParams.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SixAnalysisParams.java index f27e76b4..c5cbda3e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SixAnalysisParams.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SixAnalysisParams.java @@ -27,6 +27,15 @@ public class SixAnalysisParams extends BaseDomain { private Integer day; private Integer isReg; + private Integer pageSize; + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } // Map params = new HashMap(); // // public Map getParams() { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml index 11871d88..1a5014e9 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml @@ -821,6 +821,9 @@ group by r.enterprise_number order by num desc + + limit #{pageSize} +