diff --git a/client/src/views/big-screen/bigdata.vue b/client/src/views/big-screen/bigdata.vue index 8340c84..fb01148 100644 --- a/client/src/views/big-screen/bigdata.vue +++ b/client/src/views/big-screen/bigdata.vue @@ -21,6 +21,10 @@
执法记录仪
+
+
+
执法车辆
+
对讲机
@@ -2831,6 +2835,12 @@ function closeVoiceLive(data) { .catch((error) => console.error('Error:', error)) } +// 关闭记录仪窗口 +function closeModal() { + isShow.value = false + stopVideoLive(deviceInfo) + closeVoiceLive(deviceInfo) +} /** * 对讲机 diff --git a/client/src/views/big-screen/bigdataBack.vue b/client/src/views/big-screen/bigdataBack.vue index 83ab9fe..a4ca52e 100644 --- a/client/src/views/big-screen/bigdataBack.vue +++ b/client/src/views/big-screen/bigdataBack.vue @@ -21,7 +21,10 @@
执法记录仪
- +
+
+
执法车辆
+
对讲机
diff --git a/server/pom.xml b/server/pom.xml index b3c01f4..8a94825 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -186,12 +186,6 @@ sso-client 1.0 - - - com.hikvision.ga - artemis-http-client - 1.1.3 - org.apache.pdfbox diff --git a/server/src/main/java/com/aisino/iles/core/config/AuditConfig.java b/server/src/main/java/com/aisino/iles/core/config/AuditConfig.java index bf9270a..60e58dc 100644 --- a/server/src/main/java/com/aisino/iles/core/config/AuditConfig.java +++ b/server/src/main/java/com/aisino/iles/core/config/AuditConfig.java @@ -48,18 +48,6 @@ public class AuditConfig { } } - /** - * 审计功能用的日期时间提供者 - * - * @author hx - * @since 20210818 - */ - static class AuditDateTimeProvider implements DateTimeProvider { - @Override - public Optional getNow() { - return Optional.of(LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("uuuu-MM-dd'T'HH:mm:ss")))); - } - } /** * 审计功能用的日期时间提供者(实例) * diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZfzbglService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZfzbglService.java index 83fa8d8..5b69aba 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZfzbglService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZfzbglService.java @@ -85,6 +85,7 @@ public class ZfzbglService { zfzbgl.setZblx("矿山执法"); } else if ("6".equals(zfzbgl.getZblxdm())) { zfzbgl.setZblx("危化品执法"); + } else if ("8".equals(zfzbgl.getZblxdm())) { zfzbgl.setZblx("对讲机"); } @@ -114,6 +115,8 @@ public class ZfzbglService { z.setZblx("测量侦检"); } else if ("5".equals(z.getZblxdm())) { z.setZblx("矿山执法"); + } else if ("6".equals(z.getZblxdm())) { + z.setZblx("危化品执法"); } else if ("8".equals(z.getZblxdm())) { z.setZblx("对讲机"); }