From d1ef19f08a2cf9faa202f330798c7e6f822bb722 Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期五, 20 八月 2021 17:57:44 +0800 Subject: [PATCH] 自定义可拖动弹窗高度指令 --- ruoyi-ui/src/views/monitor/job/log.vue | 53 +++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 43 insertions(+), 10 deletions(-) diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue index 4ead634..25db43f 100644 --- a/ruoyi-ui/src/views/monitor/job/log.vue +++ b/ruoyi-ui/src/views/monitor/job/log.vue @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="任务名称" prop="jobName"> <el-input v-model="queryParams.jobName" @@ -65,6 +65,7 @@ <el-col :span="1.5"> <el-button type="danger" + plain icon="el-icon-delete" size="mini" :disabled="multiple" @@ -75,6 +76,7 @@ <el-col :span="1.5"> <el-button type="danger" + plain icon="el-icon-delete" size="mini" @click="handleClean" @@ -84,12 +86,24 @@ <el-col :span="1.5"> <el-button type="warning" + plain icon="el-icon-download" size="mini" + :loading="exportLoading" @click="handleExport" 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> <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange"> @@ -163,6 +177,7 @@ </template> <script> +import { getJob} from "@/api/monitor/job"; import { listJobLog, delJobLog, exportJobLog, cleanJobLog } from "@/api/monitor/jobLog"; export default { @@ -171,10 +186,14 @@ return { // 遮罩层 loading: true, + // 导出遮罩层 + exportLoading: false, // 选中数组 ids: [], // 非多个禁用 multiple: true, + // 显示搜索条件 + showSearch: true, // 总条数 total: 0, // 调度日志表格数据 @@ -196,14 +215,21 @@ jobName: undefined, jobGroup: undefined, status: undefined - }, - // 表单参数 - form: {} + } }; }, 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 => { @@ -228,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() { @@ -262,7 +293,7 @@ }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }).catch(() => {}); }, /** 清空按钮操作 */ handleClean() { @@ -275,7 +306,7 @@ }).then(() => { this.getList(); this.msgSuccess("清空成功"); - }).catch(function() {}); + }).catch(() => {}); }, /** 导出按钮操作 */ handleExport() { @@ -284,11 +315,13 @@ confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" - }).then(function() { + }).then(() => { + this.exportLoading = true; return exportJobLog(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + this.exportLoading = false; + }).catch(() => {}); } } }; -- Gitblit v1.9.2