From f6014677f456d18da6a7b8b6f6ce5f4d50cd98ce Mon Sep 17 00:00:00 2001
From: huxin02 <huxin02@aisino.com>
Date: Fri, 18 Apr 2025 15:37:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=AF=B9=E6=8E=A5=EF=BC=8C=E6=89=A7=E6=B3=95?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BB=AA=E6=92=92=E7=82=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/big-screen/bigdata.vue              | 10 ++++++++++
 client/src/views/big-screen/bigdataBack.vue          |  5 ++++-
 server/pom.xml                                       |  6 ------
 .../com/aisino/iles/core/config/AuditConfig.java     | 12 ------------
 .../iles/lawenforcement/service/ZfzbglService.java   |  3 +++
 5 files changed, 17 insertions(+), 19 deletions(-)

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 @@
       <div class="icon"></div>
       <div class="label">执法记录仪</div>
     </div>
+    <div class="switch switch3" :class="{ 'switch-active': isMapMarkActive === 3 }" @click="changeMapMark(3)">
+      <div class="icon"></div>
+      <div class="label">执法车辆</div>
+    </div>
     <div class="switch switch4" :class="{ 'switch-active': isMapMarkActive === 4 }" @click="changeMapMark(4)">
       <div class="icon"></div>
       <div class="label">对讲机</div>
@@ -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 @@
       <div class="icon"></div>
       <div class="label">执法记录仪</div>
     </div>
-
+    <div class="switch switch3" :class="{ 'switch-active': isMapMarkActive === 3 }" @click="changeMapMark(3)">
+      <div class="icon"></div>
+      <div class="label">执法车辆</div>
+    </div>
     <div class="switch switch4" :class="{ 'switch-active': isMapMarkActive === 4 }" @click="changeMapMark(4)">
       <div class="icon"></div>
       <div class="label">对讲机</div>
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 @@
             <artifactId>sso-client</artifactId>
             <version>1.0</version>
         </dependency>
-        <!--        海康威视-->
-        <dependency>
-            <groupId>com.hikvision.ga</groupId>
-            <artifactId>artemis-http-client</artifactId>
-            <version>1.1.3</version>
-        </dependency>
         <!-- Apache PDFBox -->
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
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<TemporalAccessor> 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("对讲机");
                 }