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

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

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_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将以乾坤子应用模式启动 # 填写后将作为乾坤子应用启动主应用注册时AppName需保持一致放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动
#VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3

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_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将以乾坤子应用模式启动 # 填写后将作为乾坤子应用启动主应用注册时AppName需保持一致放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动
#VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3

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_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将以乾坤子应用模式启动 # 填写后将作为乾坤子应用启动主应用注册时AppName需保持一致放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动
#VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3

View File

@ -2,7 +2,7 @@
VITE_USE_MOCK = false VITE_USE_MOCK = false
# 发布路径 # 发布路径
VITE_PUBLIC_PATH = /biz101 VITE_PUBLIC_PATH = /biz103
# 跨域代理,您可以配置多个 ,请注意,没有换行符 # 跨域代理,您可以配置多个 ,请注意,没有换行符
VITE_PROXY = [["/opeexup","https://www.focusnu.com/opeapi/"]] VITE_PROXY = [["/opeexup","https://www.focusnu.com/opeapi/"]]
@ -16,10 +16,10 @@ VITE_BUILD_COMPRESS = 'gzip'
VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false 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= 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_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将以乾坤子应用模式启动 # 填写后将作为乾坤子应用启动主应用注册时AppName需保持一致放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动
#VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3

View File

@ -35,7 +35,8 @@
<div class="custom-upload-list" v-if="uploadFileList.length > 0"> <div class="custom-upload-list" v-if="uploadFileList.length > 0">
<div v-for="(file, index) in uploadFileList" :key="file.uid"> <div v-for="(file, index) in uploadFileList" :key="file.uid">
<div style="margin-top: 20px;"> <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>
<div style="margin-top: 20px;"> <div style="margin-top: 20px;">
{{ file.name }} {{ file.name }}
@ -117,7 +118,7 @@ export default defineComponent({
const [state] = useRuleFormItem(props, 'value', 'change', emitData); const [state] = useRuleFormItem(props, 'value', 'change', emitData);
const currentUploadUrl = ref(uploadUrl); const currentUploadUrl = ref(uploadUrl);
const extraUploadData = ref<Record<string, any>>({}); const extraUploadData = ref<Record<string, any>>({});
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
// //
const getFileName = (path) => { const getFileName = (path) => {
if (path.lastIndexOf('\\') >= 0) { if (path.lastIndexOf('\\') >= 0) {
@ -360,6 +361,7 @@ export default defineComponent({
removeFile, removeFile,
currentUploadUrl, currentUploadUrl,
extraUploadData, extraUploadData,
opeMediaAddress,
}; };
}, },
}); });

View File

