diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html index d1ca5dfb..7876965f 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html @@ -190,6 +190,8 @@ { field : 'name', title : '区域', + sortable: true, + sorter: "sortQYName", formatter:function (value,row,index) { if(value=="其他"){ return ''+value+''; @@ -201,6 +203,7 @@ { field : 'totalNumber', title : '企业数量', + sortable: true, }, { field : 'numInt', @@ -448,6 +451,8 @@ { field : 'name', title : '街道', + sortable: true, + sorter: "sortQYName", formatter:function (value,row,index) { var obj=document.getElementById("jd"); var options=obj.options; @@ -464,6 +469,7 @@ { field : 'totalNumber', title : '企业数量', + sortable: true, }, { field : 'numInt', @@ -575,6 +581,20 @@ } }) } + + function sortTotalNumber(){ + console.log("sort") + } + function sortQYName(a,b,objA,objB){ + if (objA.sort < objB.sort) { + return -1; + } + if (objA.sort > objB.sort) { + return 1; + } + return 0; + } + /*******echarts:企业类型/占比*********/ /* const ecsh = echarts.init(document.getElementById("echartEnterprise")); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java index e4f7fa93..7cdaeeb7 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java @@ -26,6 +26,7 @@ public class StatisticsIndicator extends BaseDomain implements Comparable