From 64add90edd42956b18d47bc3a8c72244598d6dda Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 17 十一月 2021 19:14:03 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/views/monitor/job/log.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index fca1af4..35b7788 100644
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@@ -89,7 +89,6 @@
plain
icon="el-icon-download"
size="mini"
- :loading="exportLoading"
@click="handleExport"
v-hasPermi="['monitor:job:export']"
>瀵煎嚭</el-button>
@@ -185,7 +184,7 @@
</template>
<script>
-import { getJob } from "@/api/monitor/job";
+import { getJob} from "@/api/monitor/job";
import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog";
export default {
@@ -195,8 +194,6 @@
return {
// 閬僵灞�
loading: true,
- // 瀵煎嚭閬僵灞�
- exportLoading: false,
// 閫変腑鏁扮粍
ids: [],
// 闈炲涓鐢�
@@ -293,7 +290,9 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.$download.excel('/monitor/jobLog/export', this.queryParams);
+ this.download('/monitor/jobLog/export', {
+ ...this.queryParams
+ }, `log_${new Date().getTime()}.xlsx`)
}
}
};
--
Gitblit v1.9.3