chenrui
/
zdxtLawEnforcementCode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

首页微调

v6
蟑螂恶霸 1 year ago
parent
702eff6f86
commit
01f3ecccc8
4 changed files with 65 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml
  2. 65
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html
  3. 29
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java
  4. 10
      lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DeptBean.java

2
lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml
View File

@ -255,7 +255,7 @@
</select>
<select id="selectDeptById" parameterType="string" resultMap="DeptResult">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.dept_type,d.creditcode,d.zone,
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.dept_type,d.creditcode,d.zone, d.zzDisplayPath,
(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
from sys_dept d
where d.dept_id = #{deptId}

65
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html
View File

@ -55,7 +55,8 @@
</div>
<div class="count_admin">
<label class=""><img src="/statistical/images/icon_qy.png" alt="被执法企业" />被执法企业</label>
<div class="count_admin_num"><b id="enterprisesNum">0</b><span class="number_percent" id="enterprisesPer">0.0<i>%</i></span></div>
<!-- <div class="count_admin_num"><b id="enterprisesNum">0</b><span class="number_percent" id="enterprisesPer">0.0<i>%</i></span></div>-->
<div class="count_admin_num"><b id="enterprisesNum">0</b></div>
<div class="percent_box">
<div class="percent-tag">
<span class="data-rise" id=""><i class="fa fa fa-long-arrow-up"></i></span>
@ -72,7 +73,7 @@
</div>
</div>
<div class="count_admin">
<label class=""><img src="/statistical/images/icon_yj.png" alt="执法压减率" />执法压减率</label>
<label class=""><img src="/statistical/images/icon_yj.png" alt="入企压缩率" />入企压缩率</label>
<div class="count_admin_num"><b id="cut_num">0</b></div>
<div class="percent_box">
<div class="percent-tag yjlv"> <span class="number_percent" id="cut_per">0.0<i>%</i></span> </div>
@ -124,7 +125,7 @@
<label class="select_time">时间筛选<a id="timeSelect"></a></label>
</div>
</div>
<div class="link_btn"> <a href="/code/statisticalPanel/single-analysis">各市直执法单位综合分析</a> <a href="/code/statisticalPanel/overall-analysis">各区执法综合分析</a> </div>
<div class="link_btn"> <a href="/code/statisticalPanel/single-analysis">各市直执法单位综合分析</a> <a href="/code/statisticalPanel/overall-analysis"><span id="hasAll">各区执法单位综合分析</span></a> </div>
<div class="count_box">
<div class="count_item admin">
<div class="count_tit">
@ -220,8 +221,10 @@
base_html += ' <li><label>单独检查</label><span>{single_num}</span><span>{single_per}%</span></li>';
base_html += ' <li><label>联合检查</label><span>{nuite_num}</span><span>{nuite_per}%</span></li>';
base_html += ' <li><label>检查压减率</label><span>{cut_num}</span><span>{cut_per}</span></li>';
base_html += ' <li><label>被检查企业</label><span>{ent_num}</span><span>{ent_per}%</span></li>';
base_html += ' <li><label>涉企投诉次数</label><span>{com_num}</span><span>{com_per}%</span></li>';
// base_html += ' <li><label>被检查企业</label><span>{ent_num}</span><span>{ent_per}%</span></li>';
// base_html += ' <li><label>涉企投诉次数</label><span>{com_num}</span><span>{com_per}%</span></li>';
base_html += ' <li><label>被检查企业</label><span>{ent_num}</span></li>';
base_html += ' <li><label>涉企投诉次数</label><span>{com_num}</span></li>';
base_html += ' </ul>';
base_html += ' </div>';
base_html += ' <div id="fxzzf{idx}" class="tab_inspect_item" style="display: none;">';
@ -269,9 +272,9 @@
.replaceAll("{cut_num}", result.data.cutNum)
.replaceAll("{cut_per}", result.data.cutPer)
.replaceAll("{ent_num}", result.data.entNum)
.replaceAll("{ent_per}", result.data.entPer)
// .replaceAll("{ent_per}", result.data.entPer)
.replaceAll("{com_num}", result.data.comNum)
.replaceAll("{com_per}", result.data.comPer)
// .replaceAll("{com_per}", result.data.comPer)
.replaceAll("{njc_num}", result.data.njcNum)
.replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
.replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
@ -304,9 +307,9 @@
.replaceAll("{cut_num}", result.data.cutNum)
.replaceAll("{cut_per}", result.data.cutPer)
.replaceAll("{ent_num}", result.data.entNum)
.replaceAll("{ent_per}", result.data.entPer)
// .replaceAll("{ent_per}", result.data.entPer)
.replaceAll("{com_num}", result.data.comNum)
.replaceAll("{com_per}", result.data.comPer)
// .replaceAll("{com_per}", result.data.comPer)
.replaceAll("{njc_num}", result.data.njcNum)
.replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
.replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
@ -339,9 +342,9 @@
.replaceAll("{cut_num}", result.data.cutNum)
.replaceAll("{cut_per}", result.data.cutPer)
.replaceAll("{ent_num}", result.data.entNum)
.replaceAll("{ent_per}", result.data.entPer)
// .replaceAll("{ent_per}", result.data.entPer)
.replaceAll("{com_num}", result.data.comNum)
.replaceAll("{com_per}", result.data.comPer)
// .replaceAll("{com_per}", result.data.comPer)
.replaceAll("{njc_num}", result.data.njcNum)
.replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
.replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
@ -374,9 +377,9 @@
.replaceAll("{cut_num}", result.data.cutNum)
.replaceAll("{cut_per}", result.data.cutPer)
.replaceAll("{ent_num}", result.data.entNum)
.replaceAll("{ent_per}", result.data.entPer)
// .replaceAll("{ent_per}", result.data.entPer)
.replaceAll("{com_num}", result.data.comNum)
.replaceAll("{com_per}", result.data.comPer)
// .replaceAll("{com_per}", result.data.comPer)
.replaceAll("{njc_num}", result.data.njcNum)
.replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
.replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
@ -409,9 +412,9 @@
.replaceAll("{cut_num}", result.data.cutNum)
.replaceAll("{cut_per}", result.data.cutPer)
.replaceAll("{ent_num}", result.data.entNum)
.replaceAll("{ent_per}", result.data.entPer)
// .replaceAll("{ent_per}", result.data.entPer)
.replaceAll("{com_num}", result.data.comNum)
.replaceAll("{com_per}", result.data.comPer)
// .replaceAll("{com_per}", result.data.comPer)
.replaceAll("{njc_num}", result.data.njcNum)
.replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
.replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
@ -444,9 +447,9 @@
.replaceAll("{cut_num}", result.data.cutNum)
.replaceAll("{cut_per}", result.data.cutPer)
.replaceAll("{ent_num}", result.data.entNum)
.replaceAll("{ent_per}", result.data.entPer)
// .replaceAll("{ent_per}", result.data.entPer)
.replaceAll("{com_num}", result.data.comNum)
.replaceAll("{com_per}", result.data.comPer)
// .replaceAll("{com_per}", result.data.comPer)
.replaceAll("{njc_num}", result.data.njcNum)
.replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
.replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
@ -479,9 +482,9 @@
.replaceAll("{cut_num}", result.data.cutNum)
.replaceAll("{cut_per}", result.data.cutPer)
.replaceAll("{ent_num}", result.data.entNum)
.replaceAll("{ent_per}", result.data.entPer)
// .replaceAll("{ent_per}", result.data.entPer)
.replaceAll("{com_num}", result.data.comNum)
.replaceAll("{com_per}", result.data.comPer)
// .replaceAll("{com_per}", result.data.comPer)
.replaceAll("{njc_num}", result.data.njcNum)
.replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
.replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
@ -514,9 +517,9 @@
.replaceAll("{cut_num}", result.data.cutNum)
.replaceAll("{cut_per}", result.data.cutPer)
.replaceAll("{ent_num}", result.data.entNum)
.replaceAll("{ent_per}", result.data.entPer)
// .replaceAll("{ent_per}", result.data.entPer)
.replaceAll("{com_num}", result.data.comNum)
.replaceAll("{com_per}", result.data.comPer)
// .replaceAll("{com_per}", result.data.comPer)
.replaceAll("{njc_num}", result.data.njcNum)
.replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
.replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
@ -549,9 +552,9 @@
.replaceAll("{cut_num}", result.data.cutNum)
.replaceAll("{cut_per}", result.data.cutPer)
.replaceAll("{ent_num}", result.data.entNum)
.replaceAll("{ent_per}", result.data.entPer)
// .replaceAll("{ent_per}", result.data.entPer)
.replaceAll("{com_num}", result.data.comNum)
.replaceAll("{com_per}", result.data.comPer)
// .replaceAll("{com_per}", result.data.comPer)
.replaceAll("{njc_num}", result.data.njcNum)
.replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
.replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
@ -584,9 +587,9 @@
.replaceAll("{cut_num}", result.data.cutNum)
.replaceAll("{cut_per}", result.data.cutPer)
.replaceAll("{ent_num}", result.data.entNum)
.replaceAll("{ent_per}", result.data.entPer)
// .replaceAll("{ent_per}", result.data.entPer)
.replaceAll("{com_num}", result.data.comNum)
.replaceAll("{com_per}", result.data.comPer)
// .replaceAll("{com_per}", result.data.comPer)
.replaceAll("{njc_num}", result.data.njcNum)
.replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
.replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
@ -619,9 +622,9 @@
.replaceAll("{cut_num}", result.data.cutNum)
.replaceAll("{cut_per}", result.data.cutPer)
.replaceAll("{ent_num}", result.data.entNum)
.replaceAll("{ent_per}", result.data.entPer)
// .replaceAll("{ent_per}", result.data.entPer)
.replaceAll("{com_num}", result.data.comNum)
.replaceAll("{com_per}", result.data.comPer)
// .replaceAll("{com_per}", result.data.comPer)
.replaceAll("{njc_num}", result.data.njcNum)
.replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
.replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
@ -659,6 +662,9 @@
dataType: 'json',
contentType: "application/json",
success: function (result) {
if (1 == result.data.hasAll) {
$("#hasAll").text("各区执法综合分析")
}
non_jc_all = result.data.nonNum;
$("#jc_all").text(result.data.allNum);
$("#njc_all").text(result.data.nonNum);
@ -702,7 +708,7 @@
$("#enterprisesNum").text(result.data.num)
$("#enterprisesNum_yoy").text(result.data.yoy+"%")
$("#enterprisesNum_rr").text(result.data.rr+"%")
$("#enterprisesPer").text(result.data.per+"%")
// $("#enterprisesPer").text(result.data.per+"%")
}
});
}
@ -1455,7 +1461,8 @@
var laydate = layui.laydate;
laydate.render({
elem: "#timeSelect",// 指定元素
range: true, // 开启范围选择
// range: true, // 开启范围选择
range: '至', // 开启范围选择
format: 'yyyy-MM-dd', // 日期格式
min: '2019-04-14', // 最小可选日期
max: '2099-06-16', // 最大可选日期

29
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java
View File

@ -2,6 +2,7 @@ package com.zdxt.code.controller;
import com.zdxt.auth.dto.DeptBean;
import com.zdxt.auth.feign.DeptApi;
import com.zdxt.auth.feign.UserApi;
import com.zdxt.auth.project.system.dict.service.IDictDataService;
import com.zdxt.code.domain.SixAnalysisParams;
import com.zdxt.code.domain.StatisticsIndicatorPart;
@ -11,6 +12,7 @@ import com.zdxt.common.ZDResponse;
import com.zdxt.common.controller.BaseController;
import com.zdxt.domain.auth.DictData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
@ -32,9 +34,7 @@ public class StatisticalPanelController extends BaseController {
@Autowired private IDictDataService iDictDataService;
@Autowired private DeptApi deptApi;
@Autowired private UserApi userApi;
@GetMapping("/statisticalPanelDeptAndUser")
@ -225,6 +225,13 @@ public class StatisticalPanelController extends BaseController {
public ZDResponse analysisEnterprisesCoordination(@RequestBody SixAnalysisParams params){
Map<String, Object> resMap = new HashMap<String, Object>();
// 判断是不是司法局的人
resMap.put("hasAll", 0);
DeptBean deptBean = deptApi.getDeptById(userApi.getCurrentUser().getDeptId());
if (java.util.Objects.toString(deptBean.getZzDisplayPath(), "").contains("深圳市司法局")) {
resMap.put("hasAll", 1);
}
// 全市行政检查数量
Integer all_num = statisticalPaneService.analysisEnterprisesAll(params);
Integer non_num = statisticalPaneService.analysis_non_enterprisesIns(params);
@ -354,15 +361,15 @@ public class StatisticalPanelController extends BaseController {
Integer num = statisticalPaneService.analysisEnterprises(params);
double ent_rr_num = statisticalPaneService.analysisEnterprisesRr(params);
double ent_yoy_num = statisticalPaneService.analysisEnterprisesYoy(params);
Integer allnum = statisticalPaneService.analysisEnterprisesCountAll(params);
// Integer allnum = statisticalPaneService.analysisEnterprisesCountAll(params);
String rr = this.setPercentage((num - ent_rr_num) / ent_rr_num);
String yoy = this.setPercentage((num - ent_yoy_num) / ent_yoy_num);
String per = this.setPercentage((double)num / allnum);
// String per = this.setPercentage((double)num / allnum);
Map<String, Object> resMap = new HashMap<String, Object>();
resMap.put("num", num);
resMap.put("rr", rr);
resMap.put("yoy", yoy);
resMap.put("per", per);
// resMap.put("per", per);
return ZDResponse.success("被查企业", resMap);
}
@ -423,17 +430,17 @@ public class StatisticalPanelController extends BaseController {
// 被检查企业数
params.setQy(deptParams.getDeptName());
Integer ent_all_num = statisticalPaneService.analysisEnterprisesCountAll(params);
// Integer ent_all_num = statisticalPaneService.analysisEnterprisesCountAll(params);
Integer ent_num = statisticalPaneService.analysisEnterprises(params);
String ent_per = this.setPercentage((double)ent_num / ent_all_num);
// String ent_per = this.setPercentage((double)ent_num / ent_all_num);
resMap.put("entNum", ent_num);
resMap.put("entPer", ent_per);
// resMap.put("entPer", ent_per);
// 投诉
Integer com_num = statisticalPaneService.analysisEnterprisesComplaint(params);
String com_per = this.setPercentage((double)com_num / all_num);
// String com_per = this.setPercentage((double)com_num / all_num);
resMap.put("comNum", com_num);
resMap.put("comPer", com_per);
// resMap.put("comPer", com_per);
// 非行政执法
Map<String, Object> resNonTyps = new HashMap<>();

10
lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DeptBean.java
View File

@ -128,6 +128,16 @@ public class DeptBean extends BaseDomain {
private List<Integer> zoneList;
private String zzDisplayPath;
public String getZzDisplayPath() {
return zzDisplayPath;
}
public void setZzDisplayPath(String zzDisplayPath) {
this.zzDisplayPath = zzDisplayPath;
}
public Integer getZone() {
return zone;
}

Write Preview
Loading…
Cancel
Save