From 2f946c43610ec274f84ec4822985b32021730b52 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 10 Oct 2025 09:17:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=8D=E5=8A=A1=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E8=B5=84=E6=BA=90=E4=B8=8A=E4=BC=A0=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=9A=E7=BB=9F=E4=B8=80=E4=B8=8A=E4=BC=A0=E5=88=B0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E6=89=80=E5=9C=A8=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 10 +- .env.development2 | 10 +- .env.development3 | 10 +- .env.production | 16 +- .../src/jeecg/components/JImageUploadtz.vue | 6 +- .../jeecg/components/JUpload/JUploadMP3.vue | 6 +- .../jeecg/components/JUpload/JUploadMP4.vue | 954 +++++++++--------- .../ConfigServiceDirective.data.ts | 7 +- .../ConfigServiceDirectiveList.vue | 24 +- 9 files changed, 539 insertions(+), 504 deletions(-) diff --git a/.env.development b/.env.development index c1c8ec2..c1c1959 100644 --- a/.env.development +++ b/.env.development @@ -24,15 +24,15 @@ 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' +VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'default/bodyDefault.png' # 长者标签-情绪标签默认图片 -VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'https://www.focusnu.com/media/default/emoDefault.png' +VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'default/emoDefault.png' # 服务指令-服务指令图片(大)默认图片 -VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'https://www.focusnu.com/media/default/predefault.png' +VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png' # 服务指令-服务指令图片(小)默认图片 -VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC = 'https://www.focusnu.com/media/default/presmalldefault.png' +VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC = 'default/presmalldefault.png' # 服务指令-即时指令图标默认图片 -VITE_DEFAULT_DIRECTIVE_IM_PIC = 'https://www.focusnu.com/media/default/imdefault.png' +VITE_DEFAULT_DIRECTIVE_IM_PIC = 'default/imdefault.png' # 填写后将作为乾坤子应用启动,主应用注册时AppName需保持一致(放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动) #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 diff --git a/.env.development2 b/.env.development2 index 4bb60d9..06ffa31 100644 --- a/.env.development2 +++ b/.env.development2 @@ -24,15 +24,15 @@ 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' +VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'default/bodyDefault.png' # 长者标签-情绪标签默认图片 -VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'https://www.focusnu.com/media/default/emoDefault.png' +VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'default/emoDefault.png' # 服务指令-服务指令图片(大)默认图片 -VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'https://www.focusnu.com/media/default/predefault.png' +VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png' # 服务指令-服务指令图片(小)默认图片 -VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC = 'https://www.focusnu.com/media/default/presmalldefault.png' +VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC = 'default/presmalldefault.png' # 服务指令-即时指令图标默认图片 -VITE_DEFAULT_DIRECTIVE_IM_PIC = 'https://www.focusnu.com/media/default/imdefault.png' +VITE_DEFAULT_DIRECTIVE_IM_PIC = 'default/imdefault.png' # 填写后将作为乾坤子应用启动,主应用注册时AppName需保持一致(放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动) #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 diff --git a/.env.development3 b/.env.development3 index 22c61a4..22637e8 100644 --- a/.env.development3 +++ b/.env.development3 @@ -24,15 +24,15 @@ 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' +VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'default/bodyDefault.png' # 长者标签-情绪标签默认图片 -VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'https://www.focusnu.com/media/default/emoDefault.png' +VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'default/emoDefault.png' # 服务指令-服务指令图片(大)默认图片 -VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'https://www.focusnu.com/media/default/predefault.png' +VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png' # 服务指令-服务指令图片(小)默认图片 -VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC = 'https://www.focusnu.com/media/default/presmalldefault.png' +VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC = 'default/presmalldefault.png' # 服务指令-即时指令图标默认图片 -VITE_DEFAULT_DIRECTIVE_IM_PIC = 'https://www.focusnu.com/media/default/imdefault.png' +VITE_DEFAULT_DIRECTIVE_IM_PIC = 'default/imdefault.png' # 填写后将作为乾坤子应用启动,主应用注册时AppName需保持一致(放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动) #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 diff --git a/.env.production b/.env.production index 6a0598d..519d037 100644 --- a/.env.production +++ b/.env.production @@ -2,7 +2,7 @@ VITE_USE_MOCK = false # 发布路径 -VITE_PUBLIC_PATH = /biz101 +VITE_PUBLIC_PATH = /biz103 # 跨域代理,您可以配置多个 ,请注意,没有换行符 VITE_PROXY = [["/opeexup","https://www.focusnu.com/opeapi/"]] @@ -16,10 +16,10 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=/nursingunit101 +VITE_GLOB_API_URL=/nursingunit103 #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit101 +VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit103 # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= @@ -28,15 +28,15 @@ 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' +VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'default/bodyDefault.png' # 长者标签-情绪标签默认图片 -VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'https://www.focusnu.com/media/default/emoDefault.png' +VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'default/emoDefault.png' # 服务指令-服务指令图片(大)默认图片 -VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'https://www.focusnu.com/media/default/predefault.png' +VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png' # 服务指令-服务指令图片(小)默认图片 -VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC = 'https://www.focusnu.com/media/default/presmalldefault.png' +VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC = 'default/presmalldefault.png' # 服务指令-即时指令图标默认图片 -VITE_DEFAULT_DIRECTIVE_IM_PIC = 'https://www.focusnu.com/media/default/imdefault.png' +VITE_DEFAULT_DIRECTIVE_IM_PIC = 'default/imdefault.png' # 填写后将作为乾坤子应用启动,主应用注册时AppName需保持一致(放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动) #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 diff --git a/src/components/Form/src/jeecg/components/JImageUploadtz.vue b/src/components/Form/src/jeecg/components/JImageUploadtz.vue index 205db7d..3c4eefc 100644 --- a/src/components/Form/src/jeecg/components/JImageUploadtz.vue +++ b/src/components/Form/src/jeecg/components/JImageUploadtz.vue @@ -35,7 +35,8 @@
- + +
{{ file.name }} @@ -117,7 +118,7 @@ export default defineComponent({ const [state] = useRuleFormItem(props, 'value', 'change', emitData); const currentUploadUrl = ref(uploadUrl); const extraUploadData = ref>({}); - + const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS //获取文件名 const getFileName = (path) => { if (path.lastIndexOf('\\') >= 0) { @@ -360,6 +361,7 @@ export default defineComponent({ removeFile, currentUploadUrl, extraUploadData, + opeMediaAddress, }; }, }); diff --git a/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue b/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue index 28c6164..9f4b04c 100644 --- a/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue +++ b/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue @@ -34,7 +34,8 @@
- + +
{{ file.name }} @@ -63,6 +64,7 @@ import UploadItemActions from './components/UploadItemActions.vue'; import { InboxOutlined } from '@ant-design/icons-vue'; import { Upload } from 'ant-design-vue'; +const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS const { createMessage, createConfirm } = useMessage(); const { prefixCls } = useDesign('j-upload'); const attrs = useAttrs(); @@ -135,7 +137,7 @@ const bindProps = computed(() => { bind.name = 'file'; bind.listType = isImageMode.value ? 'picture-card' : 'text'; bind.class = [bind.class, { 'upload-disabled': props.disabled }]; - bind.data = { biz: props.bizPath, ...bind.data }; + bind.data = { biz: props.bizPath, ...bind.data, ...extraUploadData.value }; //update-begin-author:taoyan date:20220407 for: 自定义beforeUpload return false,并不能中断上传过程 if (!bind.beforeUpload) { bind.beforeUpload = onBeforeUpload; diff --git a/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue b/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue index 4844828..b71a8e9 100644 --- a/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue +++ b/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue @@ -1,53 +1,44 @@ diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts index 6c36420..8c2e23d 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts +++ b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts @@ -1,5 +1,6 @@ import { BasicColumn } from '/@/components/Table'; import { render } from '/@/utils/common/renderUtils'; +const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS; //列表数据 export const columns: BasicColumn[] = [ { @@ -119,7 +120,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'previewFile', customRender: ({ text }) => { // 如果 text 为空或 null/undefined,使用默认图片 - const imageUrl = text ? text : import.meta.env.VITE_DEFAULT_DIRECTIVE_PRE_PIC; + const imageUrl = text ? opeMediaAddress + text : import.meta.env.VITE_DEFAULT_DIRECTIVE_PRE_PIC; return render.renderImage({ text: imageUrl }); }, // customRender: render.renderImage, @@ -130,7 +131,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'previewFileSmall', customRender: ({ text }) => { // 如果 text 为空或 null/undefined,使用默认图片 - const imageUrl = text ? text : import.meta.env.VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC; + const imageUrl = text ? opeMediaAddress + text : import.meta.env.VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC; return render.renderImage({ text: imageUrl }); }, // customRender: render.renderImage, @@ -159,7 +160,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'immediateFile', customRender: ({ text }) => { // 如果 text 为空或 null/undefined,使用默认图片 - const imageUrl = text ? text : import.meta.env.VITE_DEFAULT_DIRECTIVE_IM_PIC; + const imageUrl = text ? opeMediaAddress + text : import.meta.env.VITE_DEFAULT_DIRECTIVE_IM_PIC; return render.renderImage({ text: imageUrl }); }, // customRender: render.renderImage, diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue index 68d7608..2c197b5 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue +++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue @@ -47,7 +47,7 @@ - +