From e7540176d09620836557821d17835751c33df261 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Fri, 06 Oct 2023 14:57:01 +0800
Subject: [PATCH] Merge branch 'demo' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into demo
---
src/components/MediaPanel.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/MediaPanel.vue b/src/components/MediaPanel.vue
index 911fb2e..f9e5d7d 100644
--- a/src/components/MediaPanel.vue
+++ b/src/components/MediaPanel.vue
@@ -34,7 +34,7 @@
<a-button type="primary" @click="compress">压缩打包</a-button>
</div>
- <a-spin :spinning="loading" :delay="1000" tip="downloading" size="large">
+ <a-spin :spinning="loading" :delay="1000" tip="加载中" size="large">
<div class="media-panel-wrapper">
<a-table class="media-table" :columns="columns" :data-source="mediaData.data" row-key="fingerprint"
rowKey="file_id" :row-selection="rowSelection"
@@ -365,7 +365,6 @@
const promiseList = [] as any
selectedRow.list.forEach(e => {
const url = prefix + e.object_key
-
const promise = getFile(url, e.file_name)
promiseList.push(promise)
})
@@ -443,9 +442,10 @@
function downloadMedia (media: MediaFile) {
loading.value = true
const url = prefix + '/' + media.object_key
- const data = new Blob([url])
- downloadFile(data, media.file_name)
- loading.value = false
+ getFile(url, media.file_name).then(res => {
+ downloadFile(res.data, res.name)
+ loading.value = false
+ })
// downloadMediaFile(workspaceId, media.file_id).then(res => {
// if (!res) {
--
Gitblit v1.9.3