@ -34,7 +34,8 @@
<div class="custom-upload-list" v-if="fileList.length > 0"> <div class="custom-upload-list" v-if="fileList.length > 0">
<div v-for="(file, index) in fileList" :key="file.uid"> <div v-for="(file, index) in fileList" :key="file.uid">
<div style="margin-top: 20px;"> <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>
<div style="margin-top: 20px;"> <div style="margin-top: 20px;">
{{ file.name }} {{ file.name }}
@ -63,6 +64,7 @@ import UploadItemActions from './components/UploadItemActions.vue';
import { InboxOutlined } from '@ant-design/icons-vue'; import { InboxOutlined } from '@ant-design/icons-vue';
import { Upload } from 'ant-design-vue'; import { Upload } from 'ant-design-vue';
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const { createMessage, createConfirm } = useMessage(); const { createMessage, createConfirm } = useMessage();
const { prefixCls } = useDesign('j-upload'); const { prefixCls } = useDesign('j-upload');
const attrs = useAttrs(); const attrs = useAttrs();
@ -135,7 +137,7 @@ const bindProps = computed(() => {
bind.name = 'file'; bind.name = 'file';
bind.listType = isImageMode.value ? 'picture-card' : 'text'; bind.listType = isImageMode.value ? 'picture-card' : 'text';
bind.class = [bind.class, { 'upload-disabled': props.disabled }]; 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 //update-begin-author:taoyan date:20220407 for: beforeUpload return false
if (!bind.beforeUpload) { if (!bind.beforeUpload) {
bind.beforeUpload = onBeforeUpload; bind.beforeUpload = onBeforeUpload;

View File

@ -1,19 +1,9 @@
<template> <template>
<div ref="containerRef" :class="`${prefixCls}-container`"> <div ref="containerRef" :class="`${prefixCls}-container`">
<a-upload-dragger <a-upload-dragger accept="video/mp4" :headers="headers" :multiple="multiple" :action="currentUploadUrl"
accept="video/mp4" :data="{ biz: bizPath, ...extraUploadData }" :fileList="fileList" :disabled="disabled" v-bind="bindProps"
:headers="headers" :beforeUpload="beforeUpload" :showUploadList="false" @remove="onRemove" @change="onFileChange"
:multiple="multiple" @preview="onFilePreview">
:action="uploadUrl"
:fileList="fileList"
:disabled="disabled"
v-bind="bindProps"
:beforeUpload="beforeUpload"
:showUploadList="false"
@remove="onRemove"
@change="onFileChange"
@preview="onFilePreview"
>
<template v-if="isImageMode"> <template v-if="isImageMode">
<div v-if="!isMaxCount"> <div v-if="!isMaxCount">
<Icon icon="ant-design:plus-outlined" /> <Icon icon="ant-design:plus-outlined" />
@ -42,10 +32,11 @@
</a-upload-dragger> </a-upload-dragger>
<!-- 文件回显 --> <!-- 文件回显 -->
<div class="custom-upload-list" v-if="fileList.length > 0"> <div class="custom-upload-list" v-if="fileList.length > 0">
<div v-for="(file, index) in fileList" :key="file.uid" > <div v-for="(file, index) in fileList" :key="file.uid">
<div style="margin-top: 20px;"> <div style="margin-top: 20px;">
<video controls style="max-width: 100%; max-height: 300px;"> <video controls style="max-width: 100%; max-height: 300px;">
<source :src="transUrl(file.url)" type="video/mp4"> <source v-if="!!file?.response?.message" :src="opeMediaAddress + file?.response?.message" type="video/mp4">
<source v-else :src="opeMediaAddress + file.url" type="video/mp4">
您的浏览器不支持视频播放 您的浏览器不支持视频播放
</video> </video>
</div> </div>
@ -61,25 +52,27 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, reactive, computed, watch, nextTick, createApp,unref } from 'vue'; import { ref, reactive, computed, watch, nextTick, createApp, unref } from 'vue';
import { Icon } from '/@/components/Icon'; import { Icon } from '/@/components/Icon';
import { getToken } from '/@/utils/auth'; import { getToken } from '/@/utils/auth';
import { uploadUrl } from '/@/api/common/api'; import { uploadUrl, uploadPre } from '/@/api/common/api';
import { propTypes } from '/@/utils/propTypes'; import { propTypes } from '/@/utils/propTypes';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { createImgPreview } from '/@/components/Preview/index'; import { createImgPreview } from '/@/components/Preview/index';
import { useAttrs } from '/@/hooks/core/useAttrs'; import { useAttrs } from '/@/hooks/core/useAttrs';
import { useDesign } from '/@/hooks/web/useDesign'; import { useDesign } from '/@/hooks/web/useDesign';
import { UploadTypeEnum } from './upload.data'; import { UploadTypeEnum } from './upload.data';
import { getFileAccessHttpUrl, getHeaders } from '/@/utils/common/compUtils'; import { getFileAccessHttpUrl, getHeaders } from '/@/utils/common/compUtils';
import UploadItemActions from './components/UploadItemActions.vue'; import UploadItemActions from './components/UploadItemActions.vue';
import { InboxOutlined } from '@ant-design/icons-vue'; import { InboxOutlined } from '@ant-design/icons-vue';
import { Upload } from 'ant-design-vue';
const { createMessage, createConfirm } = useMessage(); const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const { prefixCls } = useDesign('j-upload'); const { createMessage, createConfirm } = useMessage();
const attrs = useAttrs(); const { prefixCls } = useDesign('j-upload');
const emit = defineEmits(['change', 'update:value']); const attrs = useAttrs();
const props = defineProps({ const emit = defineEmits(['change', 'update:value']);
const props = defineProps({
value: propTypes.oneOfType([propTypes.string, propTypes.array]), value: propTypes.oneOfType([propTypes.string, propTypes.array]),
text: propTypes.string.def('上传'), text: propTypes.string.def('上传'),
fileType: propTypes.string.def(UploadTypeEnum.all), fileType: propTypes.string.def(UploadTypeEnum.all),
@ -105,33 +98,41 @@
disabled: propTypes.bool.def(false), disabled: propTypes.bool.def(false),
// //
replaceLastOne: propTypes.bool.def(false), replaceLastOne: propTypes.bool.def(false),
}); //
toOpe: {
type: Boolean,
required: false,
default: false,
}
});
const headers = getHeaders(); const headers = getHeaders();
const fileList = ref<any[]>([]); const fileList = ref<any[]>([]);
const uploadGoOn = ref<boolean>(true); const uploadGoOn = ref<boolean>(true);
// refs const currentUploadUrl = ref(uploadUrl);
const containerRef = ref(); const extraUploadData = ref<Record<string, any>>({});
// // refs
const isMaxCount = computed(() => props.maxCount > 0 && fileList.value.length >= props.maxCount); const containerRef = ref();
// //
const isImageMode = computed(() => props.fileType === UploadTypeEnum.image); const isMaxCount = computed(() => props.maxCount > 0 && fileList.value.length >= props.maxCount);
// //
const buttonDisabled = computed(()=>{ const isImageMode = computed(() => props.fileType === UploadTypeEnum.image);
if(props.disabled === true){ //
const buttonDisabled = computed(() => {
if (props.disabled === true) {
return true; return true;
} }
if(isMaxCount.value === true){ if (isMaxCount.value === true) {
if(props.replaceLastOne === true){ if (props.replaceLastOne === true) {
return false return false
}else{ } else {
return true; return true;
} }
} }
return false return false
}); });
// props attrs // props attrs
const bindProps = computed(() => { const bindProps = computed(() => {
//update-begin-author:liusq date:20220411 for: [issue/455]accept //update-begin-author:liusq date:20220411 for: [issue/455]accept
const bind: any = Object.assign({}, props, unref(attrs)); const bind: any = Object.assign({}, props, unref(attrs));
//update-end-author:liusq date:20220411 for: [issue/455]accept //update-end-author:liusq date:20220411 for: [issue/455]accept
@ -139,7 +140,7 @@
bind.name = 'file'; bind.name = 'file';
bind.listType = isImageMode.value ? 'picture-card' : 'text'; bind.listType = isImageMode.value ? 'picture-card' : 'text';
bind.class = [bind.class, { 'upload-disabled': props.disabled }]; 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 //update-begin-author:taoyan date:20220407 for: beforeUpload return false
if (!bind.beforeUpload) { if (!bind.beforeUpload) {
bind.beforeUpload = onBeforeUpload; bind.beforeUpload = onBeforeUpload;
@ -150,12 +151,12 @@
bind.accept = 'image/*'; bind.accept = 'image/*';
} }
return bind; return bind;
}); });
function removeFile(index) { function removeFile(index) {
fileList.value.splice(index, 1); fileList.value.splice(index, 1);
} }
watch( watch(
() => props.value, () => props.value,
(val) => { (val) => {
if (Array.isArray(val)) { if (Array.isArray(val)) {
@ -175,14 +176,14 @@
} }
}, },
{ immediate: true } { immediate: true }
); );
watch(fileList, () => nextTick(() => addActionsListener()), { immediate: true }); watch(fileList, () => nextTick(() => addActionsListener()), { immediate: true });
const antUploadItemCls = 'ant-upload-list-item'; const antUploadItemCls = 'ant-upload-list-item';
// Listener // Listener
function addActionsListener() { function addActionsListener() {
if (!isImageMode.value) { if (!isImageMode.value) {
return; return;
} }
@ -196,12 +197,12 @@
uploadItem.addEventListener('mouseover', onAddActionsButton); uploadItem.addEventListener('mouseover', onAddActionsButton);
} }
} }
} }
/** /**
* 上传前校验 * 上传前校验
*/ */
function beforeUpload(file) { async function beforeUpload(file) {
let fileType = file.type; let fileType = file.type;
console.log("🚀 ~ beforeUpload ~ fileType:", fileType) console.log("🚀 ~ beforeUpload ~ fileType:", fileType)
if (fileType.indexOf('video') < 0) { if (fileType.indexOf('video') < 0) {
@ -209,9 +210,26 @@
fileList.value = []; fileList.value = [];
return false; return false;
} }
if (props.toOpe) {
let res = await uploadPre({ fileName: file.name, fileSize: file.size });
if (res.result == 500) {
createMessage.info('服务暂时不可用,请稍后重试');
return Upload.LIST_IGNORE;
} else {
//
currentUploadUrl.value = '/opeexup/sys/common/static/upload/export';
extraUploadData.value = { biz: props.bizPath, name: res.result, size: file.size };
console.log("🌊 ~ beforeUpload ~ extraUploadData.value:", extraUploadData.value)
} }
// } else {
function onAddActionsButton(event) { //
currentUploadUrl.value = uploadUrl;
extraUploadData.value = { biz: props.bizPath };
}
return true;
}
//
function onAddActionsButton(event) {
const getUploadItem = () => { const getUploadItem = () => {
for (const path of event.path) { for (const path of event.path) {
if (path.classList.contains(antUploadItemCls)) { if (path.classList.contains(antUploadItemCls)) {
@ -243,10 +261,10 @@
actions[0].appendChild(div); actions[0].appendChild(div);
uploadItem.setAttribute('data-has-actions', 'true'); uploadItem.setAttribute('data-has-actions', 'true');
uploadItem.removeEventListener('mouseover', onAddActionsButton); uploadItem.removeEventListener('mouseover', onAddActionsButton);
} }
// //
function parsePathsValue(paths) { function parsePathsValue(paths) {
if (!paths || paths.length == 0) { if (!paths || paths.length == 0) {
fileList.value = []; fileList.value = [];
return; return;
@ -263,7 +281,7 @@
}); });
} }
fileList.value = list; fileList.value = list;
} }
function transUrl(record) { function transUrl(record) {
console.log("🚀 ~ transUrl ~ record:", record) console.log("🚀 ~ transUrl ~ record:", record)
@ -273,8 +291,8 @@ function transUrl(record) {
return record return record
} }
} }
// //
function parseArrayValue(array) { function parseArrayValue(array) {
if (!array || array.length == 0) { if (!array || array.length == 0) {
fileList.value = []; fileList.value = [];
return; return;
@ -291,10 +309,10 @@ function transUrl(record) {
}); });
} }
fileList.value = list; fileList.value = list;
} }
// //
function onBeforeUpload(file) { function onBeforeUpload(file) {
uploadGoOn.value = true; uploadGoOn.value = true;
if (isImageMode.value) { if (isImageMode.value) {
if (file.type.indexOf('image') < 0) { if (file.type.indexOf('image') < 0) {
@ -308,10 +326,10 @@ function transUrl(record) {
return props.beforeUpload(file); return props.beforeUpload(file);
} }
return true; return true;
} }
// //
function onRemove() { function onRemove() {
if (props.removeConfirm) { if (props.removeConfirm) {
return new Promise((resolve) => { return new Promise((resolve) => {
createConfirm({ createConfirm({
@ -324,10 +342,10 @@ function transUrl(record) {
}); });
} }
return true; return true;
} }
// uploadchange // uploadchange
function onFileChange(info) { function onFileChange(info) {
var file = info.file; var file = info.file;
let fileType = file.type; let fileType = file.type;
if (fileType.indexOf('video') < 0) { if (fileType.indexOf('video') < 0) {
@ -360,9 +378,9 @@ function transUrl(record) {
} }
return file; return file;
}); });
}else{ } else {
successFileList = fileListTemp.filter(item=>{ successFileList = fileListTemp.filter(item => {
return item.uid!=info.file.uid; return item.uid != info.file.uid;
}); });
createMessage.error(`${info.file.name} 上传失败.`); createMessage.error(`${info.file.name} 上传失败.`);
} }
@ -389,7 +407,7 @@ function transUrl(record) {
fileSize: item.size, fileSize: item.size,
}; };
newFileList.push(fileJson); newFileList.push(fileJson);
}else{ } else {
return; return;
} }
} }
@ -398,9 +416,9 @@ function transUrl(record) {
//update-end---author:liusq ---date:20230914 for[issues/5327]UploadreturnUrlfalse'[object Object]' ------------ //update-end---author:liusq ---date:20230914 for[issues/5327]UploadreturnUrlfalse'[object Object]' ------------
} }
} }
} }
function handlePathChange() { function handlePathChange() {
let uploadFiles = fileList.value; let uploadFiles = fileList.value;
let path = ''; let path = '';
if (!uploadFiles || uploadFiles.length == 0) { if (!uploadFiles || uploadFiles.length == 0) {
@ -418,51 +436,51 @@ function transUrl(record) {
path = pathList.join(','); path = pathList.join(',');
} }
emitValue(path); emitValue(path);
} }
// //
function onFilePreview(file) { function onFilePreview(file) {
if (isImageMode.value) { if (isImageMode.value) {
createImgPreview({ imageList: [file.url], maskClosable: true }); createImgPreview({ imageList: [file.url], maskClosable: true });
} else { } else {
window.open(file.url); window.open(file.url);
} }
} }
function emitValue(value) { function emitValue(value) {
emit('change', value); emit('change', value);
emit('update:value', value); emit('update:value', value);
} }
function uidGenerator() { function uidGenerator() {
return '-' + parseInt(Math.random() * 10000 + 1, 10); return '-' + parseInt(Math.random() * 10000 + 1, 10);
} }
function getFileName(path) { function getFileName(path) {
if (path.lastIndexOf('\\') >= 0) { if (path.lastIndexOf('\\') >= 0) {
let reg = new RegExp('\\\\', 'g'); let reg = new RegExp('\\\\', 'g');
path = path.replace(reg, '/'); path = path.replace(reg, '/');
} }
return path.substring(path.lastIndexOf('/') + 1); return path.substring(path.lastIndexOf('/') + 1);
} }
// //
const uploadVisible = computed(() => { const uploadVisible = computed(() => {
if (props['maxCount'] === 0) { if (props['maxCount'] === 0) {
return true; return true;
} }
return fileList.value.length < props['maxCount']; return fileList.value.length < props['maxCount'];
}); });
defineExpose({ defineExpose({
addActionsListener, addActionsListener,
}); });
</script> </script>
<style lang="less"> <style lang="less">
//noinspection LessUnresolvedVariable //noinspection LessUnresolvedVariable
@prefix-cls: ~'@{namespace}-j-upload'; @prefix-cls: ~'@{namespace}-j-upload';
.@{prefix-cls} { .@{prefix-cls} {
&-container { &-container {
position: relative; position: relative;
@ -481,11 +499,14 @@ function transUrl(record) {
.upload-download-handler { .upload-download-handler {
right: 6px !important; right: 6px !important;
} }
/* update-end-author:taoyan date:2022-5-24 for:VUEN-1093详情界面 图片下载按钮显示不全*/ /* update-end-author:taoyan date:2022-5-24 for:VUEN-1093详情界面 图片下载按钮显示不全*/
} }
.ant-upload-text-icon { .ant-upload-text-icon {
color: @primary-color; color: @primary-color;
} }
.ant-upload-list-item { .ant-upload-list-item {
.upload-actions-container { .upload-actions-container {
position: absolute; position: absolute;
@ -532,26 +553,32 @@ function transUrl(record) {
} }
} }
} }
} }
.ant-upload-wrapper .ant-upload-drag .ant-upload { .ant-upload-wrapper .ant-upload-drag .ant-upload {
padding: 0px !important; padding: 0px !important;
} }
.ant-upload-drag { .ant-upload-drag {
border: 0px !important; border: 0px !important;
} }
.upload-text { .upload-text {
font-size: 16px; font-size: 16px;
color: rgba(74, 69, 69, 0.85); color: rgba(74, 69, 69, 0.85);
margin-bottom: 8px; margin-bottom: 8px;
} }
.upload-icon { .upload-icon {
margin: 16px; margin: 16px;
} }
.divider{
font-size:12px;color:rgb(189, 189, 189); .divider {
font-size: 12px;
color: rgb(189, 189, 189);
} }
:deep(.ant-upload-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item){ :deep(.ant-upload-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item) {
position: relative; position: relative;
height: 240px !important; height: 240px !important;
padding: 8px; padding: 8px;
@ -563,7 +590,8 @@ function transUrl(record) {
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
} }
:deep(.ant-upload-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item .ant-upload-list-item-thumbnail){
:deep(.ant-upload-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item .ant-upload-list-item-thumbnail) {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -573,6 +601,7 @@ function transUrl(record) {
text-align: center; text-align: center;
flex: none; flex: none;
} }
:deep(.ant-upload-wrapper .ant-upload-list .ant-upload-list-item .ant-upload-list-item-name) { :deep(.ant-upload-wrapper .ant-upload-list .ant-upload-list-item .ant-upload-list-item-name) {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
@ -589,5 +618,4 @@ function transUrl(record) {
background: #f1f7ff; background: #f1f7ff;
text-align: center; text-align: center;
} }
</style> </style>

View File

@ -1,5 +1,6 @@
import { BasicColumn } from '/@/components/Table'; import { BasicColumn } from '/@/components/Table';
import { render } from '/@/utils/common/renderUtils'; import { render } from '/@/utils/common/renderUtils';
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS;
//列表数据 //列表数据
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
@ -119,7 +120,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'previewFile', dataIndex: 'previewFile',
customRender: ({ text }) => { customRender: ({ text }) => {
// 如果 text 为空或 null/undefined使用默认图片 // 如果 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 }); return render.renderImage({ text: imageUrl });
}, },
// customRender: render.renderImage, // customRender: render.renderImage,
@ -130,7 +131,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'previewFileSmall', dataIndex: 'previewFileSmall',
customRender: ({ text }) => { customRender: ({ text }) => {
// 如果 text 为空或 null/undefined使用默认图片 // 如果 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 }); return render.renderImage({ text: imageUrl });
}, },
// customRender: render.renderImage, // customRender: render.renderImage,
@ -159,7 +160,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'immediateFile', dataIndex: 'immediateFile',
customRender: ({ text }) => { customRender: ({ text }) => {
// 如果 text 为空或 null/undefined使用默认图片 // 如果 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 }); return render.renderImage({ text: imageUrl });
}, },
// customRender: render.renderImage, // customRender: render.renderImage,

View File

@ -47,7 +47,7 @@
<template v-for="item in treeData"> <template v-for="item in treeData">
<!-- 第一层判断是否有下级 --> <!-- 第一层判断是否有下级 -->
<a-sub-menu v-if="item.children && item.children.length > 0" :key="item.key" <a-sub-menu v-if="item.children && item.children.length > 0" :key="item.key"
@titleClick="handleTreeSelect([], {node:item})"> @titleClick="handleTreeSelect([], { node: item })">
<template #icon> <template #icon>
<Icon :icon="item.icon" :size="20" v-if="item.icon" /> <Icon :icon="item.icon" :size="20" v-if="item.icon" />
<Icon icon="ant-design:appstore-add-outlined" :size="20" v-else /> <Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@ -81,7 +81,7 @@
<!-- 第二层判断是否有下级 --> <!-- 第二层判断是否有下级 -->
<template v-for="child in item.children"> <template v-for="child in item.children">
<a-sub-menu :key="child.key" v-if="child.children && child.children.length > 0" <a-sub-menu :key="child.key" v-if="child.children && child.children.length > 0"
@titleClick="handleTreeSelect([], {node:child})"> @titleClick="handleTreeSelect([], { node: child })">
<!-- <template #icon> <!-- <template #icon>
<Icon icon="ant-design:border-verticle-outlined" :size="20" /> <Icon icon="ant-design:border-verticle-outlined" :size="20" />
</template> --> </template> -->
@ -113,7 +113,7 @@
<!-- 第三层判断是否有下级 --> <!-- 第三层判断是否有下级 -->
<template v-for="childThree in child.children"> <template v-for="childThree in child.children">
<a-sub-menu :key="childThree.key" v-if="childThree.children && childThree.children.length > 0" <a-sub-menu :key="childThree.key" v-if="childThree.children && childThree.children.length > 0"
@titleClick="handleTreeSelect([], {node:childThree})"> @titleClick="handleTreeSelect([], { node: childThree })">
<!-- <template #icon> <!-- <template #icon>
<Icon icon="ant-design:border-bottom-outlined" :size="20" /> <Icon icon="ant-design:border-bottom-outlined" :size="20" />
</template> --> </template> -->
@ -146,7 +146,7 @@
</template> </template>
<!-- 第四层判断是否有下级 --> <!-- 第四层判断是否有下级 -->
<a-menu-item :key="childFour.key" v-for="childFour in childThree.children" <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" <span @mouseenter="childFour.showContent = true" @mouseleave="childFour.showContent = false"
class="auto-wrap">{{ childFour?.title + '(' + childFour?.cycleTypeName + ')' }} class="auto-wrap">{{ childFour?.title + '(' + childFour?.cycleTypeName + ')' }}
<span v-if="childFour?.izEnabled == '1' && childFour.level != 5" <span v-if="childFour?.izEnabled == '1' && childFour.level != 5"
@ -175,7 +175,7 @@
</a-menu-item> </a-menu-item>
</a-sub-menu> </a-sub-menu>
<a-menu-item :key="childThree.key" v-if="!childThree.children || childThree.children.length < 1" <a-menu-item :key="childThree.key" v-if="!childThree.children || childThree.children.length < 1"
@click="handleTreeSelect([], {node:childThree})"> @click="handleTreeSelect([], { node: childThree })">
<!-- <template #icon> <!-- <template #icon>
<Icon icon="ant-design:border-bottom-outlined" :size="20" /> <Icon icon="ant-design:border-bottom-outlined" :size="20" />
</template> --> </template> -->
@ -208,7 +208,7 @@
</template> </template>
</a-sub-menu> </a-sub-menu>
<a-menu-item :key="child.key" v-if="!child.children || child.children.length < 1" <a-menu-item :key="child.key" v-if="!child.children || child.children.length < 1"
@click="handleTreeSelect([], {node:child})"> @click="handleTreeSelect([], { node: child })">
<!-- <template #icon> <!-- <template #icon>
<Icon icon="ant-design:border-verticle-outlined" :size="20" /> <Icon icon="ant-design:border-verticle-outlined" :size="20" />
</template> --> </template> -->
@ -238,7 +238,7 @@
</template> </template>
</a-sub-menu> </a-sub-menu>
<a-menu-item :key="item.key" v-if="!item.children || item.children.length < 1" <a-menu-item :key="item.key" v-if="!item.children || item.children.length < 1"
@click="handleTreeSelect([], {node:item})"> @click="handleTreeSelect([], { node: item })">
<template #icon> <template #icon>
<Icon :icon="item.icon" :size="20" v-if="item.icon" /> <Icon :icon="item.icon" :size="20" v-if="item.icon" />
<Icon icon="ant-design:appstore-add-outlined" :size="20" v-else /> <Icon icon="ant-design:appstore-add-outlined" :size="20" v-else />
@ -302,7 +302,8 @@
</template> </template>
</a-tree> --> </a-tree> -->
</div> </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"> <BasicTable @register="registerTable">
<!--插槽:table标题--> <!--插槽:table标题-->
@ -531,6 +532,7 @@ import CanAddDirectiveList from '/@/views/services/canadddirective/CanAddDirecti
const { createMessage, createConfirm } = useMessage(); const { createMessage, createConfirm } = useMessage();
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const canAddDirectiveRef = ref() const canAddDirectiveRef = ref()
const existDirectiveIds = ref([])//id const existDirectiveIds = ref([])//id
const insRegisterModal = ref(); const insRegisterModal = ref();
@ -888,7 +890,7 @@ const audioPlayer = ref(null);
// //
const openAudioModal = (url) => { const openAudioModal = (url) => {
audioUrl.value = getFileAccessHttpUrl(url); audioUrl.value = opeMediaAddress + url;
showAudioModal.value = true; showAudioModal.value = true;
}; };
@ -908,7 +910,7 @@ const videoPlayer = ref(null);
// //
const openVideoModal = (url) => { const openVideoModal = (url) => {
videoUrl.value = getFileAccessHttpUrl(url); videoUrl.value = opeMediaAddress + url;
showVideoModal.value = true; showVideoModal.value = true;
}; };