在线巡查设备、预警信息、自爆资产功能

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}
+    }
+  }
 
 }
 

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

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));
     }
 
+
     /**
      * 执法周报表统计查看立案填报情况
      *

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"));