diff --git a/client/src/views/dtsjygl/zfsjzbb.vue b/client/src/views/dtsjygl/zfsjzbb.vue index 7574d25..ecbbe42 100644 --- a/client/src/views/dtsjygl/zfsjzbb.vue +++ b/client/src/views/dtsjygl/zfsjzbb.vue @@ -260,7 +260,15 @@ 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/client/src/views/xzzfgl/dzjcfaBack.vue b/client/src/views/xzzfgl/dzjcfaBack.vue index ddd1ad4..417b8b4 100644 --- a/client/src/views/xzzfgl/dzjcfaBack.vue +++ b/client/src/views/xzzfgl/dzjcfaBack.vue @@ -439,6 +439,7 @@ const options = [ {value: '3', label: '举报核查'}, {value: '4', label: '随机抽查'}, ] + function handleQuery(queryParams) { queryParams.currentNodeCode = 'plan_approval,plan_approval_failed' queryParams.agencyCode = queryParams.agency?.agencyCode 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 199bd4b..53bf634 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,6 +82,7 @@ public class StatisticController { return PageResult.of(statisticService.getPagelaqkByindustryTypeDetail(query,user)); } + /** * 执法周报表统计查看立案填报情况 * diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseWarnKafka.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseWarnKafka.java index 0958b70..8c4db8b 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseWarnKafka.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseWarnKafka.java @@ -47,6 +47,7 @@ public class EnterpriseWarnKafka { enterpriseWarn.setImageUrl("https://10.17.97.98" + event.getStr("snappedPicUrl")); LocalDateTime time = ZonedDateTime.parse(event.getStr("happenTime")).toLocalDateTime(); enterpriseWarn.setTime(time); + enterpriseWarn.setConfidence(event.getStr("similarity")); enterpriseWarn.setJudgment(1); enterpriseWarn.setRemark(event.getStr("remark"));