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 | 64 ++++++++++----------------------
1 files changed, 20 insertions(+), 44 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index c7ccaa8..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() {
@@ -275,44 +268,27 @@
/** 删除按钮操作 */
handleDelete(row) {
const jobLogIds = this.ids;
- this.$confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return delJobLog(jobLogIds);
- }).then(() => {
- this.getList();
- this.msgSuccess("删除成功");
- }).catch(() => {});
+ this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项？').then(function() {
+ return delJobLog(jobLogIds);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("删除成功");
+ }).catch(() => {});
},
/** 清空按钮操作 */
handleClean() {
- this.$confirm("是否确认清空所有调度日志数据项?", "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return cleanJobLog();
- }).then(() => {
- this.getList();
- this.msgSuccess("清空成功");
- }).catch(() => {});
+ this.$modal.confirm('是否确认清空所有调度日志数据项？').then(function() {
+ return cleanJobLog();
+ }).then(() => {
+ this.getList();
+ this.$modal.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;
- }).catch(() => {});
+ this.download('/monitor/jobLog/export', {
+ ...this.queryParams
+ }, `log_${new Date().getTime()}.xlsx`)
}
}
};
--
Gitblit v1.9.2