|
|
|
@ -1,6 +1,5 @@ |
|
|
|
<template> |
|
|
|
<div class="upload-minio"> |
|
|
|
<!-- 文件选择按钮与隐藏的input --> |
|
|
|
<el-button |
|
|
|
v-if="isPreFile !== 'true'" |
|
|
|
type="primary" |
|
|
|
@ -10,15 +9,6 @@ |
|
|
|
> |
|
|
|
选择文件 |
|
|
|
</el-button> |
|
|
|
<!--<input |
|
|
|
type="file" |
|
|
|
multiple |
|
|
|
:disabled="!isCaValid || isCheckingCa" |
|
|
|
:accept="fileAcceptType" |
|
|
|
class="file-input" |
|
|
|
@change="handleFileSelect" |
|
|
|
> --> |
|
|
|
|
|
|
|
<el-dialog |
|
|
|
title="文件列表" |
|
|
|
class="minio-file" |
|
|
|
@ -47,14 +37,6 @@ |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<!-- <el-button |
|
|
|
type="success" |
|
|
|
style="margin-bottom: 20px" |
|
|
|
:disabled="fileList.some(item => item.uploading || item.merging) || fileList.length === 0" |
|
|
|
@click="handleUploadConfirm" |
|
|
|
> |
|
|
|
开始上传 |
|
|
|
</el-button> --> |
|
|
|
<div v-if="fileList.length !== 0" style="max-height: 400px; overflow: hidden; overflow-y: scroll;"> |
|
|
|
<div |
|
|
|
v-for="(fileItem, index) in fileList" |
|
|
|
@ -664,18 +646,6 @@ export default { |
|
|
|
throw new Error(response.data.msg || '合并失败') |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 动态计算合并接口URL |
|
|
|
// const mergeApiUrl = this.isBatchMount === 'true' |
|
|
|
// ? `${this.baseApi}/api/collect/merge` |
|
|
|
// : `${this.baseApi}/api/minioUpload/merge` |
|
|
|
// // 调用合并接口 |
|
|
|
// const response = await axios.post(mergeApiUrl, jsonArray, { |
|
|
|
// headers: { |
|
|
|
// 'Authorization': getToken(), |
|
|
|
// 'Content-Type': 'application/json' |
|
|
|
// } |
|
|
|
// }) |
|
|
|
} catch (err) { |
|
|
|
this.btnLoading = false |
|
|
|
this.totalMergeEndTime = new Date().getTime() |
|
|
|
|