From d9e805a6a50f0207a345d2ad7e105a70f993361d Mon Sep 17 00:00:00 2001
From: mroldx <974751082@qq.com>
Date: 星期四, 12 八月 2021 17:19:56 +0800
Subject: [PATCH] 添加获取验证码方法上遗漏的@Override注解
---
ruoyi-ui/src/views/monitor/job/log.vue | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index 121dde8..25db43f 100644
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@@ -94,6 +94,15 @@
v-hasPermi="['monitor:job:export']"
>导出</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-close"
+ size="mini"
+ @click="handleClose"
+ >关闭</el-button>
+ </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -168,6 +177,7 @@
</template>
<script>
+import { getJob} from "@/api/monitor/job";
import { listJobLog, delJobLog, exportJobLog, cleanJobLog } from "@/api/monitor/jobLog";
export default {
@@ -209,8 +219,17 @@
};
},
created() {
- this.getList();
- this.getDicts("sys_job_status").then(response => {
+ const jobId = this.$route.query.jobId;
+ if (jobId !== undefined && jobId != 0) {
+ getJob(jobId).then(response => {
+ this.queryParams.jobName = response.data.jobName;
+ this.queryParams.jobGroup = response.data.jobGroup;
+ this.getList();
+ });
+ } else {
+ this.getList();
+ }
+ this.getDicts("sys_common_status").then(response => {
this.statusOptions = response.data;
});
this.getDicts("sys_job_group").then(response => {
@@ -235,6 +254,11 @@
// 任务组名字典翻译
jobGroupFormat(row, column) {
return this.selectDictLabel(this.jobGroupOptions, row.jobGroup);
+ },
+ // 返回按钮
+ handleClose() {
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.push({ path: "/monitor/job" });
},
/** 搜索按钮操作 */
handleQuery() {
@@ -269,7 +293,7 @@
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
- })
+ }).catch(() => {});
},
/** 清空按钮操作 */
handleClean() {
@@ -282,7 +306,7 @@
}).then(() => {
this.getList();
this.msgSuccess("清空成功");
- })
+ }).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
@@ -297,7 +321,7 @@
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
- })
+ }).catch(() => {});
}
}
};
--
Gitblit v1.9.2