From 7108ec41b50cd1c8a488d44c938b1c8c38e5de48 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sat, 18 Sep 2021 18:43:59 +0800
Subject: [PATCH] !322 Cron表达式生成器关闭时销毁，避免再次打开时存在上一次修改的数据 Merge pull request !322 from muyi/master
---
ruoyi-ui/src/views/monitor/job/log.vue | 49 ++++++++++++++++++++-----------------------------
1 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index 25db43f..c7ccaa8 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>
@@ -110,10 +110,18 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
<el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
- <el-table-column label="任务组名" align="center" prop="jobGroup" :formatter="jobGroupFormat" :show-overflow-tooltip="true" />
+ <el-table-column label="任务组名" align="center" prop="jobGroup" :show-overflow-tooltip="true">
+ <template slot-scope="scope">
+ <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" :formatter="statusFormat" />
+ <el-table-column label="执行状态" align="center" prop="status">
+ <template slot-scope="scope">
+ <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">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
@@ -182,6 +190,7 @@
export default {
name: "JobLog",
+ dicts: ['sys_common_status', 'sys_job_group'],
data() {
return {
// 遮罩层
@@ -204,10 +213,6 @@
dateRange: [],
// 表单参数
form: {},
- // 执行状态字典
- statusOptions: [],
- // 任务组名字典
- jobGroupOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
@@ -229,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: {
/** 查询调度日志列表 */
@@ -246,14 +245,6 @@
this.loading = false;
}
);
- },
- // 执行状态字典翻译
- statusFormat(row, column) {
- return this.selectDictLabel(this.statusOptions, row.status);
- },
- // 任务组名字典翻译
- jobGroupFormat(row, column) {
- return this.selectDictLabel(this.jobGroupOptions, row.jobGroup);
},
// 返回按钮
handleClose() {
@@ -325,4 +316,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.2