diff --git a/client/src/views/dtsjygl/zfsjzbb.vue b/client/src/views/dtsjygl/zfsjzbb.vue index ecbbe42..7574d25 100644 --- a/client/src/views/dtsjygl/zfsjzbb.vue +++ b/client/src/views/dtsjygl/zfsjzbb.vue @@ -260,15 +260,7 @@ function objectSpanMethod({row, column, rowIndex, columnIndex}) { return {rowspan: 0, colspan: 0} } } - if (columnIndex === 1) { - if (rowIndex === 0) { - return {rowspan: rowCountWeek, colspan: 1} - } else if (rowIndex === rowCountWeek) { - return {rowspan: rowCountAll, colspan: 1} - } else { - return {rowspan: 0, colspan: 0} - } - } + } 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 a75bc0f..199bd4b 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 @@ -82,16 +82,6 @@ public class StatisticController { return PageResult.of(statisticService.getPagelaqkByindustryTypeDetail(query,user)); } - /** - * 执法周报表统计查看立案次数数量 - * - * @return 执法周报表统计查看立案次数数量 - */ - @GetMapping("/getPagelaslByindustryTypeDetail") - public PageResult getPagelaslByindustryTypeDetail(CaseQuery query, @CurrentUser RemoteUserInfo user) { - return PageResult.of(statisticService.getPagelaslByindustryTypeDetail(query,user)); - } - /** * 执法周报表统计查看立案填报情况 *