diff --git a/.env.development b/.env.development index 5985bd6..5a37183 100644 --- a/.env.development +++ b/.env.development @@ -27,3 +27,23 @@ VITE_SYTJGBM = '101' #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 # 作为乾坤子应用启动时必填,需与qiankun主应用注册子应用时填写的 entry 保持一致 #VITE_GLOB_QIANKUN_MICRO_APP_ENTRY=//localhost:3001/jeecg-vue3 + +# 管理平台静态资源路径 +VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/' + +# 长者标签-标签默认图片 +VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'directive/index/index/moren.png' +# 长者标签-标签焦点图片 +VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morencheck.png' +# 服务指令-服务指令图片(大)默认图片 +VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png' +# 服务指令-服务指令图片(小)默认图片 +VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC = 'default/presmalldefault.png' +# 服务指令-即时指令图标默认图片 +VITE_DEFAULT_DIRECTIVE_IM_PIC = 'default/imdefault.png' +# 暂无证件默认图片 +VITE_DEFAULT_ZANWUZHENGJIAN_PIC = 'default/zanweishangchuanzhengjian.png' +# 默认头像 +VITE_DEFAULT_MORENTOUXIANG_PIC = 'default/touxiang.png' +# 暂无图片默认图片 +VITE_DEFAULT_NULL_PIC = 'default/PICNULL.png' \ No newline at end of file diff --git a/.env.production b/.env.production index cb360b7..548795a 100644 --- a/.env.production +++ b/.env.production @@ -28,3 +28,23 @@ VITE_SYTJGBM = '101' # VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 # 作为乾坤子应用启动时必填,需与qiankun主应用注册子应用时填写的 entry 保持一致 # VITE_GLOB_QIANKUN_MICRO_APP_ENTRY=//qiankun.boot3.jeecg.com/jeecg-vue3 + +# 管理平台静态资源路径 +VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/' + +# 长者标签-标签默认图片 +VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'directive/index/index/moren.png' +# 长者标签-标签焦点图片 +VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morencheck.png' +# 服务指令-服务指令图片(大)默认图片 +VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png' +# 服务指令-服务指令图片(小)默认图片 +VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC = 'default/presmalldefault.png' +# 服务指令-即时指令图标默认图片 +VITE_DEFAULT_DIRECTIVE_IM_PIC = 'default/imdefault.png' +# 暂无证件默认图片 +VITE_DEFAULT_ZANWUZHENGJIAN_PIC = 'default/zanweishangchuanzhengjian.png' +# 默认头像 +VITE_DEFAULT_MORENTOUXIANG_PIC = 'default/touxiang.png' +# 暂无图片默认图片 +VITE_DEFAULT_NULL_PIC = 'default/PICNULL.png' \ No newline at end of file diff --git a/src/components/Form/src/jeecg/components/JImageUploadtz.vue b/src/components/Form/src/jeecg/components/JImageUploadtz.vue index c8929c6..b550890 100644 --- a/src/components/Form/src/jeecg/components/JImageUploadtz.vue +++ b/src/components/Form/src/jeecg/components/JImageUploadtz.vue @@ -7,14 +7,15 @@
-

点击或者拖拽上传

+

点击或者拖拽上传

- +
- 文件大小不超过10MB - | - + 文件大小不超过10MB + | + 未上传 +

@@ -115,12 +116,13 @@ export default defineComponent({ }, emits: ['options-change', 'change', 'update:value'], setup(props, { emit, refs }) { - const opeMediaAddress = ref(''); const emitData = ref([]); const attrs = useAttrs(); const [state] = useRuleFormItem(props, 'value', 'change', emitData); const currentUploadUrl = ref(uploadUrl); const extraUploadData = ref>({}); + const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS + const defaultPrePic = import.meta.env.VITE_DEFAULT_DIRECTIVE_PRE_PIC //获取文件名 const getFileName = (path) => { @@ -330,8 +332,8 @@ export default defineComponent({ }; onMounted(async () => { - const res = await getMediaUrlByOrgCode({ orgCode: '' }); - opeMediaAddress.value = res.mediaUrl; + // const res = await getMediaUrlByOrgCode({ orgCode: '' }); + // opeMediaAddress.value = res.mediaUrl; }); return { @@ -357,6 +359,7 @@ export default defineComponent({ currentUploadUrl, extraUploadData, opeMediaAddress, + defaultPrePic, }; }, }); diff --git a/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue b/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue index e0fee80..6a5c75b 100644 --- a/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue +++ b/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue @@ -16,9 +16,10 @@
- 文件大小不超过10MB - | - + 文件大小不超过10MB + | + 未上传 +

diff --git a/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue b/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue index cfc4cd3..735b8c3 100644 --- a/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue +++ b/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue @@ -11,14 +11,15 @@
-

点击或者拖拽上传

+

点击或者拖拽上传

- 文件大小不超过10MB - | - + 文件大小不超过10MB + | + 未上传 +

diff --git a/src/views/admin/bizSuppliers/components/NuBizSuppliersApplyForm.vue b/src/views/admin/bizSuppliers/components/NuBizSuppliersApplyForm.vue index db709f5..80494c9 100644 --- a/src/views/admin/bizSuppliers/components/NuBizSuppliersApplyForm.vue +++ b/src/views/admin/bizSuppliers/components/NuBizSuppliersApplyForm.vue @@ -19,7 +19,8 @@ - + diff --git a/src/views/admin/bizSuppliers/components/NuBizSuppliersInfoForm.vue b/src/views/admin/bizSuppliers/components/NuBizSuppliersInfoForm.vue index 4df997b..c078d5b 100644 --- a/src/views/admin/bizSuppliers/components/NuBizSuppliersInfoForm.vue +++ b/src/views/admin/bizSuppliers/components/NuBizSuppliersInfoForm.vue @@ -2,48 +2,59 @@ @@ -52,139 +63,139 @@ diff --git a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue index 895ccc8..99570d4 100644 --- a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue +++ b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue @@ -87,14 +87,15 @@ - + - - + + @@ -124,7 +125,7 @@ - +