diff --git a/client/src/router/index.js b/client/src/router/index.js index 2ad7f50..fae3d3b 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -488,7 +488,7 @@ const baseRoutes = [ path: '/fxczfgl', name: 'fxczfgl', component: SviLayout, - meta: {title: '非现场执法管理}, + meta: {title: '非现场执法'}, children: [ { path: 'index', diff --git a/client/src/stores/json/menu.json b/client/src/stores/json/menu.json index ab24d23..050b8f7 100644 --- a/client/src/stores/json/menu.json +++ b/client/src/stores/json/menu.json @@ -842,6 +842,7 @@ } }, + }, { "gncdbh": "A-610100000000-0005_0664", "name": "送达业务统计", diff --git a/client/src/stores/json/topMenu.json b/client/src/stores/json/topMenu.json index 137dd04..3bfd22f 100644 --- a/client/src/stores/json/topMenu.json +++ b/client/src/stores/json/topMenu.json @@ -46,7 +46,7 @@ }, { "gncdbh": 9, - "name": "统计报表", + "name": "统计分析", "icon": "zyyy_rzzx", "path": "/tjbb/zflatj", "router": true diff --git a/client/src/views/dtsjygl/zflatj.vue b/client/src/views/dtsjygl/zflatj.vue index 932c673..22a43ea 100644 --- a/client/src/views/dtsjygl/zflatj.vue +++ b/client/src/views/dtsjygl/zflatj.vue @@ -204,6 +204,13 @@ 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) const broTable = ref(null) diff --git a/client/src/views/fxczfgl/zxxcsp.vue b/client/src/views/fxczfgl/zxxcsp.vue index 2b6e44c..e2b815a 100644 --- a/client/src/views/fxczfgl/zxxcsp.vue +++ b/client/src/views/fxczfgl/zxxcsp.vue @@ -146,6 +146,7 @@
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/CaseController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/CaseController.java index 0bc2945..6c96de8 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/CaseController.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/CaseController.java @@ -216,7 +216,7 @@ public class CaseController { } /** - * 执法立案统计 + * 执法立案统计(不分页) * * @param query * @return 查询执法立案统计结果 diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java index b9c5da5..b3f3b7e 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java @@ -19,6 +19,7 @@ public class OnlinePatrolDto { private String createUserName;//录入人名称 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime;//录入时间 + private String approvalStatus;//审批状态 private String approvalUserId;//审批人id private String approvalUserName;//审批人名称 diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/query/OnlinePatrolQuery.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/query/OnlinePatrolQuery.java index 0df4ab6..2786d31 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/model/query/OnlinePatrolQuery.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/query/OnlinePatrolQuery.java @@ -16,5 +16,4 @@ public class OnlinePatrolQuery extends BaseQuery { private String industryType; private String unitName; private String unifiedSocialCode; - }