From 905746beab8ca43e471f95566a4aaa5978f0692a Mon Sep 17 00:00:00 2001
From: "wangmingyong@163.com" <wangmingyong@163.com>
Date: Thu, 13 Aug 2026 15:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=94=BB=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zdxt-efcode-enforcement-app/src/util/util.js | 16 +++++++++++++++-
 .../components/EnterpriseRecordCard.vue          |  2 +-
 .../enforcement/enforce/enforcementList.vue      | 12 ++++++++----
 .../vite-env/.env.enforcement-dev-wmy            |  4 ++--
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js
index 79c7e8a7..25717bb0 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js
@@ -201,4 +201,18 @@ const maskPhone = (phone) => {
     return str.substring(0, 3) + '****' + str.substring(str.length - 4);
 };
 
-export { setGoodsNum, isObject, comparisonObject, isElementHidden, formattedTimeYYYYmmdd, formattedTime, getDeviceType, formattedDate, formatEnforcer, formatTime, maskPhone };
+/**
+ * 解析执法人员字符串，拆分名字和电话/证件号
+ * @param {string} str - 如 "陈碧祺 178****7511"
+ * @returns {Object} { name: '陈碧祺', phone: '178****7511' }
+ */
+const parseEnforcer = (str) => {
+    if (!str) return { name: '', phone: '' };
+    const match = str.trim().match(/^(.+?)\s+(\S+)$/);
+    if (match) {
+        return { name: match[1], phone: match[2] };
+    }
+    return { name: str.trim(), phone: '' };
+};
+
+export { setGoodsNum, isObject, comparisonObject, isElementHidden, formattedTimeYYYYmmdd, formattedTime, getDeviceType, formattedDate, formatEnforcer, formatTime, maskPhone, parseEnforcer };
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/EnterpriseRecordCard.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/EnterpriseRecordCard.vue
index fff0bf34..5320428b 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/EnterpriseRecordCard.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/components/EnterpriseRecordCard.vue
@@ -63,7 +63,7 @@
 
 <script setup>
 import { ref } from 'vue';
-import { formatTime } from '@/utils/utils';
+import { formatTime } from '@/util/util';
 
 const props = defineProps({
     recordList: {
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue
index d4f6b3b8..d1291b56 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue
@@ -26,9 +26,13 @@
                             <div class="card-row">
                                 <div class="card-label">执法人员：</div>
                                 <div class="enforcer-list">
-                                    <div v-for="(enforcer, index) in formatEnforcer(item)" :key="index" class="enforcer-line">
-                                        <span class="enforcer-name">{{ enforcer.name }}</span>
-                                        <span v-if="enforcer.id" class="enforcer-id">{{ enforcer.id }}</span>
+                                    <div class="enforcer-line">
+                                        <span class="enforcer-name">{{ parseEnforcer(item.lawEnforcer).name }}</span>
+                                        <span v-if="parseEnforcer(item.lawEnforcer).phone" class="enforcer-id">{{ parseEnforcer(item.lawEnforcer).phone }}</span>
+                                    </div>
+                                    <div v-for="(value, index) in item.lawEnforcer2List || []" :key="index" class="enforcer-line">
+                                        <span class="enforcer-name">{{ parseEnforcer(value).name }}</span>
+                                        <span v-if="parseEnforcer(value).phone" class="enforcer-id">{{ parseEnforcer(value).phone }}</span>
                                     </div>
                                 </div>
                             </div>
@@ -57,7 +61,7 @@ import { useRouter } from 'vue-router';
 import { showToast } from 'vant';
 import 'vant/es/toast/style';
 import { queryEnforcementRegistrationPageList } from '@/api/enforcement';
-import { formatEnforcer } from '@/util/util';
+import { formatEnforcer, parseEnforcer } from '@/util/util';
 import SearchFilterBar from '@/components/common/SearchFilterBar.vue';
 
 const router = useRouter();
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy
index 611adfb3..8278f76f 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy
@@ -4,8 +4,8 @@ VITE_BASE_URL = '/efcode20-enf-app/api'
 VITE_CONTEXT_PATH = '/efcode20-enf-app/'
 # VITE_PROXY_TARGET = 'http://139.186.148.21:8080'
 # VITE_API_URL = 'http://192.168.1.17:8080'
-# VITE_PROXY_TARGET = 'http://172.16.21.213:8080'
-VITE_PROXY_TARGET = 'http://172.16.20.72:8080'
+VITE_PROXY_TARGET = 'http://172.16.21.213:8080'
+# VITE_PROXY_TARGET = 'http://172.16.20.72:8080'
 VITE_DEFAULT_LOGIN = '/enforcement/loginByPassword'
 VITE_APP_ENV = 'dev'
 VITE_FILE_URL = ''