yangjun
/
nursing_unit_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整服务指令资源上传位置：统一上传到管理平台所在服务器

This commit is contained in:
1378012178@qq.com 2025-10-10 09:17:28 +08:00
parent 279bdc20bc
commit 2f946c4361
9 changed files with 539 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.env.development
View File

@ -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

10
.env.development2
View File

@ -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

10
.env.development3
View File

@ -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

16
.env.production
View File

@ -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

6
src/components/Form/src/jeecg/components/JImageUploadtz.vue
View File

@ -35,7 +35,8 @@
<div class="custom-upload-list" v-if="uploadFileList.length > 0">
<div v-for="(file, index) in uploadFileList" :key="file.uid">
<div style="margin-top: 20px;">
<img :src="file.url ? file.url : file.r" style="width: 200px; height: 200px;">
<img v-if="!!file?.response?.message" :src="opeMediaAddress + file?.response?.message" style="width: 200px; height: 200px;"></img>
<img v-else :src="file.url ? opeMediaAddress + file.url : file.r" style="width: 200px; height: 200px;">
</div>
<div style="margin-top: 20px;">
{{ file.name }}
@ -117,7 +118,7 @@ export default defineComponent({
const [state] = useRuleFormItem(props, 'value', 'change', emitData);
const currentUploadUrl = ref(uploadUrl);
const extraUploadData = ref<Record<string, any>>({});
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,
};
},
});

6
src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue
View File

@ -34,7 +34,8 @@
<div class="custom-upload-list" v-if="fileList.length > 0">
<div v-for="(file, index) in fileList" :key="file.uid">
<div style="margin-top: 20px;">
<audio ref="audioPlayer" controls :src="file.url"></audio>
<audio ref="audioPlayer" controls v-if="!!file?.response?.message" :src="opeMediaAddress + file?.response?.message" ></audio>
<audio ref="audioPlayer" controls v-else :src="file.url ? opeMediaAddress + file.url : file.r" ></audio>
</div>
<div style="margin-top: 20px;">
{{ 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;

954
src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue
View File

File diff suppressed because it is too large Load Diff

7
src/views/services/serviceDirective/ConfigServiceDirective.data.ts
View File

@ -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,

24
src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
View File

@ -47,7 +47,7 @@
<template v-for="item in treeData">
<!-- 第一层判断是否有下级 -->
<a-sub-menu v-if="item.children && item.children.length > 0" :key="item.key"
@titleClick="handleTreeSelect([], {node:item})">
@titleClick="handleTreeSelect([], { node: item })">
<template #icon>
<Icon :icon="item.icon" :size="20" v-if="item.icon" />
<Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@ -81,7 +81,7 @@
<!-- 第二层判断是否有下级 -->
<template v-for="child in item.children">
<a-sub-menu :key="child.key" v-if="child.children && child.children.length > 0"
@titleClick="handleTreeSelect([], {node:child})">
@titleClick="handleTreeSelect([], { node: child })">
<!-- <template #icon>
<Icon icon="ant-design:border-verticle-outlined" :size="20" />
</template> -->
@ -113,7 +113,7 @@
<!-- 第三层判断是否有下级 -->
<template v-for="childThree in child.children">
<a-sub-menu :key="childThree.key" v-if="childThree.children && childThree.children.length > 0"
@titleClick="handleTreeSelect([], {node:childThree})">
@titleClick="handleTreeSelect([], { node: childThree })">
<!-- <template #icon>
<Icon icon="ant-design:border-bottom-outlined" :size="20" />
</template> -->
@ -146,7 +146,7 @@
</template>
<!-- 第四层判断是否有下级 -->
<a-menu-item :key="childFour.key" v-for="childFour in childThree.children"
@click="handleTreeSelect([], {node:childFour})">
@click="handleTreeSelect([], { node: childFour })">
<span @mouseenter="childFour.showContent = true" @mouseleave="childFour.showContent = false"
class="auto-wrap">{{ childFour?.title + '(' + childFour?.cycleTypeName + ')' }}
<span v-if="childFour?.izEnabled == '1' && childFour.level != 5"
@ -175,7 +175,7 @@
</a-menu-item>
</a-sub-menu>
<a-menu-item :key="childThree.key" v-if="!childThree.children || childThree.children.length < 1"
@click="handleTreeSelect([], {node:childThree})">
@click="handleTreeSelect([], { node: childThree })">
<!-- <template #icon>
<Icon icon="ant-design:border-bottom-outlined" :size="20" />
</template> -->
@ -208,7 +208,7 @@
</template>
</a-sub-menu>
<a-menu-item :key="child.key" v-if="!child.children || child.children.length < 1"
@click="handleTreeSelect([], {node:child})">
@click="handleTreeSelect([], { node: child })">
<!-- <template #icon>
<Icon icon="ant-design:border-verticle-outlined" :size="20" />
</template> -->
@ -238,7 +238,7 @@
</template>
</a-sub-menu>
<a-menu-item :key="item.key" v-if="!item.children || item.children.length < 1"
@click="handleTreeSelect([], {node:item})">
@click="handleTreeSelect([], { node: item })">
<template #icon>
<Icon :icon="item.icon" :size="20" v-if="item.icon" />
<Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@ -302,7 +302,8 @@
</template>
</a-tree> -->
</div>
<div style="width:calc(100% - 370px);float: left; background-color: white;border-radius: 8px;" class="container-height">
<div style="width:calc(100% - 370px);float: left; background-color: white;border-radius: 8px;"
class="container-height">
<!--引用表格-->
<BasicTable @register="registerTable">
<!--插槽:table标题-->
@ -337,7 +338,7 @@
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else type="link" class="btnPrivate" @click="openAudioModal(text)">播放</a-button>
</template>
<!-- <template v-if="column.dataIndex === 'previewFile'">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<img v-else :src="getFileAccessHttpUrl(text)" alt="图片不存在" class="cellIamge" />
@ -531,6 +532,7 @@ import CanAddDirectiveList from '/@/views/services/canadddirective/CanAddDirecti
const { createMessage, createConfirm } = useMessage();
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const canAddDirectiveRef = ref()
const existDirectiveIds = ref([])//指令库已存在指令id
const insRegisterModal = ref();
@ -888,7 +890,7 @@ const audioPlayer = ref(null);
// 打开音频模态框
const openAudioModal = (url) => {
audioUrl.value = getFileAccessHttpUrl(url);
audioUrl.value = opeMediaAddress + url;
showAudioModal.value = true;
};
@ -908,7 +910,7 @@ const videoPlayer = ref(null);
// 打开视频模态框
const openVideoModal = (url) => {
videoUrl.value = getFileAccessHttpUrl(url);
videoUrl.value = opeMediaAddress + url;
showVideoModal.value = true;
};