From 3d828ba07224d1935f47cb0c20dcb959281361d6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 十二月 2023 14:06:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index 00d593e..08d4d34 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -122,20 +122,22 @@
},
methods: {
handlerFile(res) {
- let reader = new FileReader();
- reader.readAsText(res.data);
- reader.onload = (result) => {
- try {
- let resData = JSON.parse(result.target.result); // 瑙ｆ瀽瀵硅薄鎴愬姛
- if (resData.code != 200) {
- this.$message.error(resData.msg);
- }
- } catch (err) {
- // console.log("err",err)// 瑙ｆ瀽鎴愬璞″け璐ワ紝璇存槑鏄甯哥殑鏂囦欢娴�
- func.downloadFileByBlobHandler(res);
- this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
- }
- };
+ // let reader = new FileReader();
+ // reader.readAsText(res.data);
+ // reader.onload = (result) => {
+ // try {
+ // let resData = JSON.parse(result.target.result); // 瑙ｆ瀽瀵硅薄鎴愬姛
+ // if (resData.code != 200) {
+ // this.$message.error(resData.msg);
+ // }
+ // } catch (err) {
+ // // 瑙ｆ瀽鎴愬璞″け璐ワ紝璇存槑鏄甯哥殑鏂囦欢娴�
+ // func.downloadFileByBlobHandler(res);
+ // this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
+ // }
+ // };
+ func.downloadFileByBlobHandler(res);
+ this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
},
escHandler() {
this.$emit('update:visible', false);
@@ -257,7 +259,7 @@
page: start,
endPage: end
}).then(res => {
- console.log('res', res)
+ // console.log('res', res)
this.handlerFile(res);
this.escHandler();
})
--
Gitblit v1.9.3