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/JImageUploadToOpe.vue b/src/components/Form/src/jeecg/components/JImageUploadToOpe.vue new file mode 100644 index 0000000..44a96f4 --- /dev/null +++ b/src/components/Form/src/jeecg/components/JImageUploadToOpe.vue @@ -0,0 +1,366 @@ + + + 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/elder/eldertag/ElderTag.data.ts b/src/views/elder/eldertag/ElderTag.data.ts index 55c55d6..aae2eb7 100644 --- a/src/views/elder/eldertag/ElderTag.data.ts +++ b/src/views/elder/eldertag/ElderTag.data.ts @@ -3,6 +3,8 @@ import { FormSchema } from '/@/components/Table'; import { rules } from '/@/utils/helper/validator'; import { render } from '/@/utils/common/renderUtils'; import { getWeekMonthQuarterYear } from '/@/utils'; +const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS; + //列表数据 export const columns: BasicColumn[] = [ { @@ -32,10 +34,10 @@ export const columns: BasicColumn[] = [ customRender: ({ text, record }) => { // 如果 text 为空或 null/undefined,使用默认图片 const imageUrl = text - ? text + ? opeMediaAddress + text : record.type == 'tx' - ? import.meta.env.VITE_DEFAULT_ELDER_TAG_BODY_PIC - : import.meta.env.VITE_DEFAULT_ELDER_TAG_EMO_PIC; + ? opeMediaAddress + import.meta.env.VITE_DEFAULT_ELDER_TAG_BODY_PIC + : opeMediaAddress + import.meta.env.VITE_DEFAULT_ELDER_TAG_EMO_PIC; return render.renderImage({ text: imageUrl }); }, // customRender: render.renderImage, diff --git a/src/views/elder/eldertag/components/ElderTagForm.vue b/src/views/elder/eldertag/components/ElderTagForm.vue index ae3754f..5d67335 100644 --- a/src/views/elder/eldertag/components/ElderTagForm.vue +++ b/src/views/elder/eldertag/components/ElderTagForm.vue @@ -30,10 +30,11 @@ - - - - + + + + @titleClick="handleTreeSelect([], { node: item })"> + @click="handleTreeSelect([], { node: item })"> -->
-
+
@@ -337,7 +338,7 @@ 无文件 播放 - +