From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/api/media.ts | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/api/media.ts b/src/api/media.ts
index 9cf48d9..634bd13 100644
--- a/src/api/media.ts
+++ b/src/api/media.ts
@@ -1,3 +1,4 @@
+import { message } from 'ant-design-vue'
import request, { IPage, IWorkspaceResponse } from '/@/api/http/request'
const HTTP_PREFIX = '/media/api/v1'
@@ -8,11 +9,18 @@
return result.data
}
// Download Media File
-export const downloadMediaFile = async function (workspaceId: string, fingerprint: string): Promise<any> {
- const url = `${HTTP_PREFIX}/files/${workspaceId}/file/${fingerprint}/url`
+export const downloadMediaFile = async function (workspaceId: string, fileId: string): Promise<any> {
+ const url = `${HTTP_PREFIX}/files/${workspaceId}/file/${fileId}/url`
const result = await request.get(url, { responseType: 'blob' })
- if (result.data.code) {
+ if (result.data.type === 'application/json') {
+ const reader = new FileReader()
+ reader.onload = function (e) {
+ const text = reader.result as string
+ const result = JSON.parse(text)
+ message.error(result.message)
+ }
+ reader.readAsText(result.data, 'utf-8')
+ } else {
return result.data
}
- return result
}
--
Gitblit v1.9.3