From 57bddf259ad66bbd47594de7612433bcc8f9ff13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=89=91=E9=94=8B?= <1822213252@qq.com>
Date: Tue, 4 Jul 2023 06:41:02 +0000
Subject: [PATCH] =?UTF-8?q?update=20=E4=B8=8B=E8=BD=BD=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=81=AE=E7=BD=A9=E5=B1=82=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E5=8D=95=E6=AC=A1=E7=82=B9=E5=87=BB=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E5=86=8D=E6=AC=A1=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 梁剑锋 <1822213252@qq.com>
---
 ruoyi-ui/src/plugins/download.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ruoyi-ui/src/plugins/download.js b/ruoyi-ui/src/plugins/download.js
index b27702f18..dae2ba9cf 100644
--- a/ruoyi-ui/src/plugins/download.js
+++ b/ruoyi-ui/src/plugins/download.js
@@ -34,6 +34,7 @@ export default {
   },
   zip(url, name) {
     var url = baseURL + url
+    downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
     axios({
       method: 'get',
       url: url,
@@ -50,6 +51,11 @@ export default {
       } else {
         this.printErrMsg(res.data);
       }
+      downloadLoadingInstance.close();
+    }).catch((r) => {
+      console.error(r)
+      Message.error('下载文件出现错误，请联系管理员！')
+      downloadLoadingInstance.close();
     })
   },
   saveAs(text, name, opts) {