|
|
@ -1,40 +1,33 @@ |
|
|
<template> |
|
|
<template> |
|
|
<div> |
|
|
|
|
|
<!--上传组件--> |
|
|
<!--上传组件--> |
|
|
|
|
|
<div class="uploader-big"> |
|
|
<uploader |
|
|
<uploader |
|
|
:auto-start="false" |
|
|
:auto-start="false" |
|
|
:options="options" |
|
|
:options="options" |
|
|
:file-status-text="statusText" |
|
|
|
|
|
class="uploader-example" |
|
|
|
|
|
@file-complete="fileComplete" |
|
|
|
|
|
@complete="complete" |
|
|
|
|
|
|
|
|
:file-status-text="fileStatusText" |
|
|
@file-success="fileSuccess" |
|
|
@file-success="fileSuccess" |
|
|
@files-added="filesAdded" |
|
|
@files-added="filesAdded" |
|
|
|
|
|
@file-progress="onFileProgress" |
|
|
|
|
|
@file-error="onFileError" |
|
|
> |
|
|
> |
|
|
<uploader-unsupport /> |
|
|
<uploader-unsupport /> |
|
|
<uploader-drop> |
|
|
<uploader-drop> |
|
|
<p>将文件拖放到此处以上传</p> |
|
|
<p>将文件拖放到此处以上传</p> |
|
|
<uploader-btn>选择文件</uploader-btn> |
|
|
|
|
|
<uploader-btn :attrs="attrs">选择图片</uploader-btn> |
|
|
|
|
|
<uploader-btn :directory="true">选择文件夹</uploader-btn> |
|
|
|
|
|
|
|
|
<uploader-btn> |
|
|
|
|
|
<slot> |
|
|
|
|
|
<i class="iconfont icon-tianjiawenjian upload-icon" /> |
|
|
|
|
|
</slot> |
|
|
|
|
|
</uploader-btn> |
|
|
|
|
|
<!-- <uploader-btn :attrs="attrs">选择图片</uploader-btn> |
|
|
|
|
|
<uploader-btn :directory="true">选择文件夹</uploader-btn> --> |
|
|
</uploader-drop> |
|
|
</uploader-drop> |
|
|
<!-- <uploader-list></uploader-list> --> |
|
|
|
|
|
<uploader-files /> |
|
|
<uploader-files /> |
|
|
</uploader> |
|
|
</uploader> |
|
|
<!-- <el-upload |
|
|
|
|
|
class="upload-demo" |
|
|
|
|
|
:action="uploadUrl" |
|
|
|
|
|
:auto-upload="false" |
|
|
|
|
|
:on-change="handleChange" |
|
|
|
|
|
:before-upload="handleBeforeUpload" |
|
|
|
|
|
:on-progress="handleProgress" |
|
|
|
|
|
> |
|
|
|
|
|
<el-button slot="trigger">选取文件</el-button> |
|
|
|
|
|
<el-button style="margin-left: 10px" type="primary" :loading="uploading" :disabled="files.length === 0" @click="handleUpload"> |
|
|
|
|
|
上传文件 |
|
|
|
|
|
</el-button> |
|
|
|
|
|
<el-progress :percentage="percent" /> |
|
|
|
|
|
</el-upload> --> |
|
|
|
|
|
|
|
|
<!-- <div class="upload-big-button"> |
|
|
|
|
|
<el-button :disabled="disabled" @click="allStart()">全部开始</el-button> |
|
|
|
|
|
<el-button @click="allStop()">全部暂停</el-button> |
|
|
|
|
|
<el-button @click="allRemove()">全部移除</el-button> |
|
|
|
|
|
</div> --> |
|
|
</div> |
|
|
</div> |
|
|
</template> |
|
|
</template> |
|
|
|
|
|
|
|
|
@ -42,19 +35,34 @@ |
|
|
import { mapGetters } from 'vuex' |
|
|
import { mapGetters } from 'vuex' |
|
|
import axios from 'axios' |
|
|
import axios from 'axios' |
|
|
import SparkMD5 from 'spark-md5' |
|
|
import SparkMD5 from 'spark-md5' |
|
|
|
|
|
import { getToken } from '@/utils/auth' |
|
|
|
|
|
// import { archivesUpload } from '@/utils/upload' |
|
|
|
|
|
import { getCurrentTime } from '@/utils/index' |
|
|
|
|
|
|
|
|
export default { |
|
|
export default { |
|
|
|
|
|
props: { |
|
|
|
|
|
selectedCategory: { |
|
|
|
|
|
type: Object, |
|
|
|
|
|
default: function() { |
|
|
|
|
|
return {} |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
arcId: { |
|
|
|
|
|
type: String, |
|
|
|
|
|
default: function() { |
|
|
|
|
|
return '' |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
data() { |
|
|
data() { |
|
|
return { |
|
|
return { |
|
|
files: [], // 选中的文件列表 |
|
|
|
|
|
uploading: false, // 是否正在上传 |
|
|
|
|
|
percent: 0, // 上传进度 |
|
|
|
|
|
uploadUrl: this.baseApi + '/api/collect/uploadFiles', // 上传地址 |
|
|
|
|
|
skip: false, |
|
|
skip: false, |
|
|
options: { |
|
|
options: { |
|
|
target: this.baseApi + '/api/file/upload', |
|
|
|
|
|
|
|
|
target: 'http://192.168.99.67:11100/api/collect/upload', |
|
|
// 开启服务端分片校验功能 |
|
|
// 开启服务端分片校验功能 |
|
|
testChunks: true, |
|
|
testChunks: true, |
|
|
|
|
|
// 真正上传的时候使用的 HTTP 方法,默认 POST |
|
|
|
|
|
uploadMethod: 'post', |
|
|
parseTimeRemaining: function(timeRemaining, parsedTimeRemaining) { |
|
|
parseTimeRemaining: function(timeRemaining, parsedTimeRemaining) { |
|
|
return parsedTimeRemaining |
|
|
return parsedTimeRemaining |
|
|
.replace(/\syears?/, '年') |
|
|
.replace(/\syears?/, '年') |
|
|
@ -71,22 +79,21 @@ export default { |
|
|
return true |
|
|
return true |
|
|
} |
|
|
} |
|
|
return (result.data.uploaded || []).indexOf(chunk.offset + 1) >= 0 |
|
|
return (result.data.uploaded || []).indexOf(chunk.offset + 1) >= 0 |
|
|
|
|
|
}, |
|
|
|
|
|
headers: { |
|
|
|
|
|
'Authorization': getToken() |
|
|
} |
|
|
} |
|
|
// headers: { |
|
|
|
|
|
// // 在header中添加的验证，请根据实际业务来 |
|
|
|
|
|
// "Access-Token": storage.get(ACCESS_TOKEN), |
|
|
|
|
|
// }, |
|
|
|
|
|
}, |
|
|
}, |
|
|
attrs: { |
|
|
attrs: { |
|
|
accept: 'image/*' |
|
|
accept: 'image/*' |
|
|
}, |
|
|
}, |
|
|
statusText: { |
|
|
|
|
|
|
|
|
// 修改上传状态 |
|
|
|
|
|
fileStatusTextObj: { |
|
|
success: '上传成功', |
|
|
success: '上传成功', |
|
|
error: '上传出错了', |
|
|
|
|
|
uploading: '上传中...', |
|
|
|
|
|
paused: '暂停中...', |
|
|
|
|
|
waiting: '等待中...', |
|
|
|
|
|
cmd5: '计算文件MD5中...' |
|
|
|
|
|
|
|
|
error: '上传错误', |
|
|
|
|
|
uploading: '正在上传', |
|
|
|
|
|
paused: '停止上传', |
|
|
|
|
|
waiting: '等待中' |
|
|
}, |
|
|
}, |
|
|
fileList: [], |
|
|
fileList: [], |
|
|
disabled: true |
|
|
disabled: true |
|
|
@ -98,99 +105,66 @@ export default { |
|
|
]) |
|
|
]) |
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
// 切片上传 |
|
|
|
|
|
async upload(file) { |
|
|
|
|
|
const chunkSize = 1024 * 1024 // 每个块的大小为 1MB |
|
|
|
|
|
const fileSize = file.size // 文件大小 |
|
|
|
|
|
const chunks = Math.ceil(fileSize / chunkSize) // 总块数 |
|
|
|
|
|
const tasks = [] // 上传任务数组 |
|
|
|
|
|
let uploaded = 0 // 已上传块数 |
|
|
|
|
|
|
|
|
|
|
|
// 文件切割 |
|
|
|
|
|
for (let i = 0; i < chunks; i++) { |
|
|
|
|
|
const start = i * chunkSize |
|
|
|
|
|
const end = Math.min(start + chunkSize, fileSize) |
|
|
|
|
|
|
|
|
|
|
|
tasks.push( |
|
|
|
|
|
new Promise((resolve, reject) => { |
|
|
|
|
|
const formData = new FormData() |
|
|
|
|
|
formData.append('chunk_index', i) // 块编号 |
|
|
|
|
|
formData.append('chunk_count', chunks) // 总块数 |
|
|
|
|
|
formData.append('file_id', file.id) // 文件ID |
|
|
|
|
|
formData.append('chunk_data', file.slice(start, end)) // 块数据 |
|
|
|
|
|
|
|
|
|
|
|
axios |
|
|
|
|
|
.post(this.uploadUrl, formData) // 上传块数据 |
|
|
|
|
|
.then(res => { |
|
|
|
|
|
uploaded++ |
|
|
|
|
|
this.percent = Math.floor((uploaded / chunks) * 100) |
|
|
|
|
|
console.log(this.percent) |
|
|
|
|
|
resolve() |
|
|
|
|
|
}) |
|
|
|
|
|
.catch(err => { |
|
|
|
|
|
reject(err) |
|
|
|
|
|
}) |
|
|
|
|
|
}) |
|
|
|
|
|
) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 待所有块上传完成后，发送合并请求 |
|
|
|
|
|
await Promise.all(tasks) |
|
|
|
|
|
const res = await axios.post(this.uploadUrl, { file_id: file.id, chunks }) |
|
|
|
|
|
|
|
|
|
|
|
// 上传成功，返回文件URL |
|
|
|
|
|
if (res.status === 200) { |
|
|
|
|
|
return `${this.uploadUrl}/${file.id}` |
|
|
|
|
|
|
|
|
fileStatusText(status, response) { |
|
|
|
|
|
if (status === 'md5') { |
|
|
|
|
|
return '校验MD5' |
|
|
} else { |
|
|
} else { |
|
|
throw new Error(res.data.message) |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
handleChange(files) { |
|
|
|
|
|
this.files = files |
|
|
|
|
|
}, |
|
|
|
|
|
async handleUpload() { |
|
|
|
|
|
console.log('handleUpload') |
|
|
|
|
|
try { |
|
|
|
|
|
console.log('handleUpload2') |
|
|
|
|
|
this.uploading = true |
|
|
|
|
|
console.log(this.files) |
|
|
|
|
|
const url = await this.upload(this.files) |
|
|
|
|
|
// 文件上传成功，将url展示给用户 |
|
|
|
|
|
this.$message.success(`文件${this.files.name}上传成功！URL：${url}`) |
|
|
|
|
|
// for (let i = 0; i < this.files.length; i++) { |
|
|
|
|
|
// const file = this.files[i] |
|
|
|
|
|
// console.log('file', file) |
|
|
|
|
|
|
|
|
|
|
|
// } |
|
|
|
|
|
} catch (err) { |
|
|
|
|
|
console.log('handleUpload3') |
|
|
|
|
|
this.$message.error(`文件上传失败！${err.message}`) |
|
|
|
|
|
} finally { |
|
|
|
|
|
console.log('handleUpload4') |
|
|
|
|
|
this.uploading = false |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
handleBeforeUpload() { |
|
|
|
|
|
// TODO: 检查文件大小、类型等 |
|
|
|
|
|
}, |
|
|
|
|
|
handleProgress(event, file) { |
|
|
|
|
|
// 显示上传进度 |
|
|
|
|
|
this.percent = Math.floor((event.loaded / event.total) * 100) |
|
|
|
|
|
|
|
|
return this.fileStatusTextObj[status] |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
fileSuccess(rootFile, file, response, chunk) { |
|
|
fileSuccess(rootFile, file, response, chunk) { |
|
|
|
|
|
this.nowDate = getCurrentTime() |
|
|
|
|
|
console.log(this.fileList) |
|
|
|
|
|
const testList = [] |
|
|
|
|
|
const promiseArray = this.fileList.map(async(item, index) => { |
|
|
|
|
|
testList.push(item.file) |
|
|
|
|
|
const json = {} |
|
|
|
|
|
if (item.file.type.substring(0, item.file.type.indexOf('/')) === 'image') { |
|
|
|
|
|
const fileBase64 = await this.getBase64(item) |
|
|
|
|
|
const imgRes = await this.getImgPx(fileBase64) |
|
|
|
|
|
item.file.px = imgRes.width + 'px*' + imgRes.height + 'px' |
|
|
|
|
|
} else { |
|
|
|
|
|
item.file.px = '' |
|
|
|
|
|
} |
|
|
|
|
|
json.file_name = item.file.name |
|
|
|
|
|
json.file_size = item.file.size |
|
|
|
|
|
json.file_type = item.file.name.substring(item.name.lastIndexOf('.') + 1, item.file.name.length) |
|
|
|
|
|
// json.file_path = res.data.data |
|
|
|
|
|
json.file_path = '' |
|
|
|
|
|
json.sequence = null |
|
|
|
|
|
json.archive_id = this.arcId |
|
|
|
|
|
json.file_dpi = item.file.px |
|
|
|
|
|
json.file_thumbnail = '' |
|
|
|
|
|
json.create_time = this.nowDate |
|
|
|
|
|
json.id = null |
|
|
|
|
|
return json |
|
|
|
|
|
}) |
|
|
const result = JSON.parse(response) |
|
|
const result = JSON.parse(response) |
|
|
|
|
|
|
|
|
|
|
|
console.log(result) |
|
|
|
|
|
console.log(result.data) |
|
|
|
|
|
console.log(result.data.needMerge) |
|
|
|
|
|
console.log(this.skip) |
|
|
|
|
|
|
|
|
|
|
|
Promise.all(promiseArray) |
|
|
|
|
|
.then((arrayUpload) => { |
|
|
const fileInfo = { |
|
|
const fileInfo = { |
|
|
|
|
|
categoryId: this.selectedCategory.id, |
|
|
|
|
|
archivesId: this.arcId, |
|
|
identifier: file.uniqueIdentifier, |
|
|
identifier: file.uniqueIdentifier, |
|
|
filename: file.name, |
|
|
filename: file.name, |
|
|
totalChunks: chunk.offset, |
|
|
totalChunks: chunk.offset, |
|
|
totalSize: file.size |
|
|
|
|
|
|
|
|
totalSize: file.size, |
|
|
|
|
|
fileJsonString: JSON.stringify(arrayUpload) |
|
|
} |
|
|
} |
|
|
// 是否需要合并 |
|
|
|
|
|
if (result.data.needMerge && !this.skip) { |
|
|
|
|
|
axios.post(this.baseApi + '/api/file/merge', fileInfo).then((res) => { |
|
|
|
|
|
if (res.code === 200) { |
|
|
|
|
|
|
|
|
console.log('arrayUpload', arrayUpload) |
|
|
|
|
|
axios.post('http://192.168.99.67:11100/api/collect/merge ', fileInfo, { |
|
|
|
|
|
headers: { |
|
|
|
|
|
'Authorization': getToken() |
|
|
|
|
|
} |
|
|
|
|
|
}).then((res) => { |
|
|
|
|
|
console.log(res) |
|
|
|
|
|
if (res.data.code === 200) { |
|
|
console.log('上传成功') |
|
|
console.log('上传成功') |
|
|
} else { |
|
|
} else { |
|
|
console.log(res) |
|
|
console.log(res) |
|
|
@ -198,16 +172,39 @@ export default { |
|
|
}).catch(function(error) { |
|
|
}).catch(function(error) { |
|
|
console.log(error) |
|
|
console.log(error) |
|
|
}) |
|
|
}) |
|
|
} else { |
|
|
|
|
|
console.log('上传成功，不需要合并') |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
}) |
|
|
|
|
|
.catch((error) => { |
|
|
|
|
|
console.error(error) |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
// 是否需要合并 |
|
|
|
|
|
// if (result.data.needMerge && !this.skip) { |
|
|
|
|
|
// axios.post('http://192.168.99.67:11100/api/collect/merge ', fileInfo, { |
|
|
|
|
|
// headers: { |
|
|
|
|
|
// 'Authorization': getToken() |
|
|
|
|
|
// } |
|
|
|
|
|
// }).then((res) => { |
|
|
|
|
|
// if (res.code === 200) { |
|
|
|
|
|
// console.log('上传成功') |
|
|
|
|
|
// } else { |
|
|
|
|
|
// console.log(res) |
|
|
|
|
|
// } |
|
|
|
|
|
// }).catch(function(error) { |
|
|
|
|
|
// console.log(error) |
|
|
|
|
|
// }) |
|
|
|
|
|
// } else { |
|
|
|
|
|
// console.log('上传成功，不需要合并') |
|
|
|
|
|
// } |
|
|
if (this.skip) { |
|
|
if (this.skip) { |
|
|
this.skip = false |
|
|
this.skip = false |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
fileComplete(rootFile) { |
|
|
|
|
|
|
|
|
onFileError(rootFile, file, message, chunk) { |
|
|
|
|
|
console.log('上传出错：' + message) |
|
|
}, |
|
|
}, |
|
|
complete() { |
|
|
|
|
|
|
|
|
// 文件进度的回调 |
|
|
|
|
|
onFileProgress(rootFile, file, chunk) { |
|
|
|
|
|
console.log(`上传中 ${file.name}，chunk：${chunk.startByte / 1024 / 1024} ~ ${chunk.endByte / 1024 / 1024}`) |
|
|
}, |
|
|
}, |
|
|
filesAdded(file, fileList, event) { |
|
|
filesAdded(file, fileList, event) { |
|
|
file.forEach((e) => { |
|
|
file.forEach((e) => { |
|
|
@ -216,6 +213,13 @@ export default { |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
computeMD5(file) { |
|
|
computeMD5(file) { |
|
|
|
|
|
const maxMessage = '上传文件大小不能超过 10GB!' |
|
|
|
|
|
const maxSize = 10 * 1024 * 1024 * 1024 |
|
|
|
|
|
if (file && file.size > maxSize) { |
|
|
|
|
|
this.$message.warning(maxMessage) |
|
|
|
|
|
return false |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
const fileReader = new FileReader() |
|
|
const fileReader = new FileReader() |
|
|
const time = new Date().getTime() |
|
|
const time = new Date().getTime() |
|
|
const blobSlice = |
|
|
const blobSlice = |
|
|
@ -224,11 +228,11 @@ export default { |
|
|
File.prototype.webkitSlice |
|
|
File.prototype.webkitSlice |
|
|
let currentChunk = 0 |
|
|
let currentChunk = 0 |
|
|
// 文件分片大小 |
|
|
// 文件分片大小 |
|
|
const chunkSize = 5 * 1024 * 1024 |
|
|
|
|
|
|
|
|
const chunkSize = 10 * 1024 * 1024 |
|
|
const chunks = Math.ceil(file.size / chunkSize) |
|
|
const chunks = Math.ceil(file.size / chunkSize) |
|
|
const spark = new SparkMD5.ArrayBuffer() |
|
|
const spark = new SparkMD5.ArrayBuffer() |
|
|
// 文件状态设为"计算MD5" |
|
|
// 文件状态设为"计算MD5" |
|
|
file.cmd5 = true // 文件状态为“计算md5...” |
|
|
|
|
|
|
|
|
file.cmd5 = true |
|
|
file.pause() |
|
|
file.pause() |
|
|
loadNext() |
|
|
loadNext() |
|
|
fileReader.onload = (e) => { |
|
|
fileReader.onload = (e) => { |
|
|
@ -259,11 +263,9 @@ export default { |
|
|
this.error(`文件${file.name}读取出错，请检查该文件`) |
|
|
this.error(`文件${file.name}读取出错，请检查该文件`) |
|
|
file.cancel() |
|
|
file.cancel() |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
function loadNext() { |
|
|
function loadNext() { |
|
|
const start = currentChunk * chunkSize |
|
|
const start = currentChunk * chunkSize |
|
|
const end = |
|
|
|
|
|
start + chunkSize >= file.size ? file.size : start + chunkSize |
|
|
|
|
|
|
|
|
const end = start + chunkSize >= file.size ? file.size : start + chunkSize |
|
|
fileReader.readAsArrayBuffer(blobSlice.call(file.file, start, end)) |
|
|
fileReader.readAsArrayBuffer(blobSlice.call(file.file, start, end)) |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
@ -289,20 +291,45 @@ export default { |
|
|
}) |
|
|
}) |
|
|
this.fileList = [] |
|
|
this.fileList = [] |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
</script> |
|
|
</script> |
|
|
|
|
|
|
|
|
<style lang="scss" scoped> |
|
|
<style lang="scss" scoped> |
|
|
.upload-demo{ |
|
|
|
|
|
|
|
|
.uploader-big{ |
|
|
|
|
|
width: 100%; |
|
|
|
|
|
.uploader{ |
|
|
position: relative; |
|
|
position: relative; |
|
|
display: flex; |
|
|
display: flex; |
|
|
|
|
|
flex-direction: column; |
|
|
justify-content: center; |
|
|
justify-content: center; |
|
|
|
|
|
width: 100%; |
|
|
|
|
|
text-align: center; |
|
|
|
|
|
margin-bottom: 8px; |
|
|
|
|
|
.uploader-drop{ |
|
|
|
|
|
padding: 20px 0; |
|
|
|
|
|
border: none; |
|
|
|
|
|
.uploader-btn{ |
|
|
width: 120px; |
|
|
width: 120px; |
|
|
margin: 20px 0 30px 0; |
|
|
|
|
|
.el-progress{ |
|
|
|
|
|
position: absolute; |
|
|
|
|
|
left: 0; |
|
|
|
|
|
bottom: -20px; |
|
|
|
|
|
|
|
|
margin: 10px 0 0 0; |
|
|
|
|
|
padding: 0; |
|
|
|
|
|
border: none; |
|
|
|
|
|
i{ |
|
|
|
|
|
font-size: 32px; |
|
|
|
|
|
color: #1F55EB; |
|
|
|
|
|
} |
|
|
|
|
|
&:hover{ |
|
|
|
|
|
background-color: transparent; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
.upload-big-button{ |
|
|
|
|
|
display: flex; |
|
|
|
|
|
flex-direction: row; |
|
|
|
|
|
justify-content: center; |
|
|
|
|
|
align-items: center; |
|
|
|
|
|
margin: 10px 0 5px 0; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
</style> |
|
|
</style> |
