From f325e58c5a08910e081698e702a6baf3ce00db54 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 08 九月 2022 16:58:14 +0800
Subject: [PATCH] 冲突
---
src/components/uploaderFile/index.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/components/uploaderFile/index.vue b/src/components/uploaderFile/index.vue
index 3434a5e..b4b4189 100644
--- a/src/components/uploaderFile/index.vue
+++ b/src/components/uploaderFile/index.vue
@@ -61,10 +61,11 @@
};
const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
+ console.log(uploadFile)
goalManagementApi()
- .searchFile(uploadFile.fileName)
+ .searchFile(uploadFile.name)
.then((res) => {
- window.open(res.data, "_blank");
+ window.open(res.config.url, "_blank");
})
dialogImageUrl.value = uploadFile.url!;
// dialogVisible.value = true;
@@ -104,8 +105,12 @@
let form = new FormData();
form.append('file', param.file);
//组装文件名（传入后缀名）
+ console.log(param)
+ var fileNameList = param.file.name.split('.')
+ var typeFile = param.file.name.split('.')[fileNameList.length-1]
var fileName1 = getFileName(param.file.type.split('/')[1], 1);
- var fileName2 = getFileName(param.file.type.split('/')[1], 2);
+ // var fileName2 = getFileName(param.file.type.split('/')[1], 2);
+ var fileName2 = '.'+typeFile;
goalManagementApi()
.beforeUploadFile(fileName1, fileName2)
.then((res) => {
--
Gitblit v1.9.2