From 2fca4b511af7314f7baf6b9af55601f346215e33 Mon Sep 17 00:00:00 2001
From: hanqi <huxin02@aisino.com>
Date: Fri, 9 May 2025 18:15:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E8=AE=B0=E5=BD=95=E4=BB=AA?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/big-screen/bigdata.vue                     | 4 ----
 client/src/views/big-screen/bigdataBack.vue                 | 4 ----
 .../iles/lawenforcement/service/DeliveryRecordService.java  | 6 +++++-
 .../aisino/iles/lawenforcement/service/ZfzbglService.java   | 2 --
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/client/src/views/big-screen/bigdata.vue b/client/src/views/big-screen/bigdata.vue
index fb01148..d922f7f 100644
--- a/client/src/views/big-screen/bigdata.vue
+++ b/client/src/views/big-screen/bigdata.vue
@@ -13,10 +13,6 @@
     <div class="fullScreen" @click="fullScreen"></div>
     <div class="back" @click="goHome">返回首页</div>
 
-    <div class="switch switch1" :class="{ 'switch-active': isMapMarkActive === 1 }" @click="changeMapMark(1)">
-      <div class="icon"></div>
-      <div class="label">企业</div>
-    </div>
     <div class="switch switch2" :class="{ 'switch-active': isMapMarkActive === 2 }" @click="changeMapMark(2)">
       <div class="icon"></div>
       <div class="label">执法记录仪</div>
diff --git a/client/src/views/big-screen/bigdataBack.vue b/client/src/views/big-screen/bigdataBack.vue
index a4ca52e..7df5852 100644
--- a/client/src/views/big-screen/bigdataBack.vue
+++ b/client/src/views/big-screen/bigdataBack.vue
@@ -13,10 +13,6 @@
     <div class="fullScreen" @click="fullScreen"></div>
     <div class="back" @click="goHome">返回首页</div>
 
-    <div class="switch switch1" :class="{ 'switch-active': isMapMarkActive === 1 }" @click="changeMapMark(1)">
-      <div class="icon"></div>
-      <div class="label">企业</div>
-    </div>
     <div class="switch switch2" :class="{ 'switch-active': isMapMarkActive === 2 }" @click="changeMapMark(2)">
       <div class="icon"></div>
       <div class="label">执法记录仪</div>
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/DeliveryRecordService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/DeliveryRecordService.java
index 75ea148..cb1898d 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/service/DeliveryRecordService.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/DeliveryRecordService.java
@@ -262,7 +262,11 @@ public class DeliveryRecordService {
                                 () -> resMap.put(k, 0L)
                         );
             });
-
+            long sum = resMap.values().stream()
+                    .mapToLong(o -> Long.parseLong(String.valueOf(o)))
+                    .sum();
+            resMap.put("total", sum);
+            mm.put(key, resMap);
         });
         return agencyList.stream().map(o -> {
             Map<String, Object> resMap = new HashMap<>();
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 11ccf2b..afec007 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
@@ -122,8 +122,6 @@ public class ZfzbglService {
                     z.setZblx("危化品执法");
                 } else if ("7".equals(z.getZblxdm())) {
                     z.setZblx("执法记录仪");
-                } else if ("8".equals(z.getZblxdm())) {
-                    z.setZblx("对讲机");
                 }
             }
             if (null!=z.getAgency()) {