From 1a60da2e444081cf64d0042af5aa051f49e15a4b Mon Sep 17 00:00:00 2001
From: renhao02 <huxin02@aisino.com>
Date: Fri, 18 Apr 2025 15:32:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=85=A5=E4=BC=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E3=80=81=E6=89=A7=E6=B3=95=E8=AE=B0=E5=BD=95=E4=BB=AA?=
 =?UTF-8?q?=E6=92=92=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/public/js/ZLMRTCClient.js                 |  1 +
 client/src/components/OfficerSelector.vue        |  1 +
 client/src/router/index.js                       | 16 ++++++++--------
 client/src/views/common/MultiplePicture.vue      |  2 +-
 .../controller/QrCodeController.java             |  2 +-
 server/src/main/resources/application.yml        |  1 +
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/client/public/js/ZLMRTCClient.js b/client/public/js/ZLMRTCClient.js
index 8e81d7b..6e8ac24 100644
--- a/client/public/js/ZLMRTCClient.js
+++ b/client/public/js/ZLMRTCClient.js
@@ -474,6 +474,7 @@ function ZLMRTCClient_(exports) {
                     }
                 };
                 constraints = JSON.parse(JSON.stringify(constraints));
+
                 remap(constraints.audio, 'noiseSuppression', 'googNoiseSuppression');
                 constraints.audio = constraintsToChrome_(constraints.audio);
             }
diff --git a/client/src/components/OfficerSelector.vue b/client/src/components/OfficerSelector.vue
index 7a62fec..6eb8a1d 100644
--- a/client/src/components/OfficerSelector.vue
+++ b/client/src/components/OfficerSelector.vue
@@ -354,6 +354,7 @@ import { officers } from '../api/lawenforcement/Officer'
     // 不立即更新v-model，等用户点击确认按钮时再更新
   }
 
+
   function isPersonSelected(personId) {
     return selectedPeople.value.some((p) => p.id === personId)
   }
diff --git a/client/src/router/index.js b/client/src/router/index.js
index a52f723..e4a606b 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -442,14 +442,14 @@ const baseRoutes = [
                     },
                 ]
             },
-            // {
-            //     path: 'smrq',
-            //     name: '_smrq',
-            //     component: () => import('@views/xzzfgl/smrq.vue'),
-            //     meta: {
-            //         title: '扫码入企',
-            //     },
-            // },
+            {
+                 path: 'smrq',
+                 name: '_smrq',
+                component: () => import('@views/xzzfgl/smrq.vue'),
+                 meta: {
+                     title: '扫码入企',
+                },
+             },
             {
                 path: 'jcbgl',
                 name: '_jcbgl',
diff --git a/client/src/views/common/MultiplePicture.vue b/client/src/views/common/MultiplePicture.vue
index 06ccb4e..efb514e 100644
--- a/client/src/views/common/MultiplePicture.vue
+++ b/client/src/views/common/MultiplePicture.vue
@@ -16,7 +16,7 @@
                :file-list="pictureList"
                accept="image/gif,image/jpg,image/jpeg,image/png,image/GIF,image/JPG">
       <el-icon>
-
+        <Plus/>
       </el-icon>
     </el-upload>
     <el-upload v-if="mergeParameters.mode === 'detail'"
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/QrCodeController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/QrCodeController.java
index 1206506..dfac515 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/QrCodeController.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/QrCodeController.java
@@ -6,7 +6,7 @@ import com.aisino.iles.lawenforcement.service.QrCodeService;
 import org.springframework.web.bind.annotation.*;
 
 /**
- * 综合执法/扫码入企
+ * 扫码入企
  */
 @RestController
 @RequestMapping("/api/qrcode")
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index 2bc0e8c..cc9c9e3 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -104,6 +104,7 @@ third-party:
     save: ${sso.base_url}/jcxxgl/company/jbxx/save
     token: ${sso.base_url}/uaa/oauth/backendServiceToken
     refresh: ${sso.base_url}/uaa/oauth/token
+
     produceLicensePage: ${sso.base_url}/jcxxglApi/djbQyscxk/queryPage
     hazardPage: ${sso.base_url}/jcxxglApi/djbQyyhxx/queryPage
     sourcesDangerPage: ${sso.base_url}/jcxxglApi/djbQyzdbw/queryPage