diff --git a/.env.development b/.env.development index ceec4f6..c1c8ec2 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = / # 跨域代理,您可以配置多个 ,请注意,没有换行符 -VITE_PROXY = [["/nursing-unit_101","http://localhost:8091/nursing-unit_101"],["/upload","http://localhost:3300/upload"]] +VITE_PROXY = [["/nursing-unit_101","http://localhost:8091/nursing-unit_101"],["/upload","http://localhost:3300/upload"],["/opeexup","http://localhost:8081/opeapi/"]] #后台接口全路径地址(必填) VITE_GLOB_DOMAIN_URL=http://localhost:8091/nursing-unit_101 @@ -20,6 +20,9 @@ VITE_GLOB_API_URL_PREFIX= #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 VITE_APP_SUB_jeecg-app-1 = '//localhost:8091' +# 管理平台静态资源路径 +VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/upFiles/' + # 长者标签-体型标签默认图片 VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'https://www.focusnu.com/media/default/bodyDefault.png' # 长者标签-情绪标签默认图片 diff --git a/.env.development2 b/.env.development2 index 370eaa8..4bb60d9 100644 --- a/.env.development2 +++ b/.env.development2 @@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = / # 跨域代理,您可以配置多个 ,请注意,没有换行符 -VITE_PROXY = [["/nursing-unit_102","http://localhost:8092/nursing-unit_102"],["/upload","http://localhost:3300/upload"]] +VITE_PROXY = [["/nursing-unit_102","http://localhost:8092/nursing-unit_102"],["/upload","http://localhost:3300/upload"],["/opeexup","http://localhost:8081/opeapi/"]] #后台接口全路径地址(必填) VITE_GLOB_DOMAIN_URL=http://localhost:8092/nursing-unit_102 @@ -20,6 +20,9 @@ VITE_GLOB_API_URL_PREFIX= #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 VITE_APP_SUB_jeecg-app-1 = '//localhost:8092' +# 管理平台静态资源路径 +VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/upFiles/' + # 长者标签-体型标签默认图片 VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'https://www.focusnu.com/media/default/bodyDefault.png' # 长者标签-情绪标签默认图片 diff --git a/.env.development3 b/.env.development3 index bdcc66a..22c61a4 100644 --- a/.env.development3 +++ b/.env.development3 @@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = / # 跨域代理,您可以配置多个 ,请注意,没有换行符 -VITE_PROXY = [["/nursing-unit_103","http://localhost:8093/nursing-unit_103"],["/upload","http://localhost:3300/upload"]] +VITE_PROXY = [["/nursing-unit_103","http://localhost:8093/nursing-unit_103"],["/upload","http://localhost:3300/upload"],["/opeexup","http://localhost:8081/opeapi/"]] #后台接口全路径地址(必填) VITE_GLOB_DOMAIN_URL=http://localhost:8093/nursing-unit_103 @@ -20,6 +20,9 @@ VITE_GLOB_API_URL_PREFIX= #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 VITE_APP_SUB_jeecg-app-1 = '//localhost:8092' +# 管理平台静态资源路径 +VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/upFiles/' + # 长者标签-体型标签默认图片 VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'https://www.focusnu.com/media/default/bodyDefault.png' # 长者标签-情绪标签默认图片 diff --git a/.env.production b/.env.production index 28cef7b..6a0598d 100644 --- a/.env.production +++ b/.env.production @@ -4,6 +4,9 @@ VITE_USE_MOCK = false # 发布路径 VITE_PUBLIC_PATH = /biz101 +# 跨域代理,您可以配置多个 ,请注意,没有换行符 +VITE_PROXY = [["/opeexup","https://www.focusnu.com/opeapi/"]] + # 是否启用gzip或brotli压缩 # 选项值: gzip | brotli | none # 如果需要多个可以使用“,”分隔 @@ -21,6 +24,9 @@ VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit101 # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= +# 管理平台静态资源路径 +VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/upFiles/' + # 长者标签-体型标签默认图片 VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'https://www.focusnu.com/media/default/bodyDefault.png' # 长者标签-情绪标签默认图片 diff --git a/src/api/common/api.ts b/src/api/common/api.ts index 41c65d2..19f069c 100644 --- a/src/api/common/api.ts +++ b/src/api/common/api.ts @@ -20,6 +20,7 @@ enum Api { getApiAddressByOrgCode = '/sys/api/getApiAddressByOrgCode', getOrgUrlByOrgCode = '/sys/api/getOrgUrlByOrgCode', getMediaUrlByOrgCode = '/sys/api/getMediaUrlByOrgCode', + uploadPre = '/sys/common/upload/pre', } /** @@ -200,3 +201,11 @@ export const uploadMyFile = (url, data) => { export const getOrgInfo = () => { return defHttp.get({ url: Api.getOrgInfo }); }; + +/** + * 上传前置接口 + * @param params + */ +export const uploadPre = (params) => { + return defHttp.post({ url: Api.uploadPre, params }, { isTransformResponse: false }); +}; diff --git a/src/components/Form/src/jeecg/components/JImageUploadtz.vue b/src/components/Form/src/jeecg/components/JImageUploadtz.vue index 8ef45a9..205db7d 100644 --- a/src/components/Form/src/jeecg/components/JImageUploadtz.vue +++ b/src/components/Form/src/jeecg/components/JImageUploadtz.vue @@ -1,38 +1,28 @@ diff --git a/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue b/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue index dcb9466..28c6164 100644 --- a/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue +++ b/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue @@ -1,48 +1,38 @@ diff --git a/src/views/admin/employeesadvisoryinfo/NuEmployeesAdvisoryInfoList.vue b/src/views/admin/employeesadvisoryinfo/NuEmployeesAdvisoryInfoList.vue index 2d03a0d..09bd878 100644 --- a/src/views/admin/employeesadvisoryinfo/NuEmployeesAdvisoryInfoList.vue +++ b/src/views/admin/employeesadvisoryinfo/NuEmployeesAdvisoryInfoList.vue @@ -228,26 +228,26 @@ function getTableAction(record) { label: '邀请', onClick: handleInvite.bind(null, record), }, - { - label: '获取身份证', - onClick: handleAcquireIdenCard.bind(null, record), - ifShow: () => { - //正面hasCardZmPath和反面hasCardFmPath两个字段 员工传了且已拉取时为1 没有证件为0 拉取中是2 未获取/拉取失败都是null/undefined - let result = false - if (record.hasCardZmPath == '2' || record.hasCardFmPath == '2') { - //有正在拉取中的不让拉 - return false; - } - if (record.hasCardZmPath == '1' && record.hasCardFmPath == '1') { - //两个都成功了不让拉 - return false; - } - if (record.hasCardZmPath == null || record.hasCardZmPath == undefined || record.hasCardFmPath == null || record.hasCardFmPath == undefined) { - result = true - } - return result - } - } + // { + // label: '获取身份证', + // onClick: handleAcquireIdenCard.bind(null, record), + // ifShow: () => { + // //正面hasCardZmPath和反面hasCardFmPath两个字段 员工传了且已拉取时为1 没有证件为0 拉取中是2 未获取/拉取失败都是null/undefined + // let result = false + // if (record.hasCardZmPath == '2' || record.hasCardFmPath == '2') { + // //有正在拉取中的不让拉 + // return false; + // } + // if (record.hasCardZmPath == '1' && record.hasCardFmPath == '1') { + // //两个都成功了不让拉 + // return false; + // } + // if (record.hasCardZmPath == null || record.hasCardZmPath == undefined || record.hasCardFmPath == null || record.hasCardFmPath == undefined) { + // result = true + // } + // return result + // } + // } ]; } diff --git a/src/views/admin/employeesadvisoryinfo/components/NuEmployeesAdvisoryInfoForm.vue b/src/views/admin/employeesadvisoryinfo/components/NuEmployeesAdvisoryInfoForm.vue index d33fb40..d847f52 100644 --- a/src/views/admin/employeesadvisoryinfo/components/NuEmployeesAdvisoryInfoForm.vue +++ b/src/views/admin/employeesadvisoryinfo/components/NuEmployeesAdvisoryInfoForm.vue @@ -128,12 +128,12 @@ - + - + diff --git a/src/views/admin/employeesapply/components/EmployeesApplyForm.vue b/src/views/admin/employeesapply/components/EmployeesApplyForm.vue index 11b583a..82923bc 100644 --- a/src/views/admin/employeesapply/components/EmployeesApplyForm.vue +++ b/src/views/admin/employeesapply/components/EmployeesApplyForm.vue @@ -152,14 +152,14 @@ - - @@ -171,7 +171,7 @@ + :value="opeMediaAddress + formData.healthCertificatePositive" disabled> + :bodyStyle="{ padding: '14px' }" @close="handleInvidedCancel"> - +