From 81181ca2c21f20dd022a85abd8e876017bc72138 Mon Sep 17 00:00:00 2001 From: "wangmingyong@163.com" Date: Thu, 27 Aug 2026 10:07:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vite-env/.env.enforcement-dev-wmy | 4 ++-- .../zdxt-efcode-enterprise-app/src/util/w6sMedia.js | 1 - .../src/views/enterprise/nos/nosDetail.vue | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) 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 7cca0901..1e2d7f5c 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,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 = '' diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/util/w6sMedia.js b/zdxt-web-client/zdxt-efcode-enterprise-app/src/util/w6sMedia.js index 5e13e525..5e083d69 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/util/w6sMedia.js +++ b/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) => { diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/nos/nosDetail.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/nos/nosDetail.vue index f959ebea..d9aea6f9 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/nos/nosDetail.vue +++ b/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 || '',