From 50353b807ae4a1fb30ad93c424a45d1766e0795d Mon Sep 17 00:00:00 2001
From: jiangzongtao <huxin02@aisino.com>
Date: Fri, 6 Jun 2025 17:23:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/router/index.js                                    | 1 -
 client/src/views/fxczfgl/dzzxxc.vue                           | 4 +++-
 client/src/views/xzzfgl/smrq.vue                              | 1 +
 .../iles/lawenforcement/controller/BigScreenController.java   | 1 +
 .../schedule/service/EnterpriseJoinScheduleService.java       | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/src/router/index.js b/client/src/router/index.js
index e4ad0df..fae3d3b 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -450,7 +450,6 @@ const baseRoutes = [
             //         title: '扫码入企',
             //     },
             // },
-
             {
                 path: 'jcbgl',
                 name: '_jcbgl',
diff --git a/client/src/views/fxczfgl/dzzxxc.vue b/client/src/views/fxczfgl/dzzxxc.vue
index bf5e1e4..80ebf43 100644
--- a/client/src/views/fxczfgl/dzzxxc.vue
+++ b/client/src/views/fxczfgl/dzzxxc.vue
@@ -55,7 +55,9 @@
     <el-table-column prop="agency.agencyName" label="属地" min-width="250"/>
     <el-table-column prop="unitName" label="企业" min-width="350"/>
     <el-table-column prop="industryType" label="行业类型" min-width="200">
-
+      <template #default="{row}">
+        <el-span>{{ DICTDISPLAYS.HYLB_MAP[row.industryType] || row.industryType }}</el-span>
+      </template>
     </el-table-column>
     <el-table-column prop="videoAccessMsg" label="视频" min-width="100"/>
     <el-table-column prop="perceptionAccessMsg" label="感知" min-width="100"/>
diff --git a/client/src/views/xzzfgl/smrq.vue b/client/src/views/xzzfgl/smrq.vue
index 69aea3f..69a6e72 100644
--- a/client/src/views/xzzfgl/smrq.vue
+++ b/client/src/views/xzzfgl/smrq.vue
@@ -198,6 +198,7 @@ const {
   queryParams
 } = toRefs(state)
 
+// 扫码入企
 function handleMask(row) {
   maskConfig.value.show = true
   maskConfig.value.data = row
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java
index 79ee09b..76d25ce 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java
@@ -38,6 +38,7 @@ public class BigScreenController {
     public Result<Map> getDataOverview() {
         return Ok.of(bigScreenService.getDataOverview());
     }
+
     /**
      * 企业信息统计
      *
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseJoinScheduleService.java b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseJoinScheduleService.java
index 208c7bd..111fd71 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseJoinScheduleService.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseJoinScheduleService.java
@@ -109,6 +109,7 @@ public class EnterpriseJoinScheduleService {
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void scheduledUpdateEnterpriseTask2() {
         log.info("===== 开始执行企业感知设备信息同步任务 =====");
+
         int page = 0;
         final int limit = 2000;
         Page<Enterprise> pageResult;