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
+113 -4
View File
@@ -63,6 +63,59 @@ const JobAPI = {
data: params,
});
},
// 获取定时任务运行日志(实时状态)
getJobRunLog() {
return request<ApiResponse<JobRunLog[]>>({
url: `/monitor/job/log`,
method: "get",
});
},
// 获取定时任务日志详情
getJobLogDetail(id: number) {
return request<ApiResponse<JobLogDetail>>({
url: `/monitor/job/log/detail/${id}`,
method: "get",
});
},
// 查询定时任务日志列表
getJobLogList(query: JobLogPageQuery) {
return request<ApiResponse<PageResult<JobLogTable[]>>>({
url: `/monitor/job/log/list`,
method: "get",
params: query,
});
},
// 删除定时任务日志
deleteJobLog(ids: number[]) {
return request<ApiResponse>({
url: `/monitor/job/log/delete`,
method: "delete",
data: ids,
});
},
// 清空定时任务日志
clearJobLog() {
return request<ApiResponse>({
url: `/monitor/job/log/clear`,
method: "delete",
});
},
// 导出定时任务日志
exportJobLog(query: JobLogPageQuery) {
return request<Blob>({
url: `/monitor/job/log/export`,
method: "post",
data: query,
responseType: "blob",
});
},
};
export default JobAPI;
@@ -76,6 +129,14 @@ export interface JobPageQuery extends PageQuery {
end_time?: string;
}
export interface JobLogPageQuery extends PageQuery {
status?: boolean;
/** 开始时间 */
start_time?: string;
/** 结束时间 */
end_time?: string;
}
export interface JobOptionData {
id?: number;
option?: number; //操作类型 1: 暂停 2: 恢复 3: 重启
@@ -83,8 +144,8 @@ export interface JobOptionData {
export interface JobTable {
index?: number;
id?: number;
name?: string;
id: number;
name: string;
func?: string;
trigger?: string;
args?: string;
@@ -97,7 +158,6 @@ export interface JobTable {
start_date?: string;
end_date?: string;
status?: boolean;
message?: string;
description?: string;
created_at?: string;
updated_at?: string;
@@ -119,6 +179,55 @@ export interface JobForm {
start_date?: string;
end_date?: string;
status?: boolean;
message?: string;
description?: string;
}
// 定时任务运行日志接口(对应Scheduler实时状态)
export interface JobRunLog {
id: string;
name: string;
trigger: string;
executor: string;
func: string;
func_ref: string;
args: any[];
kwargs: any;
misfire_grace_time: number;
coalesce: boolean;
max_instances: number;
next_run_time: string;
state: string;
}
// 定时任务日志详情接口(对应数据库日志表)
export interface JobLogDetail {
id: number;
job_name: string;
job_group: string;
job_executor: string;
invoke_target: string;
job_args?: string;
job_kwargs?: string;
job_trigger?: string;
job_message?: string;
status: boolean;
exception_info?: string;
create_time: string;
}
// 定时任务日志列表接口(对应数据库日志表)
export interface JobLogTable {
index?: number;
id: number;
job_name: string;
job_group: string;
job_executor: string;
invoke_target: string;
job_args?: string;
job_kwargs?: string;
job_trigger?: string;
job_message?: string;
status: boolean;
exception_info?: string;
create_time: string;
}
+8 -8
View File
@@ -3,7 +3,7 @@ import request from "@/utils/request";
const ConfigAPI = {
uploadFile(body: any) {
return request<ApiResponse<UploadFilePath>>({
url: `/system/config/upload`,
url: `/system/param/upload`,
method: "post",
data: body,
headers: { "Content-Type": "multipart/form-data" },
@@ -12,14 +12,14 @@ const ConfigAPI = {
getInitConfig() {
return request<ApiResponse<ConfigTable[]>>({
url: `/system/config/info`,
url: `/system/param/info`,
method: "get",
});
},
getConfigList(query: ConfigPageQuery) {
return request<ApiResponse<PageResult<ConfigTable[]>>>({
url: `/system/config/list`,
url: `/system/param/list`,
method: "get",
params: query,
});
@@ -27,14 +27,14 @@ const ConfigAPI = {
getConfigDetail(query: number) {
return request<ApiResponse<ConfigTable>>({
url: `/system/config/detail/${query}`,
url: `/system/param/detail/${query}`,
method: "get",
});
},
createConfig(body: ConfigForm) {
return request<ApiResponse>({
url: `/system/config/create`,
url: `/system/param/create`,
method: "post",
data: body,
});
@@ -42,7 +42,7 @@ const ConfigAPI = {
updateConfig(id: number, body: ConfigForm) {
return request<ApiResponse>({
url: `/system/config/update/${id}`,
url: `/system/param/update/${id}`,
method: "put",
data: body,
});
@@ -50,7 +50,7 @@ const ConfigAPI = {
deleteConfig(body: number[]) {
return request<ApiResponse>({
url: `/system/config/delete`,
url: `/system/param/delete`,
method: "delete",
data: body,
});
@@ -58,7 +58,7 @@ const ConfigAPI = {
exportConfig(body: ConfigPageQuery) {
return request<Blob>({
url: `/system/config/export`,
url: `/system/param/export`,
method: "post",
data: body,
responseType: "blob",
+3
View File
@@ -22,6 +22,9 @@ interface ImportMetaEnv {
/** 资源管理根路径 */
VITE_RESOURCE_ROOT_PATH: string;
/** ws 端点 */
VITE_APP_WS_ENDPOINT: string;
}
interface ImportMeta {
+20 -25
View File
@@ -5,7 +5,7 @@
<!-- 顶部导航栏 -->
<div class="chat-navbar">
<div class="navbar-left">
<h2>FVA智能助手</h2>
<h2>FA智能助手</h2>
</div>
<div class="navbar-right">
<div class="connection-status">
@@ -17,9 +17,9 @@
<span class="status-text">{{ connectionStatusText }}</span>
</div>
<el-button
v-if="messages.length > 0"
text
@click="clearCurrentChat"
v-if="messages.length > 0"
>
<el-icon><Delete /></el-icon>
清空对话
@@ -35,14 +35,14 @@
</div>
<!-- 聊天消息区域 -->
<div class="chat-messages" ref="messagesContainer">
<div ref="messagesContainer" class="chat-messages">
<!-- 欢迎界面 -->
<div v-if="messages.length === 0" class="welcome-screen">
<div class="welcome-content">
<div class="ai-logo">
<el-icon size="64"><ChatDotRound /></el-icon>
</div>
<h1>FVA智能助手</h1>
<h1>FA智能助手</h1>
<p class="welcome-subtitle">我是您的专属AI助手可以帮您回答问题处理任务和进行智能对话</p>
<div class="example-prompts">
@@ -50,17 +50,17 @@
<h4>系统介绍</h4>
<p>请介绍一下FastAPI Vue3 Admin系统</p>
</div>
<div class="prompt-card" @click="setPrompt('如何在FVA系统中创建新的模块?')">
<div class="prompt-card" @click="setPrompt('如何在系统中创建新的模块?')">
<h4>开发指导</h4>
<p>如何在FVA系统中创建新的模块</p>
<p>如何在系统中创建新的模块</p>
</div>
<div class="prompt-card" @click="setPrompt('FVA系统的权限管理是如何工作的?')">
<div class="prompt-card" @click="setPrompt('系统的权限管理是如何工作的?')">
<h4>权限管理</h4>
<p>FVA系统的权限管理是如何工作的</p>
<p>FA系统的权限管理是如何工作的</p>
</div>
<div class="prompt-card" @click="setPrompt('如何优化FVA系统的性能?')">
<div class="prompt-card" @click="setPrompt('如何优化FA系统的性能?')">
<h4>性能优化</h4>
<p>如何优化FVA系统的性能</p>
<p>如何优化系统的性能</p>
</div>
</div>
</div>
@@ -84,7 +84,7 @@
<div class="message-content">
<div class="message-header">
<strong class="sender-name">
{{ message.type === 'user' ? 'You' : 'FVA助手' }}
{{ message.type === 'user' ? 'You' : 'FA助手' }}
</strong>
</div>
<div class="message-body">
@@ -97,11 +97,11 @@
</div>
<div v-else class="message-text" v-html="formatMessage(message.content)"></div>
</div>
<div class="message-actions" v-if="!message.loading">
<div v-if="!message.loading" class="message-actions">
<el-button text size="small" @click="copyMessage(message.content)">
<el-icon><CopyDocument /></el-icon>
</el-button>
<el-button text size="small" v-if="message.type === 'assistant'">
<el-button v-if="message.type === 'assistant'" text size="small">
<el-icon><RefreshLeft /></el-icon>
</el-button>
</div>
@@ -115,8 +115,8 @@
:title="error"
type="error"
:closable="true"
@close="error = ''"
show-icon
@close="error = ''"
/>
</div>
</div>
@@ -127,23 +127,23 @@
<div class="input-container">
<el-input
v-model="inputMessage"
:placeholder="isConnected ? '向FVA助手发送消息...' : '请先连接到服务器'"
:placeholder="isConnected ? '向FA助手发送消息...' : '请先连接到服务器'"
:disabled="!isConnected || sending"
type="textarea"
:rows="1"
:autosize="{ minRows: 1, maxRows: 6 }"
resize="none"
class="message-input"
@keydown.enter.exact.prevent="sendMessage"
@keydown.shift.enter.exact="inputMessage += '\n'"
class="message-input"
resize="none"
/>
<el-button
:disabled="!inputMessage.trim() || !isConnected || sending"
:loading="sending"
@click="sendMessage"
class="send-button"
type="primary"
circle
@click="sendMessage"
>
<el-icon><Promotion /></el-icon>
</el-button>
@@ -160,7 +160,7 @@
</template>
<script setup lang="ts">
import { ref, reactive, onMounted, onUnmounted, nextTick, computed } from 'vue'
import { ref, onMounted, onUnmounted, nextTick, computed } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import {
ChatDotRound,
@@ -195,7 +195,7 @@ const messagesContainer = ref<HTMLElement>()
// WebSocket 连接
let ws: WebSocket | null = null
const WS_URL = 'ws://service.fastapiadmin.com/api/v1/ai/mcp/ws/chat'
const WS_URL = import.meta.env.VITE_APP_WS_ENDPOINT + '/api/v1/ai/ws/mcp/chat'
// 计算属性
const connectionStatusText = computed(() => {
@@ -241,11 +241,6 @@ const connectWebSocket = () => {
console.log('WebSocket 连接已关闭', event.code, event.reason)
isConnected.value = false
connectionStatus.value = 'disconnected'
if (event.code !== 1000) {
error.value = '连接意外断开,请检查网络连接'
ElMessage.error('连接断开')
}
}
ws.onerror = (error) => {
+186 -96
View File
@@ -36,61 +36,94 @@
<!-- 应用网格 -->
<div v-loading="loading" class="app-grid">
<div
v-for="app in applicationList"
:key="app.id"
class="app-card"
>
<div class="app-card-header">
<el-avatar :size="48" :src="app.icon_url" class="app-avatar">
<el-icon size="24"><Monitor /></el-icon>
</el-avatar>
<div class="app-info">
<h3 class="app-name">{{ app.name }}</h3>
<el-tag :type="app.status ? 'success' : 'danger'" size="small">
{{ app.status ? '启用' : '停用' }}
</el-tag>
<el-card
v-for="app in applicationList"
:key="app.id"
class="app-card-el"
:body-style="{ padding: '12px' }"
shadow="hover"
>
<template #header>
<div class="app-card-header-el">
<div class="app-info-header">
<el-avatar
:size="40"
:src="app.icon_url"
class="app-avatar-el"
>
<el-icon size="20"><Monitor /></el-icon>
</el-avatar>
<div class="app-title-section">
<h3 class="app-name-el">{{ app.name }}</h3>
<el-tag
:type="app.status ? 'success' : 'danger'"
size="small"
class="app-status-tag"
>
{{ app.status ? '启用' : '停用' }}
</el-tag>
</div>
</div>
<el-dropdown
trigger="click"
@command="(command) => handleAppAction(command, app)"
>
<el-button
type="text"
icon="MoreFilled"
size="small"
class="app-menu-btn"
/>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item command="edit" icon="Edit">编辑</el-dropdown-item>
<el-dropdown-item command="delete" icon="Delete" divided>删除</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</div>
</template>
<div class="app-card-content">
<p class="app-description">{{ app.description || '暂无描述' }}</p>
<div class="app-meta-info">
<div class="app-meta-row">
<div class="meta-item left">
<el-icon size="14" class="meta-icon"><User /></el-icon>
<span>{{ app.creator?.name || '未知' }}</span>
</div>
<div class="meta-item right">
<el-icon size="14" class="meta-icon"><Clock /></el-icon>
<span>{{ formatTime(app.created_at) }}</span>
</div>
</div>
</div>
</div>
<el-dropdown trigger="click" @command="(command) => handleAppAction(command, app)">
<el-button type="text" icon="MoreFilled" size="small" />
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item command="edit" icon="Edit">编辑</el-dropdown-item>
<el-dropdown-item command="delete" icon="Delete" divided>删除</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</div>
<div class="app-card-body">
<p class="app-desc">{{ app.description || '暂无描述' }}</p>
<div class="app-meta">
<span class="app-creator">{{ app.creator?.name || '未知' }}</span>
<span class="app-time">{{ formatTime(app.created_at) }}</span>
<div class="app-card-actions">
<el-button
type="primary"
icon="Link"
size="small"
:disabled="!app.status"
class="action-btn"
@click="openAppExternal(app.access_url)"
>
外部打开
</el-button>
<el-button
type="default"
icon="View"
size="small"
:disabled="!app.status"
class="action-btn"
@click="openAppInternal(app)"
>
内部打开
</el-button>
</div>
</div>
<div class="app-card-footer">
<el-button
type="primary"
icon="Link"
size="small"
@click="openAppExternal(app.access_url)"
:disabled="!app.status"
>
外部打开
</el-button>
<el-button
type="default"
icon="View"
size="small"
@click="openAppInternal(app)"
:disabled="!app.status"
>
内部打开
</el-button>
</div>
</div>
</el-card>
</div>
<!-- 空状态 -->
@@ -180,6 +213,7 @@ import { useAppStore } from "@/store/modules/app.store";
import { useTagsViewStore } from "@/store";
import { useRouter } from "vue-router";
import { DeviceEnum } from "@/enums/settings/device.enum";
import { Monitor, User, Clock } from '@element-plus/icons-vue';
import ApplicationAPI, { type ApplicationForm, type ApplicationInfo, type ApplicationPageQuery } from "@/api/application/myapp";
import { formatToDateTime } from "@/utils/dateUtil";
@@ -460,66 +494,82 @@ onMounted(() => {
}
.app-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
gap: 10px;
padding: 20px 0;
flex: 1;
overflow-y: auto;
}
display: grid;
grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
gap: 16px;
padding: 20px 0;
flex: 1;
}
.app-card {
border: 1px solid var(--el-border-color);
.app-card-el {
border: 1px solid var(--el-border-color-lighter);
border-radius: 6px;
padding: 10px;
background: var(--el-bg-color);
transition: all 0.2s ease;
display: flex;
flex-direction: column;
transition: all 0.3s ease;
min-height: 180px;
width: 100%;
&:hover {
border-color: var(--el-color-primary);
box-shadow: var(--el-box-shadow-light);
transform: translateY(-1px);
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
}
}
.app-card-header {
.app-card-header-el {
display: flex;
align-items: center;
gap: 8px;
margin-bottom: 8px;
justify-content: space-between;
}
.app-avatar {
flex-shrink: 0;
}
.app-info {
.app-info-header {
display: flex;
align-items: center;
gap: 12px;
flex: 1;
min-width: 0;
}
.app-name {
font-size: 13px;
.app-avatar-el {
flex-shrink: 0;
}
.app-title-section {
flex: 1;
min-width: 0;
}
.app-name-el {
font-size: 16px;
font-weight: 600;
color: var(--el-text-color-primary);
margin: 0 0 3px 0;
margin: 0 0 4px 0;
line-height: 1.3;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.app-card-body {
flex: 1;
margin-bottom: 8px;
.app-status-tag {
margin-top: 2px;
}
.app-desc {
font-size: 11px;
.app-menu-btn {
padding: 4px;
color: var(--el-text-color-secondary);
&:hover {
color: var(--el-color-primary);
}
}
.app-card-content {
margin: 12px 0;
}
.app-description {
font-size: 14px;
color: var(--el-text-color-regular);
margin: 0 0 4px 0;
line-height: 1.3;
line-height: 1.5;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
@@ -527,23 +577,63 @@ onMounted(() => {
overflow: hidden;
}
.app-meta {
.app-meta-info {
display: flex;
align-items: center;
font-size: 10px;
flex-direction: column;
gap: 8px;
font-size: 13px;
color: var(--el-text-color-secondary);
}
.app-meta-row {
display: flex;
justify-content: space-between;
align-items: center;
gap: 12px;
}
.app-card-footer {
.meta-item {
display: flex;
gap: 4px;
align-items: center;
gap: 6px;
white-space: nowrap;
overflow: hidden;
}
.meta-item.left {
flex: 1;
justify-content: flex-start;
min-width: 0;
}
.meta-item.right {
flex: 1;
justify-content: flex-end;
text-align: right;
min-width: 0;
}
.meta-icon {
color: var(--el-text-color-placeholder);
flex-shrink: 0;
}
.meta-item span {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
max-width: 100%;
}
.app-card-actions {
display: flex;
gap: 8px;
margin-top: 12px;
.el-button {
font-size: 11px;
padding: 3px 6px;
.action-btn {
flex: 1;
width: 40%;
font-size: 12px;
padding: 4px 8px;
}
}
@@ -80,8 +80,8 @@
<pagination
v-if="total > 0"
v-model:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.page_no"
v-model:limit="queryParams.page_size"
@pagination="handleQuery"
/>
</el-card>
@@ -429,8 +429,8 @@ import GeneratorAPI, {
FieldConfig,
} from "@/api/codegen.api";
import DictAPI from "@/api/system/dict.api";
import MenuAPI from "@/api/system/menu.api";
import DictAPI from "@/api/system/dict";
import MenuAPI from "@/api/system/menu";
interface TreeNode {
label: string;
@@ -441,8 +441,8 @@ const treeData = ref<TreeNode[]>([]);
const queryFormRef = ref();
const queryParams = reactive<TablePageQuery>({
pageNum: 1,
pageSize: 10,
page_no: 1,
page_size: 10,
});
const loading = ref(false);
@@ -633,7 +633,7 @@ function handleQuery() {
loading.value = true;
GeneratorAPI.getTablePage(queryParams)
.then((data) => {
pageData.value = data.list;
pageData.value = data.items;
total.value = data.total;
})
.finally(() => {
@@ -644,7 +644,7 @@ function handleQuery() {
/** 重置查询 */
function handleResetQuery() {
queryFormRef.value.resetFields();
queryParams.pageNum = 1;
queryParams.page_no = 1;
handleQuery();
}
@@ -653,11 +653,17 @@ async function handleOpenDialog(tableName: string) {
dialog.visible = true;
active.value = 0;
menuOptions.value = await MenuAPI.getOptions(true);
menuOptions.value = await MenuAPI.getMenuList({
page_no: 1,
page_size: 1000,
});
currentTableName.value = tableName;
//
DictAPI.getList().then((data) => {
DictAPI.getDictTypeList({
page_no: 1,
page_size: 1000,
}).then((data) => {
dictOptions.value = data;
loading.value = true;
GeneratorAPI.getGenConfig(tableName)
@@ -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']);
@@ -198,7 +198,7 @@
<el-input-number v-model="formData.dict_sort" controls-position="right" :min="1" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-switch v-model="formData.status" inline-prompt :active-icon="Check" :inactive-icon="Close" active-text="启用" inactive-text="停用" active-value="true" inactive-value="false" />
<el-switch v-model="formData.status" inline-prompt active-value="true" inactive-value="false" />
</el-form-item>
<el-form-item label="描述" prop="description">
@@ -235,7 +235,6 @@ const props = defineProps({
import DictAPI, { DictDataTable, DictDataForm, DictDataPageQuery } from "@/api/system/dict";
import { ElMessageBox } from "element-plus";
import { Check, Close } from '@element-plus/icons-vue'
import { useAppStore } from "@/store/modules/app.store";
import { DeviceEnum } from "@/enums/settings/device.enum";
+1 -1
View File
@@ -97,7 +97,7 @@
</div>
<!-- 表格区域 -->
<el-table ref="dataTableRef" v-loading="loading" :data="pageTableData.filter(item => item.username !== 'superadmin')" highlight-current-row class="data-table__content" height="450" border stripe @selection-change="handleSelectionChange">
<el-table ref="dataTableRef" v-loading="loading" :data="pageTableData" highlight-current-row class="data-table__content" height="450" border stripe @selection-change="handleSelectionChange">
<template #empty>
<el-empty :image-size="80" description="暂无数据" />
</template>