From 00e0dbbf98347b1e47a7e0aedd41baa61f7567ed Mon Sep 17 00:00:00 2001
From: fuyongxin <110568259@qq.com>
Date: Wed, 03 Jun 2026 08:47:03 +0800
Subject: [PATCH] 修改配置nacos，后端gateway端口
---
ruoyi-ui/src/views/monitor/job/log.vue | 190 ++++++++++++++++++++--------------------------
1 files changed, 83 insertions(+), 107 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index 842db03..56dc96f 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,16 +13,15 @@
<el-form-item label="任务组名" prop="jobGroup">
<el-select
v-model="queryParams.jobGroup"
- placeholder="请任务组名"
+ placeholder="请选择任务组名"
clearable
- size="small"
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>
@@ -32,21 +30,19 @@
v-model="queryParams.status"
placeholder="请选择执行状态"
clearable
- size="small"
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>
<el-form-item label="执行时间">
<el-date-picker
v-model="dateRange"
- size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
@@ -56,7 +52,7 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@@ -65,6 +61,7 @@
<el-col :span="1.5">
<el-button
type="danger"
+ plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@@ -75,6 +72,7 @@
<el-col :span="1.5">
<el-button
type="danger"
+ plain
icon="el-icon-delete"
size="mini"
@click="handleClean"
@@ -84,11 +82,21 @@
<el-col :span="1.5">
<el-button
type="warning"
+ plain
icon="el-icon-download"
size="mini"
@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>
@@ -97,10 +105,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>
@@ -127,47 +143,19 @@
@pagination="getList"
/>
- <!-- 调度日志详细 -->
- <el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body>
- <el-form ref="form" :model="form" label-width="100px" size="mini">
- <el-row>
- <el-col :span="12">
- <el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item>
- <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="任务分组：">{{ form.jobGroup }}</el-form-item>
- <el-form-item label="执行时间：">{{ form.createTime }}</el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="调用方法：">{{ form.invokeTarget }}</el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="日志信息：">{{ form.jobMessage }}</el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="执行状态：">
- <div v-if="form.status == 0">正常</div>
- <div v-else-if="form.status == 1">失败</div>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="异常信息：" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button @click="open = false">关 闭</el-button>
- </div>
- </el-dialog>
+ <job-log-detail :visible.sync="open" :row="form" type="log" />
</div>
</template>
<script>
-import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog";
+import { getJob} from "@/api/monitor/job"
+import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog"
+import JobLogDetail from './detail'
export default {
name: "JobLog",
+ components: { JobLogDetail },
+ dicts: ['sys_common_status', 'sys_job_group'],
data() {
return {
// 遮罩层
@@ -188,10 +176,6 @@
dateRange: [],
// 表单参数
form: {},
- // 执行状态字典
- statusOptions: [],
- // 任务组名字典
- jobGroupOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
@@ -200,83 +184,75 @@
jobGroup: undefined,
status: undefined
}
- };
+ }
},
created() {
- this.getList();
- this.getDicts("sys_job_status").then(response => {
- this.statusOptions = response.data;
- });
- this.getDicts("sys_job_group").then(response => {
- this.jobGroupOptions = response.data;
- });
+ const jobId = this.$route.params && this.$route.params.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()
+ }
},
methods: {
/** 查询调度日志列表 */
getList() {
- this.loading = true;
+ this.loading = true
listJobLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- this.jobLogList = response.rows;
- this.total = response.total;
- this.loading = false;
+ this.jobLogList = response.rows
+ this.total = response.total
+ this.loading = false
}
- );
+ )
},
- // 执行状态字典翻译
- statusFormat(row, column) {
- return this.selectDictLabel(this.statusOptions, row.status);
- },
- // 任务组名字典翻译
- jobGroupFormat(row, column) {
- return this.selectDictLabel(this.jobGroupOptions, row.jobGroup);
+ // 返回按钮
+ handleClose() {
+ const obj = { path: "/monitor/job" }
+ this.$tab.closeOpenPage(obj)
},
/** 搜索按钮操作 */
handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
+ this.queryParams.pageNum = 1
+ this.getList()
},
/** 重置按钮操作 */
resetQuery() {
- this.dateRange = [];
- this.resetForm("queryForm");
- this.handleQuery();
+ this.dateRange = []
+ this.resetForm("queryForm")
+ this.handleQuery()
},
// 多选框选中数据
handleSelectionChange(selection) {
- this.ids = selection.map(item => item.jobLogId);
- this.multiple = !selection.length;
+ this.ids = selection.map(item => item.jobLogId)
+ this.multiple = !selection.length
},
/** 详细按钮操作 */
handleView(row) {
- this.open = true;
- this.form = row;
+ this.open = true
+ this.form = row
},
/** 删除按钮操作 */
handleDelete(row) {
- const jobLogIds = this.ids;
- this.$confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return delJobLog(jobLogIds);
- }).then(() => {
- this.getList();
- this.msgSuccess("删除成功");
- })
+ const jobLogIds = this.ids
+ 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("清空成功");
- })
+ this.$modal.confirm('是否确认清空所有调度日志数据项？').then(function() {
+ return cleanJobLog()
+ }).then(() => {
+ this.getList()
+ this.$modal.msgSuccess("清空成功")
+ }).catch(() => {})
},
/** 导出按钮操作 */
handleExport() {
@@ -285,5 +261,5 @@
}, `log_${new Date().getTime()}.xlsx`)
}
}
-};
-</script>
\ No newline at end of file
+}
+</script>
--
Gitblit v1.9.3