From c364836a9d32bb6ec7eab8185da244228a55d24c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 24 十一月 2021 10:58:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-ui/src/views/demo/demo/index.vue | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/demo/demo/index.vue b/ruoyi-ui/src/views/demo/demo/index.vue
index 6f952ec..9ff0e47 100644
--- a/ruoyi-ui/src/views/demo/demo/index.vue
+++ b/ruoyi-ui/src/views/demo/demo/index.vue
@@ -77,7 +77,6 @@
plain
icon="el-icon-download"
size="mini"
- :loading="exportLoading"
@click="handleExport"
v-hasPermi="['demo:demo:export']"
>瀵煎嚭</el-button>
@@ -181,8 +180,6 @@
buttonLoading: false,
// 閬僵灞�
loading: true,
- // 瀵煎嚭閬僵灞�
- exportLoading: false,
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -358,7 +355,9 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.downLoadExcel('/demo/demo/export', this.queryParams);
+ this.download('demo/demo/export', {
+ ...this.queryParams
+ }, `demo_${new Date().getTime()}.xlsx`)
}
}
};
--
Gitblit v1.9.3