diff --git a/client/src/views/big-screen/bigdata.vue b/client/src/views/big-screen/bigdata.vue index 0514c3e..e9c6afe 100644 --- a/client/src/views/big-screen/bigdata.vue +++ b/client/src/views/big-screen/bigdata.vue @@ -1240,7 +1240,7 @@ function closeZfzbPage() { function getZfxs() { api.getZfxs().then(res => { if (res.success) { - let data = res.data + showEnforceChart(data) } }) diff --git a/client/src/views/big-screen/bigdataBack.vue b/client/src/views/big-screen/bigdataBack.vue index a4ca52e..5d8630d 100644 --- a/client/src/views/big-screen/bigdataBack.vue +++ b/client/src/views/big-screen/bigdataBack.vue @@ -1048,8 +1048,6 @@ function getZfxs() { } const chart2 = ref(null) -let enforceChart = null -let sumNum = ref(0) function showEnforceChart(data) { if (chart2.value) { diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/StatisticController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/StatisticController.java index 53bf634..249a7f1 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/StatisticController.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/StatisticController.java @@ -136,7 +136,6 @@ public class StatisticController { /** * 季报表 - * * @param * @return 执法季报表统计 */ diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/SupervisionCheckService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/SupervisionCheckService.java index d8f088a..1e95914 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/SupervisionCheckService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/SupervisionCheckService.java @@ -430,9 +430,7 @@ public class SupervisionCheckService { * @return 统计结果 */ public List checkStatistics(SupervisionCheckQuery query, RemoteUserInfo user) { -// Jurisdiction userJurisdiction = user.getJurisdictions().stream().findFirst().orElseThrow(); -// String gxdwbm = com.aisino.iles.common.util.StringUtils.trimTrailingString((Optional.ofNullable(query.getGxdwbm()).filter(StringUtils::hasText).orElse(userJurisdiction.getJurisdictionCode())), "00") + "%"; -// Integer ilevel = Optional.ofNullable(query.getIlevel()).orElse(userJurisdiction.getJurisdictionLevel()); + return supervisionCheckRepository.checkStatistics(com.aisino.iles.common.util.StringUtils.trimEven0(query.getGxdwbm()) + "%", query.getIlevel()); }