调整服务指令资源上传位置：统一上传到管理平台所在服务器
This commit is contained in:
parent
279bdc20bc
commit
2f946c4361
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,19 +1,9 @@
|
|||
<template>
|
||||
<div ref="containerRef" :class="`${prefixCls}-container`">
|
||||
<a-upload-dragger
|
||||
accept="video/mp4"
|
||||
:headers="headers"
|
||||
:multiple="multiple"
|
||||
:action="uploadUrl"
|
||||
:fileList="fileList"
|
||||
:disabled="disabled"
|
||||
v-bind="bindProps"
|
||||
:beforeUpload="beforeUpload"
|
||||
:showUploadList="false"
|
||||
@remove="onRemove"
|
||||
@change="onFileChange"
|
||||
@preview="onFilePreview"
|
||||
>
|
||||
<a-upload-dragger accept="video/mp4" :headers="headers" :multiple="multiple" :action="currentUploadUrl"
|
||||
:data="{ biz: bizPath, ...extraUploadData }" :fileList="fileList" :disabled="disabled" v-bind="bindProps"
|
||||
:beforeUpload="beforeUpload" :showUploadList="false" @remove="onRemove" @change="onFileChange"
|
||||
@preview="onFilePreview">
|
||||
<template v-if="isImageMode">
|
||||
<div v-if="!isMaxCount">
|
||||
<Icon icon="ant-design:plus-outlined" />
|
||||
|
|
@ -42,10 +32,11 @@
|
|||
</a-upload-dragger>
|
||||
<!-- 文件回显 -->
|
||||
<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;">
|
||||
<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>
|
||||
</div>
|
||||
|
|
@ -61,25 +52,27 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, reactive, computed, watch, nextTick, createApp,unref } from 'vue';
|
||||
import { Icon } from '/@/components/Icon';
|
||||
import { getToken } from '/@/utils/auth';
|
||||
import { uploadUrl } from '/@/api/common/api';
|
||||
import { propTypes } from '/@/utils/propTypes';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { createImgPreview } from '/@/components/Preview/index';
|
||||
import { useAttrs } from '/@/hooks/core/useAttrs';
|
||||
import { useDesign } from '/@/hooks/web/useDesign';
|
||||
import { UploadTypeEnum } from './upload.data';
|
||||
import { getFileAccessHttpUrl, getHeaders } from '/@/utils/common/compUtils';
|
||||
import UploadItemActions from './components/UploadItemActions.vue';
|
||||
import { InboxOutlined } from '@ant-design/icons-vue';
|
||||
import { ref, reactive, computed, watch, nextTick, createApp, unref } from 'vue';
|
||||
import { Icon } from '/@/components/Icon';
|
||||
import { getToken } from '/@/utils/auth';
|
||||
import { uploadUrl, uploadPre } from '/@/api/common/api';
|
||||
import { propTypes } from '/@/utils/propTypes';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import { createImgPreview } from '/@/components/Preview/index';
|
||||
import { useAttrs } from '/@/hooks/core/useAttrs';
|
||||
import { useDesign } from '/@/hooks/web/useDesign';
|
||||
import { UploadTypeEnum } from './upload.data';
|
||||
import { getFileAccessHttpUrl, getHeaders } from '/@/utils/common/compUtils';
|
||||
import UploadItemActions from './components/UploadItemActions.vue';
|
||||
import { InboxOutlined } from '@ant-design/icons-vue';
|
||||
import { Upload } from 'ant-design-vue';
|
||||
|
||||
const { createMessage, createConfirm } = useMessage();
|
||||
const { prefixCls } = useDesign('j-upload');
|
||||
const attrs = useAttrs();
|
||||
const emit = defineEmits(['change', 'update:value']);
|
||||
const props = defineProps({
|
||||
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
|
||||
const { createMessage, createConfirm } = useMessage();
|
||||
const { prefixCls } = useDesign('j-upload');
|
||||
const attrs = useAttrs();
|
||||
const emit = defineEmits(['change', 'update:value']);
|
||||
const props = defineProps({
|
||||
value: propTypes.oneOfType([propTypes.string, propTypes.array]),
|
||||
text: propTypes.string.def('上传'),
|
||||
fileType: propTypes.string.def(UploadTypeEnum.all),
|
||||
|
|
@ -105,33 +98,41 @@
|
|||
disabled: propTypes.bool.def(false),
|
||||
// 替换前一个文件，用于超出最大数量依然允许上传
|
||||
replaceLastOne: propTypes.bool.def(false),
|
||||
});
|
||||
// 是否上传至管理平台
|
||||
toOpe: {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: false,
|
||||
}
|
||||
});
|
||||
|
||||
const headers = getHeaders();
|
||||
const fileList = ref<any[]>([]);
|
||||
const uploadGoOn = ref<boolean>(true);
|
||||
// refs
|
||||
const containerRef = ref();
|
||||
// 是否达到了最大上传数量
|
||||
const isMaxCount = computed(() => props.maxCount > 0 && fileList.value.length >= props.maxCount);
|
||||
// 当前是否是上传图片模式
|
||||
const isImageMode = computed(() => props.fileType === UploadTypeEnum.image);
|
||||
// 上传按钮是否禁用
|
||||
const buttonDisabled = computed(()=>{
|
||||
if(props.disabled === true){
|
||||
const headers = getHeaders();
|
||||
const fileList = ref<any[]>([]);
|
||||
const uploadGoOn = ref<boolean>(true);
|
||||
const currentUploadUrl = ref(uploadUrl);
|
||||
const extraUploadData = ref<Record<string, any>>({});
|
||||
// refs
|
||||
const containerRef = ref();
|
||||
// 是否达到了最大上传数量
|
||||
const isMaxCount = computed(() => props.maxCount > 0 && fileList.value.length >= props.maxCount);
|
||||
// 当前是否是上传图片模式
|
||||
const isImageMode = computed(() => props.fileType === UploadTypeEnum.image);
|
||||
// 上传按钮是否禁用
|
||||
const buttonDisabled = computed(() => {
|
||||
if (props.disabled === true) {
|
||||
return true;
|
||||
}
|
||||
if(isMaxCount.value === true){
|
||||
if(props.replaceLastOne === true){
|
||||
if (isMaxCount.value === true) {
|
||||
if (props.replaceLastOne === true) {
|
||||
return false
|
||||
}else{
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false
|
||||
});
|
||||
// 合并 props 和 attrs
|
||||
const bindProps = computed(() => {
|
||||
});
|
||||
// 合并 props 和 attrs
|
||||
const bindProps = computed(() => {
|
||||
//update-begin-author:liusq date:20220411 for: [issue/455]上传组件传入accept限制上传文件类型无效
|
||||
const bind: any = Object.assign({}, props, unref(attrs));
|
||||
//update-end-author:liusq date:20220411 for: [issue/455]上传组件传入accept限制上传文件类型无效
|
||||
|
|
@ -139,7 +140,7 @@
|
|||
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;
|
||||
|
|
@ -150,12 +151,12 @@
|
|||
bind.accept = 'image/*';
|
||||
}
|
||||
return bind;
|
||||
});
|
||||
function removeFile(index) {
|
||||
});
|
||||
function removeFile(index) {
|
||||
fileList.value.splice(index, 1);
|
||||
}
|
||||
}
|
||||
|
||||
watch(
|
||||
watch(
|
||||
() => props.value,
|
||||
(val) => {
|
||||
if (Array.isArray(val)) {
|
||||
|
|
@ -175,14 +176,14 @@
|
|||
}
|
||||
},
|
||||
{ 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
|
||||
function addActionsListener() {
|
||||
// Listener
|
||||
function addActionsListener() {
|
||||
if (!isImageMode.value) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -196,12 +197,12 @@
|
|||
uploadItem.addEventListener('mouseover', onAddActionsButton);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* 上传前校验
|
||||
*/
|
||||
function beforeUpload(file) {
|
||||
async function beforeUpload(file) {
|
||||
let fileType = file.type;
|
||||
console.log("🚀 ~ beforeUpload ~ fileType:", fileType)
|
||||
if (fileType.indexOf('video') < 0) {
|
||||
|
|
@ -209,9 +210,26 @@
|
|||
fileList.value = [];
|
||||
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)
|
||||
}
|
||||
// 添加可左右移动的按钮
|
||||
function onAddActionsButton(event) {
|
||||
} else {
|
||||
// 恢复默认
|
||||
currentUploadUrl.value = uploadUrl;
|
||||
extraUploadData.value = { biz: props.bizPath };
|
||||
}
|
||||
return true;
|
||||
}
|
||||
// 添加可左右移动的按钮
|
||||
function onAddActionsButton(event) {
|
||||
const getUploadItem = () => {
|
||||
for (const path of event.path) {
|
||||
if (path.classList.contains(antUploadItemCls)) {
|
||||
|
|
@ -243,10 +261,10 @@
|
|||
actions[0].appendChild(div);
|
||||
uploadItem.setAttribute('data-has-actions', 'true');
|
||||
uploadItem.removeEventListener('mouseover', onAddActionsButton);
|
||||
}
|
||||
}
|
||||
|
||||
// 解析数据库存储的逗号分割
|
||||
function parsePathsValue(paths) {
|
||||
// 解析数据库存储的逗号分割
|
||||
function parsePathsValue(paths) {
|
||||
if (!paths || paths.length == 0) {
|
||||
fileList.value = [];
|
||||
return;
|
||||
|
|
@ -263,7 +281,7 @@
|
|||
});
|
||||
}
|
||||
fileList.value = list;
|
||||
}
|
||||
}
|
||||
|
||||
function transUrl(record) {
|
||||
console.log("🚀 ~ transUrl ~ record:", record)
|
||||
|
|
@ -273,8 +291,8 @@ function transUrl(record) {
|
|||
return record
|
||||
}
|
||||
}
|
||||
// 解析数组值
|
||||
function parseArrayValue(array) {
|
||||
// 解析数组值
|
||||
function parseArrayValue(array) {
|
||||
if (!array || array.length == 0) {
|
||||
fileList.value = [];
|
||||
return;
|
||||
|
|
@ -291,10 +309,10 @@ function transUrl(record) {
|
|||
});
|
||||
}
|
||||
fileList.value = list;
|
||||
}
|
||||
}
|
||||
|
||||
// 文件上传之前的操作
|
||||
function onBeforeUpload(file) {
|
||||
// 文件上传之前的操作
|
||||
function onBeforeUpload(file) {
|
||||
uploadGoOn.value = true;
|
||||
if (isImageMode.value) {
|
||||
if (file.type.indexOf('image') < 0) {
|
||||
|
|
@ -308,10 +326,10 @@ function transUrl(record) {
|
|||
return props.beforeUpload(file);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// 删除处理事件
|
||||
function onRemove() {
|
||||
// 删除处理事件
|
||||
function onRemove() {
|
||||
if (props.removeConfirm) {
|
||||
return new Promise((resolve) => {
|
||||
createConfirm({
|
||||
|
|
@ -324,10 +342,10 @@ function transUrl(record) {
|
|||
});
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// upload组件change事件
|
||||
function onFileChange(info) {
|
||||
// upload组件change事件
|
||||
function onFileChange(info) {
|
||||
var file = info.file;
|
||||
let fileType = file.type;
|
||||
if (fileType.indexOf('video') < 0) {
|
||||
|
|
@ -360,9 +378,9 @@ function transUrl(record) {
|
|||
}
|
||||
return file;
|
||||
});
|
||||
}else{
|
||||
successFileList = fileListTemp.filter(item=>{
|
||||
return item.uid!=info.file.uid;
|
||||
} else {
|
||||
successFileList = fileListTemp.filter(item => {
|
||||
return item.uid != info.file.uid;
|
||||
});
|
||||
createMessage.error(`${info.file.name} 上传失败.`);
|
||||
}
|
||||
|
|
@ -389,7 +407,7 @@ function transUrl(record) {
|
|||
fileSize: item.size,
|
||||
};
|
||||
newFileList.push(fileJson);
|
||||
}else{
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -398,9 +416,9 @@ function transUrl(record) {
|
|||
//update-end---author:liusq ---date:20230914 for：[issues/5327]Upload组件returnUrl为false时上传的字段值返回了一个'[object Object]' ------------
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function handlePathChange() {
|
||||
function handlePathChange() {
|
||||
let uploadFiles = fileList.value;
|
||||
let path = '';
|
||||
if (!uploadFiles || uploadFiles.length == 0) {
|
||||
|
|
@ -418,51 +436,51 @@ function transUrl(record) {
|
|||
path = pathList.join(',');
|
||||
}
|
||||
emitValue(path);
|
||||
}
|
||||
}
|
||||
|
||||
// 预览文件、图片
|
||||
function onFilePreview(file) {
|
||||
// 预览文件、图片
|
||||
function onFilePreview(file) {
|
||||
if (isImageMode.value) {
|
||||
createImgPreview({ imageList: [file.url], maskClosable: true });
|
||||
} else {
|
||||
window.open(file.url);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function emitValue(value) {
|
||||
function emitValue(value) {
|
||||
emit('change', value);
|
||||
emit('update:value', value);
|
||||
}
|
||||
}
|
||||
|
||||
function uidGenerator() {
|
||||
function uidGenerator() {
|
||||
return '-' + parseInt(Math.random() * 10000 + 1, 10);
|
||||
}
|
||||
}
|
||||
|
||||
function getFileName(path) {
|
||||
function getFileName(path) {
|
||||
if (path.lastIndexOf('\\') >= 0) {
|
||||
let reg = new RegExp('\\\\', 'g');
|
||||
path = path.replace(reg, '/');
|
||||
}
|
||||
return path.substring(path.lastIndexOf('/') + 1);
|
||||
}
|
||||
//计算是否可以继续上传
|
||||
const uploadVisible = computed(() => {
|
||||
}
|
||||
//计算是否可以继续上传
|
||||
const uploadVisible = computed(() => {
|
||||
if (props['maxCount'] === 0) {
|
||||
return true;
|
||||
}
|
||||
return fileList.value.length < props['maxCount'];
|
||||
});
|
||||
});
|
||||
|
||||
defineExpose({
|
||||
defineExpose({
|
||||
addActionsListener,
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="less">
|
||||
//noinspection LessUnresolvedVariable
|
||||
@prefix-cls: ~'@{namespace}-j-upload';
|
||||
//noinspection LessUnresolvedVariable
|
||||
@prefix-cls: ~'@{namespace}-j-upload';
|
||||
|
||||
.@{prefix-cls} {
|
||||
.@{prefix-cls} {
|
||||
&-container {
|
||||
position: relative;
|
||||
|
||||
|
|
@ -481,11 +499,14 @@ function transUrl(record) {
|
|||
.upload-download-handler {
|
||||
right: 6px !important;
|
||||
}
|
||||
|
||||
/* update-end-author:taoyan date:2022-5-24 for:VUEN-1093详情界面 图片下载按钮显示不全*/
|
||||
}
|
||||
|
||||
.ant-upload-text-icon {
|
||||
color: @primary-color;
|
||||
}
|
||||
|
||||
.ant-upload-list-item {
|
||||
.upload-actions-container {
|
||||
position: absolute;
|
||||
|
|
@ -532,26 +553,32 @@ function transUrl(record) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.ant-upload-wrapper .ant-upload-drag .ant-upload {
|
||||
padding: 0px !important;
|
||||
}
|
||||
|
||||
.ant-upload-drag {
|
||||
border: 0px !important;
|
||||
}
|
||||
|
||||
.upload-text {
|
||||
font-size: 16px;
|
||||
color: rgba(74, 69, 69, 0.85);
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.upload-icon {
|
||||
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;
|
||||
height: 240px !important;
|
||||
padding: 8px;
|
||||
|
|
@ -563,7 +590,8 @@ function transUrl(record) {
|
|||
justify-content: center;
|
||||
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;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
|
|
@ -573,6 +601,7 @@ function transUrl(record) {
|
|||
text-align: center;
|
||||
flex: none;
|
||||
}
|
||||
|
||||
:deep(.ant-upload-wrapper .ant-upload-list .ant-upload-list-item .ant-upload-list-item-name) {
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
|
|
@ -589,5 +618,4 @@ function transUrl(record) {
|
|||
background: #f1f7ff;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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标题-->
|
||||
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue