From 7204e011d9e36594b481e6d7dc3443c4756c6324 Mon Sep 17 00:00:00 2001
From: zhangtao <9480807882@qq.com>
Date: Sun, 20 Jul 2025 15:39:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(role):=20=E6=96=B0=E5=A2=9E=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=9D=83=E9=99=90=E5=88=86=E9=85=8D=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refactor(menu): 重构菜单类型枚举和权限数据结构
fix(log): 修复日志类型显示和查询问题
style(common): 重命名部门树格式化函数为通用树格式化函数
perf(store): 移除控制台日志输出
docs(tsconfig): 添加Vite客户端类型注释
chore(package): 调整依赖项顺序
---
 .../app/api/v1/models/system/menu_model.py    |    2 +-
 .../v1/models/system/operation_log_model.py   |    1 +
 .../v1/params/system/operation_log_param.py   |    2 +
 .../app/api/v1/schemas/system/menu_schema.py  |    4 +-
 .../v1/schemas/system/operation_log_schema.py |    1 +
 .../services/system/operation_log_service.py  |    3 +
 backend/app/core/router_class.py              |    3 +
 backend/app/scripts/data/system_menu.json     |    6 +-
 backend/dev_sql.db                            |  Bin 241664 -> 253952 bytes
 frontend/package.json                         |    2 +-
 frontend/src/api/system/dept.ts               |    2 +-
 frontend/src/api/system/log.ts                |    2 +
 frontend/src/api/system/menu.ts               |    6 +-
 frontend/src/api/system/role.ts               |   26 +-
 frontend/src/enums/system/menu.enum.ts        |    4 +-
 frontend/src/store/modules/notice.store.ts    |    1 -
 .../src/store/modules/permission.store.ts     |    2 +-
 frontend/src/utils/common.ts                  |    6 +-
 frontend/src/views/monitor/job/index.vue      | 1150 ++++++++++-------
 frontend/src/views/system/config/index.vue    |    6 +-
 frontend/src/views/system/dept/index.vue      |   15 +-
 .../system/dict/components/DataDrawer.vue     |   13 +-
 frontend/src/views/system/dict/index.vue      |    6 +-
 frontend/src/views/system/log/index.vue       |   32 +-
 frontend/src/views/system/menu/index.vue      |  255 ++--
 frontend/src/views/system/notice/index.vue    |  204 +--
 frontend/src/views/system/position/index.vue  |    6 +-
 .../role/components/PermissonDrawer.vue       |  305 +++++
 frontend/src/views/system/role/index.vue      |  258 +---
 .../views/system/user/components/DeptTree.vue |    4 +-
 .../system/user/components/UserImport.vue     |  199 +++
 frontend/src/views/system/user/index.vue      |   10 +-
 frontend/tsconfig.json                        |    5 +-
 33 files changed, 1507 insertions(+), 1034 deletions(-)
 create mode 100644 frontend/src/views/system/role/components/PermissonDrawer.vue

diff --git a/backend/app/api/v1/models/system/menu_model.py b/backend/app/api/v1/models/system/menu_model.py
index 6f27e396..40c50aa0 100644
--- a/backend/app/api/v1/models/system/menu_model.py
+++ b/backend/app/api/v1/models/system/menu_model.py
@@ -39,7 +39,7 @@ class MenuModel(ModelBase):
     keep_alive = Column(Boolean, default=True, nullable=False, comment="是否缓存(True:是 False:否)")
     always_show = Column(Boolean, default=False, nullable=False, comment="是否始终显示(True:是 False:否)")
     title = Column(String(50), nullable=True, comment="菜单标题")
-    params = Column(String(200), nullable=True, comment="路由参数")
+    params = Column(Text, nullable=True, comment="路由参数(JSON数组: [{\"key\": \"\", \"value\": \"\"}])")
     affix = Column(Boolean, default=False, nullable=False, comment="是否固定标签页(True:是 False:否)")
 
     # 层级关系
diff --git a/backend/app/api/v1/models/system/operation_log_model.py b/backend/app/api/v1/models/system/operation_log_model.py
index 95589481..26b2902a 100644
--- a/backend/app/api/v1/models/system/operation_log_model.py
+++ b/backend/app/api/v1/models/system/operation_log_model.py
@@ -13,6 +13,7 @@ class OperationLogModel(ModelBase):
     __table_args__ = ({'comment': '操作日志表'})
 
     id = Column(Integer, primary_key=True, autoincrement=True, comment='主键ID')
+    type = Column(Integer, nullable=True, comment="日志类型(1登录日志 2操作日志)", index=True)
     request_path = Column(String(255), nullable=True, comment="请求路径", index=True)
     request_method = Column(String(10), nullable=True, comment="请求方式", index=True)
     request_payload = Column(Text, nullable=True, comment="请求体")
