拍照接口调试

zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy

@@ -4,9 +4,9 @@ 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.21.213:8080'
 # VITE_PROXY_TARGET = 'http://172.16.21.93:8080'
-# VITE_PROXY_TARGET = 'http://172.16.20.72:8080'
+VITE_PROXY_TARGET = 'http://172.16.20.72:8080'
 VITE_DEFAULT_LOGIN = '/enforcement/loginByPassword'
 VITE_APP_ENV = 'dev'
 VITE_FILE_URL = ''

zdxt-web-client/zdxt-efcode-enterprise-app/src/util/w6sMedia.js

@@ -76,7 +76,6 @@ const formatDateTime = () => {
 export const takePhotoWithWaterMark = async () => {
   // 如果调用方未传 content，则默认显示当前时间作为水印文字
   const watermarkContent =  formatDateTime();
-  console.log('[w6sMedia] takePhotoWithWaterMark 开始, 入参:', { content: watermarkContent, fontSize, color, timeEnable, locationEnable })
   await ensureW6sAuth();
   console.log('[w6sMedia] 鉴权完成, 准备调起拍照')
   return new Promise((resolve, reject) => {

zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/nos/nosDetail.vue

@@ -99,7 +99,7 @@ const applyDetailData = (data) => {
     })),
     taskSource: data.taskSourceName || '',
     enforcementUnit: data.lawEnforcementAgency || '',
-    enforcementPerson: (data.lawEnforcer || []).map(e => `${e.lawEnforcerName || ''} ${e.lawEnforcerPhone || ''}`.trim()).filter(Boolean),
+    enforcementPerson: (data.lawEnforcer || []).map(e => `${e.lawEnforcerName || ''} ${e.lawEnforcerIdCard || e.lawEnforcerPhone || ''}`.trim()).filter(Boolean),
     enforcementPersonNames: (data.lawEnforcer || []).map(e => e.lawEnforcerName || '').filter(Boolean),
     enterpriseName: data.enterpriseName || '',
     enterpriseNumber: data.usciCode || '',