From 2c2dad24d59b37df254d1c003d6c3e1119b51d6c Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 11 八月 2021 14:28:05 +0800 Subject: [PATCH] update 更新 阿里云 maven源 新地址 --- ruoyi-ui/src/views/monitor/job/log.vue | 50 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 18 deletions(-) diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue index 121dde8..8ce0111 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,7 +177,9 @@ </template> <script> -import { listJobLog, delJobLog, exportJobLog, cleanJobLog } from "@/api/monitor/jobLog"; +import { getJob } from "@/api/monitor/job"; +import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog"; +import { downLoadExcel } from "@/utils/download"; export default { name: "JobLog", @@ -209,8 +220,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 +255,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 +294,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }) + }).catch(() => {}); }, /** 娓呯┖鎸夐挳鎿嶄綔 */ handleClean() { @@ -282,23 +307,12 @@ }).then(() => { this.getList(); this.msgSuccess("娓呯┖鎴愬姛"); - }) + }).catch(() => {}); }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { - const queryParams = this.queryParams; - this.$confirm("鏄惁纭瀵煎嚭鎵�鏈夎皟搴︽棩蹇楁暟鎹」?", "璀﹀憡", { - confirmButtonText: "纭畾", - cancelButtonText: "鍙栨秷", - type: "warning" - }).then(() => { - this.exportLoading = true; - return exportJobLog(queryParams); - }).then(response => { - this.download(response.msg); - this.exportLoading = false; - }) + downLoadExcel('/monitor/jobLog/export', this.queryParams); } } }; -</script> \ No newline at end of file +</script> -- Gitblit v1.9.3