From f7db1bcb1b43528a575a9d099d24b379a2ad8c11 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Fri, 29 Jan 2021 13:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/utils/zipdownload.js             | 92 +++++++++----------
 .../src/views/benyi/child_files/index.vue     |  2 +-
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/ruoyi-ui/src/utils/zipdownload.js b/ruoyi-ui/src/utils/zipdownload.js
index 5ea8ddc67..cf1409dac 100644
--- a/ruoyi-ui/src/utils/zipdownload.js
+++ b/ruoyi-ui/src/utils/zipdownload.js
@@ -2,46 +2,46 @@ import axios from 'axios'
 import { getToken } from '@/utils/auth'
 
 const mimeMap = {
-  xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-  zip: 'application/zip'
+    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    zip: 'application/zip'
 }
 
 const baseUrl = process.env.VUE_APP_BASE_API
 export function downLoadZip(str, filename) {
-  var url = baseUrl + str
-  axios({
-    method: 'get',
-    url: url,
-    responseType: 'blob',
-    headers: { 'Authorization': 'Bearer ' + getToken() }
-  }).then(res => {
-    resolveBlob(res, mimeMap.zip)
-  })
+    var url = baseUrl + str
+    axios({
+        method: 'get',
+        url: url,
+        responseType: 'blob',
+        headers: { 'Authorization': 'Bearer ' + getToken() }
+    }).then(res => {
+        resolveBlob(res, mimeMap.zip)
+    })
 }
-export function downLoadUrl(str) {
-  var url = baseUrl + str
-  axios({
-    method: 'get',
-    url: url,
-    responseType: 'blob',
-    headers: { 'Authorization': 'Bearer ' + getToken() },
-  }).then(res => {
-    console.log(res);
-    // downloadFileFun(res, item)
-  })
+export function downLoadUrl(str, item) {
+    var url = baseUrl + str
+    axios({
+        method: 'get',
+        url: url,
+        responseType: 'blob',
+        headers: { 'Authorization': 'Bearer ' + getToken() },
+    }).then(res => {
+        // console.log(res);
+        downloadFileFun(res.data, item)
+    })
 }
 
 export function downloadFileFun(data, item) {
-  if (!data) {
-    return
-  }
-  let url = window.URL.createObjectURL(new Blob([data]))
-  let link = document.createElement('a')
-  link.style.display = 'none'
-  link.href = url
-  link.setAttribute('download', item.name)
-  document.body.appendChild(link)
-  link.click()
+    if (!data) {
+        return
+    }
+    let url = window.URL.createObjectURL(new Blob([data]))
+    let link = document.createElement('a')
+    link.style.display = 'none'
+    link.href = url
+    link.setAttribute('download', item.name)
+    document.body.appendChild(link)
+    link.click()
 }
 
 /**
@@ -50,17 +50,17 @@ export function downloadFileFun(data, item) {
  * @param {String} mimeType MIME类型
  */
 export function resolveBlob(res, mimeType) {
-  const aLink = document.createElement('a')
-  var blob = new Blob([res.data], { type: mimeType })
-  // //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名;
-  var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
-  var contentDisposition = decodeURI(res.headers['content-disposition'])
-  var result = patt.exec(contentDisposition)
-  var fileName = result[1]
-  fileName = fileName.replace(/\"/g, '')
-  aLink.href = URL.createObjectURL(blob)
-  aLink.setAttribute('download', fileName) // 设置下载文件名称
-  document.body.appendChild(aLink)
-  aLink.click()
-  document.body.appendChild(aLink)
-}
+    const aLink = document.createElement('a')
+    var blob = new Blob([res.data], { type: mimeType })
+        // //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名;
+    var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
+    var contentDisposition = decodeURI(res.headers['content-disposition'])
+    var result = patt.exec(contentDisposition)
+    var fileName = result[1]
+    fileName = fileName.replace(/\"/g, '')
+    aLink.href = URL.createObjectURL(blob)
+    aLink.setAttribute('download', fileName) // 设置下载文件名称
+    document.body.appendChild(aLink)
+    aLink.click()
+    document.body.appendChild(aLink)
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/benyi/child_files/index.vue b/ruoyi-ui/src/views/benyi/child_files/index.vue
index 5a853b8b5..a4924e670 100644
--- a/ruoyi-ui/src/views/benyi/child_files/index.vue
+++ b/ruoyi-ui/src/views/benyi/child_files/index.vue
@@ -67,7 +67,7 @@ export default {
     },
     load() {},
     down(row) {
-      downLoadUrl(row.fileurl);
+      downLoadUrl(row.fileurl,row);
     },
   },
 };