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 a484ab3c..50d0badd 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 @@ -337,7 +337,7 @@ function chartArea() { itemGap: 20, itemWidth: 10, itemHeight: 10, - data:['涉企检查次数','联合检查次数','行政检查预告次数','涉企投诉次数','执法预警次数','企业数量'] + data:['企业数量','涉企检查次数','联合检查次数','行政检查预告次数','涉企投诉次数','执法预警次数'] // data:areas }, grid: { @@ -396,6 +396,20 @@ function chartArea() { } ], series : [ + { + name:'企业数量', + type:'bar', + barWidth: '10%', + showBackground: true, + backgroundStyle: { + borderRadius: [10, 10, 0, 0] + }, + data:[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + color:'#a1d4f5', + itemStyle: { + borderRadius: [10, 10, 0, 0] + } + }, { name:'涉企检查次数', type:'bar', @@ -451,7 +465,7 @@ function chartArea() { itemStyle: { borderRadius: [10, 10, 0, 0] } - }, + } // { // name:'执法预警次数', // type:'bar', @@ -466,20 +480,6 @@ function chartArea() { // borderRadius: [10, 10, 0, 0] // } // }, - { - name:'企业数量', - type:'bar', - barWidth: '10%', - showBackground: true, - backgroundStyle: { - borderRadius: [10, 10, 0, 0] - }, - data:[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - color:'#a1d4f5', - itemStyle: { - borderRadius: [10, 10, 0, 0] - } - } ] }; 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 fbdac7f2..76a22724 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 @@ -171,25 +171,25 @@ -% -
-
执法预警数量
-
- -
-
- - -
-
- - -
-
-
-
- - -%
-
- - -%
-
+ + + + + + + + + + + + + + + + + + +
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/single-analysis.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/single-analysis.html index 7a5e6792..3696d4c3 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/single-analysis.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/single-analysis.html @@ -132,25 +132,25 @@ -%
-
-
执法预警数量
-
- -
-
- - -
-
- - -
-
-
-
- - -%
-
- - -%
-
+ + + + + + + + + + + + + + + + + + +
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java index b2927d9a..8495cac2 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java @@ -701,6 +701,19 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService { List all_area=new ArrayList<>(); /** -------- 总数 -------- */ + //企业数量 + SixAnalysis enterprise = new SixAnalysis(); + all_area.add(enterprise); + enterprise.setTitle("企业数量"); + int ent_num = statisticalPanelMapper.staisticalEnterprise(params); + double ent_rr_num = statisticalPanelMapper.staisticalEnterprise_rr(params); + double ent_yoy_num = statisticalPanelMapper.staisticalEnterprise_yoy(params); + params.setQy(null); + enterprise.setNum(ent_num); +// enterprise.setRing_ratio(this.calculateRingRatio(ent_rr_num, ent_num)); +// enterprise.setYoy(this.calculateYearOverYear(ent_yoy_num, ent_num)); + enterprise.setRing_ratio(this.setPercentage((ent_num - ent_rr_num) / ent_rr_num)); + enterprise.setYoy(this.setPercentage((ent_num - ent_yoy_num) / ent_yoy_num)); // 涉企检查数量 SixAnalysis registration = new SixAnalysis(); all_area.add(registration); @@ -761,19 +774,6 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService { // warning.setNum(war_num); // warning.setRing_ratio(this.calculateRingRatio(war_rr_num, war_num)); // warning.setYoy(this.calculateYearOverYear(war_yoy_num, war_num)); - //企业数量 - SixAnalysis enterprise = new SixAnalysis(); - all_area.add(enterprise); - enterprise.setTitle("企业数量"); - int ent_num = statisticalPanelMapper.staisticalEnterprise(params); - double ent_rr_num = statisticalPanelMapper.staisticalEnterprise_rr(params); - double ent_yoy_num = statisticalPanelMapper.staisticalEnterprise_yoy(params); - params.setQy(null); - enterprise.setNum(ent_num); -// enterprise.setRing_ratio(this.calculateRingRatio(ent_rr_num, ent_num)); -// enterprise.setYoy(this.calculateYearOverYear(ent_yoy_num, ent_num)); - enterprise.setRing_ratio(this.setPercentage((ent_num - ent_rr_num) / ent_rr_num)); - enterprise.setYoy(this.setPercentage((ent_num - ent_yoy_num) / ent_yoy_num)); params.setDateType("day");