diff --git a/client/src/layouts/header/index-svi.vue b/client/src/layouts/header/index-svi.vue index 2c28304..0a259b1 100644 --- a/client/src/layouts/header/index-svi.vue +++ b/client/src/layouts/header/index-svi.vue @@ -35,13 +35,7 @@ -
- 综合执法一张图 - - - - - +
diff --git a/client/src/views/dtsjygl/zflatj.vue b/client/src/views/dtsjygl/zflatj.vue index 06e0b65..22a43ea 100644 --- a/client/src/views/dtsjygl/zflatj.vue +++ b/client/src/views/dtsjygl/zflatj.vue @@ -204,7 +204,11 @@ function reset(query) { handleQuery() } - +function getCurrentQuarter() { + const now = new Date() + const quarter = Math.floor(now.getMonth() / 3) + 1; + queryParams.value.Jd = queryParams.value.Jd === undefined ? quarter : queryParams.value.Jd +} const {componentLoading, queryParams, permissions, tableConfig, apiConfig, dialogConfig, actions} = toRefs(state) diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/EnforcementInfoHistoryController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/EnforcementInfoHistoryController.java index 0f7d3d7..407832c 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/EnforcementInfoHistoryController.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/EnforcementInfoHistoryController.java @@ -72,6 +72,7 @@ public class EnforcementInfoHistoryController { } + /** * 立案上报审核 * @param historyId 历史执法信息id diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/HomePageController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/HomePageController.java index 42cef87..1f1d067 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/HomePageController.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/HomePageController.java @@ -48,8 +48,6 @@ public class HomePageController { public Result>> countCurrentNodeCode(@CurrentUser RemoteUserInfo user) { return Ok.of(homePageService.countCurrentNodeCode(user)); } - - /** * 执法趋势统计 *