From cc9ddf2ecaf3ad935374f49c842227f7eb15779d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 十一月 2022 10:21:15 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

---
 src/utils/helper.js |   43 +++++++++++++++++++------------------------
 1 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/utils/helper.js b/src/utils/helper.js
index 25f8baf..e9853bc 100644
--- a/src/utils/helper.js
+++ b/src/utils/helper.js
@@ -45,30 +45,26 @@
         })
     return arr;
 }
-export async function myDownLoad(arr){
-    let fileName = arr.headers['content-disposition'];
-            console.log(fileName);
-            if (fileName) {
-                fileName = fileName.slice(fileName.indexOf('filename=') + 9);
-            }
-            const blob = new Blob([arr.data], {
-                type: 'application/octet-stream'
-            })
-            // content-disposition
-            const downloadElement = document.createElement('a')
-            // 鍒涘缓涓嬭浇鐨勯摼鎺�
-            const href = window.URL.createObjectURL(blob)
-            downloadElement.href = href
-            // // 涓嬭浇鍚庢枃浠跺悕
-            downloadElement.download = fileName
-            document.body.appendChild(downloadElement)
-            // 鐐瑰嚮涓嬭浇
-            downloadElement.click()
-            // 涓嬭浇瀹屾垚绉婚櫎鍏冪礌
-            document.body.removeChild(downloadElement)
-            // 閲婃斁鎺塨lob瀵硅薄
-            window.URL.revokeObjectURL(href)
+
+// data: 鏂囦欢, contentDisposition锛氳姹傚ご涓枃浠剁殑鍚嶅瓧
+// 榛樿涓嶇敤淇敼锛岀洿鎺ュ皢杩斿洖鐨剅es浼犲叆鍗冲彲
+export function downloadFile(res) {
+    const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+    const fileName = res.contentDisposition.split('=')[1];
+    if (window.navigator && window.navigator.msSaveBlob) {
+        navigator.msSaveBlob(blob, fileName);
+    } else {
+        const link = document.createElement('a');
+        link.style.display = 'none';
+        link.href = URL.createObjectURL(blob);
+        link.setAttribute('download', decodeURI(fileName));
+        document.body.appendChild(link);
+        link.click();
+        URL.revokeObjectURL(link.href);
+        document.body.removeChild(link);
+    }
 }
+
 // 鑾峰彇token
 export function getToken() {
     const token = sessionStorage.getItem('token');
@@ -76,7 +72,6 @@
     if (token && tokenHead) {
         return tokenHead + token;
     }
-    return;
 }
 // 鑾峰彇骞存湀鏃ユ椂鍒嗙
 export function getNowDate(time){

--
Gitblit v1.8.0