From 43d76e599091dc6b79b51f89c79514b50e33ea35 Mon Sep 17 00:00:00 2001
From: fuzui <73400@163.com>
Date: 星期四, 16 十二月 2021 02:18:48 +0800
Subject: [PATCH] fix: cron组件中周回显bug
---
ruoyi-ui/src/views/monitor/job/log.vue | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index f8b3a50..98b9ab3 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>
@@ -186,7 +185,7 @@
<script>
import { getJob} from "@/api/monitor/job";
-import { listJobLog, delJobLog, exportJobLog, cleanJobLog } from "@/api/monitor/jobLog";
+import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog";
export default {
name: "JobLog",
@@ -195,8 +194,6 @@
return {
// 閬僵灞�
loading: true,
- // 瀵煎嚭閬僵灞�
- exportLoading: false,
// 閫変腑鏁扮粍
ids: [],
// 闈炲涓鐢�
@@ -248,8 +245,8 @@
},
// 杩斿洖鎸夐挳
handleClose() {
- this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.push({ path: "/monitor/job" });
+ const obj = { path: "/monitor/job" };
+ this.$tab.closeOpenPage(obj);
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -293,14 +290,9 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- const queryParams = this.queryParams;
- this.$modal.confirm('鏄惁纭瀵煎嚭鎵�鏈夎皟搴︽棩蹇楁暟鎹」锛�').then(() => {
- this.exportLoading = true;
- return exportJobLog(queryParams);
- }).then(response => {
- this.download(response.msg);
- this.exportLoading = false;
- }).catch(() => {});
+ this.download('/monitor/jobLog/export', {
+ ...this.queryParams
+ }, `log_${new Date().getTime()}.xlsx`)
}
}
};
--
Gitblit v1.9.3