From b1e5ebab8f2d522b876a46f6a60f37227a6de1e5 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 10 十月 2021 11:26:50 +0800
Subject: [PATCH] 升级spring-boot-mybatis到最新版2.2.0
---
ruoyi-ui/src/views/monitor/job/log.vue | 81 +++++++++++++++-------------------------
1 files changed, 30 insertions(+), 51 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index b55b011..44efe5f 100644
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@@ -20,10 +20,10 @@
style="width: 240px"
>
<el-option
- v-for="dict in jobGroupOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.sys_job_group"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
@@ -36,10 +36,10 @@
style="width: 240px"
>
<el-option
- v-for="dict in statusOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.sys_common_status"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
@@ -112,14 +112,14 @@
<el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
<el-table-column label="任务组名" align="center" prop="jobGroup" :show-overflow-tooltip="true">
<template slot-scope="scope">
- <dict-tag :options="jobGroupOptions" :value="scope.row.jobGroup"/>
+ <dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
</template>
</el-table-column>
<el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
<el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
<el-table-column label="执行状态" align="center" prop="status">
<template slot-scope="scope">
- <dict-tag :options="statusOptions" :value="scope.row.status"/>
+ <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="执行时间" align="center" prop="createTime" width="180">
@@ -190,6 +190,7 @@
export default {
name: "JobLog",
+ dicts: ['sys_common_status', 'sys_job_group'],
data() {
return {
// 遮罩层
@@ -212,10 +213,6 @@
dateRange: [],
// 表单参数
form: {},
- // 执行状态字典
- statusOptions: [],
- // 任务组名字典
- jobGroupOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
@@ -237,12 +234,6 @@
} else {
this.getList();
}
- this.getDicts("sys_common_status").then(response => {
- this.statusOptions = response.data;
- });
- this.getDicts("sys_job_group").then(response => {
- this.jobGroupOptions = response.data;
- });
},
methods: {
/** 查询调度日志列表 */
@@ -284,44 +275,32 @@
/** 删除按钮操作 */
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.$modal.confirm('是否确认导出所有调度日志数据项？').then(() => {
+ this.exportLoading = true;
+ return exportJobLog(queryParams);
+ }).then(response => {
+ this.$download.name(response.msg);
+ this.exportLoading = false;
+ }).catch(() => {});
}
}
};
--
Gitblit v1.9.2