feat(系统配置): 重构系统配置模块为参数管理模块

refactor(代码生成): 重构代码生成相关组件和路由路径

feat(WebSocket): 添加WebSocket支持并配置Nginx代理

fix(用户管理): 移除超级管理员过滤并调整用户数据

feat(定时任务): 完善定时任务日志功能并添加相关API

style(前端): 优化AI助手界面样式和提示文本

chore(初始化数据): 清理和更新系统初始化数据

perf(前端): 优化表格操作列宽度和按钮样式

docs(注释): 更新控制器注释以反映模块变更
This commit is contained in:
zhangtao
2025-09-11 02:06:11 +08:00
parent 6bd474eb4f
commit ea4e35fd14
45 changed files with 1872 additions and 1637 deletions
@@ -1,32 +1,373 @@
<!-- 字典数据 -->
<!-- 任务日志抽屉 -->
<template>
<el-drawer v-model="drawerVisible" :title="'【' + props.dictLabel + '】日志数据'" :size="drawerSize">
<el-drawer v-model="drawerVisible" :title="'【' + props.jobName + '】任务日志'" :size="drawerSize">
<!-- 搜索区域 -->
<div class="search-container">
<!-- 开发中 -->
<el-form ref="queryFormRef" :model="queryFormData" :inline="true" label-suffix=":">
<el-form-item prop="status" label="执行状态">
<el-select v-model="queryFormData.status" placeholder="请选择执行状态" style="width: 167.5px" clearable>
<el-option :value="true" label="成功" />
<el-option :value="false" label="失败" />
</el-select>
</el-form-item>
<!-- 时间范围,收起状态下隐藏 -->
<el-form-item v-if="isExpand" prop="start_time" label="执行时间">
<DatePicker
v-model="dateRange"
@update:model-value="handleDateRangeChange"
/>
</el-form-item>
<!-- 查询、重置、展开/收起按钮 -->
<el-form-item class="search-buttons">
<el-button type="primary" icon="search" @click="handleQuery">查询</el-button>
<el-button icon="refresh" @click="handleResetQuery">重置</el-button>
<!-- 展开/收起 -->
<template v-if="isExpandable">
<el-link class="ml-3" type="primary" underline="never" @click="isExpand = !isExpand">
{{ isExpand ? "收起" : "展开" }}
<el-icon>
<template v-if="isExpand">
<ArrowUp />
</template>
<template v-else>
<ArrowDown />
</template>
</el-icon>
</el-link>
</template>
</el-form-item>
</el-form>
</div>
<!-- 内容区域 -->
<el-card shadow="hover" class="data-table">
<template #header>
<div class="card-header">
<span>
<el-tooltip content="任务执行日志记录每次定时任务的执行情况,包括成功、失败状态及错误信息。">
<QuestionFilled class="w-4 h-4 mx-1" />
</el-tooltip>
任务执行日志列表
</span>
</div>
</template>
<!-- 功能区域 -->
<div class="data-table__toolbar">
<div class="data-table__toolbar--actions">
<el-button type="danger" icon="delete" :disabled="selectIds.length === 0" @click="handleDelete(selectIds)">批量删除</el-button>
<el-button type="warning" icon="delete" @click="handleClearLog">清空日志</el-button>
</div>
<div class="data-table__toolbar--tools">
<el-tooltip content="导出">
<el-button type="warning" icon="download" circle @click="handleExport" />
</el-tooltip>
<el-tooltip content="刷新">
<el-button type="default" icon="refresh" circle @click="handleRefresh" />
</el-tooltip>
</div>
</div>
<!-- 表格区域:任务日志列表 -->
<el-table ref="dataTableRef" v-loading="loading" :data="pageTableData" highlight-current-row class="data-table__content" height="460" border stripe @selection-change="handleSelectionChange">
<template #empty>
<el-empty :image-size="80" description="暂无数据" />
</template>
<el-table-column type="selection" min-width="55" align="center" />
<el-table-column type="index" fixed label="序号" min-width="60">
<template #default="scope">
{{ (queryFormData.page_no - 1) * queryFormData.page_size + scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column label="任务名称" prop="job_name" min-width="150" show-overflow-tooltip />
<el-table-column label="任务组名" prop="job_group" min-width="120" show-overflow-tooltip />
<el-table-column label="执行状态" prop="status" min-width="100" show-overflow-tooltip>
<template #default="scope">
<el-tag :type="scope.row.status === true ? 'success' : 'danger'">
{{ scope.row.status ? "成功" : "失败" }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="执行信息" prop="job_message" min-width="200" show-overflow-tooltip />
<el-table-column label="异常信息" prop="exception_info" min-width="250" show-overflow-tooltip />
<el-table-column label="执行器" prop="job_executor" min-width="120" show-overflow-tooltip />
<el-table-column label="调用目标" prop="invoke_target" min-width="200" show-overflow-tooltip />
<el-table-column label="位置参数" prop="job_args" min-width="150" show-overflow-tooltip />
<el-table-column label="关键字参数" prop="job_kwargs" min-width="150" show-overflow-tooltip />
<el-table-column label="触发器" prop="job_trigger" min-width="120" show-overflow-tooltip />
<el-table-column label="创建时间" prop="create_time" min-width="180" sortable />
<el-table-column fixed="right" label="操作" align="center" min-width="120">
<template #default="scope">
<el-button type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)">详情</el-button>
<el-button type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页区域 -->
<template #footer>
<pagination v-model:total="total" v-model:page="queryFormData.page_no" v-model:limit="queryFormData.page_size" @pagination="loadingData" />
</template>
</el-card>
<!-- 弹窗区域 -->
<el-dialog v-model="dialogVisible.visible" :title="dialogVisible.title" @close="handleCloseDialog">
<!-- 详情 -->
<template v-if="dialogVisible.type === 'detail'">
<el-descriptions :column="2" border>
<el-descriptions-item label="日志ID" :span="2">{{ detailFormData.id }}</el-descriptions-item>
<el-descriptions-item label="任务名称" :span="2">{{ detailFormData.job_name }}</el-descriptions-item>
<el-descriptions-item label="任务组名" :span="2">{{ detailFormData.job_group }}</el-descriptions-item>
<el-descriptions-item label="执行状态" :span="2">
<el-tag :type="detailFormData.status === true ? 'success' : 'danger'">
{{ detailFormData.status ? "成功" : "失败" }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="执行信息" :span="2">{{ detailFormData.job_message || '-' }}</el-descriptions-item>
<el-descriptions-item label="异常信息" :span="2">{{ detailFormData.exception_info || '-' }}</el-descriptions-item>
<el-descriptions-item label="执行器" :span="2">{{ detailFormData.job_executor || '-' }}</el-descriptions-item>
<el-descriptions-item label="调用目标" :span="2">{{ detailFormData.invoke_target || '-' }}</el-descriptions-item>
<el-descriptions-item label="位置参数" :span="2">{{ detailFormData.job_args || '-' }}</el-descriptions-item>
<el-descriptions-item label="关键字参数" :span="2">{{ detailFormData.job_kwargs || '-' }}</el-descriptions-item>
<el-descriptions-item label="触发器" :span="2">{{ detailFormData.job_trigger || '-' }}</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">{{ detailFormData.create_time }}</el-descriptions-item>
</el-descriptions>
</template>
</el-dialog>
</el-drawer>
</template>
<script setup lang="ts">
// 处理可以参考字典数据抽屉
// 添加 props 来接收 dictType
// 添加 props 来接收 jobId 和 jobName
const props = defineProps({
dictType: {
type: String,
jobId: {
type: Number,
required: true
},
dictLabel: {
jobName: {
type: String,
required: true
}
})
import JobAPI, { JobLogPageQuery, JobLogTable } from "@/api/monitor/job";
import { ElMessageBox } from "element-plus";
import { useAppStore } from "@/store/modules/app.store";
import { DeviceEnum } from "@/enums/settings/device.enum";
const appStore = useAppStore();
const drawerSize = computed(() => (appStore.device === DeviceEnum.DESKTOP ? "80%" : "60%"));
const queryFormRef = ref();
const dataTableRef = ref();
const total = ref(0);
const selectIds = ref<number[]>([]);
const loading = ref(false);
const isExpand = ref(false);
const isExpandable = ref(true);
const drawerVisible = ref<boolean>(false);
// 分页表单
const pageTableData = ref<JobLogTable[]>([]);
// 详情表单
const detailFormData = ref<JobLogTable>({} as JobLogTable);
// 分页查询参数
const queryFormData = reactive<JobLogPageQuery>({
page_no: 1,
page_size: 10,
status: undefined,
start_time: undefined,
end_time: undefined,
});
// 弹窗状态
const dialogVisible = reactive({
title: "",
visible: false,
type: 'detail',
});
// 日期范围临时变量
const dateRange = ref<[Date, Date] | []>([]);
// 处理日期范围变化
function handleDateRangeChange(range: [Date, Date]) {
dateRange.value = range;
if (range && range.length === 2) {
queryFormData.start_time = range[0].toISOString();
queryFormData.end_time = range[1].toISOString();
} else {
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
}
}
// 列表刷新
async function handleRefresh () {
await loadingData();
};
// 加载表格数据
async function loadingData() {
loading.value = true;
try {
// 调用任务日志列表接口
const response = await JobAPI.getJobLogList(queryFormData);
pageTableData.value = response.data.data.items;
total.value = response.data.data.total;
}
catch (error: any) {
console.error(error);
}
finally {
loading.value = false;
}
}
// 查询(重置页码后获取数据)
async function handleQuery() {
queryFormData.page_no = 1;
loadingData();
}
// 重置查询
async function handleResetQuery() {
queryFormRef.value.resetFields();
queryFormData.page_no = 1;
queryFormData.status = undefined;
queryFormData.start_time = undefined;
queryFormData.end_time = undefined;
dateRange.value = [];
loadingData();
}
// 行复选框选中项变化
async function handleSelectionChange(selection: any) {
selectIds.value = selection.map((item: any) => item.id);
}
// 关闭弹窗
async function handleCloseDialog() {
dialogVisible.visible = false;
}
// 打开详情弹窗
async function handleOpenDialog(type: 'detail', id?: number) {
dialogVisible.type = type;
if (id) {
const response = await JobAPI.getJobLogDetail(id);
dialogVisible.title = "任务日志详情";
Object.assign(detailFormData.value, response.data.data);
}
dialogVisible.visible = true;
}
// 删除、批量删除
async function handleDelete(ids: number[]) {
ElMessageBox.confirm("确认删除该任务日志?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(async () => {
try {
loading.value = true;
await JobAPI.deleteJobLog(ids);
handleResetQuery();
} catch (error: any) {
console.error(error);
} finally {
loading.value = false;
}
}).catch(() => {
ElMessageBox.close();
});
}
// 清空日志
async function handleClearLog() {
ElMessageBox.confirm("确认清空所有任务日志?此操作不可恢复!", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(async () => {
try {
loading.value = true;
await JobAPI.clearJobLog();
handleResetQuery();
} catch (error: any) {
console.error(error);
} finally {
loading.value = false;
}
}).catch(() => {
ElMessageBox.close();
});
}
// 导出
async function handleExport() {
ElMessageBox.confirm('是否确认导出当前任务日志?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
let downloadUrl = '';
try {
loading.value = true;
const response = await JobAPI.exportJobLog(queryFormData);
const fileData = response.data;
const fileName = decodeURI(response.headers["content-disposition"].split(";")[1].split("=")[1]);
const fileType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";
const blob = new Blob([fileData], { type: fileType });
downloadUrl = window.URL.createObjectURL(blob);
const downloadLink = document.createElement("a");
downloadLink.href = downloadUrl;
downloadLink.download = fileName;
document.body.appendChild(downloadLink);
downloadLink.click();
document.body.removeChild(downloadLink);
} catch (error: any) {
console.error('导出失败:', error);
} finally {
if (downloadUrl) {
window.URL.revokeObjectURL(downloadUrl);
}
loading.value = false;
}
}).catch(() => {
ElMessageBox.close();
});
}
// 打开抽屉
function openDrawer() {
drawerVisible.value = true;
// 重置查询条件并加载数据
handleResetQuery();
}
// 关闭抽屉
function closeDrawer() {
drawerVisible.value = false;
}
// 暴露方法给父组件
defineExpose({
openDrawer,
closeDrawer
});
onMounted(() => {
// 抽屉打开时会自动加载数据
});
</script>
<style lang="scss" scoped></style>
+32 -21
View File
@@ -186,15 +186,15 @@
sortable
/>
<el-table-column fixed="right" label="操作" min-width="240">
<el-table-column fixed="right" label="操作" min-width="300">
<template #default="scope">
<div class="flex">
<el-button
type="info"
type="warning"
size="small"
link
icon="document"
@click="handleOpenDialog('log', scope.row.id)"
@click="handleOpenLogDrawer(scope.row.id, scope.row.name)"
>
日志
</el-button>
@@ -315,9 +315,6 @@
<el-descriptions-item label="结束时间" :span="2">{{
detailFormData.end_date
}}</el-descriptions-item>
<el-descriptions-item label="日志信息" :span="2">{{
detailFormData.message
}}</el-descriptions-item>
<el-descriptions-item label="创建人" :span="2">{{
detailFormData.creator?.name
}}</el-descriptions-item>
@@ -351,7 +348,8 @@
</el-form-item>
<el-form-item label="任务函数" prop="func" style="width: 40%">
<el-select v-model="formData.func" placeholder="请选择任务函数">
<el-option v-for="item in dictStore.getDictArray('sys_job_function')"
<el-option
v-for="item in dictStore.getDictArray('sys_job_function')"
:key="item.dict_value"
:label="item.dict_label"
:value="item.dict_value"
@@ -360,7 +358,8 @@
</el-form-item>
<el-form-item label="存储器" prop="jobstore" style="width: 40%">
<el-select v-model="formData.jobstore" placeholder="请选择存储器">
<el-option v-for="item in dictStore.getDictArray('sys_job_store')"
<el-option
v-for="item in dictStore.getDictArray('sys_job_store')"
:key="item.dict_value"
:label="item.dict_label"
:value="item.dict_value"
@@ -369,7 +368,8 @@
</el-form-item>
<el-form-item label="执行器" prop="executor" style="width: 40%">
<el-select v-model="formData.executor" placeholder="请选择执行器">
<el-option v-for="item in dictStore.getDictArray('sys_job_executor')"
<el-option
v-for="item in dictStore.getDictArray('sys_job_executor')"
:key="item.dict_value"
:label="item.dict_label"
:value="item.dict_value"
@@ -410,7 +410,8 @@
</el-form-item>
<el-form-item label="触发器" prop="trigger" style="width: 40%">
<el-select v-model="formData.trigger" placeholder="请选择触发器">
<el-option v-for="item in dictStore.getDictArray('sys_job_trigger')"
<el-option
v-for="item in dictStore.getDictArray('sys_job_trigger')"
:key="item.dict_value"
:label="item.dict_label"
:value="item.dict_value"
@@ -458,9 +459,9 @@
</template>
<IntervalTab
ref="intervalTabRef"
:cron-value="formData.trigger_args"
@confirm="handleIntervalConfirm"
@cancel="openIntervalTab = false"
:cron-value="formData.trigger_args"
/>
</el-popover>
</el-form-item>
@@ -493,10 +494,10 @@
/>
</template>
<vue3CronPlus
i18n="cn"
max-height="500px"
@change="handlechangeCron"
@close="openCron = false"
max-height="500px"
i18n="cn"
></vue3CronPlus>
</el-popover>
</el-form-item>
@@ -566,6 +567,9 @@
</template>
</el-dialog>
</div>
<JobLogDrawer v-if="drawerVisible" v-model="drawerVisible" :job-id="currentJobId" :job-name="currentJobName" />
</template>
<script lang="ts" setup>
@@ -579,6 +583,7 @@ import IntervalTab from "@/components/IntervalTab/index.vue";
import { useDictStore } from "@/store/index";
import { vue3CronPlus } from "vue3-cron-plus";
import "vue3-cron-plus/dist/index.css"; // 引入样式
import JobLogDrawer from "@/views/monitor/job/components/JobLogDrawer.vue"
const dictStore = useDictStore();
@@ -600,7 +605,7 @@ const intervalTabRef = ref();
const pageTableData = ref<JobTable[]>([]);
// 详情表单
const detailFormData = ref<JobTable>({});
const detailFormData = ref<JobTable>({} as JobTable);
// 分页查询参数
const queryFormData = reactive<JobPageQuery>({
@@ -628,7 +633,6 @@ const formData = reactive<JobForm>({
start_date: undefined,
end_date: undefined,
status: undefined,
message: undefined,
description: undefined,
});
@@ -639,6 +643,9 @@ const dialogVisible = reactive({
type: "create" as "create" | "update" | "detail" | "log",
});
// 抽屉显隐
const drawerVisible = ref(false);
// 表单验证规则
const rules = reactive({
name: [{ required: true, message: "请输入任务名称", trigger: "blur" }],
@@ -713,7 +720,6 @@ const initialFormData: JobForm = {
start_date: undefined,
end_date: undefined,
status: undefined,
message: undefined,
description: undefined,
}
@@ -740,7 +746,7 @@ async function handleCloseDialog() {
// 打开弹窗
async function handleOpenDialog(
type: "create" | "update" | "detail" | "log",
type: "create" | "update" | "detail",
id?: number
) {
dialogVisible.type = type;
@@ -752,10 +758,6 @@ async function handleOpenDialog(
} else if (type === "update") {
dialogVisible.title = "修改任务";
Object.assign(formData, response.data.data);
} else if (type === "log") {
// 处理可以参考字典数据
dialogVisible.title = "任务日志";
ElMessage.success("开发中...");
}
} else {
dialogVisible.title = "新增任务";
@@ -911,6 +913,15 @@ const handleOption = (id: number, option: number) => {
});
};
const currentJobId = ref<number>(0);
const currentJobName = ref<string>("");
function handleOpenLogDrawer(jobId: number, jobName: string) {
currentJobId.value = jobId;
currentJobName.value = jobName;
drawerVisible.value = true;
}
onMounted(async () => {
// 加载字典数据
await dictStore.getDict(['sys_job_function','sys_job_executor','sys_job_store', 'sys_job_trigger']);