diff --git a/backend/app/api/v1/params/system/operation_log_param.py b/backend/app/api/v1/params/system/operation_log_param.py
index 2d4654d9..6ac667cf 100644
--- a/backend/app/api/v1/params/system/operation_log_param.py
+++ b/backend/app/api/v1/params/system/operation_log_param.py
@@ -11,6 +11,7 @@ class OperationLogQueryParams:
 
     def __init__(
             self,
+            type: Optional[int] = Query(None, description="日志类型(1:登录日志, 2:操作日志)"),
             request_path: Optional[str] = Query(None, description="请求路径"),
             request_method: Optional[str] = Query(None, description="请求方法"),
             request_ip: Optional[str] = Query(None, description="请求IP"),
@@ -29,6 +30,7 @@ class OperationLogQueryParams:
         self.request_method = request_method
         self.request_ip = request_ip
         self.response_code = response_code
+        self.type = type
         
         # 时间范围查询
         if start_time and end_time:
diff --git a/backend/app/api/v1/schemas/system/menu_schema.py b/backend/app/api/v1/schemas/system/menu_schema.py
index 52634d4f..f237ede4 100644
--- a/backend/app/api/v1/schemas/system/menu_schema.py
+++ b/backend/app/api/v1/schemas/system/menu_schema.py
@@ -10,7 +10,7 @@ from app.core.base_schema import BaseSchema
 class MenuCreateSchema(BaseModel):
     """菜单创建模型"""
     name: str = Field(..., max_length=50, description="菜单名称")
-    type: int = Field(..., ge=1, le=3, description="菜单类型(1:目录 2:菜单 3:按钮)")
+    type: int = Field(..., ge=1, le=4, description="菜单类型(1:目录 2:菜单 3:按钮 4:外链)")
     icon: Optional[str] = Field(default=None, max_length=100, description="菜单图标")
     order: int = Field(default=1, ge=0, description="显示顺序")
     permission: Optional[str] = Field(default=None, max_length=100, description="权限标识")
@@ -23,7 +23,7 @@ class MenuCreateSchema(BaseModel):
     hidden: bool = Field(default=False, description="是否隐藏(True:是 False:否)")
     always_show: bool = Field(default=False, description="是否始终显示(True:是 False:否)")
     title: Optional[str] = Field(default=None, max_length=50, description="菜单标题")
-    params: Optional[str] = Field(default=None, max_length=200, description="路由参数")
+    params: Optional[list[dict[str, str]]] = Field(default=None, description="路由参数，格式为[{key: string, value: string}]")
     affix: bool = Field(default=False, description="是否固定标签页(True:是 False:否)")
     parent_id: Optional[int] = Field(default=None, ge=0, description="父菜单ID")
     description: Optional[str] = Field(default=None, max_length=500, description="备注说明")
diff --git a/backend/app/api/v1/schemas/system/operation_log_schema.py b/backend/app/api/v1/schemas/system/operation_log_schema.py
index fd421109..1044278b 100644
--- a/backend/app/api/v1/schemas/system/operation_log_schema.py
+++ b/backend/app/api/v1/schemas/system/operation_log_schema.py
@@ -8,6 +8,7 @@ from app.core.base_schema import BaseSchema
 
 class OperationLogCreateSchema(BaseModel):
     """日志创建模型"""
+    type: Optional[int] = Field(default=None, description="日志类型(1登录日志 2操作日志)")
     request_path: Optional[str] = Field(default=None, description="请求路径")
     request_method: Optional[str] = Field(default=None, description="请求方法")
     request_payload: Optional[str] = Field(default=None, description="请求负载")
diff --git a/backend/app/api/v1/services/system/operation_log_service.py b/backend/app/api/v1/services/system/operation_log_service.py
index e2fc1f7e..a79678f2 100644
--- a/backend/app/api/v1/services/system/operation_log_service.py
+++ b/backend/app/api/v1/services/system/operation_log_service.py
@@ -65,6 +65,7 @@ class OperationLogService:
         # 操作日志字段映射
         mapping_dict = {
             'id': '编号',
+            'type': '日志类型',
             'request_path': '请求URL',
             'request_method': '请求方式',
             'request_payload': '请求参数',
@@ -87,5 +88,7 @@ class OperationLogService:
         for item in data:
             # 处理状态
             item['response_code'] = '成功' if item.get('response_code') == 200 else '失败'
+            # 处理日志类型
+            item['type'] = '操作日志' if item.get('type') == 1 else '登录日志'
 
         return ExcelUtil.export_list2excel(list_data=operation_log_list, mapping_dict=mapping_dict)
diff --git a/backend/app/core/router_class.py b/backend/app/core/router_class.py
index 838bcab1..37159b3e 100644
--- a/backend/app/core/router_class.py
+++ b/backend/app/core/router_class.py
@@ -60,9 +60,11 @@ class OperationLogRoute(APIRoute):
             process_time = time.time() - start_time
 
             # 获取当前用户ID,如果是登录接口则为空
+            log_type = 1 # 1:登录日志 2:操作日志
             current_user_id = None
             if "user_id" in request.scope:
                 current_user_id = request.scope.get("user_id")
+                log_type = 2
             
             request_ip = None
             x_forwarded_for = request.headers.get('X-Forwarded-For')
@@ -81,6 +83,7 @@ class OperationLogRoute(APIRoute):
                     auth = AuthSchema(db=session)
                     
                     await OperationLogService.create_log_service(data=OperationLogCreateSchema(
+                        type = log_type,
                         request_path = request.url.path,
                         request_method = request.method,
                         request_payload = payload,
diff --git a/backend/app/scripts/data/system_menu.json b/backend/app/scripts/data/system_menu.json
index 1e8f9d7f..d430a47c 100644
--- a/backend/app/scripts/data/system_menu.json
+++ b/backend/app/scripts/data/system_menu.json
@@ -1500,7 +1500,7 @@
     "route_name": null,
     "route_path": null,
     "component_path": null,
-    "parent_id": 62,
+    "parent_id": 71,
     "status": true,
     "keep_alive": false,
     "hidden": false,
@@ -1535,7 +1535,7 @@
   {
     "id": 74,
     "name": "接口管理",
-    "type": 2,
+    "type": 4,
     "icon": "api",
     "order": 1,
     "permission": "common:docs:query",
@@ -1556,7 +1556,7 @@
   {
     "id": 75,
     "name": "文档管理",
-    "type": 2,
+    "type": 4,
     "icon": "el-icon-Document",
     "order": 2,
     "permission": "common:redoc:query",
diff --git a/backend/dev_sql.db b/backend/dev_sql.db
index 987cdf89f2c13e778d9c13b4e348a2d553aeece1..d05ed0728ca3e339dad26587286c58058f5d479d 100644
GIT binary patch
delta 19527
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

delta 13102
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
W^R^!IW#@}=)jM4vd0VU^N&gQR-yZw`

diff --git a/frontend/package.json b/frontend/package.json
index 39f2e9a5..98eaf833 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -45,7 +45,6 @@
     "@types/node": "^22.16.5",
     "@types/nprogress": "^0.2.3",
     "@types/qs": "^6.14.0",
-    "@vitejs/plugin-vue": "^6.0.0",
     "eslint": "^9.31.0",
     "sass": "^1.89.2",
     "terser": "^5.43.1",
@@ -53,6 +52,7 @@
     "unocss": "66.2.3",
     "unplugin-auto-import": "^19.3.0",
     "unplugin-vue-components": "^28.8.0",
+    "@vitejs/plugin-vue": "^6.0.0",
     "vite": "^6.3.5"
   },
   "engines": {
diff --git a/frontend/src/api/system/dept.ts b/frontend/src/api/system/dept.ts
index 23f07358..98b1285c 100644
--- a/frontend/src/api/system/dept.ts
+++ b/frontend/src/api/system/dept.ts
@@ -1,7 +1,7 @@
 import request from "@/utils/request";
 
 const DeptAPI = {
-  getDeptList(query: DeptPageQuery) {
+  getDeptList(query?: DeptPageQuery) {
     return request<ApiResponse<PageResult<DeptTable[]>>>({
       url: `/system/dept/list`,
       method: "get",
diff --git a/frontend/src/api/system/log.ts b/frontend/src/api/system/log.ts
index 178f3de1..5da00e5a 100644
--- a/frontend/src/api/system/log.ts
+++ b/frontend/src/api/system/log.ts
@@ -37,6 +37,7 @@ const LogAPI = {
 export default LogAPI;
 
 export interface LogPageQuery extends PageQuery {
+  type?: number;
   request_path?: string;
   creator_name?: string;
   /** 开始时间 */
@@ -47,6 +48,7 @@ export interface LogPageQuery extends PageQuery {
 
 export interface LogTable {
   id?: number;
+  type?: number; // 1 登录日志 2 操作日志
   request_path?: string;
   request_method?: string;
   request_ip?: string;
diff --git a/frontend/src/api/system/menu.ts b/frontend/src/api/system/menu.ts
index 2e579865..138546df 100644
--- a/frontend/src/api/system/menu.ts
+++ b/frontend/src/api/system/menu.ts
@@ -1,7 +1,7 @@
 import request from "@/utils/request";
 
 const MenuAPI = {
-  getMenuList(query: MenuPageQuery) {
+  getMenuList(query?: MenuPageQuery) {
     return request<ApiResponse<PageResult<MenuTable[]>>>({
       url: `/system/menu/list`,
       method: "get",
@@ -78,7 +78,7 @@ export interface MenuTable {
   hidden?: boolean;
   always_show?: boolean;
   title?: string;
-  params?: string;
+  params?: { key: string; value: string; }[];
   affix?: boolean;
   status?: boolean;
   description?: string;
@@ -103,7 +103,7 @@ export interface MenuForm {
   hidden?: boolean;
   always_show?: boolean;
   title?: string;
-  params?: string;
+  params?: { key: string; value: string; }[];
   affix?: boolean;
   status?: boolean;
   description?: string;
diff --git a/frontend/src/api/system/role.ts b/frontend/src/api/system/role.ts
index 2be6dc6c..4efca3f9 100644
--- a/frontend/src/api/system/role.ts
+++ b/frontend/src/api/system/role.ts
@@ -106,26 +106,26 @@ export interface RoleForm {
 }
 
 export interface permissionDataType {
-  role_ids?: RoleTable["id"][];
-  menu_ids?: permissionMenuType["id"][];
-  data_scope?: number;
-  dept_ids?: number[];
+  role_ids: RoleTable["id"][];
+  menu_ids: permissionMenuType["id"][];
+  data_scope: number;
+  dept_ids: permissionDeptType["id"][];
 }
 
 export interface permissionDeptType {
-  id?: number;
-  name?: string;
-  parent_id?: number;
-  children?: permissionDeptType[];
+  id: number;
+  name: string;
+  parent_id: number;
+  children: permissionDeptType[];
 }
 
 export interface permissionMenuType {
-  id?: number;
-  name?: string;
-  type?: number;
-  permission?: string;
+  id: number;
+  name: string;
+  type: number;
+  permission: string;
   parent_id?: number;
-  status?: boolean;
+  status: boolean;
   description?: string;
   children?: permissionMenuType[];
 }
diff --git a/frontend/src/enums/system/menu.enum.ts b/frontend/src/enums/system/menu.enum.ts
index cf246c3e..f561d8fc 100644
--- a/frontend/src/enums/system/menu.enum.ts
+++ b/frontend/src/enums/system/menu.enum.ts
@@ -1,7 +1,7 @@
 // 核心枚举定义
 export enum MenuTypeEnum {
-  CATALOG = 2, // 目录
-  MENU = 1, // 菜单
+  CATALOG = 1, // 目录
+  MENU = 2, // 菜单
   BUTTON = 3, // 按钮
   EXTLINK = 4, // 外链
 }
diff --git a/frontend/src/store/modules/notice.store.ts b/frontend/src/store/modules/notice.store.ts
index 6f9baf1e..f493d86e 100644
--- a/frontend/src/store/modules/notice.store.ts
+++ b/frontend/src/store/modules/notice.store.ts
@@ -11,7 +11,6 @@ export const useNoticeStore = defineStore("notice", {
   actions: {
     async getNotice() {
       const response = await NoticeAPI.getNoticeListAvailable();
-      console.log('获取我的通知公告', response);
       this.noticeList = response.data.data.items;
       this.total = response.data.data.total;
       this.isNoticeLoaded = true;
diff --git a/frontend/src/store/modules/permission.store.ts b/frontend/src/store/modules/permission.store.ts
index 5da4561b..dd8967bb 100644
--- a/frontend/src/store/modules/permission.store.ts
+++ b/frontend/src/store/modules/permission.store.ts
@@ -22,7 +22,7 @@ export interface Meta {
   /** 排序 */
   order?: number;
   /** 参数 */
-  params?: string;
+  params?: { key: string; value: string; }[];
   /** 是否固定路由 */
   affix?: boolean;
 }
diff --git a/frontend/src/utils/common.ts b/frontend/src/utils/common.ts
index f27ee2a5..ccdd5d73 100644
--- a/frontend/src/utils/common.ts
+++ b/frontend/src/utils/common.ts
@@ -1,5 +1,3 @@
-
-
 // 问候语：根据当前小时返回不同问候语
 export function greetings () {
   // 当前时间（用于计算问候语）
@@ -145,7 +143,7 @@ export function listToTree(list: any[]) {
 }
 
 // 加载部门选项
-export function formatDeptTree(nodes: any[]): any[] {
+export function formatTree(nodes: any[]): any[] {
   return nodes.map(node => {
     const formattedNode = {
       value: node.id,
@@ -153,7 +151,7 @@ export function formatDeptTree(nodes: any[]): any[] {
     };
     
     if (node.children && node.children.length > 0) {
-      Object.assign(formattedNode, { children: formatDeptTree(node.children) });
+      Object.assign(formattedNode, { children: formatTree(node.children) });
     }
     
     return formattedNode;
diff --git a/frontend/src/views/monitor/job/index.vue b/frontend/src/views/monitor/job/index.vue
index 3b190f6d..e24354aa 100644
--- a/frontend/src/views/monitor/job/index.vue
+++ b/frontend/src/views/monitor/job/index.vue
@@ -1,280 +1,506 @@
 <!-- 公告通知配置 -->
 <template>
-    <div class="app-container">
-        <!-- 搜索区域 -->
-        <div class="search-container">
-            <el-form ref="queryFormRef" :model="queryFormData" :inline="true">
-                <el-form-item prop="name" label="任务名称">
-                    <el-input v-model="queryFormData.name" placeholder="请输入任务名称" clearable />
-                </el-form-item>
-                <el-form-item prop="status" label="状态">
-                    <el-select v-model="queryFormData.status" placeholder="请选择状态" 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="创建时间">
-                    <el-date-picker v-model="queryFormData.start_time" type="daterange" value-format="yyyy-MM-dd"
-                        range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
-                </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="success" icon="plus" @click="handleOpenDialog('create')">新增</el-button>
-                    <el-button type="danger" icon="delete" :disabled="selectIds.length === 0" @click="handleDelete(selectIds)">批量删除</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="danger" icon="plus" circle @click="handleClear" />
-                    </el-tooltip>
-                    <el-tooltip content="刷新">
-                        <el-button type="primary" icon="refresh" circle @click="handleRefresh" />
-                    </el-tooltip>
-                </div>
-            </div>
-
-            <!-- 表格区域：系统配置列表 -->
-            <el-table ref="dataTableRef" v-loading="loading" :data="pageTableData" class="data-table__content"
-                highlight-current-row height="450" border stripe @selection-change="handleSelectionChange">
-                <template #empty>
-                    <el-empty :image-size="80" description="暂无数据" />
+  <div class="app-container">
+    <!-- 搜索区域 -->
+    <div class="search-container">
+      <el-form ref="queryFormRef" :model="queryFormData" :inline="true">
+        <el-form-item prop="name" label="任务名称">
+          <el-input
+            v-model="queryFormData.name"
+            placeholder="请输入任务名称"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item prop="status" label="状态">
+          <el-select
+            v-model="queryFormData.status"
+            placeholder="请选择状态"
+            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="创建时间">
+          <el-date-picker
+            v-model="queryFormData.start_time"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          />
+        </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>
-                <el-table-column type="selection" align="center" min-width="55" />
-                <el-table-column type="index" label="序号" fixed min-width="60" />
-                <el-table-column label="任务名称" prop="name" min-width="140" />
-                <el-table-column label="执行函数" prop="func" min-width="140" />
-                <el-table-column label="触发器" prop="trigger" min-width="100" />
-                <el-table-column label="存储器" prop="jobstore" min-width="100" />
-                <el-table-column label="执行器" prop="executor" min-width="100" />
-                <el-table-column label="并发执行" prop="coalesce" min-width="100">
-                    <template #default="scope">
-                        <el-tag :type="scope.row.coalesce === true ? 'success' : 'danger'">
-                            {{ scope.row.coalesce === true ? "是" : "否" }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column label="状态" prop="status" min-width="100">
-                    <template #default="scope">
-                        <el-tag :type="scope.row.status === true ? 'success' : 'danger'">
-                            {{ scope.row.status === true ? "启用" : "停用" }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column label="描述" prop="description" min-width="100" />
-                <el-table-column label="创建时间" prop="created_at" min-width="200" sortable />
-                <el-table-column label="更新时间" prop="updated_at" min-width="200" sortable />
-
-                <el-table-column fixed="right" label="操作" min-width="240">
-                    <template #default="scope">
-                        <el-button type="info" size="small" link icon="document"
-                            @click="handleOpenDialog('detail', scope.row.id)">详情</el-button>
-                        <el-button type="primary" size="small" link icon="edit"
-                            @click="handleOpenDialog('update', scope.row.id)">编辑</el-button>
-                        <el-button type="danger" size="small" link icon="delete"
-                            @click="handleDelete([scope.row.id])">删除</el-button>
-                        <el-dropdown trigger="click">
-                            <el-button type="default" size="small" link icon="ArrowDown">更多</el-button>
-                            <template #dropdown>
-                                <el-dropdown-menu>
-                                    <el-dropdown-item icon="Check" @click="handleOption(scope.row, 1)">暂停</el-dropdown-item>
-                                    <el-dropdown-item icon="CircleClose" @click="handleOption(scope.row, 2)">恢复</el-dropdown-item>
-                                    <!-- <el-dropdown-item icon="CircleClose" @click="handleOption(scope.row, 3)">重启</el-dropdown-item> -->
-                                </el-dropdown-menu>
-                            </template>
-                        </el-dropdown>
-                    </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="4" border>
-                    <el-descriptions-item label="序号" :span="2">{{ detailFormData.id }}</el-descriptions-item>
-                    <el-descriptions-item label="任务名称" :span="2">{{ detailFormData.name }}</el-descriptions-item>
-                    <el-descriptions-item label="任务函数" :span="2">{{ detailFormData.func }}</el-descriptions-item>
-                    <el-descriptions-item label="存储器" :span="2">{{ detailFormData.jobstore }}</el-descriptions-item>
-                    <el-descriptions-item label="执行器" :span="2">{{ detailFormData.executor }}</el-descriptions-item>
-                    <el-descriptions-item label="触发器" :span="2">{{ detailFormData.trigger }}</el-descriptions-item>
-                    <el-descriptions-item label="位置参数" :span="2">{{ detailFormData.args }}</el-descriptions-item>
-                    <el-descriptions-item label="关键字参数" :span="2">{{ detailFormData.kwargs }}</el-descriptions-item>
-                    <el-descriptions-item label="并发执行" :span="2">
-                        <el-tag :type="detailFormData.coalesce ? 'success' : 'danger'">
-                            {{ detailFormData.coalesce ? '是' : '否' }}
-                        </el-tag>
-                    </el-descriptions-item>
-                    <el-descriptions-item label="状态" :span="2">
-                        <el-tag :type="detailFormData.status ? 'success' : 'danger'">
-                            {{ detailFormData.status ? '启用' : '停用' }}
-                        </el-tag>
-                    </el-descriptions-item>
-                    <el-descriptions-item label="最大实例数" :span="2">{{ detailFormData.max_instances }}</el-descriptions-item>
-                    <el-descriptions-item label="触发器参数" :span="2">{{ detailFormData.trigger_args }}</el-descriptions-item>
-                    <el-descriptions-item label="开始时间" :span="2">{{ detailFormData.start_date }}</el-descriptions-item>
-                    <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>
-                    <el-descriptions-item label="创建时间" :span="2">{{ detailFormData.created_at }}</el-descriptions-item>
-                    <el-descriptions-item label="更新时间" :span="2">{{ detailFormData.updated_at }}</el-descriptions-item>
-                    <el-descriptions-item label="描述" :span="4">{{ detailFormData.description }}</el-descriptions-item>
-                </el-descriptions>
-            </template>
-            <!-- 新增、编辑表单 -->
-            <template v-else>
-                <el-form ref="dataFormRef" :model="formData" :rules="rules" label-suffix=":" label-width="100px">
-                    <el-form-item label="任务名称" prop="name">
-                        <el-input v-model="formData.name" placeholder="请输入任务名称" :maxlength="50" />
-                    </el-form-item>
-                    <el-form-item label="任务函数" prop="func">
-                        <el-input v-model="formData.func" placeholder="请输入任务函数" :maxlength="50" />
-                    </el-form-item>
-                    <el-form-item label="存储器" prop="jobstore">
-                        <el-select v-model="formData.jobstore" placeholder="请选择存储器">
-                            <el-option value="default" label="默认(Memory)" />
-                            <el-option value="sqlalchemy" label="数据库" />
-                            <el-option value="redis" label="Redis存储器" />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="执行器" prop="executor">
-                        <el-select v-model="formData.executor" placeholder="请选择执行器">
-                            <el-option value="default" label="默认" />
-                            <el-option value="processpool" label="进程池" />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="位置参数" prop="args">
-                        <el-input v-model="formData.args" placeholder="请输入位置参数" :maxlength="50" />
-                    </el-form-item>
-                    <el-form-item label="关键字参数" prop="kwargs">
-                        <el-input v-model="formData.kwargs" placeholder="请输入关键字参数" :maxlength="50" />
-                    </el-form-item>
-                    <el-form-item label="并发执行" prop="coalesce">
-                        <el-radio-group v-model="formData.coalesce">
-                            <el-radio :value="true">是</el-radio>
-                            <el-radio :value="false">否</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="最大实例数" prop="max_instances">
-                        <el-input-number v-model="formData.max_instances" controls-position="right" :min="1"
-                            :max="10" />
-                    </el-form-item>
-                    <el-form-item label="触发器" prop="trigger">
-                        <el-select v-model="formData.trigger" placeholder="请选择触发器">
-                            <el-option value="date" label="指定日期(date)" />
-                            <el-option value="interval" label="间隔触发器(interval)" />
-                            <el-option value="cron" label="cron表达式" />
-                        </el-select>
-                    </el-form-item>
-
-                    <!-- 运行日期、间隔时间或 Cron 表达式 -->
-                    <el-form-item v-if="formData.trigger === 'date'" label="运行日期"
-                        :rules="[{ required: true, message: '请选择运行日期' }]">
-                        <el-date-picker v-model="formData.trigger_args" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-                            value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择运行日期" style="width: 100%" />
-                    </el-form-item>
-                    <el-form-item v-else-if="formData.trigger === 'interval'" label="间隔时间"
-                        :rules="[{ required: true, message: '请输入间隔时间' }]">
-                        <el-input v-model="formData.trigger_args" placeholder="请输入 秒-分-时-天-周 (* * * * 1)" clearable
-                            @click="openIntervalTabHandle('create')" />
-                    </el-form-item>
-                    <el-form-item v-else-if="formData.trigger === 'cron'" label="Cron表达式"
-                        :rules="[{ required: true, message: '请输入Cron表达式' }]">
-                        <el-input v-model="formData.trigger_args" placeholder="请输入 Cron表达式(*/3 * * * *)" clearable
-                            readonly @click="handleShowCron">
-                        </el-input>
-                    </el-form-item>
-                    <!-- 开始日期和结束日期 -->
-                    <el-form-item v-if="formData.trigger && formData.trigger != 'date'" label="开始日期"
-                        :rules="[{ required: false, message: '请选择开始日期' }]">
-                        <el-date-picker v-model="formData.start_date" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-                            value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始日期" style="width: 100%" />
-                    </el-form-item>
-                    <el-form-item v-if="formData.trigger && formData.trigger != 'date'" label="结束日期"
-                        :rules="[{ required: false, message: '请选择结束日期' }]">
-                        <el-date-picker v-model="formData.end_date" type="datetime" format="YYYY-MM-DD HH:mm:ss"
-                            value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束日期" style="width: 100%" />
-                    </el-form-item>
-
-                    <el-form-item label="描述" prop="description">
-                        <el-input v-model="formData.description" :rows="4" :maxlength="100" show-word-limit
-                            type="textarea" placeholder="请输入描述" />
-                    </el-form-item>
-                </el-form>
-            </template>
-
-            <template #footer>
-                <div class="dialog-footer">
-                    <!-- 详情弹窗不需要确定按钮的提交逻辑 -->
-                    <el-button v-if="dialogVisible.type !== 'detail'" type="primary"
-                        @click="handleSubmit">确定</el-button>
-                    <el-button v-else type="primary" @click="handleCloseDialog">确定</el-button>
-                    <el-button @click="handleCloseDialog">取消</el-button>
-                </div>
-            </template>
-        </el-dialog>
-
-        <!-- 时间间隔组件 -->
-        <el-dialog v-model="openIntervalTab" title="间隔时间设置" :width="600" :destroy-on-close="true"
-            @ok="handleIntervalConfirm">
-            <IntervalTab ref="intervalTabRef" />
-        </el-dialog>
-
-        <!-- core组件 -->
-        <el-dialog v-model="openCron">
-            <Vue3CronPlusPicker :expression="expression" @hide="closeDialog" @fill="fillValue" />
-        </el-dialog>
+                <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="success"
+            icon="plus"
+            @click="handleOpenDialog('create')"
+            >新增</el-button
+          >
+          <el-button
+            type="danger"
+            icon="delete"
+            :disabled="selectIds.length === 0"
+            @click="handleDelete(selectIds)"
+            >批量删除</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="danger" icon="plus" circle @click="handleClear" />
+          </el-tooltip>
+          <el-tooltip content="刷新">
+            <el-button
+              type="primary"
+              icon="refresh"
+              circle
+              @click="handleRefresh"
+            />
+          </el-tooltip>
+        </div>
+      </div>
+
+      <!-- 表格区域：系统配置列表 -->
+      <el-table
+        ref="dataTableRef"
+        v-loading="loading"
+        :data="pageTableData"
+        class="data-table__content"
+        highlight-current-row
+        height="450"
+        border
+        stripe
+        @selection-change="handleSelectionChange"
+      >
+        <template #empty>
+          <el-empty :image-size="80" description="暂无数据" />
+        </template>
+        <el-table-column type="selection" align="center" min-width="55" />
+        <el-table-column type="index" label="序号" fixed 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="name" min-width="140" />
+        <el-table-column label="执行函数" prop="func" min-width="140" />
+        <el-table-column label="触发器" prop="trigger" min-width="100" />
+        <el-table-column label="存储器" prop="jobstore" min-width="100" />
+        <el-table-column label="执行器" prop="executor" min-width="100" />
+        <el-table-column label="并发执行" prop="coalesce" min-width="100">
+          <template #default="scope">
+            <el-tag :type="scope.row.coalesce === true ? 'success' : 'danger'">
+              {{ scope.row.coalesce === true ? "是" : "否" }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" prop="status" min-width="100">
+          <template #default="scope">
+            <el-tag :type="scope.row.status === true ? 'success' : 'danger'">
+              {{ scope.row.status === true ? "启用" : "停用" }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="描述" prop="description" min-width="100" />
+        <el-table-column
+          label="创建时间"
+          prop="created_at"
+          min-width="200"
+          sortable
+        />
+        <el-table-column
+          label="更新时间"
+          prop="updated_at"
+          min-width="200"
+          sortable
+        />
+
+        <el-table-column fixed="right" label="操作" min-width="240">
+          <template #default="scope">
+            <el-button
+              type="info"
+              size="small"
+              link
+              icon="document"
+              @click="handleOpenDialog('detail', scope.row.id)"
+              >详情</el-button
+            >
+            <el-button
+              type="primary"
+              size="small"
+              link
+              icon="edit"
+              @click="handleOpenDialog('update', scope.row.id)"
+              >编辑</el-button
+            >
+            <el-button
+              type="danger"
+              size="small"
+              link
+              icon="delete"
+              @click="handleDelete([scope.row.id])"
+              >删除</el-button
+            >
+            <el-dropdown trigger="click">
+              <el-button type="default" size="small" link icon="ArrowDown"
+                >更多</el-button
+              >
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <el-dropdown-item
+                    icon="Check"
+                    @click="handleOption(scope.row, 1)"
+                    >暂停</el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    icon="CircleClose"
+                    @click="handleOption(scope.row, 2)"
+                    >恢复</el-dropdown-item
+                  >
+                  <!-- <el-dropdown-item icon="CircleClose" @click="handleOption(scope.row, 3)">重启</el-dropdown-item> -->
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
+          </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"
+      top="3vh"
+      @close="handleCloseDialog"
+    >
+      <!-- 详情 -->
+      <template v-if="dialogVisible.type === 'detail'">
+        <el-descriptions :column="4" border>
+          <el-descriptions-item label="序号" :span="2">{{
+            detailFormData.id
+          }}</el-descriptions-item>
+          <el-descriptions-item label="任务名称" :span="2">{{
+            detailFormData.name
+          }}</el-descriptions-item>
+          <el-descriptions-item label="任务函数" :span="2">{{
+            detailFormData.func
+          }}</el-descriptions-item>
+          <el-descriptions-item label="存储器" :span="2">{{
+            detailFormData.jobstore
+          }}</el-descriptions-item>
+          <el-descriptions-item label="执行器" :span="2">{{
+            detailFormData.executor
+          }}</el-descriptions-item>
+          <el-descriptions-item label="触发器" :span="2">{{
+            detailFormData.trigger
+          }}</el-descriptions-item>
+          <el-descriptions-item label="位置参数" :span="2">{{
+            detailFormData.args
+          }}</el-descriptions-item>
+          <el-descriptions-item label="关键字参数" :span="2">{{
+            detailFormData.kwargs
+          }}</el-descriptions-item>
+          <el-descriptions-item label="并发执行" :span="2">
+            <el-tag :type="detailFormData.coalesce ? 'success' : 'danger'">
+              {{ detailFormData.coalesce ? "是" : "否" }}
+            </el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="状态" :span="2">
+            <el-tag :type="detailFormData.status ? 'success' : 'danger'">
+              {{ detailFormData.status ? "启用" : "停用" }}
+            </el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="最大实例数" :span="2">{{
+            detailFormData.max_instances
+          }}</el-descriptions-item>
+          <el-descriptions-item label="触发器参数" :span="2">{{
+            detailFormData.trigger_args
+          }}</el-descriptions-item>
+          <el-descriptions-item label="开始时间" :span="2">{{
+            detailFormData.start_date
+          }}</el-descriptions-item>
+          <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>
+          <el-descriptions-item label="创建时间" :span="2">{{
+            detailFormData.created_at
+          }}</el-descriptions-item>
+          <el-descriptions-item label="更新时间" :span="2">{{
+            detailFormData.updated_at
+          }}</el-descriptions-item>
+          <el-descriptions-item label="描述" :span="4">{{
+            detailFormData.description
+          }}</el-descriptions-item>
+        </el-descriptions>
+      </template>
+      <!-- 新增、编辑表单 -->
+      <template v-else>
+        <el-form
+          ref="dataFormRef"
+          :model="formData"
+          :rules="rules"
+          label-suffix=":"
+          label-width="100px"
+        >
+          <el-form-item label="任务名称" prop="name">
+            <el-input
+              v-model="formData.name"
+              placeholder="请输入任务名称"
+              :maxlength="50"
+            />
+          </el-form-item>
+          <el-form-item label="任务函数" prop="func">
+            <el-input
+              v-model="formData.func"
+              placeholder="请输入任务函数"
+              :maxlength="50"
+            />
+          </el-form-item>
+          <el-form-item label="存储器" prop="jobstore">
+            <el-select v-model="formData.jobstore" placeholder="请选择存储器">
+              <el-option value="default" label="默认(Memory)" />
+              <el-option value="sqlalchemy" label="数据库" />
+              <el-option value="redis" label="Redis存储器" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="执行器" prop="executor">
+            <el-select v-model="formData.executor" placeholder="请选择执行器">
+              <el-option value="default" label="默认" />
+              <el-option value="processpool" label="进程池" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="位置参数" prop="args">
+            <el-input
+              v-model="formData.args"
+              placeholder="请输入位置参数"
+              :maxlength="50"
+            />
+          </el-form-item>
+          <el-form-item label="关键字参数" prop="kwargs">
+            <el-input
+              v-model="formData.kwargs"
+              placeholder="请输入关键字参数"
+              :maxlength="50"
+            />
+          </el-form-item>
+          <el-form-item label="并发执行" prop="coalesce">
+            <el-radio-group v-model="formData.coalesce">
+              <el-radio :value="true">是</el-radio>
+              <el-radio :value="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="最大实例数" prop="max_instances">
+            <el-input-number
+              v-model="formData.max_instances"
+              controls-position="right"
+              :min="1"
+              :max="10"
+            />
+          </el-form-item>
+          <el-form-item label="触发器" prop="trigger">
+            <el-select v-model="formData.trigger" placeholder="请选择触发器">
+              <el-option value="date" label="指定日期(date)" />
+              <el-option value="interval" label="间隔触发器(interval)" />
+              <el-option value="cron" label="cron表达式" />
+            </el-select>
+          </el-form-item>
+
+          <!-- 运行日期、间隔时间或 Cron 表达式 -->
+          <el-form-item
+            v-if="formData.trigger === 'date'"
+            label="运行日期"
+            :rules="[{ required: true, message: '请选择运行日期' }]"
+          >
+            <el-date-picker
+              v-model="formData.trigger_args"
+              type="datetime"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择运行日期"
+              style="width: 100%"
+            />
+          </el-form-item>
+          <el-form-item
+            v-else-if="formData.trigger === 'interval'"
+            label="间隔时间"
+            :rules="[{ required: true, message: '请输入间隔时间' }]"
+          >
+            <el-input
+              v-model="formData.trigger_args"
+              placeholder="请输入 秒-分-时-天-周 (* * * * 1)"
+              clearable
+              @click="openIntervalTabHandle('create')"
+            />
+          </el-form-item>
+          <el-form-item
+            v-else-if="formData.trigger === 'cron'"
+            label="Cron表达式"
+            :rules="[{ required: true, message: '请输入Cron表达式' }]"
+          >
+            <el-input
+              v-model="formData.trigger_args"
+              placeholder="请输入 Cron表达式(*/3 * * * *)"
+              clearable
+              readonly
+              @click="handleShowCron"
+            >
+            </el-input>
+          </el-form-item>
+          <!-- 开始日期和结束日期 -->
+          <el-form-item
+            v-if="formData.trigger && formData.trigger != 'date'"
+            label="开始日期"
+            :rules="[{ required: false, message: '请选择开始日期' }]"
+          >
+            <el-date-picker
+              v-model="formData.start_date"
+              type="datetime"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择开始日期"
+              style="width: 100%"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="formData.trigger && formData.trigger != 'date'"
+            label="结束日期"
+            :rules="[{ required: false, message: '请选择结束日期' }]"
+          >
+            <el-date-picker
+              v-model="formData.end_date"
+              type="datetime"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择结束日期"
+              style="width: 100%"
+            />
+          </el-form-item>
+
+          <el-form-item label="描述" prop="description">
+            <el-input
+              v-model="formData.description"
+              :rows="4"
+              :maxlength="100"
+              show-word-limit
+              type="textarea"
+              placeholder="请输入描述"
+            />
+          </el-form-item>
+        </el-form>
+      </template>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <!-- 详情弹窗不需要确定按钮的提交逻辑 -->
+          <el-button
+            v-if="dialogVisible.type !== 'detail'"
+            type="primary"
+            @click="handleSubmit"
+            >确定</el-button
+          >
+          <el-button v-else type="primary" @click="handleCloseDialog"
+            >确定</el-button
+          >
+          <el-button @click="handleCloseDialog">取消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 时间间隔组件 -->
+    <el-dialog
+      v-model="openIntervalTab"
+      title="间隔时间设置"
+      :width="600"
+      :destroy-on-close="true"
+      @ok="handleIntervalConfirm"
+    >
+      <IntervalTab ref="intervalTabRef" />
+    </el-dialog>
+
+    <!-- core组件 -->
+    <el-dialog v-model="openCron">
+      <Vue3CronPlusPicker @hide="closeDialog" @fill="fillValue" :expression="expression" />
+    </el-dialog>
+  </div>
 </template>
 
 <script lang="ts" setup>
 defineOptions({
-    name: "Job",
-    inheritAttrs: false,
+  name: "Job",
+  inheritAttrs: false,
 });
 
 import JobAPI, { JobTable, JobForm, JobPageQuery } from "@/api/monitor/job";
@@ -326,288 +552,288 @@ const detailFormData = ref<JobTable>({});
 
 // 分页查询参数
 const queryFormData = reactive<JobPageQuery>({
-    page_no: 1,
-    page_size: 10,
-    name: undefined,
-    status: undefined,
-    start_time: undefined,
-    end_time: undefined,
+  page_no: 1,
+  page_size: 10,
+  name: undefined,
+  status: undefined,
+  start_time: undefined,
+  end_time: undefined,
 });
 
 // 编辑表单
 const formData = reactive<JobForm>({
-    id: undefined,
-    name: undefined,
-    func: undefined,
-    trigger: undefined,
-    args: undefined,
-    kwargs: undefined,
-    coalesce: undefined,
-    max_instances: undefined,
-    jobstore: undefined,
-    executor: undefined,
-    trigger_args: undefined,
-    start_date: undefined,
-    end_date: undefined,
-    status: undefined,
-    message: undefined,
-    description: undefined,
+  id: undefined,
+  name: undefined,
+  func: undefined,
+  trigger: undefined,
+  args: undefined,
+  kwargs: undefined,
+  coalesce: undefined,
+  max_instances: undefined,
+  jobstore: undefined,
+  executor: undefined,
+  trigger_args: undefined,
+  start_date: undefined,
+  end_date: undefined,
+  status: undefined,
+  message: undefined,
+  description: undefined,
 });
 
 // 弹窗状态
 const dialogVisible = reactive({
-    title: "",
-    visible: false,
-    type: "create" as "create" | "update" | "detail",
+  title: "",
+  visible: false,
+  type: "create" as "create" | "update" | "detail",
 });
 
 // 表单验证规则
 const rules = reactive({
-    name: [{ required: true, message: "请输入任务名称", trigger: "blur" }],
-    func: [{ required: true, message: "请输入执行函数", trigger: "blur" }],
-    trigger: [{ required: true, message: "请选择触发器", trigger: "blur" }],
-    coalesce: [{ required: true, message: "请选择并发执行", trigger: "blur" }],
-    jobstore: [{ required: true, message: "请选择存储器", trigger: "blur" }],
-    executor: [{ required: true, message: "请选择执行器", trigger: "blur" }],
+  name: [{ required: true, message: "请输入任务名称", trigger: "blur" }],
+  func: [{ required: true, message: "请输入执行函数", trigger: "blur" }],
+  trigger: [{ required: true, message: "请选择触发器", trigger: "blur" }],
+  coalesce: [{ required: true, message: "请选择并发执行", trigger: "blur" }],
+  jobstore: [{ required: true, message: "请选择存储器", trigger: "blur" }],
+  executor: [{ required: true, message: "请选择执行器", trigger: "blur" }],
 });
 
 // 刷新数据(防抖)
 const handleRefresh = useDebounceFn(() => {
-    loadingData();
-    ElMessage.success("刷新成功");
+  loadingData();
+  ElMessage.success("刷新成功");
 }, 1000);
 
 // 加载表格数据
 async function loadingData() {
-    loading.value = true;
-    try {
-        const response = await JobAPI.getJobList(queryFormData);
-        pageTableData.value = response.data.data.items;
-        total.value = response.data.data.total;
-    } catch (error: any) {
-        ElMessage.error(error.message);
-    } finally {
-        loading.value = false;
-    }
+  loading.value = true;
+  try {
+    const response = await JobAPI.getJobList(queryFormData);
+    pageTableData.value = response.data.data.items;
+    total.value = response.data.data.total;
+  } catch (error: any) {
+    ElMessage.error(error.message);
+  } finally {
+    loading.value = false;
+  }
 }
 
 // 查询（重置页码后获取数据）
 async function handleQuery() {
-    queryFormData.page_no = 1;
-    loadingData();
+  queryFormData.page_no = 1;
+  loadingData();
 }
 
 // 重置查询
 async function handleResetQuery() {
-    queryFormRef.value.resetFields();
-    queryFormData.page_no = 1;
-    loadingData();
+  queryFormRef.value.resetFields();
+  queryFormData.page_no = 1;
+  loadingData();
 }
 
 // 重置表单
 async function resetForm() {
-    dataFormRef.value.resetFields();
-    dataFormRef.value.clearValidate();
-    formData.id = undefined;
+  dataFormRef.value.resetFields();
+  dataFormRef.value.clearValidate();
+  formData.id = undefined;
 }
 
 // 行复选框选中项变化
 async function handleSelectionChange(selection: any) {
-    selectIds.value = selection.map((item: any) => item.id);
+  selectIds.value = selection.map((item: any) => item.id);
 }
 
 // 关闭弹窗
 async function handleCloseDialog() {
-    dialogVisible.visible = false;
-    resetForm();
+  dialogVisible.visible = false;
+  resetForm();
 }
 
 // 打开弹窗
 async function handleOpenDialog(
-    type: "create" | "update" | "detail",
-    id?: number,
+  type: "create" | "update" | "detail",
+  id?: number
 ) {
-    dialogVisible.type = type;
-    if (id) {
-        const response = await JobAPI.getJobDetail(id);
-        if (type === "detail") {
-            dialogVisible.title = "任务详情";
-            Object.assign(detailFormData.value, response.data.data);
-        } else if (type === "update") {
-            dialogVisible.title = "修改任务";
-            Object.assign(formData, response.data.data);
-        }
-    } else {
-        dialogVisible.title = "新增任务";
-        formData.id = undefined;
+  dialogVisible.type = type;
+  if (id) {
+    const response = await JobAPI.getJobDetail(id);
+    if (type === "detail") {
+      dialogVisible.title = "任务详情";
+      Object.assign(detailFormData.value, response.data.data);
+    } else if (type === "update") {
+      dialogVisible.title = "修改任务";
+      Object.assign(formData, response.data.data);
     }
-    dialogVisible.visible = true;
+  } else {
+    dialogVisible.title = "新增任务";
+    formData.id = undefined;
+  }
+  dialogVisible.visible = true;
 }
 
 // 提交表单（防抖）
 async function handleSubmit() {
-    // 表单校验
-    dataFormRef.value.validate(async (valid: any) => {
-        if (valid) {
-            loading.value = true;
-            // 根据弹窗传入的参数(deatil\create\update)判断走什么逻辑
-            const id = formData.id;
-            if (id) {
-                try {
-                    await JobAPI.updateJob(formData);
-                    dialogVisible.visible = false;
-                    resetForm();
-                    handleCloseDialog();
-                    handleResetQuery();
-                } catch (error: any) {
-                    ElMessage.error(error.message);
-                } finally {
-                    loading.value = false;
-                }
-            } else {
-                try {
-                    await JobAPI.createJob(formData);
-                    dialogVisible.visible = false;
-                    resetForm();
-                    handleCloseDialog();
-                    handleResetQuery();
-                } catch (error: any) {
-                    ElMessage.error(error.message);
-                } finally {
-                    loading.value = false;
-                }
-            }
+  // 表单校验
+  dataFormRef.value.validate(async (valid: any) => {
+    if (valid) {
+      loading.value = true;
+      // 根据弹窗传入的参数(deatil\create\update)判断走什么逻辑
+      const id = formData.id;
+      if (id) {
+        try {
+          await JobAPI.updateJob(formData);
+          dialogVisible.visible = false;
+          resetForm();
+          handleCloseDialog();
+          handleResetQuery();
+        } catch (error: any) {
+          ElMessage.error(error.message);
+        } finally {
+          loading.value = false;
         }
-    });
+      } else {
+        try {
+          await JobAPI.createJob(formData);
+          dialogVisible.visible = false;
+          resetForm();
+          handleCloseDialog();
+          handleResetQuery();
+        } catch (error: any) {
+          ElMessage.error(error.message);
+        } finally {
+          loading.value = false;
+        }
+      }
+    }
+  });
 }
 
 // 删除、批量删除
 async function handleDelete(ids: number[]) {
-    ElMessageBox.confirm("确认删除该项数据?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+  ElMessageBox.confirm("确认删除该项数据?", "警告", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(async () => {
+      try {
+        loading.value = true;
+        await JobAPI.deleteJob(ids);
+        handleResetQuery();
+      } catch (error: any) {
+        ElMessage.error(error.message);
+      } finally {
+        loading.value = false;
+      }
     })
-        .then(async () => {
-            try {
-                loading.value = true;
-                await JobAPI.deleteJob(ids);
-                handleResetQuery();
-            } catch (error: any) {
-                ElMessage.error(error.message);
-            } finally {
-                loading.value = false;
-            }
-        })
-        .catch(() => {
-            ElMessage.info("已取消删除");
-        });
+    .catch(() => {
+      ElMessage.info("已取消删除");
+    });
 }
 
 // 导出
 async function handleExport() {
-    ElMessageBox.confirm("是否确认导出当前任务配置?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-    })
-        .then(async () => {
-            try {
-                loading.value = true;
-                const body = {
-                    ...queryFormData,
-                    page_no: 1,
-                    page_size: total.value,
-                };
-                ElMessage.warning("正在导出数据，请稍候...");
+  ElMessageBox.confirm("是否确认导出当前任务配置?", "警告", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(async () => {
+      try {
+        loading.value = true;
+        const body = {
+          ...queryFormData,
+          page_no: 1,
+          page_size: total.value,
+        };
+        ElMessage.warning("正在导出数据，请稍候...");
 
-                const response = await JobAPI.exportJob(body);
-                const blob = new Blob([JSON.stringify(response.data.data)], {
-                    type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8",
-                });
-                // 从响应头获取文件名
-                const contentDisposition = response.headers["content-disposition"];
-                let fileName = "系统配置.xlsx";
-                if (contentDisposition) {
-                    const fileNameMatch = contentDisposition.match(/filename=(.*?)(;|$)/);
-                    if (fileNameMatch) {
-                        fileName = decodeURIComponent(fileNameMatch[1]);
-                    }
-                }
-                const url = window.URL.createObjectURL(blob);
-                const link = document.createElement("a");
-                link.href = url;
-                link.download = fileName;
-                document.body.appendChild(link);
-                link.click();
-            } catch (error: any) {
-                ElMessage.error("文件处理失败", error.message);
-                console.error("导出错误:", error);
-            } finally {
-                loading.value = false;
-            }
-        })
-        .catch(() => {
-            ElMessage.info("已取消导出");
+        const response = await JobAPI.exportJob(body);
+        const blob = new Blob([JSON.stringify(response.data.data)], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8",
         });
+        // 从响应头获取文件名
+        const contentDisposition = response.headers["content-disposition"];
+        let fileName = "系统配置.xlsx";
+        if (contentDisposition) {
+          const fileNameMatch = contentDisposition.match(/filename=(.*?)(;|$)/);
+          if (fileNameMatch) {
+            fileName = decodeURIComponent(fileNameMatch[1]);
+          }
+        }
+        const url = window.URL.createObjectURL(blob);
+        const link = document.createElement("a");
+        link.href = url;
+        link.download = fileName;
+        document.body.appendChild(link);
+        link.click();
+      } catch (error: any) {
+        ElMessage.error("文件处理失败", error.message);
+        console.error("导出错误:", error);
+      } finally {
+        loading.value = false;
+      }
+    })
+    .catch(() => {
+      ElMessage.info("已取消导出");
+    });
 }
 
 function openIntervalTabHandle(value: any) {
-    openIntervalTab.value = true;
-    modalTitle.value = value;
+  openIntervalTab.value = true;
+  modalTitle.value = value;
 }
 
 function handleIntervalConfirm() {
-    formData.trigger_args = intervalTabRef.value.handleConfirm();
-    openIntervalTab.value = false;
+  formData.trigger_args = intervalTabRef.value.handleConfirm();
+  openIntervalTab.value = false;
 }
 
 const handleShowCron = () => {
-    openCron.value = true;
-    expression.value = formData.trigger_args;
+  openCron.value = true;
+  expression.value = formData.trigger_args;
 };
 
 const closeDialog = () => {
-    openCron.value = false;
+  openCron.value = false;
 };
 
 const fillValue = (cronValue: string) => {
-    formData.trigger_args = cronValue;
+  formData.trigger_args = cronValue;
 };
 
 // 清空按钮操作
 const handleClear = () => {
-    ElMessageBox.confirm("是否确认清空所有定时任务数据?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+  ElMessageBox.confirm("是否确认清空所有定时任务数据?", "警告", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(async () => {
+      try {
+        loading.value = true;
+        await JobAPI.clearJob();
+        ElMessage.success("清空成功");
+        handleResetQuery();
+      } catch (error: any) {
+        ElMessage.error(error.message);
+      } finally {
+        loading.value = false;
+      }
     })
-        .then(async () => {
-            try {
-                loading.value = true;
-                await JobAPI.clearJob();
-                ElMessage.success("清空成功");
-                handleResetQuery();
-            } catch (error: any) {
-                ElMessage.error(error.message);
-            } finally {
-                loading.value = false;
-            }
-        })
-        .catch(() => {
-            ElMessage.info("已取消清空");
-        });
+    .catch(() => {
+      ElMessage.info("已取消清空");
+    });
 };
 
 // 操作按钮:操作类型 1: 暂停 2: 恢复 3: 重启（暂时移除重启）
 const handleOption = (id: number, option: number) => {
-    JobAPI.OptionJob({ id, option }).then(() => {
-        loadingData();
-    });
+  JobAPI.OptionJob({ id, option }).then(() => {
+    loadingData();
+  });
 };
 
 onMounted(() => {
-    loadingData();
+  loadingData();
 });
 </script>
 
diff --git a/frontend/src/views/system/config/index.vue b/frontend/src/views/system/config/index.vue
index 8e7928a5..809bcdd9 100644
--- a/frontend/src/views/system/config/index.vue
+++ b/frontend/src/views/system/config/index.vue
@@ -88,7 +88,11 @@
           <el-empty :image-size="80" description="暂无数据" />
         </template>
         <el-table-column v-if="tableColumns.find(col => col.prop === 'selection')?.show" type="selection" min-width="55" align="center" />
-        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" type="index" fixed label="序号" min-width="60" />
+        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" 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 v-if="tableColumns.find(col => col.prop === 'config_name')?.show" key="config_name" label="配置名称" prop="config_name" min-width="100" />
         <el-table-column v-if="tableColumns.find(col => col.prop === 'config_key')?.show" key="config_key" label="配置键" prop="config_key" min-width="200" />
         <el-table-column v-if="tableColumns.find(col => col.prop === 'config_value')?.show" key="config_value" label="配置值" prop="config_value" min-width="120" show-overflow-tooltip />
diff --git a/frontend/src/views/system/dept/index.vue b/frontend/src/views/system/dept/index.vue
index 7772b2ed..0a6eb2c1 100644
--- a/frontend/src/views/system/dept/index.vue
+++ b/frontend/src/views/system/dept/index.vue
@@ -181,7 +181,7 @@ defineOptions({
 
 import DeptAPI, { DeptTable, DeptForm, DeptPageQuery } from "@/api/system/dept";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { listToTree, formatDeptTree } from "@/utils/common";
+import { listToTree, formatTree } from "@/utils/common";
 
 const queryFormRef = ref();
 const dataFormRef = ref();
@@ -246,13 +246,8 @@ const rules = reactive({
   status: [{ required: true, message: "请选择状态", trigger: "blur" }],
 });
 
-// 刷新数据(防抖)
-const handleRefresh = () => {
-  refreshTable();
-};
-
-// 刷新列表数据
-async function refreshTable() {
+// 列表刷新
+async function handleRefresh () {
   loading.value = true;
   try {
     const response = await DeptAPI.getDeptList(queryFormData);
@@ -264,7 +259,7 @@ async function refreshTable() {
   } finally {
     loading.value = false;
   }
-}
+};
 
 // 加载表格数据
 async function loadingData() {
@@ -275,7 +270,7 @@ async function loadingData() {
     pageTableData.value = treeData;
     total.value = response.data.data.total;
     // 加载部门选项
-    deptOptions.value = formatDeptTree(treeData);
+    deptOptions.value = formatTree(treeData);
   }
   catch (error: any) {
     ElMessage.error(error.message);
diff --git a/frontend/src/views/system/dict/components/DataDrawer.vue b/frontend/src/views/system/dict/components/DataDrawer.vue
index 14fca18d..ffdf6dc3 100644
--- a/frontend/src/views/system/dict/components/DataDrawer.vue
+++ b/frontend/src/views/system/dict/components/DataDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 字典数据 -->
 <template>
-  <el-drawer v-model="drawerVisible" :title="`${props.dictLabel}-字典数据`" size="70%">
+  <el-drawer v-model="drawerVisible" :title="'【' + props.dictLabel + '】字典数据'" :size="drawerSize">
     <!-- 搜索区域 -->
     <div class="search-container">
       <el-form ref="queryFormRef" :model="queryFormData" :inline="true">
@@ -96,7 +96,11 @@
           <el-empty :image-size="80" description="暂无数据" />
         </template>
         <el-table-column v-if="tableColumns.find(col => col.prop === 'selection')?.show" type="selection" min-width="55" align="center" />
-        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" type="index" fixed label="序号" min-width="60" />
+        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" 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 v-if="tableColumns.find(col => col.prop === 'dict_label')?.show" key="dict_label" label="标签" prop="dict_label" min-width="100" show-overflow-tooltip />
         <el-table-column v-if="tableColumns.find(col => col.prop === 'status')?.show" key="status" label="状态" prop="status" min-width="100" show-overflow-tooltip>
           <template #default="scope">
@@ -242,6 +246,11 @@ import DictAPI, { DictDataTable, DictDataForm, DictDataPageQuery } from "@/api/s
 import { ElMessage, ElMessageBox } from "element-plus";
 import { useDebounceFn } from "@vueuse/core";
 import { Check, Close } from '@element-plus/icons-vue'
+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 dataFormRef = ref();
diff --git a/frontend/src/views/system/dict/index.vue b/frontend/src/views/system/dict/index.vue
index 8869b793..c6aef4e1 100644
--- a/frontend/src/views/system/dict/index.vue
+++ b/frontend/src/views/system/dict/index.vue
@@ -100,7 +100,11 @@
           <el-empty :image-size="80" description="暂无数据" />
         </template>
         <el-table-column v-if="tableColumns.find(col => col.prop === 'selection')?.show" type="selection" min-width="55" align="center" />
-        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" type="index" fixed label="序号" min-width="60" />
+        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" 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 v-if="tableColumns.find(col => col.prop === 'dict_name')?.show" key="dict_name" label="字典名称" prop="dict_name" min-width="120" />
         <el-table-column v-if="tableColumns.find(col => col.prop === 'dict_type')?.show" key="dict_type" label="字典类型" prop="dict_type" min-width="160" />
         <el-table-column v-if="tableColumns.find(col => col.prop === 'status')?.show" key="status" label="状态" prop="status" min-width="80">
diff --git a/frontend/src/views/system/log/index.vue b/frontend/src/views/system/log/index.vue
index e48e8a12..c38c1850 100644
--- a/frontend/src/views/system/log/index.vue
+++ b/frontend/src/views/system/log/index.vue
@@ -10,6 +10,12 @@
         <el-form-item prop="creator_name" label="创建人">
           <el-input v-model="queryFormData.creator_name" placeholder="请输入创建人" clearable />
         </el-form-item>
+        <el-form-item prop="type" label="日志类型">
+          <el-select v-model="queryFormData.type" placeholder="请选择日志类型" style="width: 167.5px" clearable>
+            <el-option label="登录日志" value=1 />
+            <el-option label="操作日志" value=2 />
+          </el-select>
+        </el-form-item>
         <!-- 时间范围，收起状态下隐藏 -->
         <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
           <el-date-picker v-model="queryFormData.start_time" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
@@ -82,7 +88,18 @@
           <el-empty :image-size="80" description="暂无数据" />
         </template>
         <el-table-column v-if="tableColumns.find(col => col.prop === 'selection')?.show" prop='selection' type="selection" min-width="55" align="center" />
-        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" type="index" fixed label="序号" min-width="60" />
+        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" 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 v-if="tableColumns.find(col => col.prop === 'type')?.show" label="日志类型" prop="type" min-width="100">
+          <template #default="scope">
+            <el-tag :type="scope.row.type === 1 ? 'success' : 'primary'">
+              {{ scope.row.type === 1 ? '登录日志' : '操作日志' }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column v-if="tableColumns.find(col => col.prop === 'request_path')?.show" label="请求路径" prop="request_path" min-width="200" show-overflow-tooltip />
         <el-table-column v-if="tableColumns.find(col => col.prop === 'request_method')?.show" label="请求方法" prop="request_method" min-width="100">
           <template #default="scope">
@@ -133,6 +150,11 @@
       <!-- 详情 -->
       <template v-if="dialogVisible.type === 'detail'">
         <el-descriptions :column="4" border>
+          <el-descriptions-item label="日志类型" :span="2">
+            <el-tag :type="detailFormData.type === 1 ? 'success' : 'primary'">
+              {{ detailFormData.type === 1 ? '登录日志' : '操作日志' }}
+            </el-tag>
+          </el-descriptions-item>
           <el-descriptions-item label="请求路径" :span="2">{{ detailFormData.request_path }}</el-descriptions-item>
           <el-descriptions-item label="请求方法" :span="2">
             <el-tag :type="getMethodType(detailFormData.request_method)">
@@ -145,15 +167,15 @@
             </el-tag>
           </el-descriptions-item>
           <el-descriptions-item label="请求IP" :span="2">{{ detailFormData.request_ip }}</el-descriptions-item>
+          <el-descriptions-item label="处理时间" :span="2">{{ detailFormData.process_time }}</el-descriptions-item>
+          <el-descriptions-item label="浏览器" :span="2">{{ detailFormData.request_browser }}</el-descriptions-item>
+          <el-descriptions-item label="操作系统" :span="2">{{ detailFormData.request_os }}</el-descriptions-item>
           <el-descriptions-item label="请求参数" :span="4">
             <el-input v-model="detailFormData.request_payload" type="textarea" :rows="3" readonly class="long-text-editor" />
           </el-descriptions-item>
           <el-descriptions-item label="响应数据" :span="4">
             <el-input v-model="detailFormData.response_json" type="textarea" :rows="5" readonly class="long-text-editor" />
           </el-descriptions-item>
-          <el-descriptions-item label="处理时间" :span="2">{{ detailFormData.process_time }}</el-descriptions-item>
-          <el-descriptions-item label="浏览器" :span="2">{{ detailFormData.request_browser }}</el-descriptions-item>
-          <el-descriptions-item label="操作系统" :span="2">{{ detailFormData.request_os }}</el-descriptions-item>
           <el-descriptions-item label="登录地点" :span="2">{{ detailFormData.login_location }}</el-descriptions-item>
           <el-descriptions-item label="创建人" :span="2">{{ detailFormData.creator?.name }}</el-descriptions-item>
           <el-descriptions-item label="创建时间" :span="2">{{ detailFormData.created_at }}</el-descriptions-item>
@@ -199,6 +221,7 @@ const pageTableData = ref<LogTable[]>([]);
 const tableColumns = ref([
   { prop: 'selection', label: '选择框', show: true },
   { prop: 'index', label: '序号', show: true },
+  { prop: 'type', label: '日志类型', show: true },
   { prop: 'request_path', label: '请求路径', show: true },
   { prop: 'request_method', label: '请求方法', show: true },
   { prop: 'response_code', label: '响应状态码', show: true },
@@ -221,6 +244,7 @@ const detailFormData = ref<LogTable>({});
 const queryFormData = reactive<LogPageQuery>({
   page_no: 1,
   page_size: 10,
+  type: undefined,
   request_path: undefined,
   creator_name: undefined,
   start_time: undefined,
diff --git a/frontend/src/views/system/menu/index.vue b/frontend/src/views/system/menu/index.vue
index ebe4edb0..bc7af0fb 100644
--- a/frontend/src/views/system/menu/index.vue
+++ b/frontend/src/views/system/menu/index.vue
@@ -4,8 +4,8 @@
     <!-- 搜索区域 -->
     <div class="search-container">
       <el-form ref="queryFormRef" :model="queryFormData" :inline="true">
-        <el-form-item prop="notice_title" label="标题">
-          <el-input v-model="queryFormData.name" placeholder="请输入标题" clearable />
+        <el-form-item prop="name" label="菜单名称">
+          <el-input v-model="queryFormData.name" placeholder="请输入菜单名称" clearable />
         </el-form-item>
         <el-form-item prop="status" label="状态">
           <el-select v-model="queryFormData.status" placeholder="请选择状态" style="width: 167.5px" clearable>
@@ -69,23 +69,19 @@
         </div>
         <div class="data-table__toolbar--tools">
           <el-tooltip content="刷新">
-            <el-button type="default" icon="refresh" circle @click="handleRefresh" />
+            <el-button type="primary" icon="refresh" circle @click="handleRefresh" />
           </el-tooltip>
         </div>
       </div>
 
       <!-- 表格区域 -->
-      <el-table ref="dataTableRef" v-loading="loading" row-key="id" :data="pageTableData" :tree-props="{children: 'children',hasChildren: 'hasChildren'}" class="data-table__content" height="450" border stripe @selection-change="handleSelectionChange" @row-click="handleRowClick">
+      <el-table ref="dataTableRef" v-loading="loading" row-key="id" :data="pageTableData" :tree-props="{children: 'children',hasChildren: 'hasChildren'}" class="data-table__content" height="540" border stripe @selection-change="handleSelectionChange" @row-click="handleRowClick">
         <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" />
-        <el-table-column label="菜单名称" prop="name" min-width="120">
-          <template #default="scope">
-            {{ scope.row.name }}
-          </template>
-        </el-table-column>
+        <el-table-column label="菜单名称" prop="name" min-width="240" />
         <el-table-column label="图标" prop="icon" min-width="80" align="center">
           <template #default="scope">
             <template v-if="scope.row.icon && scope.row.icon.startsWith('el-icon')">
@@ -114,23 +110,26 @@
           </template>
         </el-table-column>
         <el-table-column label="排序" prop="order" min-width="80" />
-        <el-table-column label="重定向" prop="redirect" min-width="100" />
+        <el-table-column label="重定向" prop="redirect" min-width="200" />
         <el-table-column label="是否缓存" prop="keep_alive" min-width="100">
           <template #default="scope">
-            <el-tag v-if="scope.row.keep_alive" type="success">是</el-tag>
-            <el-tag v-else type="danger">否</el-tag>
+            <el-tag :type="scope.row.keep_alive ? 'success' : 'danger'">
+              {{ scope.row.keep_alive ? '是' : '否' }}
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column label="是否隐藏" prop="hidden" min-width="100">
           <template #default="scope">
-            <el-tag v-if="scope.row.hidden" type="success">是</el-tag>
-            <el-tag v-else type="danger">否</el-tag>
+            <el-tag :type="scope.row.hidden ? 'success' : 'danger'">
+              {{ scope.row.hidden ? '是' : '否' }}
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column label="显示根路由" prop="always_show" min-width="120">
           <template #default="scope">
-            <el-tag v-if="scope.row.always_show" type="success">是</el-tag>
-            <el-tag v-else type="danger">否</el-tag>
+            <el-tag :type="scope.row.always_show ? 'success' : 'danger'">
+              {{ scope.row.always_show ? '是' : '否' }}
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column label="固定路由" prop="affix" min-width="100">
@@ -140,30 +139,26 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="菜单标题" prop="title" min-width="100"/>
-        <el-table-column label="权限标识" prop="permission" min-width="100"  />
-        <el-table-column label="路由名称" prop="router_name" min-width="100" />
-        <el-table-column label="路由路径" prop="router_name" min-width="100" />
-        <el-table-column label="组件路径" prop="component_path" min-width="100"  />
+        <el-table-column label="菜单标题" prop="title" min-width="200"/>
+        <el-table-column label="权限标识" prop="permission" min-width="220"  />
+        <el-table-column label="路由名称" prop="route_name" min-width="200" />
+        <el-table-column label="路由路径" prop="route_path" min-width="200" />
+        <el-table-column label="组件路径" prop="component_path" min-width="200"  />
         <el-table-column label="路由参数" prop="params" min-width="100" />
-        <el-table-column label="描述" prop="description" min-width="100" />
+        <el-table-column label="描述" prop="description" min-width="200" />
         <el-table-column label="创建时间" prop="created_at" min-width="200" sortable />
         <el-table-column label="更新时间" prop="updated_at" min-width="200" sortable />
 
         <el-table-column fixed="right" label="操作" align="center" min-width="260">
           <template #default="scope">
-            <el-button v-if="scope.row.type == MenuTypeEnum.CATALOG || scope.row.type == MenuTypeEnum.MENU" type="success" link size="small" icon="plus" @click.stop="handleOpenDialog(scope.row.id)">新增</el-button>
-            <el-button type="info" size="small" link icon="document" @click.stop="handleOpenDialog('detail', scope.row.id)">详情</el-button>
-            <el-button type="primary" size="small" link icon="edit" @click.stop="handleOpenDialog('update', scope.row.id)">编辑</el-button>
-            <el-button type="danger" size="small" link icon="delete" @click.stop="handleDelete([scope.row.id])">删除</el-button>
+            <el-button v-if="scope.row.type == MenuTypeEnum.CATALOG || scope.row.type == MenuTypeEnum.MENU" type="success" link size="small" icon="plus" @click.stop="handleOpenDialog('create', undefined, scope.row.id)">新增</el-button>
+            <el-button type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)">详情</el-button>
+            <el-button type="primary" size="small" link icon="edit" @click="handleOpenDialog('update', 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-if="total > 0" v-model:total="total" v-model:page="queryFormData.page_no" v-model:limit="queryFormData.page_size" @pagination="loadingData" />
-      </template>
     </el-card>
 
     <!-- 弹窗区域 -->
@@ -179,7 +174,18 @@
             <el-tag v-if="detailFormData.type === MenuTypeEnum.BUTTON" type="danger">按钮</el-tag>
             <el-tag v-if="detailFormData.type === MenuTypeEnum.EXTLINK" type="info">外链</el-tag>
           </el-descriptions-item>
-          <el-descriptions-item label="图标" :span="2">{{ detailFormData.icon }}</el-descriptions-item>
+          <el-descriptions-item label="图标" :span="2">
+            <template #default="scope">
+              <template v-if=" detailFormData.icon &&  detailFormData.icon.startsWith('el-icon')">
+                <el-icon style="vertical-align: -0.15em">
+                  <component :is="detailFormData.icon.replace('el-icon-', '')" />
+                </el-icon>
+              </template>
+              <template v-else-if=" detailFormData.icon">
+                <div :class="`i-svg:${detailFormData.icon}`" />
+              </template>
+            </template>
+          </el-descriptions-item>
           <el-descriptions-item label="排序" :span="2">{{ detailFormData.order }}</el-descriptions-item>
           <el-descriptions-item label="权限标识" :span="2">{{ detailFormData.permission }}</el-descriptions-item>
           <el-descriptions-item label="路由名称" :span="2">{{ detailFormData.route_name }}</el-descriptions-item>
@@ -216,9 +222,9 @@
             </el-tag>
           </el-descriptions-item>
           <el-descriptions-item label="排序" :span="2">{{ detailFormData.order }}</el-descriptions-item>
-          <el-descriptions-item label="描述" :span="2">{{ detailFormData.description }}</el-descriptions-item>
           <el-descriptions-item label="创建时间" :span="2">{{ detailFormData.created_at }}</el-descriptions-item>
           <el-descriptions-item label="更新时间" :span="2">{{ detailFormData.updated_at }}</el-descriptions-item>
+          <el-descriptions-item label="描述" :span="4">{{ detailFormData.description }}</el-descriptions-item>
         </el-descriptions>
       </template>
 
@@ -260,7 +266,7 @@
                 </el-tooltip>
               </div>
             </template>
-            <el-input v-model="formData.route_name" placeholder="User" />
+            <el-input v-model="formData.route_name" placeholder="请输入路由名称" />
           </el-form-item>
 
           <el-form-item v-if="formData.type == MenuTypeEnum.CATALOG || formData.type == MenuTypeEnum.MENU" prop="routePath">
@@ -279,7 +285,7 @@
               </div>
             </template>
             <el-input v-if="formData.type == MenuTypeEnum.CATALOG" v-model="formData.route_path" placeholder="system" />
-            <el-input v-else v-model="formData.route_path" placeholder="user" />
+            <el-input v-else v-model="formData.route_path" placeholder="请输入路由路径" />
           </el-form-item>
 
           <el-form-item v-if="formData.type == MenuTypeEnum.MENU" prop="component">
@@ -297,7 +303,7 @@
               </div>
             </template>
 
-            <el-input v-model="formData.component_path" placeholder="system/user/index" style="width: 95%">
+            <el-input v-model="formData.component_path" placeholder="请输入组件路径，如system/user/index" style="width: 95%">
               <template v-if="formData.type == MenuTypeEnum.MENU" #prepend>src/views/</template>
               <template v-if="formData.type == MenuTypeEnum.MENU" #append>.vue</template>
             </el-input>
@@ -318,7 +324,7 @@
               </div>
             </template>
 
-            <div v-if="!formData.params || formData.params.length === 0">
+            <div v-if="!formData.params || (Array.isArray(formData.params) && formData.params.length === 0)">
               <el-button type="success" plain @click="formData.params = [{ key: '', value: '' }]">
                 添加路由参数
               </el-button>
@@ -342,10 +348,27 @@
             </div>
           </el-form-item>
 
-          <el-form-item v-if="formData.type !== MenuTypeEnum.BUTTON" prop="hidden" label="显示状态">
+          <el-form-item v-if="formData.type !== MenuTypeEnum.BUTTON">
+            <template #label>
+              <div class="flex-y-center">
+                是否隐藏
+                <el-tooltip placement="bottom" effect="light">
+                  <template #content>
+                    选择"是", 菜单中隐藏
+                    <br />
+                    选择"否"，菜单中显示。
+                    <br />
+                  </template>
+                  <el-icon class="ml-1 cursor-pointer">
+                    <QuestionFilled />
+                  </el-icon>
+                </el-tooltip>
+              </div>
+            </template>
+
             <el-radio-group v-model="formData.hidden">
-              <el-radio :value="true">显示</el-radio>
-              <el-radio :value="false">隐藏</el-radio>
+              <el-radio :value="true">是</el-radio>
+              <el-radio :value="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
 
@@ -382,12 +405,12 @@
           </el-form-item>
 
           <el-form-item label="排序" prop="order">
-            <el-input-number v-model="formData.order" style="width: 100px" controls-position="right" :min="0" />
+            <el-input-number v-model="formData.order"  controls-position="right" :min="1" />
           </el-form-item>
 
           <!-- 权限标识 -->
-          <el-form-item v-if="formData.type == MenuTypeEnum.BUTTON" label="权限标识" prop="perm">
-            <el-input v-model="formData.permission" placeholder="sys:user:add" />
+          <el-form-item v-if="formData.type == MenuTypeEnum.BUTTON || formData.type === MenuTypeEnum.MENU" label="权限标识" prop="perm">
+            <el-input v-model="formData.permission" placeholder="请输入权限标识，如sys:user:add" />
           </el-form-item>
 
           <el-form-item v-if="formData.type !== MenuTypeEnum.BUTTON" label="图标" prop="icon">
@@ -395,8 +418,26 @@
             <icon-select v-model="formData.icon" />
           </el-form-item>
 
-          <el-form-item v-if="formData.type == MenuTypeEnum.CATALOG" label="跳转路由">
-            <el-input v-model="formData.redirect" placeholder="跳转路由" />
+          <el-form-item v-if="formData.type == MenuTypeEnum.CATALOG || formData.type === MenuTypeEnum.MENU" label="重定向" prop="redirect">
+            <el-input v-model="formData.redirect" placeholder="请输入重定向路由" />
+          </el-form-item>
+
+          <el-form-item v-if="formData.type != MenuTypeEnum.BUTTON" label="常驻标签栏" prop="affix">
+            <el-radio-group v-model="formData.affix">
+              <el-radio :value="true">是</el-radio>
+              <el-radio :value="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+          <el-form-item label="状态" prop="status">
+            <el-radio-group v-model="formData.status">
+              <el-radio :value="true">启用</el-radio>
+              <el-radio :value="false">禁用</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+          <el-form-item label="描述" prop="description">
+            <el-input v-model="formData.description" :rows="4" :maxlength="100" show-word-limit type="textarea" placeholder="请输入描述" />
           </el-form-item>
         </el-form>
       </template>
@@ -424,7 +465,7 @@ import { DeviceEnum } from "@/enums/settings/device.enum";
 
 import MenuAPI, { MenuPageQuery, MenuForm, MenuTable } from "@/api/system/menu";
 import { MenuTypeEnum } from "@/enums/system/menu.enum";
-import { listToTree } from "@/utils/common";
+import { formatTree, listToTree } from "@/utils/common";
 
 const appStore = useAppStore();
 
@@ -459,18 +500,18 @@ const formData = reactive<MenuForm>({
   name: undefined,
   type: MenuTypeEnum.MENU,
   icon: undefined,
-  order: undefined,
+  order: 1,
   permission: '',
   route_name: '',
   route_path: '',
   component_path: '',
   redirect: '',
   parent_id: undefined,
-  keep_alive: undefined,
-  hidden: undefined,
-  always_show: undefined,
+  keep_alive: false,
+  hidden: false,
+  always_show: false,
   title: '',
-  params: '',
+  params: [] as { key: string; value: string }[],
   affix: false,
   status: true,
   description: undefined,
@@ -508,19 +549,41 @@ const rules = reactive({
 // 选择表格的行菜单ID
 const selectedMenuId = ref<number | undefined>();
 
-// 刷新数据(防抖)
-const handleRefresh = useDebounceFn(() => {
-  loadingData();
-  ElMessage.success("刷新成功");
-}, 1000);
+// 列表刷新
+async function handleRefresh () {
+  loading.value = true;
+  try {
+    const response = await MenuAPI.getMenuList(queryFormData);
+    const treeData = listToTree(response.data.data.items);
+    pageTableData.value = treeData;
+    total.value = response.data.data.total;
+  } catch (error: any) {
+    ElMessage.error(error.message);
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 修改菜单选项过滤逻辑，添加递归过滤函数
+const filterMenuTypes = (nodes: MenuTable[]) => {
+  return nodes
+    .filter(node => node.type === MenuTypeEnum.CATALOG || node.type === MenuTypeEnum.MENU)
+    .map((node: any): any => ({
+      ...node,
+      children: node.children ? filterMenuTypes(node.children) : []
+    }));
+};
 
 // 加载表格数据
 async function loadingData() {
   loading.value = true;
   try {
     const response = await MenuAPI.getMenuList(queryFormData);
-    pageTableData.value = listToTree(response.data.data.items);
+    const treeData = listToTree(response.data.data.items);
+    pageTableData.value = treeData;
     total.value = response.data.data.total;
+    // 加载部门选项，只显示目录、菜单
+    menuOptions.value = formatTree(filterMenuTypes(treeData));
   }
   catch (error: any) {
     ElMessage.error(error.message);
@@ -566,10 +629,10 @@ async function handleCloseDialog() {
 }
 
 //打开弹窗
-async function handleOpenDialog(type: 'create' | 'update' | 'detail', id?: number) {
+async function handleOpenDialog(type: 'create' | 'update' | 'detail', id?: number, parentId?: number) {
   dialogVisible.type = type;
   if (id) {
-    const response = await MenuAPI.getMenuDetail({ id });
+    const response = await MenuAPI.getMenuDetail(id);
     if (type === 'detail') {
       dialogVisible.title = "菜单详情";
       Object.assign(detailFormData.value, response.data.data);
@@ -580,6 +643,10 @@ async function handleOpenDialog(type: 'create' | 'update' | 'detail', id?: numbe
   } else {
     dialogVisible.title = "新增菜单";
     formData.id = undefined;
+    // 设置父级部门
+    if (parentId) {
+      formData.parent_id = parentId;
+    }
   }
   dialogVisible.visible = true;
 }
@@ -632,48 +699,44 @@ async function handleSubmit() {
 
 // 删除、批量删除
 async function handleDelete(ids: number[]) {
-  if (!ids && !selectIds.value.length) {
-    ElMessageBox.confirm("确认删除该项数据?", "警告", {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "warning",
-    }).then(async () => {
-      try {
-        loading.value = true;
-        await DictAPI.deleteDictType({ ids });
-        handleResetQuery();
-      } catch (error: any) {
-        ElMessage.error(error.message);
-      } finally {
-        loading.value = false;
-      }
-    }).catch(() => {
-      ElMessage.info('已取消删除');
-    });
-  }
+  ElMessageBox.confirm("确认删除该项数据?", "警告", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    try {
+      loading.value = true;
+      await MenuAPI.deleteMenu(ids);
+      handleResetQuery();
+    } catch (error: any) {
+      ElMessage.error(error.message);
+    } finally {
+      loading.value = false;
+    }
+  }).catch(() => {
+    ElMessage.info('已取消删除');
+  });
 }
 
 // 批量启用/停用
 async function handleMoreClick(status: boolean) {
-  if (selectIds.value.length) {
-    ElMessageBox.confirm(`确认${status ? '启用' : '停用'}该项数据?`, "警告", {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "warning",
-    }).then(async () => {
-      try {
-        loading.value = true;
-        await MenuAPI.batchAvailableMenu({ ids: selectIds.value, status });
-        handleResetQuery();
-      } catch (error: any) {
-        ElMessage.error(error.message);
-      } finally {
-        loading.value = false;
-      }
-    }).catch(() => {
-      ElMessage.info('已取消批量操作');
-    });
-  }
+  ElMessageBox.confirm(`确认${status ? '启用' : '停用'}该项数据?`, "警告", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    try {
+      loading.value = true;
+      await MenuAPI.batchAvailableMenu({ ids: selectIds.value, status });
+      handleResetQuery();
+    } catch (error: any) {
+      ElMessage.error(error.message);
+    } finally {
+      loading.value = false;
+    }
+  }).catch(() => {
+    ElMessage.info('已取消批量操作');
+  });
 }
 
 onMounted(() => {
diff --git a/frontend/src/views/system/notice/index.vue b/frontend/src/views/system/notice/index.vue
index e7a4ba88..ae3b49af 100644
--- a/frontend/src/views/system/notice/index.vue
+++ b/frontend/src/views/system/notice/index.vue
@@ -107,7 +107,11 @@
           <el-empty :image-size="80" description="暂无数据" />
         </template>
         <el-table-column v-if="tableColumns.find(col => col.prop === 'selection')?.show" type="selection" min-width="55" align="center" />
-        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" type="index" fixed label="序号" min-width="60" />
+        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" 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 v-if="tableColumns.find(col => col.prop === 'notice_title')?.show" label="通知标题" prop="notice_title" min-width="140" />
         <el-table-column v-if="tableColumns.find(col => col.prop === 'status')?.show" label="状态" prop="status" min-width="80">
           <template #default="scope">
@@ -230,81 +234,6 @@
       </template>
     </el-dialog>
 
-    <!-- 导出弹窗 -->
-    <el-dialog v-model="exportsModalVisible" :align-center="true" title="导出数据" width="600px" style="padding-right: 0" @close="handleCloseExportsModal">
-      <!-- 滚动 -->
-      <el-scrollbar max-height="60vh">
-        <!-- 表单 -->
-        <el-form ref="exportsFormRef" style="padding-right: var(--el-dialog-padding-primary)" :model="exportsFormData" :rules="exportsFormRules">
-          <el-form-item label="文件名" prop="filename">
-            <el-input v-model="exportsFormData.filename" clearable />
-          </el-form-item>
-          <el-form-item label="工作表名" prop="sheetname">
-            <el-input v-model="exportsFormData.sheetname" clearable />
-          </el-form-item>
-          <el-form-item label="数据源" prop="origin">
-            <el-select v-model="exportsFormData.origin">
-              <el-option label="当前数据 (当前页的数据)" :value="ExportsOriginEnum.CURRENT" />
-              <el-option label="选中数据 (所有选中的数据)" :value="ExportsOriginEnum.SELECTED" :disabled="selectionData.length <= 0" />
-              <el-option label="全量数据 (所有分页的数据)" :value="ExportsOriginEnum.REMOTE" :disabled="contentConfig.exportsAction === undefined" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="字段" prop="fields">
-            <el-checkbox-group v-model="exportsFormData.fields">
-              <template v-for="col in cols" :key="col.prop">
-                <el-checkbox v-if="col.prop" :value="col.prop" :label="col.label" />
-              </template>
-            </el-checkbox-group>
-          </el-form-item>
-        </el-form>
-      </el-scrollbar>
-      <!-- 弹窗底部操作按钮 -->
-      <template #footer>
-        <div style="padding-right: var(--el-dialog-padding-primary)">
-          <el-button type="primary" @click="handleExportsSubmit">确 定</el-button>
-          <el-button @click="handleCloseExportsModal">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-    <!-- 导入弹窗 -->
-    <el-dialog v-model="importModalVisible" :align-center="true" title="导入数据" width="600px" style="padding-right: 0" @close="handleCloseImportModal">
-      <!-- 滚动 -->
-      <el-scrollbar max-height="60vh">
-        <!-- 表单 -->
-        <el-form ref="importFormRef" style="padding-right: var(--el-dialog-padding-primary)" :model="importFormData"
-          :rules="importFormRules">
-          <el-form-item label="文件名" prop="files">
-            <el-upload ref="uploadRef" v-model:file-list="importFormData.files" class="w-full"
-              accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-              :drag="true" :limit="1" :auto-upload="false" :on-exceed="handleFileExceed">
-              <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-              <div class="el-upload__text">
-                <span>将文件拖到此处，或</span>
-                <em>点击上传</em>
-              </div>
-              <template #tip>
-                <div class="el-upload__tip">
-                  *.xlsx / *.xls
-                  <el-link v-if="contentConfig.importTemplate" type="primary" icon="download" underline="never"
-                    @click="handleDownloadTemplate">
-                    下载模板
-                  </el-link>
-                </div>
-              </template>
-            </el-upload>
-          </el-form-item>
-        </el-form>
-      </el-scrollbar>
-      <!-- 弹窗底部操作按钮 -->
-      <template #footer>
-        <div style="padding-right: var(--el-dialog-padding-primary)">
-          <el-button type="primary" :disabled="importFormData.files.length === 0" @click="handleImportSubmit">
-            确 定
-          </el-button>
-          <el-button @click="handleCloseImportModal">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
@@ -580,129 +509,6 @@ async function handleMoreClick(status: boolean) {
   }
 }
 
-
-// // 导出
-// function handleExport() {
-//   const filename = exportsFormData.filename
-//     ? exportsFormData.filename
-//     : props.contentConfig.permPrefix || "export";
-//   const sheetname = exportsFormData.sheetname ? exportsFormData.sheetname : "sheet";
-//   const workbook = new ExcelJS.Workbook();
-//   const worksheet = workbook.addWorksheet(sheetname);
-//   const columns: Partial<ExcelJS.Column>[] = [];
-//   cols.value.forEach((col) => {
-//     if (col.label && col.prop && exportsFormData.fields.includes(col.prop)) {
-//       columns.push({ header: col.label, key: col.prop });
-//     }
-//   });
-//   worksheet.columns = columns;
-//   if (exportsFormData.origin === ExportsOriginEnum.REMOTE) {
-//     if (props.contentConfig.exportsAction) {
-//       props.contentConfig.exportsAction(lastFormData).then((res) => {
-//         worksheet.addRows(res);
-//         workbook.xlsx
-//           .writeBuffer()
-//           .then((buffer) => {
-//             saveXlsx(buffer, filename as string);
-//           })
-//           .catch((error) => console.log(error));
-//       });
-//     } else {
-//       ElMessage.error("未配置exportsAction");
-//     }
-//   } else {
-//     worksheet.addRows(
-//       exportsFormData.origin === ExportsOriginEnum.SELECTED ? selectionData.value : pageData.value
-//     );
-//     workbook.xlsx
-//       .writeBuffer()
-//       .then((buffer) => {
-//         saveXlsx(buffer, filename as string);
-//       })
-//       .catch((error) => console.log(error));
-//   }
-// }
-
-// // 下载导入模板
-// function handleDownloadTemplate() {
-//   const importTemplate = props.contentConfig.importTemplate;
-//   if (typeof importTemplate === "string") {
-//     window.open(importTemplate);
-//   } else if (typeof importTemplate === "function") {
-//     importTemplate().then((response) => {
-//       const fileData = response.data;
-//       const fileName = decodeURI(
-//         response.headers["content-disposition"].split(";")[1].split("=")[1]
-//       );
-//       saveXlsx(fileData, fileName);
-//     });
-//   } else {
-//     ElMessage.error("未配置importTemplate");
-//   }
-// }
-
-// // 导入
-// function handleImport() {
-//   const importsAction = props.contentConfig.importsAction;
-//   if (importsAction === undefined) {
-//     ElMessage.error("未配置importsAction");
-//     return;
-//   }
-//   // 获取选择的文件
-//   const file = importFormData.files[0].raw as File;
-//   // 创建Workbook实例
-//   const workbook = new ExcelJS.Workbook();
-//   // 使用FileReader对象来读取文件内容
-//   const fileReader = new FileReader();
-//   // 二进制字符串的形式加载文件
-//   fileReader.readAsArrayBuffer(file);
-//   fileReader.onload = (ev) => {
-//     if (ev.target !== null && ev.target.result !== null) {
-//       const result = ev.target.result as ArrayBuffer;
-//       // 从 buffer中加载数据解析
-//       workbook.xlsx
-//         .load(result)
-//         .then((workbook) => {
-//           // 解析后的数据
-//           const data = [];
-//           // 获取第一个worksheet内容
-//           const worksheet = workbook.getWorksheet(1);
-//           if (worksheet) {
-//             // 获取第一行的标题
-//             const fields: any[] = [];
-//             worksheet.getRow(1).eachCell((cell) => {
-//               fields.push(cell.value);
-//             });
-//             // 遍历工作表的每一行（从第二行开始，因为第一行通常是标题行）
-//             for (let rowNumber = 2; rowNumber <= worksheet.rowCount; rowNumber++) {
-//               const rowData: IObject = {};
-//               const row = worksheet.getRow(rowNumber);
-//               // 遍历当前行的每个单元格
-//               row.eachCell((cell, colNumber) => {
-//                 // 获取标题对应的键，并将当前单元格的值存储到相应的属性名中
-//                 rowData[fields[colNumber - 1]] = cell.value;
-//               });
-//               // 将当前行的数据对象添加到数组中
-//               data.push(rowData);
-//             }
-//           }
-//           if (data.length === 0) {
-//             ElMessage.error("未解析到数据");
-//             return;
-//           }
-//           importsAction(data).then(() => {
-//             ElMessage.success("导入数据成功");
-//             handleCloseImportModal();
-//             handleRefresh(true);
-//           });
-//         })
-//         .catch((error) => console.log(error));
-//     } else {
-//       ElMessage.error("读取文件失败");
-//     }
-//   };
-// }
-
 onMounted(() => {
   loadingData();
 });
diff --git a/frontend/src/views/system/position/index.vue b/frontend/src/views/system/position/index.vue
index a3361e07..de84dff6 100644
--- a/frontend/src/views/system/position/index.vue
+++ b/frontend/src/views/system/position/index.vue
@@ -95,7 +95,11 @@
           <el-empty :image-size="80" description="暂无数据" />
         </template>
         <el-table-column v-if="tableColumns.find(col => col.prop === 'selection')?.show" type="selection" min-width="55" align="center" />
-        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" type="index" fixed label="序号" min-width="60" />
+        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" 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 v-if="tableColumns.find(col => col.prop === 'name')?.show" key="name" label="岗位名称" prop="name" min-width="100" />
         <el-table-column v-if="tableColumns.find(col => col.prop === 'status')?.show" key="status" label="状态" prop="status" min-width="80">
           <template #default="scope">
diff --git a/frontend/src/views/system/role/components/PermissonDrawer.vue b/frontend/src/views/system/role/components/PermissonDrawer.vue
new file mode 100644
index 00000000..d07091d5
--- /dev/null
+++ b/frontend/src/views/system/role/components/PermissonDrawer.vue
@@ -0,0 +1,305 @@
+  <!-- 角色授权 -->
+<template>
+  <!-- 分配权限弹窗 -->
+  <el-drawer v-model="drawerVisible" :title="'【' + props.roleName + '】权限分配'" size="50%">
+    <el-container>
+      <!-- 数据权限 -->
+      <el-aside >
+        <div class="border-r-1 border-r-[#f0f0f0] b-r-solid h-[100%] p-[20px] box-border">
+          <div class="flex items-center">
+            <div style="display: flex; gap: 10px; ">
+              <div style="width: 10px; background-color: #409eff;"></div>
+              <div>
+                <span style="font-size: 16px;">数据授权</span>
+                <el-tooltip placement="right">
+                  <template #content>
+                    <span>授权用户可操作的数据范围</span>
+                  </template>
+                  <el-icon class="ml-1 inline-block cursor-pointer">
+                    <QuestionFilled />
+                  </el-icon>
+                </el-tooltip>
+              </div>
+            </div>
+          </div>
+          <div class="mt-3">
+            <el-form ref="dataFormRef" :model="permissionState">
+              <el-form-item prop="data_scope">
+                <el-select v-model="permissionState.data_scope">
+                  <el-option :key="1" label="仅本人数据权限" :value="1" />
+                  <el-option :key="2" label="本部门数据权限" :value="2" />
+                  <el-option :key="3" label="本部门及以下数据权限" :value="3" />
+                  <el-option :key="4" label="全部数据权限" :value="4" />
+                  <el-option :key="5" label="自定义数据权限" :value="5" />
+                </el-select>
+                </el-form-item>
+              </el-form>
+              
+              <div class="mt-5 max-h-[60vh] b-1 b-solid b-[#e5e7eb] p-10px overflow-auto box-border" v-if="permissionState.data_scope === 5 && deptTreeData.length">
+                <el-input v-model="deptFilterText" placeholder="部门名称" />
+                <el-tree 
+                  ref="deptTreeRef"
+                  node-key="value"
+                  show-checkbox
+                  :data="deptTreeData"
+                  :filter-node-method="handleFilter"
+                  default-expand-all
+                  :highlight-current="true"
+                  :check-strictly="!parentChildLinked"
+                  @check="deptTreeCheck"
+                  style="height: calc(100% - 60px); overflow-y: auto; margin-top: 10px;"
+                  >
+                  <template #empty>
+                    <el-empty :image-size="80" description="暂无数据" />
+                  </template>
+                </el-tree>
+              </div>
+          </div>
+        </div>
+      </el-aside>
+
+      <!-- 菜单权限 -->
+      <el-main>
+        <div style="display: flex; gap: 10px; ">
+          <div style="width: 10px; background-color: #409eff;"></div>
+          <div>
+            <span style="font-size: 16px;">菜单授权</span>
+            <el-tooltip placement="right">
+              <template #content>
+                <span>授权用户可操作的菜单权限</span>
+              </template>
+              <el-icon class="ml-1 inline-block cursor-pointer">
+                <QuestionFilled />
+              </el-icon>
+            </el-tooltip>
+          </div>
+        </div>
+        <div class="mt-3 flex-x-between">
+          <el-input v-model="permFilterText" placeholder="菜单名称" />
+          <div class="flex-center ml-5">
+            <el-button type="primary" size="small" plain @click="togglePermTree">
+              <template #icon>
+                <Switch />
+              </template>
+              {{ isExpanded ? "收缩" : "展开" }}
+            </el-button>
+            <el-checkbox v-model="parentChildLinked" class="ml-5" @change="handleParentChildLinkedChange">
+              父子联动
+            </el-checkbox>
+
+            <el-tooltip placement="bottom">
+              <template #content>
+                如果只需勾选菜单权限，不需要勾选子菜单或者按钮权限，请关闭父子联动
+              </template>
+              <el-icon class="ml-1 color-[--el-color-primary] inline-block cursor-pointer">
+                <QuestionFilled />
+              </el-icon>
+            </el-tooltip>
+          </div>
+        </div>
+
+        <div class="mt-5 max-h-[65vh] b-1 b-solid b-[#e5e7eb] p-10px overflow-auto box-border">
+          <el-tree 
+            ref="permTreeRef" 
+            node-key="value" 
+            show-checkbox 
+            :data="menuTreeData"
+            :filter-node-method="handleFilter" 
+            default-expand-all
+            :highlight-current="true"
+            :check-strictly="!parentChildLinked"
+            @check="menuTreeCheck"
+            style="height: calc(100% - 60px); overflow: auto; margin-top: 10px;">
+            <template #empty>
+              <el-empty :image-size="80" description="暂无数据" />
+            </template>
+          </el-tree>
+        </div>
+      </el-main>
+    </el-container>
+
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="handleCancel">取 消</el-button>
+        <el-button type="primary" @click.stop="handleDrawerSave">确 定</el-button>
+      </div>
+    </template>
+  </el-drawer>
+</template>
+
+<script setup lang="ts">
+// 添加 props 来接收 dictType
+const props = defineProps({
+  roleName: {
+    type: String,
+    required: true
+  },
+  roleId: {
+    type: Number,
+    required: true
+  },
+  modelValue: {
+    type: Boolean,
+    required: true
+  }
+})
+
+import { listToTree, formatTree } from "@/utils/common";
+import RoleAPI, { permissionDataType, permissionDeptType, permissionMenuType } from "@/api/system/role";
+import DeptAPI from "@/api/system/dept";
+import MenuAPI from "@/api/system/menu";
+import type { TreeInstance } from 'element-plus'
+
+const emit = defineEmits(['update:modelValue'])
+
+const permTreeRef = ref<TreeInstance>();
+const deptTreeRef = ref<TreeInstance>()
+const deptFilterText = ref("")
+const permFilterText = ref("");
+const dataFormRef = ref();
+const drawerVisible = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  }
+})
+const isExpanded = ref(true);
+const parentChildLinked = ref(true)
+const loading = ref<boolean>(false);
+const deptTreeData = ref<permissionDeptType[]>([]);
+const menuTreeData = ref<permissionMenuType[]>([]);
+const permissionState = ref<permissionDataType>({
+  role_ids: [],
+  menu_ids: [],
+  data_scope: 1,
+  dept_ids: []
+});
+
+// 初始化方法,用于打开抽屉并加载数据
+const init = async () => {
+  loading.value = true;
+
+  try {
+    // 获取全部部门树
+    const deptResponse = await DeptAPI.getDeptList();
+    deptTreeData.value = formatTree(listToTree(deptResponse.data.data.items));
+
+    // 获取全部菜单树
+    const menuResponse = await MenuAPI.getMenuList();
+    menuTreeData.value = formatTree(listToTree(menuResponse.data.data.items));
+
+    // 获取角色详情
+    const roleResponse = await RoleAPI.getRoleDetail(props.roleId);
+
+    // 更新权限状态
+    permissionState.value = {
+      role_ids: [props.roleId],
+      menu_ids: roleResponse.data.data.menus?.map(menu => menu.id) || [],
+      data_scope: roleResponse.data.data.data_scope || 1,
+      dept_ids: roleResponse.data.data.depts?.map(dept => dept.id) || []
+    };
+
+    // 回显菜单树选中项
+    if (permTreeRef.value) {
+      await permTreeRef.value.setCheckedKeys(permissionState.value.menu_ids);
+    }
+
+    // 修改：增加对 deptTreeRef.value 的存在性判断，并添加日志
+    if (permissionState.value.data_scope === 5 && deptTreeRef.value) {
+      // await 一定不能丢，否则到导致初始化时候deptTreeRef.value 为 undefined
+      await deptTreeRef.value.setCheckedKeys(permissionState.value.dept_ids);
+    }
+
+  } catch (error: any) {
+    ElMessage.error('获取权限数据失败: ' + error.message);
+  } finally {
+    loading.value = false;
+    // handleCancel()
+  }
+}
+
+// 取消按钮处理函数
+function handleCancel() {
+  drawerVisible.value = false;
+}
+
+// 保存权限设置
+async function handleDrawerSave () {
+  try {
+    loading.value = true;
+
+    // 构造提交数据
+    const submitData : permissionDataType = {
+      role_ids: [props.roleId],
+      menu_ids: (permTreeRef.value?.getCheckedKeys() || []).map(key => Number(key)),
+      data_scope: permissionState.value.data_scope,
+      dept_ids: (deptTreeRef.value?.getCheckedKeys() || []).map(key => Number(key))
+    };
+
+    await RoleAPI.setPermission(submitData)
+    
+  } catch (error: any) {
+    console.error('保存失败:', error);
+    ElMessage.error('保存失败: ' + error.message);
+  } finally {
+    loading.value = false;
+    drawerVisible.value = false;
+  }
+}
+
+// 部门树选择回调
+const deptTreeCheck = (checkedIds: number[]) => {
+  permissionState.value.dept_ids = checkedIds;
+}
+
+// 菜单选择变更回调
+const menuTreeCheck = (checkedIds: number[]) => {
+  permissionState.value.menu_ids = checkedIds;
+}
+
+// 展开/收缩 菜单权限树
+function togglePermTree() {
+  isExpanded.value = !isExpanded.value;
+  if (permTreeRef.value) {
+    Object.values(permTreeRef.value.store.nodesMap).forEach((node: any) => {
+      if (isExpanded.value) {
+        node.expand();
+      } else {
+        node.collapse();
+      }
+    });
+  }
+}
+
+// 部门筛选
+watch(deptFilterText, (val) => {
+  deptTreeRef.value!.filter(val);
+})
+
+// 菜单筛选
+watch(permFilterText, (val) => {
+  permTreeRef.value!.filter(val);
+});
+
+// 树节点过滤
+function handleFilter(
+  value: string,
+  data: {[key: string]: any;}
+) {
+  if (!value) return true;
+  return data.label.includes(value);
+}
+
+// 父子菜单节点是否联动
+function handleParentChildLinkedChange(val: any) {
+  parentChildLinked.value = val;
+}
+
+onMounted(async () => {
+  await init();
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue
index a9ae0229..1b5af436 100644
--- a/frontend/src/views/system/role/index.vue
+++ b/frontend/src/views/system/role/index.vue
@@ -1,11 +1,11 @@
-<!-- 岗位管理 -->
+<!-- 角色管理 -->
 <template>
   <div class="app-container">
     <!-- 搜索区域 -->
     <div class="search-container">
       <el-form ref="queryFormRef" :model="queryFormData" :inline="true">
-        <el-form-item prop="name" label="岗位名称">
-          <el-input v-model="queryFormData.name" placeholder="请输入岗位名称" clearable />
+        <el-form-item prop="name" label="角色名称">
+          <el-input v-model="queryFormData.name" placeholder="请输入角色名称" clearable />
         </el-form-item>
         <el-form-item prop="status" label="状态">
           <el-select v-model="queryFormData.status" placeholder="请选择状态" style="width: 167.5px" clearable>
@@ -96,11 +96,23 @@
           <el-empty :image-size="80" description="暂无数据" />
         </template>
         <el-table-column v-if="tableColumns.find(col => col.prop === 'selection')?.show" type="selection" width="55" align="center" />
-        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" type="index" fixed label="序号" width="60" />
+        <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" type="index" fixed label="序号" width="60" >
+          <template #default="scope">
+            {{ (queryFormData.page_no - 1) * queryFormData.page_size + scope.$index + 1 }}
+          </template>
+        </el-table-column>
         <el-table-column v-if="tableColumns.find(col => col.prop === 'name')?.show" key="name" label="角色名称" prop="name" min-width="100" />
-        <el-table-column v-if="tableColumns.find(col => col.prop === 'data_scope')?.show" key="data_scope" label="数据权限" prop="data_scope" min-width="100" />
+        <el-table-column v-if="tableColumns.find(col => col.prop === 'data_scope')?.show" key="data_scope" label="数据权限" prop="data_scope" min-width="200">
+          <template #default="scope">
+            <el-tag v-if="scope.row.data_scope === 1" type="primary">仅本人数据权限</el-tag>
+            <el-tag v-else-if="scope.row.data_scope === 2" type="info">本部门数据权限</el-tag>
+            <el-tag v-else-if="scope.row.data_scope === 3" type="warning">本部门及以下数据权限</el-tag>
+            <el-tag v-else-if="scope.row.data_scope === 4" type="success">全部数据权限</el-tag>
+            <el-tag v-else type="danger" >自定义数据权限</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column v-if="tableColumns.find(col => col.prop === 'order')?.show" key="order" label="排序" prop="order" min-width="80" show-overflow-tooltip />
-        <el-table-column v-if="tableColumns.find(col => col.prop === 'status')?.show" key="status" label="状态" prop="status" min-width="60">
+        <el-table-column v-if="tableColumns.find(col => col.prop === 'status')?.show" key="status" label="状态" prop="status" min-width="80">
           <template #default="scope">
             <el-tag :type="scope.row.status === true ? 'success' : 'danger'">
               {{ scope.row.status === true ? "启用" : "停用" }}
@@ -118,7 +130,7 @@
 
         <el-table-column v-if="tableColumns.find(col => col.prop === 'operation')?.show" fixed="right" label="操作" align="center" min-width="280">
           <template #default="scope">
-            <el-button type="primary" size="small" link icon="position" @click="handleOpenAssignPermDialog(scope.row)">分配权限</el-button>
+            <el-button type="primary" size="small" link icon="position" @click="handleOpenAssignPermDialog(scope.row.id, scope.row.name)">分配权限</el-button>
             <el-button type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)">详情</el-button>
             <el-button type="primary" size="small" link icon="edit" @click="handleOpenDialog('update', scope.row.id)">编辑</el-button>
             <el-button type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])">删除</el-button>
@@ -133,26 +145,30 @@
     </el-card>
 
     <!-- 角色表单弹窗 -->
-    <el-dialog v-model="dialogVisible.visible" :title="dialogVisible.title" width="500px" @close="handleCloseDialog">
+    <el-dialog v-model="dialogVisible.visible" :title="dialogVisible.title" @close="handleCloseDialog">
       <!-- 详情 -->
       <template v-if="dialogVisible.type === 'detail'">
-        <el-descriptions :column="2" border>
+        <el-descriptions :column="4" border>
           <el-descriptions-item label="角色名称" :span="2">{{ detailFormData.name }}</el-descriptions-item>
           <el-descriptions-item label="排序" :span="2">
             {{ detailFormData.order }}
           </el-descriptions-item>
           <el-descriptions-item label="数据权限" :span="2">
-            {{ detailFormData.data_scope }}
+            <el-tag v-if="detailFormData.data_scope === 1" type="primary">仅本人数据权限</el-tag>
+            <el-tag v-else-if="detailFormData.data_scope === 2" type="info">本部门数据权限</el-tag>
+            <el-tag v-else-if="detailFormData.data_scope === 3" type="warning">本部门及以下数据权限</el-tag>
+            <el-tag v-else-if="detailFormData.data_scope === 4" type="success">全部数据权限</el-tag>
+            <el-tag v-else type="danger" >自定义数据权限</el-tag>
           </el-descriptions-item>
           <el-descriptions-item label="状态" :span="2">
             <el-tag :type="detailFormData.status ? 'success' : 'danger'">
               {{ detailFormData.status ? '启用' : '停用' }}
             </el-tag>
           </el-descriptions-item>
-          <el-descriptions-item label="描述" :span="2">{{ detailFormData.description }}</el-descriptions-item>
           <el-descriptions-item label="创建人" :span="2">{{ detailFormData.creator?.name }}</el-descriptions-item>
           <el-descriptions-item label="创建时间" :span="2">{{ detailFormData.created_at }}</el-descriptions-item>
           <el-descriptions-item label="更新时间" :span="2">{{ detailFormData.updated_at }}</el-descriptions-item>
+          <el-descriptions-item label="描述" :span="4">{{ detailFormData.description }}</el-descriptions-item>
         </el-descriptions>
       </template>
       <!-- 新增、编辑表单 -->
@@ -189,148 +205,33 @@
       </template>
     </el-dialog>
 
-    <!-- 分配权限弹窗 -->
-    <el-drawer v-model="assignPermDialogVisible" :title="'【' + checkedRole.name + '】权限分配'" :size="drawerSize">
-      <!-- 使用 element-plus 的 row 和 col 组件实现左右两部分并排显示 -->
-      <el-row :gutter="20" style="height: calc(100% - 60px);">
-        <!-- 左侧数据权限设置，占据 8 列 -->
-        <el-col :span="8">
-          <div style="display: flex; gap: 10px; ">
-            <div style="width: 10px; background-color: #1677ff;"></div>
-            <div>
-              <span style="font-size: 16px;">数据授权</span>
-              <a-tooltip placement="right">
-                <template #title>
-                  <span>授权用户可操作的数据范围</span>
-                </template>
-                <QuestionCircleOutlined style="margin-left: 5px;" />
-              </a-tooltip>
-            </div>
-          </div>
+    <PermissonDrawer v-if="drawerVisible" v-model="drawerVisible" :role-name="checkedRole.name" :role-id="checkedRole.id" />
 
-          <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
-            <el-form-item label="数据权限" prop="data_scope">
-              <el-select v-model="permissionState.data_scope">
-                <el-option :key="1" label="全部数据" :value="1" />
-                <el-option :key="2" label="部门及子部门数据" :value="2" />
-                <el-option :key="3" label="本部门数据" :value="3" />
-                <el-option :key="4" label="仅本人数据" :value="4" />
-                <el-option :key="5" label="自定义数据" :value="5" />
-              </el-select>
-            </el-form-item>
-          </el-form>
-
-          <el-tree 
-            v-if="permissionState.data_scope === 5 && deptTreeData.length"
-            :checked-keys="permissionState.dept_ids" 
-            :row-key="record => record.id" 
-            :tree-data="deptTreeData"
-            :default-expand-all=true 
-            :field-names="{ children: 'children', title: 'name', key: 'id' }" 
-            checkable
-            check-strictly style="margin-top: 15px; height: calc(100% - 100px); overflow: auto;"
-            @check="deptTreeCheck" />
-        </el-col>
-
-        <!-- 右侧菜单功能权限设置，占据 16 列 -->
-        <el-col :span="16">
-          <div class="flex-x-between">
-            <div style="width: 10px; background-color: #1677ff;"></div>
-            <span style="font-size: 16px;">菜单授权</span>
-            <el-input v-model="permKeywords" clearable class="w-[150px]" placeholder="菜单权限名称">
-              <template #prefix>
-                <Search />
-              </template>
-            </el-input>
-
-            <div class="flex-center ml-5">
-              <el-button type="primary" size="small" plain @click="togglePermTree">
-                <template #icon>
-                  <Switch />
-                </template>
-                {{ isExpanded ? "收缩" : "展开" }}
-              </el-button>
-              <el-checkbox v-model="parentChildLinked" class="ml-5" @change="handleparentChildLinkedChange">
-                父子联动
-              </el-checkbox>
-
-              <el-tooltip placement="bottom">
-                <template #content>
-                  如果只需勾选菜单权限，不需要勾选子菜单或者按钮权限，请关闭父子联动
-                </template>
-                <el-icon class="ml-1 color-[--el-color-primary] inline-block cursor-pointer">
-                  <QuestionFilled />
-                </el-icon>
-              </el-tooltip>
-            </div>
-          </div>
-
-          <el-tree 
-            ref="permTreeRef" 
-            node-key="value" 
-            show-checkbox 
-            :data="menuTreeData"
-            :filter-node-method="handlePermFilter" 
-            :default-expand-all="true" 
-            :check-strictly="!parentChildLinked"
-            class="mt-5" 
-            style="height: calc(100% - 60px); 
-            overflow: auto;">
-            <template #default="{ data }">
-              {{ data.label }}
-            </template>
-          </el-tree>
-        </el-col>
-      </el-row>
-
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="handleAssignPermSubmit">确 定</el-button>
-          <el-button @click="assignPermDialogVisible = false">取 消</el-button>
-        </div>
-      </template>
-    </el-drawer>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ElMessage, ElMessageBox } from "element-plus";
-import { useAppStore } from "@/store/modules/app.store";
-import { DeviceEnum } from "@/enums/settings/device.enum";
-
-import RoleAPI, { RoleTable, RoleForm, TablePageQuery, permissionDataType, permissionDeptType, permissionMenuType } from "@/api/system/role";
-import MenuAPI from "@/api/system/menu";
-
 defineOptions({
   name: "Role",
   inheritAttrs: false,
 });
 
-const appStore = useAppStore();
+import { ElMessage, ElMessageBox } from "element-plus";
+import RoleAPI, { RoleTable, RoleForm, TablePageQuery } from "@/api/system/role";
 
 const queryFormRef = ref();
 const dataFormRef = ref();
-const permTreeRef = ref();
 const selectIds = ref<number[]>([]);
 const loading = ref(false);
-const ids = ref<number[]>([]);
 const total = ref(0);
 const isExpand = ref(false);
 const isExpandable = ref(true);
 
-
-const permissionState = ref<permissionDataType>({
-  role_ids: [],
-  menu_ids: [],
-  data_scope: 1,
-  dept_ids: []
-});
-const deptTreeData = ref<permissionDeptType[]>([]);
-const menuTreeData = ref<permissionMenuType[]>([]);
-
 // 分页表单
 const pageTableData = ref<RoleTable[]>([]);
 
+// 抽屉显隐
+const drawerVisible = ref(false);
 
 // 表格列配置
 const tableColumns = ref([
@@ -347,11 +248,12 @@ const tableColumns = ref([
   { prop: 'operation', label: '操作', show: true }
 ])
 
-const drawerSize = computed(() => (appStore.device === DeviceEnum.DESKTOP ? "600px" : "90%"));
-
 // 详情表单
 const detailFormData = ref<RoleTable>({});
 
+// 选中的角色
+const checkedRole = ref<RoleTable>({});
+
 const queryFormData = reactive<TablePageQuery>({
   page_no: 1,
   page_size: 10,
@@ -384,19 +286,6 @@ const rules = reactive({
   status: [{ required: true, message: "请选择状态", trigger: "blur" }],
 });
 
-// 选中的角色
-interface CheckedRole {
-  id?: number;
-  name?: string;
-}
-
-const checkedRole = ref<CheckedRole>({});
-const assignPermDialogVisible = ref(false);
-
-const permKeywords = ref("");
-const isExpanded = ref(true);
-
-const parentChildLinked = ref(true);
 
 // 加载表格数据
 async function loadingData() {
@@ -594,85 +483,14 @@ async function handleMoreClick(status: boolean) {
 }
 
 // 打开分配菜单权限弹窗
-async function handleOpenAssignPermDialog(row: RoleTable) {
-  const roleId = row.id;
+async function handleOpenAssignPermDialog(roleId: number, roleName: string) {
   if (roleId) {
-    assignPermDialogVisible.value = true;
-    loading.value = true;
-
+    drawerVisible.value = true;
     checkedRole.value.id = roleId;
-    checkedRole.value.name = row.name;
-
-    // 获取所有的菜单
-    menuTreeData.value = await MenuAPI.getMenuList();
-
-    // 回显角色已拥有的菜单
-    RoleAPI.getRoleMenuIds(roleId)
-      .then((data) => {
-        const checkedMenuIds = data;
-        checkedMenuIds.forEach((menuId) => permTreeRef.value!.setChecked(menuId, true, false));
-      })
-      .finally(() => {
-        loading.value = false;
-      });
+    checkedRole.value.name = roleName;
   }
 }
 
-// 分配菜单权限提交
-function handleAssignPermSubmit() {
-  const roleId = checkedRole.value.id;
-  if (roleId) {
-    const checkedMenuIds: number[] = permTreeRef
-      .value!.getCheckedNodes(false, true)
-      .map((node: any) => node.value);
-
-    loading.value = true;
-    RoleAPI.setPermission(roleId, checkedMenuIds)
-      .then(() => {
-        ElMessage.success("分配权限成功");
-        assignPermDialogVisible.value = false;
-        handleResetQuery();
-      })
-      .finally(() => {
-        loading.value = false;
-      });
-  }
-}
-
-// 展开/收缩 菜单权限树
-function togglePermTree() {
-  isExpanded.value = !isExpanded.value;
-  if (permTreeRef.value) {
-    Object.values(permTreeRef.value.store.nodesMap).forEach((node: any) => {
-      if (isExpanded.value) {
-        node.expand();
-      } else {
-        node.collapse();
-      }
-    });
-  }
-}
-
-// 权限筛选
-watch(permKeywords, (val) => {
-  permTreeRef.value!.filter(val);
-});
-
-function handlePermFilter(
-  value: string,
-  data: {
-    [key: string]: any;
-  }
-) {
-  if (!value) return true;
-  return data.label.includes(value);
-}
-
-// 父子菜单节点是否联动
-function handleparentChildLinkedChange(val: any) {
-  parentChildLinked.value = val;
-}
-
 onMounted(() => {
   loadingData();
 });
diff --git a/frontend/src/views/system/user/components/DeptTree.vue b/frontend/src/views/system/user/components/DeptTree.vue
index a28e124f..310d1e09 100644
--- a/frontend/src/views/system/user/components/DeptTree.vue
+++ b/frontend/src/views/system/user/components/DeptTree.vue
@@ -21,7 +21,7 @@
 
 <script setup lang="ts">
 import DeptAPI, { DeptPageQuery } from "@/api/system/dept";
-import { formatDeptTree, listToTree } from "@/utils/common";
+import { formatTree, listToTree } from "@/utils/common";
 
 const props = defineProps({
   modelValue: {
@@ -76,7 +76,7 @@ onBeforeMount(() => {
   loading.value = true;
   DeptAPI.getDeptList(queryFormData).then((response) => {
     const treeData = listToTree(response.data.data.items);
-    deptOptions.value = formatDeptTree(treeData);
+    deptOptions.value = formatTree(treeData);
   }).finally(() => {
     loading.value = false;
   });
diff --git a/frontend/src/views/system/user/components/UserImport.vue b/frontend/src/views/system/user/components/UserImport.vue
index 82b1a0d8..98ea86c1 100644
--- a/frontend/src/views/system/user/components/UserImport.vue
+++ b/frontend/src/views/system/user/components/UserImport.vue
@@ -84,6 +84,82 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 导出弹窗预留 -->
+    <el-dialog v-model="exportsModalVisible" :align-center="true" title="导出数据" width="600px" style="padding-right: 0" @close="handleCloseExportsModal">
+      <!-- 滚动 -->
+      <el-scrollbar max-height="60vh">
+        <!-- 表单 -->
+        <el-form ref="exportsFormRef" style="padding-right: var(--el-dialog-padding-primary)" :model="exportsFormData" :rules="exportsFormRules">
+          <el-form-item label="文件名" prop="filename">
+            <el-input v-model="exportsFormData.filename" clearable />
+          </el-form-item>
+          <el-form-item label="工作表名" prop="sheetname">
+            <el-input v-model="exportsFormData.sheetname" clearable />
+          </el-form-item>
+          <el-form-item label="数据源" prop="origin">
+            <el-select v-model="exportsFormData.origin">
+              <el-option label="当前数据 (当前页的数据)" :value="ExportsOriginEnum.CURRENT" />
+              <el-option label="选中数据 (所有选中的数据)" :value="ExportsOriginEnum.SELECTED" :disabled="selectionData.length <= 0" />
+              <el-option label="全量数据 (所有分页的数据)" :value="ExportsOriginEnum.REMOTE" :disabled="contentConfig.exportsAction === undefined" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="字段" prop="fields">
+            <el-checkbox-group v-model="exportsFormData.fields">
+              <template v-for="col in cols" :key="col.prop">
+                <el-checkbox v-if="col.prop" :value="col.prop" :label="col.label" />
+              </template>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-form>
+      </el-scrollbar>
+      <!-- 弹窗底部操作按钮 -->
+      <template #footer>
+        <div style="padding-right: var(--el-dialog-padding-primary)">
+          <el-button type="primary" @click="handleExportsSubmit">确 定</el-button>
+          <el-button @click="handleCloseExportsModal">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <!-- 导入弹窗预留 -->
+    <el-dialog v-model="importModalVisible" :align-center="true" title="导入数据" width="600px" style="padding-right: 0" @close="handleCloseImportModal">
+      <!-- 滚动 -->
+      <el-scrollbar max-height="60vh">
+        <!-- 表单 -->
+        <el-form ref="importFormRef" style="padding-right: var(--el-dialog-padding-primary)" :model="importFormData"
+          :rules="importFormRules">
+          <el-form-item label="文件名" prop="files">
+            <el-upload ref="uploadRef" v-model:file-list="importFormData.files" class="w-full"
+              accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+              :drag="true" :limit="1" :auto-upload="false" :on-exceed="handleFileExceed">
+              <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+              <div class="el-upload__text">
+                <span>将文件拖到此处，或</span>
+                <em>点击上传</em>
+              </div>
+              <template #tip>
+                <div class="el-upload__tip">
+                  *.xlsx / *.xls
+                  <el-link v-if="contentConfig.importTemplate" type="primary" icon="download" underline="never"
+                    @click="handleDownloadTemplate">
+                    下载模板
+                  </el-link>
+                </div>
+              </template>
+            </el-upload>
+          </el-form-item>
+        </el-form>
+      </el-scrollbar>
+      <!-- 弹窗底部操作按钮 -->
+      <template #footer>
+        <div style="padding-right: var(--el-dialog-padding-primary)">
+          <el-button type="primary" :disabled="importFormData.files.length === 0" @click="handleImportSubmit">
+            确 定
+          </el-button>
+          <el-button @click="handleCloseImportModal">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -194,4 +270,127 @@ const handleClose = () => {
   importFormData.files.length = 0;
   visible.value = false;
 };
+
+
+// // 导出
+// function handleExport() {
+//   const filename = exportsFormData.filename
+//     ? exportsFormData.filename
+//     : props.contentConfig.permPrefix || "export";
+//   const sheetname = exportsFormData.sheetname ? exportsFormData.sheetname : "sheet";
+//   const workbook = new ExcelJS.Workbook();
+//   const worksheet = workbook.addWorksheet(sheetname);
+//   const columns: Partial<ExcelJS.Column>[] = [];
+//   cols.value.forEach((col) => {
+//     if (col.label && col.prop && exportsFormData.fields.includes(col.prop)) {
+//       columns.push({ header: col.label, key: col.prop });
+//     }
+//   });
+//   worksheet.columns = columns;
+//   if (exportsFormData.origin === ExportsOriginEnum.REMOTE) {
+//     if (props.contentConfig.exportsAction) {
+//       props.contentConfig.exportsAction(lastFormData).then((res) => {
+//         worksheet.addRows(res);
+//         workbook.xlsx
+//           .writeBuffer()
+//           .then((buffer) => {
+//             saveXlsx(buffer, filename as string);
+//           })
+//           .catch((error) => console.log(error));
+//       });
+//     } else {
+//       ElMessage.error("未配置exportsAction");
+//     }
+//   } else {
+//     worksheet.addRows(
+//       exportsFormData.origin === ExportsOriginEnum.SELECTED ? selectionData.value : pageData.value
+//     );
+//     workbook.xlsx
+//       .writeBuffer()
+//       .then((buffer) => {
+//         saveXlsx(buffer, filename as string);
+//       })
+//       .catch((error) => console.log(error));
+//   }
+// }
+
+// // 下载导入模板
+// function handleDownloadTemplate() {
+//   const importTemplate = props.contentConfig.importTemplate;
+//   if (typeof importTemplate === "string") {
+//     window.open(importTemplate);
+//   } else if (typeof importTemplate === "function") {
+//     importTemplate().then((response) => {
+//       const fileData = response.data;
+//       const fileName = decodeURI(
+//         response.headers["content-disposition"].split(";")[1].split("=")[1]
+//       );
+//       saveXlsx(fileData, fileName);
+//     });
+//   } else {
+//     ElMessage.error("未配置importTemplate");
+//   }
+// }
+
+// // 导入
+// function handleImport() {
+//   const importsAction = props.contentConfig.importsAction;
+//   if (importsAction === undefined) {
+//     ElMessage.error("未配置importsAction");
+//     return;
+//   }
+//   // 获取选择的文件
+//   const file = importFormData.files[0].raw as File;
+//   // 创建Workbook实例
+//   const workbook = new ExcelJS.Workbook();
+//   // 使用FileReader对象来读取文件内容
+//   const fileReader = new FileReader();
+//   // 二进制字符串的形式加载文件
+//   fileReader.readAsArrayBuffer(file);
+//   fileReader.onload = (ev) => {
+//     if (ev.target !== null && ev.target.result !== null) {
+//       const result = ev.target.result as ArrayBuffer;
+//       // 从 buffer中加载数据解析
+//       workbook.xlsx
+//         .load(result)
+//         .then((workbook) => {
+//           // 解析后的数据
+//           const data = [];
+//           // 获取第一个worksheet内容
+//           const worksheet = workbook.getWorksheet(1);
+//           if (worksheet) {
+//             // 获取第一行的标题
+//             const fields: any[] = [];
+//             worksheet.getRow(1).eachCell((cell) => {
+//               fields.push(cell.value);
+//             });
+//             // 遍历工作表的每一行（从第二行开始，因为第一行通常是标题行）
+//             for (let rowNumber = 2; rowNumber <= worksheet.rowCount; rowNumber++) {
+//               const rowData: IObject = {};
+//               const row = worksheet.getRow(rowNumber);
+//               // 遍历当前行的每个单元格
+//               row.eachCell((cell, colNumber) => {
+//                 // 获取标题对应的键，并将当前单元格的值存储到相应的属性名中
+//                 rowData[fields[colNumber - 1]] = cell.value;
+//               });
+//               // 将当前行的数据对象添加到数组中
+//               data.push(rowData);
+//             }
+//           }
+//           if (data.length === 0) {
+//             ElMessage.error("未解析到数据");
+//             return;
+//           }
+//           importsAction(data).then(() => {
+//             ElMessage.success("导入数据成功");
+//             handleCloseImportModal();
+//             handleRefresh(true);
+//           });
+//         })
+//         .catch((error) => console.log(error));
+//     } else {
+//       ElMessage.error("读取文件失败");
+//     }
+//   };
+// }
 </script>
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 81a7cbff..e378d6e4 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -120,7 +120,11 @@
               <el-empty :image-size="80" description="暂无数据" />
             </template>
             <el-table-column v-if="tableColumns.find(col => col.prop === 'selection')?.show" type="selection" min-width="55" align="center" />
-            <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" type="index" fixed label="序号" align="center" min-width="60" />
+            <el-table-column v-if="tableColumns.find(col => col.prop === 'index')?.show" type="index" fixed label="序号" align="center" min-width="60" >
+              <template #default="scope">
+                {{ (queryFormData.page_no - 1) * queryFormData.page_size + scope.$index + 1 }}
+              </template>
+            </el-table-column>
             <el-table-column v-if="tableColumns.find(col => col.prop === 'avatar')?.show" label="头像" prop="avatar" min-width="80" align="center">
               <template #default="scope">
                 <el-avatar size="small" :src="scope.row.avatar" />
@@ -179,7 +183,7 @@
     <el-drawer v-model="dialogVisible.visible" :title="dialogVisible.title" append-to-body :size="drawerSize" @close="handleCloseDialog">
       <!-- 详情 -->
       <template v-if="dialogVisible.type === 'detail'">
-        <el-descriptions :column="2" border>
+        <el-descriptions :column="4" border>
           <el-descriptions-item label="编号" :span="2">{{ detailFormData.id }}</el-descriptions-item>
           <el-descriptions-item label="头像" :span="2">
             <el-avatar :src="detailFormData.avatar" size="small"></el-avatar>
@@ -208,7 +212,7 @@
           <el-descriptions-item label="创建人" :span="2">{{ detailFormData.creator?.name }}</el-descriptions-item>
           <el-descriptions-item label="创建时间" :span="2">{{ detailFormData.created_at }}</el-descriptions-item>
           <el-descriptions-item label="更新时间" :span="2">{{ detailFormData.updated_at }}</el-descriptions-item>
-          <el-descriptions-item label="描述" :span="2">{{ detailFormData.description }}</el-descriptions-item>
+          <el-descriptions-item label="描述" :span="4">{{ detailFormData.description }}</el-descriptions-item>
         </el-descriptions>
       </template>
       <!-- 新增、编辑表单 -->
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 31791484..ca8aacf3 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -22,7 +22,10 @@
     // 调试和兼容性相关配置
     "sourceMap": true,
     "useDefineForClassFields": true,
-    "allowJs": true
+    "allowJs": true,
+
+    // 类型检查相关配置
+    "types": ["vite/client"] // 添加 Vite 客户端类型
   },
 
   "include": ["mock/**/*.ts", "src/**/*.ts", "src/**/*.vue", "vite.config.ts"],