From eb9f3d37725c5df391f390c00cdeefa2d9a1d29b Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期二, 12 七月 2022 18:04:49 +0800 Subject: [PATCH] 修改验证码开关变量名 --- ruoyi-ui/src/views/monitor/job/log.vue | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue index 44efe5f..d7c36f4 100644 --- a/ruoyi-ui/src/views/monitor/job/log.vue +++ b/ruoyi-ui/src/views/monitor/job/log.vue @@ -1,12 +1,11 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="浠诲姟鍚嶇О" prop="jobName"> <el-input v-model="queryParams.jobName" placeholder="璇疯緭鍏ヤ换鍔″悕绉�" clearable - size="small" style="width: 240px" @keyup.enter.native="handleQuery" /> @@ -14,9 +13,8 @@ <el-form-item label="浠诲姟缁勫悕" prop="jobGroup"> <el-select v-model="queryParams.jobGroup" - placeholder="璇蜂换鍔$粍鍚�" + placeholder="璇烽�夋嫨浠诲姟缁勫悕" clearable - size="small" style="width: 240px" > <el-option @@ -32,7 +30,6 @@ v-model="queryParams.status" placeholder="璇烽�夋嫨鎵ц鐘舵��" clearable - size="small" style="width: 240px" > <el-option @@ -46,7 +43,6 @@ <el-form-item label="鎵ц鏃堕棿"> <el-date-picker v-model="dateRange" - size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" @@ -89,7 +85,6 @@ plain icon="el-icon-download" size="mini" - :loading="exportLoading" @click="handleExport" v-hasPermi="['monitor:job:export']" >瀵煎嚭</el-button> @@ -186,7 +181,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 +190,6 @@ return { // 閬僵灞� loading: true, - // 瀵煎嚭閬僵灞� - exportLoading: false, // 閫変腑鏁扮粍 ids: [], // 闈炲涓鐢� @@ -248,8 +241,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 +286,9 @@ }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { - const queryParams = this.queryParams; - this.$modal.confirm('鏄惁纭瀵煎嚭鎵�鏈夎皟搴︽棩蹇楁暟鎹」锛�').then(() => { - this.exportLoading = true; - return exportJobLog(queryParams); - }).then(response => { - this.$download.name(response.msg); - this.exportLoading = false; - }).catch(() => {}); + this.download('/monitor/jobLog/export', { + ...this.queryParams + }, `log_${new Date().getTime()}.xlsx`) } } }; -- Gitblit v1.9.3