diff --git a/backend/app/core/ap_scheduler.py b/backend/app/core/ap_scheduler.py
index 1b16191b..d2cfbd6f 100644
--- a/backend/app/core/ap_scheduler.py
+++ b/backend/app/core/ap_scheduler.py
@@ -79,6 +79,9 @@ class SchedulerUtil:
     """
 
     redis_instance: Redis | None = None
+    # 临时存储 job_name，用于在 EVENT_JOB_SUBMITTED 时获取
+    # 格式可以是: str (任务名称) 或 tuple[str, str] (原任务ID, 任务名称)
+    _job_name_cache: dict[str, str | tuple[str, str]] = {}
 
     @classmethod
     def scheduler_event_listener(cls, event: JobEvent | JobExecutionEvent) -> None:
@@ -135,16 +138,43 @@ class SchedulerUtil:
         if job:
             log.info(f"任务 {job_id} ({job.name}) 已提交执行")
 
-            # 创建执行日志
-            cls._create_job_log(
-                job_id=job_id,
-                job_name=job.name,
-                trigger_type=cls._get_trigger_type(job_id),
+            trigger_type = cls._get_trigger_type(job_id)
+
+            # 周期性任务（cron/interval）：更新 pending 状态为 running
+            if trigger_type in ("cron", "interval"):
+                cls._update_job_log(
+                    job_id=job_id,
+                    status="running",
+                )
+            else:
+                # 一次性任务（manual/date）：创建新的 running 状态日志
+                cls._create_job_log(
+                    job_id=job_id,
+                    job_name=job.name,
+                    trigger_type=trigger_type,
+                    status="running",
+                )
+        else:
+            # 任务可能已经被移除（一次性任务执行完毕后自动移除）
+            # 尝试从缓存获取 job_name 和原任务 ID
+            cached_value = cls._job_name_cache.pop(job_id, None)
+            # 处理新的缓存格式 (原任务ID, 任务名称) 或旧的格式 任务名称
+            if isinstance(cached_value, tuple):
+                original_job_id, job_name = cached_value
+            else:
+                original_job_id, job_name = job_id, cached_value
+
+            log.info(f"任务 {job_id} 提交执行，但未找到任务信息（可能已被移除），尝试创建日志")
+            result = cls._create_job_log(
+                job_id=original_job_id,
+                job_name=job_name,
+                trigger_type="manual",
                 status="running",
             )
-        else:
-            # 任务可能已经被移除（一次性任务），尝试从事件中获取信息
-            log.debug(f"任务 {job_id} 提交执行，但未找到任务信息（可能已被移除）")
+            if result:
+                log.info(f"任务 {original_job_id} 日志创建成功，id={result}")
+            else:
+                log.error(f"任务 {original_job_id} 日志创建失败")
 
     @classmethod
     def _handle_job_executed(cls, event: JobExecutionEvent) -> None:
@@ -168,6 +198,19 @@ class SchedulerUtil:
             result=str(retval) if retval else None,
         )
 
+        # 为周期性任务创建新的 pending 状态日志，等待下次执行
+        job = cls.get_job(job_id=job_id)
+        if job:
+            trigger_type = cls._get_trigger_type(job_id)
+            if trigger_type in ("cron", "interval") and job.next_run_time:
+                cls._create_job_log(
+                    job_id=job_id,
+                    job_name=job.name,
+                    trigger_type=trigger_type,
+                    status="pending",
+                )
+                log.debug(f"任务 {job_id} 已创建新的 pending 状态日志，等待下次执行")
+
     @classmethod
     def _handle_job_error(cls, event: JobExecutionEvent) -> None:
         """
@@ -192,6 +235,19 @@ class SchedulerUtil:
             error=str(exception) if exception else "未知错误",
         )
 
+        # 为周期性任务创建新的 pending 状态日志，等待下次执行
+        job = cls.get_job(job_id=job_id)
+        if job:
+            trigger_type = cls._get_trigger_type(job_id)
+            if trigger_type in ("cron", "interval") and job.next_run_time:
+                cls._create_job_log(
+                    job_id=job_id,
+                    job_name=job.name,
+                    trigger_type=trigger_type,
+                    status="pending",
+                )
+                log.debug(f"任务 {job_id} 已创建新的 pending 状态日志，等待下次执行")
+
     @classmethod
     def _handle_job_missed(cls, event: JobEvent) -> None:
         """
@@ -212,16 +268,44 @@ class SchedulerUtil:
             error="任务错过执行时间",
         )
 
+        # 为周期性任务创建新的 pending 状态日志，等待下次执行
+        if job:
+            trigger_type = cls._get_trigger_type(job_id)
+            if trigger_type in ("cron", "interval") and job.next_run_time:
+                cls._create_job_log(
+                    job_id=job_id,
+                    job_name=job.name,
+                    trigger_type=trigger_type,
+                    status="pending",
+                )
+                log.debug(f"任务 {job_id} 已创建新的 pending 状态日志，等待下次执行")
+
     @classmethod
     def _handle_job_removed(cls, event: JobEvent) -> None:
         """
         处理任务被移除事件
+
+        注意：APScheduler 对于一次性任务（DateTrigger）会先触发 JOB_REMOVED，
+        然后再触发 JOB_SUBMITTED 和 JOB_EXECUTED。因此：
+        - 对于一次性任务，不应该在 JOB_REMOVED 时创建或更新日志
+        - 只有周期性任务在移除时才需要更新日志状态
         """
         job_id = str(event.job_id)
         jobstore = getattr(event, "jobstore", "unknown")
 
         log.info(f"任务 {job_id} 从 {jobstore} 存储器中移除")
 
+        # 检查是否是一次性任务（DateTrigger）
+        # 如果任务已经不存在，说明可能是一次性任务执行后被自动移除
+        # 这种情况下不需要更新日志，因为 JOB_EXECUTED 会处理
+        job = cls.get_job(job_id=job_id)
+        if job is None:
+            # 任务已经被移除，可能是一次性任务
+            # 不需要在这里创建日志，JOB_SUBMITTED 和 JOB_EXECUTED 会处理
+            log.debug(f"任务 {job_id} 已从调度器中移除（可能是一次性任务），跳过日志更新")
+            return
+
+        # 任务还存在，说明是周期性任务被手动移除
         # 更新执行日志
         cls._update_job_log_on_removed(job_id=job_id)
 
@@ -236,6 +320,17 @@ class SchedulerUtil:
 
         if job:
             log.info(f"任务 {job_id} ({job.name}) 已添加到 {jobstore} 存储器")
+
+            # 为周期性任务（cron/interval）创建初始的 pending 状态日志
+            trigger_type = cls._get_trigger_type(job_id)
+            if trigger_type in ("cron", "interval"):
+                cls._create_job_log(
+                    job_id=job_id,
+                    job_name=job.name,
+                    trigger_type=trigger_type,
+                    status="pending",
+                )
+                log.debug(f"任务 {job_id} 已创建初始 pending 状态日志")
         else:
             log.info(f"任务 {job_id} 已添加到 {jobstore} 存储器")
 
@@ -337,9 +432,10 @@ class SchedulerUtil:
     def _handle_all_jobs_removed(cls, event: SchedulerEvent) -> None:
         """
         处理所有任务移除事件
+        注意：清空调度器任务不应该清空执行日志，而是将所有 pending 状态的日志更新为 cancelled
         """
         log.info("所有任务已从调度器中移除")
-        cls._clear_all_job_logs()
+        cls._cancel_all_pending_job_logs()
 
     @classmethod
     def _handle_job_max_instances(cls, event: JobEvent) -> None:
@@ -473,7 +569,7 @@ class SchedulerUtil:
     @classmethod
     def _clear_all_job_logs(cls) -> None:
         """
-        清空所有任务日志
+        清空所有任务日志（仅用于手动清空，不建议使用）
         """
         try:
             from sqlalchemy.orm import Session
@@ -487,6 +583,26 @@ class SchedulerUtil:
         except Exception as e:
             log.error(f"清空任务日志失败: {e!s}", exc_info=True)
 
+    @classmethod
+    def _cancel_all_pending_job_logs(cls) -> None:
+        """
+        将所有 pending 状态的执行日志更新为 cancelled
+        用于清空调度器任务时，不删除日志而是更新状态
+        """
+        try:
+            from sqlalchemy.orm import Session
+
+            from app.plugin.module_task.job.model import JobModel
+
+            with Session(engine) as session:
+                session.query(JobModel).filter(JobModel.status == "pending").update(
+                    {"status": "cancelled"}
+                )
+                session.commit()
+                log.info("所有待执行任务日志已标记为已取消")
+        except Exception as e:
+            log.error(f"取消待执行任务日志失败: {e!s}", exc_info=True)
+
     @classmethod
     def _get_trigger_type(cls, job_id: str) -> str:
         """
@@ -634,7 +750,7 @@ class SchedulerUtil:
             return {"error": str(e), "raw_data": str(blob_data[:200])}
 
     @classmethod
-    def _create_job_log(cls, job_id: str, job_name: str | None = None, trigger_type: str = "manual", status: str = "running") -> int:
+    def _create_job_log(cls, job_id: str, job_name: str | None = None, trigger_type: str = "manual", status: str = "running") -> int | None:
         """
         创建执行日志
         """
@@ -642,27 +758,36 @@ class SchedulerUtil:
 
         from app.plugin.module_task.job.model import JobModel
 
-        job = cls.get_job(job_id=job_id)
-        next_run_time = str(job.next_run_time) if job and job.next_run_time else None
-        job_state = cls._get_job_state(job) if job else None
+        try:
+            job = cls.get_job(job_id=job_id)
+            next_run_time = str(job.next_run_time) if job and job.next_run_time else None
+            job_state = cls._get_job_state(job) if job else None
+            # 如果没有传入 job_name，尝试从 job 获取
+            if not job_name and job:
+                job_name = job.name
 
-        with Session(engine) as session:
-            job_log = JobModel(
-                job_id=job_id,
-                job_name=job_name,
-                trigger_type=trigger_type,
-                status=status,
-                next_run_time=next_run_time,
-                job_state=job_state,
-            )
-            session.add(job_log)
-            session.commit()
-            return job_log.id
+            with Session(engine) as session:
+                job_log = JobModel(
+                    job_id=job_id,
+                    job_name=job_name,
+                    trigger_type=trigger_type,
+                    status=status,
+                    next_run_time=next_run_time,
+                    job_state=job_state,
+                )
+                session.add(job_log)
+                session.commit()
+                log.info(f"执行日志创建成功: job_id={job_id}, id={job_log.id}")
+                return job_log.id
+        except Exception as e:
+            log.error(f"创建执行日志失败: job_id={job_id}, error={e}", exc_info=True)
+            return None
 
     @classmethod
     def _update_job_log(cls, job_id: str, status: str, result: str | None = None, error: str | None = None) -> None:
         """
-        更新执行日志（更新该 job_id 最新的 pending 或 running 状态日志）
+        更新执行日志（更新该 job_id 最新的 pending 状态日志）
+        用于周期性任务在提交执行时将 pending 更新为 running
         """
         from sqlalchemy.orm import Session
 
@@ -672,75 +797,6 @@ class SchedulerUtil:
         next_run_time = str(job.next_run_time) if job and job.next_run_time else None
         job_state = cls._get_job_state(job) if job else None
 
-        with Session(engine) as session:
-            job_log = (
-                session.query(JobModel)
-                .filter(JobModel.job_id == job_id, JobModel.status.in_(['pending', 'running']))
-                .order_by(JobModel.created_time.desc())
-                .first()
-            )
-            if job_log:
-                job_log.status = status
-                if next_run_time:
-                    job_log.next_run_time = next_run_time
-                if job_state:
-                    job_log.job_state = job_state
-                if result:
-                    job_log.result = result
-                if error:
-                    job_log.error = error
-                session.commit()
-            else:
-                log.warning(f"未找到任务 {job_id} 的待执行或运行中日志记录")
-
-    @classmethod
-    def _update_latest_job_log(cls, job_id: str, status: str, result: str | None = None, error: str | None = None) -> None:
-        """
-        更新最新的执行日志（更新该 job_id 最新的一条 running 状态日志）
-        用于每次执行完成后更新状态
-        """
-        from sqlalchemy.orm import Session
-
-        from app.plugin.module_task.job.model import JobModel
-
-        job = cls.get_job(job_id=job_id)
-        next_run_time = str(job.next_run_time) if job and job.next_run_time else None
-        job_state = cls._get_job_state(job) if job else None
-
-        with Session(engine) as session:
-            job_log = (
-                session.query(JobModel)
-                .filter(JobModel.job_id == job_id, JobModel.status == "running")
-                .order_by(JobModel.created_time.desc())
-                .first()
-            )
-            if job_log:
-                job_log.status = status
-                if next_run_time:
-                    job_log.next_run_time = next_run_time
-                if job_state:
-                    job_log.job_state = job_state
-                if result:
-                    job_log.result = result
-                if error:
-                    job_log.error = error
-                session.commit()
-            else:
-                log.warning(f"未找到任务 {job_id} 的运行中日志记录")
-
-    @classmethod
-    def _update_job_log_on_removed(cls, job_id: str) -> None:
-        """
-        任务被移除时，更新最新的 pending 状态日志为 cancelled
-        注意：
-        - 只有当任务还在 pending 状态时才更新为 cancelled
-        - 一次性任务（trigger_type 为 date 或 manual）执行后会自动触发 REMOVED 事件，此时不应该标记为 cancelled
-        - REMOVED 事件可能在 SUBMITTED 之前触发，此时状态还是 pending
-        """
-        from sqlalchemy.orm import Session
-
-        from app.plugin.module_task.job.model import JobModel
-
         with Session(engine) as session:
             job_log = (
                 session.query(JobModel)
@@ -749,10 +805,141 @@ class SchedulerUtil:
                 .first()
             )
             if job_log:
-                if job_log.trigger_type in ("date", "manual"):
+                job_log.status = status
+                if next_run_time:
+                    job_log.next_run_time = next_run_time
+                if job_state:
+                    job_log.job_state = job_state
+                if result:
+                    job_log.result = result
+                if error:
+                    job_log.error = error
+                session.commit()
+            else:
+                log.warning(f"未找到任务 {job_id} 的待执行日志记录")
+
+    @classmethod
+    def _update_latest_job_log(cls, job_id: str, status: str, result: str | None = None, error: str | None = None) -> None:
+        """
+        更新最新的执行日志（更新该 job_id 最新的一条日志）
+        用于每次执行完成后更新状态
+        """
+        from sqlalchemy.orm import Session
+
+        from app.plugin.module_task.job.model import JobModel
+
+        try:
+            job = cls.get_job(job_id=job_id)
+            next_run_time = str(job.next_run_time) if job and job.next_run_time else None
+            job_state = cls._get_job_state(job) if job else None
+
+            with Session(engine) as session:
+                # 首先尝试更新 running 状态的日志
+                job_log = (
+                    session.query(JobModel)
+                    .filter(JobModel.job_id == job_id, JobModel.status == "running")
+                    .order_by(JobModel.created_time.desc())
+                    .first()
+                )
+                if job_log:
+                    job_log.status = status
+                    if next_run_time:
+                        job_log.next_run_time = next_run_time
+                    if job_state:
+                        job_log.job_state = job_state
+                    if result:
+                        job_log.result = result
+                    if error:
+                        job_log.error = error
+                    session.commit()
+                    log.info(f"执行日志更新成功: job_id={job_id}, id={job_log.id}, status={status}")
                     return
+
+                # 没有找到 running 状态的日志，尝试更新 cancelled 状态的日志
+                # 这种情况发生在 EVENT_JOB_REMOVED 先于 EVENT_JOB_SUBMITTED 触发时
+                job_log = (
+                    session.query(JobModel)
+                    .filter(JobModel.job_id == job_id, JobModel.status == "cancelled")
+                    .order_by(JobModel.created_time.desc())
+                    .first()
+                )
+                if job_log:
+                    job_log.status = status
+                    if next_run_time:
+                        job_log.next_run_time = next_run_time
+                    if job_state:
+                        job_log.job_state = job_state
+                    if result:
+                        job_log.result = result
+                    if error:
+                        job_log.error = error
+                    session.commit()
+                    log.info(f"执行日志更新成功: job_id={job_id}, id={job_log.id}, status={status}")
+                    return
+
+                # 创建新的日志记录
+                log.debug(f"未找到任务 {job_id} 的日志记录，创建新日志")
+                trigger_type = cls._get_trigger_type(job_id) if job else "manual"
+                new_log = JobModel(
+                    job_id=job_id,
+                    job_name=job.name if job else None,
+                    trigger_type=trigger_type,
+                    status=status,
+                    next_run_time=next_run_time,
+                    job_state=job_state,
+                    result=result,
+                    error=error,
+                )
+                session.add(new_log)
+                session.commit()
+                log.info(f"执行日志创建成功: job_id={job_id}, id={new_log.id}, status={status}")
+        except Exception as e:
+            log.error(f"更新执行日志失败: job_id={job_id}, status={status}, error={e}", exc_info=True)
+
+    @classmethod
+    def _update_job_log_on_removed(cls, job_id: str) -> None:
+        """
+        任务被移除时，更新最新的 pending 或 running 状态日志为 cancelled
+
+        事件触发顺序分析：
+        1. 一次性任务（manual/date）：
+           - EVENT_JOB_SUBMITTED -> 创建日志（status=running）
+           - EVENT_JOB_EXECUTED/ERROR -> 更新日志（status=success/failed）
+           - EVENT_JOB_REMOVED -> 日志已更新，不会被标记为 cancelled
+
+        2. 周期性任务（cron/interval）：
+           - EVENT_JOB_SUBMITTED -> 创建日志（status=running）
+           - EVENT_JOB_EXECUTED/ERROR -> 更新日志（status=success/failed）
+           - 下次执行 -> EVENT_JOB_SUBMITTED -> 创建新日志（status=running）
+           - EVENT_JOB_REMOVED -> 将 pending/running 标记为 cancelled
+
+        3. 特殊情况：
+           - 一次性任务在执行前被删除：running -> cancelled
+           - 周期性任务在 pending 状态被删除：pending -> cancelled
+
+        注意：
+        - 只有当任务还在 pending 或 running 状态时才更新为 cancelled
+        - 如果任务已经执行完成（success/failed/timeout），则不需要更新
+        - 如果任务已经标记为 cancelled，则不需要更新
+        """
+        from sqlalchemy.orm import Session
+
+        from app.plugin.module_task.job.model import JobModel
+
+        with Session(engine) as session:
+            job_log = (
+                session.query(JobModel)
+                .filter(
+                    JobModel.job_id == job_id,
+                    JobModel.status.in_(['pending', 'running'])
+                )
+                .order_by(JobModel.created_time.desc())
+                .first()
+            )
+            if job_log:
                 job_log.status = "cancelled"
                 session.commit()
+                log.info(f"任务 {job_id} 的执行日志已标记为已取消")
 
     @classmethod
     def get_job_status(cls, job_id: str | int) -> str:
@@ -763,7 +950,8 @@ class SchedulerUtil:
         if not job:
             return "未知"
 
-        if job_id in scheduler._jobstores[job._jobstore_alias]._paused_jobs:
+        # 判断是否暂停：next_run_time 为 None 表示任务已暂停
+        if job.next_run_time is None:
             return "暂停中"
 
         if scheduler.state == 0:
@@ -780,13 +968,7 @@ class SchedulerUtil:
         from datetime import timedelta
         trigger = DateTrigger(run_date=datetime.now() + timedelta(seconds=0.1))
         job = cls._add_job_with_trigger(job_info, trigger)
-        # 手动创建执行日志，确保调试时也能生成记录
-        cls._create_job_log(
-            job_id=str(job_info.id),
-            job_name=job_info.name,
-            trigger_type="manual",
-            status="running",
-        )
+        # 注意：不需要手动创建执行日志，EVENT_JOB_SUBMITTED 事件会自动创建
         return job
 
     @classmethod
@@ -922,6 +1104,9 @@ class SchedulerUtil:
                 except json.JSONDecodeError:
                     raise ValueError(f"关键字参数JSON格式无效: {kwargs_str}")
 
+        # 缓存 job_name，用于 EVENT_JOB_SUBMITTED 时获取
+        cls._job_name_cache[str(job_info.id)] = job_info.name or ""
+
         try:
             job = scheduler.add_job(
                 func=cls._task_wrapper,
@@ -1076,8 +1261,37 @@ class SchedulerUtil:
 
     @classmethod
     def run_job_now(cls, job_id: str | int, jobstore: str | None = None) -> Job | None:
+        """
+        立即执行任务
+
+        注意：为了不改变原任务的触发器配置，我们创建一个新的临时任务来执行，
+        而不是修改原任务的 trigger。
+        """
         job = cls.get_job(job_id=job_id, jobstore=jobstore)
         if not job:
             return None
-        trigger = DateTrigger(run_date=datetime.now(), timezone="Asia/Shanghai")
-        return scheduler.modify_job(str(job_id), jobstore, trigger=trigger)
+
+        # 创建一个新的临时任务 ID
+        temp_job_id = f"{job_id}_run_now_{datetime.now().timestamp()}"
+
+        # 缓存 job_name 和原任务 ID，用于 EVENT_JOB_SUBMITTED 时获取
+        # 格式: (原任务ID, 任务名称)
+        cls._job_name_cache[temp_job_id] = (str(job_id), f"{job.name}(立即执行)")
+
+        # 创建临时任务，延迟 0.1 秒执行，确保事件监听器能够捕获事件
+        from datetime import timedelta
+        trigger = DateTrigger(run_date=datetime.now() + timedelta(seconds=0.1), timezone="Asia/Shanghai")
+        temp_job = scheduler.add_job(
+            func=job.func,
+            trigger=trigger,
+            args=job.args,
+            kwargs=job.kwargs,
+            id=temp_job_id,
+            name=f"{job.name}(立即执行)",
+            jobstore=jobstore or "default",
+            executor=job.executor,
+            max_instances=1,
+        )
+
+        log.info(f"任务 {job_id} 已触发立即执行，临时任务 ID: {temp_job_id}")
+        return temp_job
diff --git a/backend/app/plugin/module_task/job/controller.py b/backend/app/plugin/module_task/job/controller.py
index ecc34c1f..fbe7d610 100644
--- a/backend/app/plugin/module_task/job/controller.py
+++ b/backend/app/plugin/module_task/job/controller.py
@@ -62,7 +62,7 @@ async def get_scheduler_jobs_controller() -> JSONResponse:
     summary="启动调度器",
     description="启动调度器",
     response_model=ResponseSchema[None],
-    dependencies=[Depends(AuthPermission(["module_task:job:update"]))],
+    dependencies=[Depends(AuthPermission(["module_task:job:scheduler"]))],
 )
 async def start_scheduler_controller() -> JSONResponse:
     """
@@ -78,7 +78,7 @@ async def start_scheduler_controller() -> JSONResponse:
     summary="暂停调度器",
     description="暂停调度器",
     response_model=ResponseSchema[None],
-    dependencies=[Depends(AuthPermission(["module_task:job:update"]))],
+    dependencies=[Depends(AuthPermission(["module_task:job:scheduler"]))],
 )
 async def pause_scheduler_controller() -> JSONResponse:
     """
@@ -94,7 +94,7 @@ async def pause_scheduler_controller() -> JSONResponse:
     summary="恢复调度器",
     description="恢复调度器",
     response_model=ResponseSchema[None],
-    dependencies=[Depends(AuthPermission(["module_task:job:update"]))],
+    dependencies=[Depends(AuthPermission(["module_task:job:scheduler"]))],
 )
 async def resume_scheduler_controller() -> JSONResponse:
     """
@@ -110,7 +110,7 @@ async def resume_scheduler_controller() -> JSONResponse:
     summary="关闭调度器",
     description="关闭调度器",
     response_model=ResponseSchema[None],
-    dependencies=[Depends(AuthPermission(["module_task:job:update"]))],
+    dependencies=[Depends(AuthPermission(["module_task:job:scheduler"]))],
 )
 async def shutdown_scheduler_controller() -> JSONResponse:
     """
@@ -126,7 +126,7 @@ async def shutdown_scheduler_controller() -> JSONResponse:
     summary="清空所有任务",
     description="清空调度器中的所有任务",
     response_model=ResponseSchema[None],
-    dependencies=[Depends(AuthPermission(["module_task:job:delete"]))],
+    dependencies=[Depends(AuthPermission(["module_task:job:task"]))],
 )
 async def clear_jobs_controller() -> JSONResponse:
     """
@@ -182,7 +182,7 @@ async def sync_jobs_controller() -> JSONResponse:
     summary="暂停任务",
     description="暂停调度器中的任务",
     response_model=ResponseSchema[None],
-    dependencies=[Depends(AuthPermission(["module_task:job:update"]))],
+    dependencies=[Depends(AuthPermission(["module_task:job:task"]))],
 )
 async def pause_job_controller(
     job_id: Annotated[str, Path(description="调度器任务ID")],
@@ -203,7 +203,7 @@ async def pause_job_controller(
     summary="恢复任务",
     description="恢复调度器中的任务",
     response_model=ResponseSchema[None],
-    dependencies=[Depends(AuthPermission(["module_task:job:update"]))],
+    dependencies=[Depends(AuthPermission(["module_task:job:task"]))],
 )
 async def resume_job_controller(
     job_id: Annotated[str, Path(description="调度器任务ID")],
@@ -224,7 +224,7 @@ async def resume_job_controller(
     summary="立即执行任务",
     description="立即执行调度器中的任务",
     response_model=ResponseSchema[None],
-    dependencies=[Depends(AuthPermission(["module_task:job:update"]))],
+    dependencies=[Depends(AuthPermission(["module_task:job:task"]))],
 )
 async def run_job_controller(
     job_id: Annotated[str, Path(description="调度器任务ID")],
@@ -343,20 +343,3 @@ async def delete_job_log_controller(
     await JobService.delete_job_log_service(auth=auth, ids=ids)
     log.info(f"删除执行日志成功: {ids}")
     return SuccessResponse(msg="删除执行日志成功")
-
-
-@JobRouter.delete(
-    "/log/clear",
-    summary="清空执行日志",
-    description="清空所有执行日志",
-    response_model=ResponseSchema[None],
-)
-async def clear_job_log_controller(
-    auth: Annotated[AuthSchema, Depends(AuthPermission(["module_task:job:delete"]))],
-) -> JSONResponse:
-    """
-    清空所有执行日志
-    """
-    await JobService.clear_job_log_service(auth=auth)
-    log.info("清空执行日志成功")
-    return SuccessResponse(msg="清空执行日志成功")
diff --git a/backend/app/plugin/module_task/job/schema.py b/backend/app/plugin/module_task/job/schema.py
index 0ae817f5..ae5b0fb8 100644
--- a/backend/app/plugin/module_task/job/schema.py
+++ b/backend/app/plugin/module_task/job/schema.py
@@ -49,7 +49,9 @@ class JobQueryParam:
         status: str | None = Query(None, description="执行状态"),
         trigger_type: str | None = Query(None, description="触发方式"),
     ) -> None:
-        self.job_id = (QueueEnum.eq.value, job_id)
-        self.job_name = (QueueEnum.like.value, job_name)
+        # 确保 job_id 是字符串类型
+        self.job_id = (QueueEnum.eq.value, str(job_id) if job_id is not None else None)
+        # 只有当 job_name 不为空时才添加查询条件
+        self.job_name = (QueueEnum.like.value, job_name) if job_name else None
         self.status = (QueueEnum.eq.value, status)
         self.trigger_type = (QueueEnum.eq.value, trigger_type)
diff --git a/backend/app/plugin/module_task/node/controller.py b/backend/app/plugin/module_task/node/controller.py
index bcc43d44..8d525a38 100644
--- a/backend/app/plugin/module_task/node/controller.py
+++ b/backend/app/plugin/module_task/node/controller.py
@@ -214,7 +214,7 @@ async def clear_obj_controller(
 async def execute_job_controller(
     id: Annotated[int, Path(description="节点ID")],
     data: NodeExecuteSchema,
-    auth: Annotated[AuthSchema, Depends(AuthPermission(["module_task:node:update"]))],
+    auth: Annotated[AuthSchema, Depends(AuthPermission(["module_task:node:execute"]))],
 ) -> JSONResponse:
     """
     调试节点
diff --git a/backend/app/plugin/module_task/node/service.py b/backend/app/plugin/module_task/node/service.py
index c4feddc4..c8a8f7f2 100644
--- a/backend/app/plugin/module_task/node/service.py
+++ b/backend/app/plugin/module_task/node/service.py
@@ -1,8 +1,9 @@
+from apscheduler.jobstores.base import JobLookupError
+
 from app.api.v1.module_system.auth.schema import AuthSchema
 from app.core.ap_scheduler import SchedulerUtil
 from app.core.exceptions import CustomException
 from app.utils.cron_util import CronUtil
-from apscheduler.jobstores.base import JobLookupError
 
 from .crud import NodeCRUD
 from .schema import (
diff --git a/backend/app/scripts/data/sys_menu.json b/backend/app/scripts/data/sys_menu.json
index 9e85de80..e6e628e6 100644
--- a/backend/app/scripts/data/sys_menu.json
+++ b/backend/app/scripts/data/sys_menu.json
@@ -2632,11 +2632,11 @@
             "description": "查询调度器"
           },
           {
-            "name": "操作调度器",
+            "name": "控制调度器",
             "type": 3,
             "icon": null,
             "order": 2,
-            "permission": "module_task:job:update",
+            "permission": "module_task:job:scheduler",
             "route_name": null,
             "route_path": null,
             "component_path": null,
@@ -2644,17 +2644,36 @@
             "keep_alive": true,
             "hidden": false,
             "always_show": false,
-            "title": "操作调度器",
+            "title": "控制调度器",
             "params": null,
             "affix": false,
             "redirect": null,
-            "description": "操作调度器"
+            "description": "控制调度器"
+          },
+          {
+            "name": "操作任务",
+            "type": 3,
+            "icon": null,
+            "order": 3,
+            "permission": "module_task:job:task",
+            "route_name": null,
+            "route_path": null,
+            "component_path": null,
+            "status": "0",
+            "keep_alive": true,
+            "hidden": false,
+            "always_show": false,
+            "title": "操作任务",
+            "params": null,
+            "affix": false,
+            "redirect": null,
+            "description": "操作任务"
           },
           {
             "name": "删除执行日志",
             "type": 3,
             "icon": null,
-            "order": 3,
+            "order": 4,
             "permission": "module_task:job:delete",
             "route_name": null,
             "route_path": null,
@@ -2673,7 +2692,7 @@
             "name": "详情执行日志",
             "type": 3,
             "icon": null,
-            "order": 4,
+            "order": 5,
             "permission": "module_task:job:detail",
             "route_name": null,
             "route_path": null,
@@ -2729,10 +2748,29 @@
             "description": "创建节点"
           },
           {
-            "name": "修改节点",
+            "name": "调试节点",
             "type": 3,
             "icon": null,
             "order": 2,
+            "permission": "module_task:node:execute",
+            "route_name": null,
+            "route_path": null,
+            "component_path": null,
+            "status": "0",
+            "keep_alive": true,
+            "hidden": false,
+            "always_show": false,
+            "title": "调试节点",
+            "params": null,
+            "affix": false,
+            "redirect": null,
+            "description": "调试节点"
+          },
+          {
+            "name": "修改节点",
+            "type": 3,
+            "icon": null,
+            "order": 3,
             "permission": "module_task:node:update",
             "route_name": null,
             "route_path": null,
@@ -2751,7 +2789,7 @@
             "name": "删除节点",
             "type": 3,
             "icon": null,
-            "order": 3,
+            "order": 4,
             "permission": "module_task:node:delete",
             "route_name": null,
             "route_path": null,
@@ -2770,7 +2808,7 @@
             "name": "详情节点",
             "type": 3,
             "icon": null,
-            "order": 4,
+            "order": 5,
             "permission": "module_task:node:detail",
             "route_name": null,
             "route_path": null,
@@ -2789,7 +2827,7 @@
             "name": "查询节点",
             "type": 3,
             "icon": null,
-            "order": 5,
+            "order": 6,
             "permission": "module_task:node:query",
             "route_name": null,
             "route_path": null,
diff --git a/frontend/src/api/module_task/job.ts b/frontend/src/api/module_task/job.ts
index be922392..d784b6b3 100644
--- a/frontend/src/api/module_task/job.ts
+++ b/frontend/src/api/module_task/job.ts
@@ -116,13 +116,6 @@ const JobAPI = {
       data: ids,
     });
   },
-
-  clearJobLog() {
-    return request<ApiResponse>({
-      url: `${API_PATH}/log/clear`,
-      method: "delete",
-    });
-  },
 };
 
 export default JobAPI;
@@ -153,6 +146,8 @@ export interface JobLogTable extends BaseType {
   job_name?: string;
   trigger_type?: string;
   status: string;
+  next_run_time?: string;
+  job_state?: string;
   result?: string;
   error?: string;
   created_time?: string;
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 4f2b3518..23a36325 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -82,7 +82,7 @@ html.sidebar-color-blue .layout-mix .layout__sidebar--left .el-menu {
 // 全局搜索区域样式
 .search-container {
   padding: 18px 16px 0;
-  margin-bottom: 16px;
+  margin-top: 16px;
   background-color: var(--el-bg-color-overlay);
   border: 1px solid var(--el-border-color-light);
   border-radius: 4px;
@@ -115,7 +115,7 @@ html.sidebar-color-blue .layout-mix .layout__sidebar--left .el-menu {
 
   // 表格内容区域
   &__content {
-    // margin: 8px 0; // 表格内容区域添加内边距
+    margin: 0px 0; // 表格内容区域添加内边距
   }
 
   // 分页区域
diff --git a/frontend/src/views/dashboard/index.vue b/frontend/src/views/dashboard/index.vue
index 9a43e601..2201c110 100644
--- a/frontend/src/views/dashboard/index.vue
+++ b/frontend/src/views/dashboard/index.vue
@@ -262,7 +262,7 @@
               </el-radio-group>
             </div>
           </template>
-          <ECharts :options="visitTrendChartOptions" height="400px" />
+          <ECharts :options="visitTrendChartOptions" height="calc(100vh - 550px)" />
         </el-card>
       </el-col>
       <!-- 最新动态 -->
@@ -285,7 +285,7 @@
             </div>
           </template>
 
-          <el-scrollbar height="400px">
+          <el-scrollbar height="calc(100vh - 550px)">
             <el-timeline class="p-3">
               <el-timeline-item
                 v-for="(item, index) in vesionList"
diff --git a/frontend/src/views/module_ai/chat_message/index.vue b/frontend/src/views/module_ai/chat_message/index.vue
index 105359a6..11990dd4 100644
--- a/frontend/src/views/module_ai/chat_message/index.vue
+++ b/frontend/src/views/module_ai/chat_message/index.vue
@@ -1,79 +1,6 @@
 <!-- AI智能助手消息列表 -->
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div v-show="visible" class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        label-suffix=":"
-        :inline="true"
-        @submit.prevent="handleQuery"
-      >
-        <el-form-item prop="session_id" label="会话ID">
-          <el-input v-model="queryFormData.session_id" placeholder="请输入会话ID" clearable />
-        </el-form-item>
-        <el-form-item prop="type" label="类型">
-          <el-select
-            v-model="queryFormData.type"
-            placeholder="请选择类型"
-            style="width: 170px"
-            clearable
-          >
-            <el-option value="user" label="用户" />
-            <el-option value="assistant" label="助手" />
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="content" label="内容">
-          <el-input v-model="queryFormData.content" placeholder="请输入内容" clearable />
-        </el-form-item>
-        <el-form-item v-if="isExpand" prop="created_time" label="创建时间">
-          <DatePicker
-            v-model="createdDateRange"
-            @update:model-value="handleCreatedDateRangeChange"
-          />
-        </el-form-item>
-        <el-form-item v-if="isExpand" prop="updated_time" label="更新时间">
-          <DatePicker
-            v-model="updatedDateRange"
-            @update:model-value="handleUpdatedDateRangeChange"
-          />
-        </el-form-item>
-        <!-- 查询、重置、展开/收起按钮 -->
-        <el-form-item>
-          <el-button
-            v-hasPerm="['module_example:demo:query']"
-            type="primary"
-            icon="search"
-            @click="handleQuery"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_example:demo:query']"
-            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 class="data-table">
       <template #header>
@@ -85,6 +12,77 @@
             </el-tooltip>
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div v-show="visible" class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            label-suffix=":"
+            :inline="true"
+            @submit.prevent="handleQuery"
+          >
+            <el-form-item prop="session_id" label="会话ID">
+              <el-input v-model="queryFormData.session_id" placeholder="请输入会话ID" clearable />
+            </el-form-item>
+            <el-form-item prop="type" label="类型">
+              <el-select
+                v-model="queryFormData.type"
+                placeholder="请选择类型"
+                style="width: 170px"
+                clearable
+              >
+                <el-option value="user" label="用户" />
+                <el-option value="assistant" label="助手" />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="content" label="内容">
+              <el-input v-model="queryFormData.content" placeholder="请输入内容" clearable />
+            </el-form-item>
+            <el-form-item v-if="isExpand" prop="created_time" label="创建时间">
+              <DatePicker
+                v-model="createdDateRange"
+                @update:model-value="handleCreatedDateRangeChange"
+              />
+            </el-form-item>
+            <!-- 查询、重置、展开/收起按钮 -->
+            <el-form-item>
+              <el-button
+                v-hasPerm="['module_example:demo:query']"
+                type="primary"
+                icon="search"
+                @click="handleQuery"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_example:demo:query']"
+                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>
       </template>
 
       <!-- 功能区域 -->
@@ -149,8 +147,8 @@
         :data="pageTableData"
         highlight-current-row
         class="data-table__content"
-        height="450"
-        max-height="450"
+        height="calc(100vh - 440px)"
+        max-height="calc(100vh - 440px)"
         border
         stripe
         @selection-change="handleSelectionChange"
@@ -196,7 +194,7 @@
           v-if="tableColumns.find((col) => col.prop === 'content')?.show"
           label="内容"
           prop="content"
-          min-width="300"
+          min-width="200"
           show-overflow-tooltip
         >
           <template #default="scope">
@@ -381,8 +379,6 @@ const isExpandable = ref(true);
 
 // 日期范围临时变量
 const createdDateRange = ref<[Date, Date] | []>([]);
-// 更新时间范围临时变量
-const updatedDateRange = ref<[Date, Date] | []>([]);
 
 // 处理创建时间范围变化
 function handleCreatedDateRangeChange(range: [Date, Date]) {
@@ -394,16 +390,6 @@ function handleCreatedDateRangeChange(range: [Date, Date]) {
   }
 }
 
-// 处理更新时间范围变化
-function handleUpdatedDateRangeChange(range: [Date, Date]) {
-  updatedDateRange.value = range;
-  if (range && range.length === 2) {
-    queryFormData.updated_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
-  } else {
-    queryFormData.updated_time = undefined;
-  }
-}
-
 // 分页表单
 const pageTableData = ref<MessageTable[]>([]);
 
diff --git a/frontend/src/views/module_ai/chat_session/index.vue b/frontend/src/views/module_ai/chat_session/index.vue
index 935bc8d7..a2f5472a 100644
--- a/frontend/src/views/module_ai/chat_session/index.vue
+++ b/frontend/src/views/module_ai/chat_session/index.vue
@@ -1,65 +1,6 @@
 <!-- AI智能助手会话列表 -->
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div v-show="visible" class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        label-suffix=":"
-        :inline="true"
-        @submit.prevent="handleQuery"
-      >
-        <el-form-item prop="title" label="标题">
-          <el-input v-model="queryFormData.title" placeholder="请输入标题" clearable />
-        </el-form-item>
-        <el-form-item v-if="isExpand" prop="created_time" label="创建时间">
-          <DatePicker
-            v-model="createdDateRange"
-            @update:model-value="handleCreatedDateRangeChange"
-          />
-        </el-form-item>
-        <el-form-item v-if="isExpand" prop="updated_time" label="更新时间">
-          <DatePicker
-            v-model="updatedDateRange"
-            @update:model-value="handleUpdatedDateRangeChange"
-          />
-        </el-form-item>
-        <!-- 查询、重置、展开/收起按钮 -->
-        <el-form-item>
-          <el-button
-            v-hasPerm="['module_example:demo:query']"
-            type="primary"
-            icon="search"
-            @click="handleQuery"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_example:demo:query']"
-            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 class="data-table">
       <template #header>
@@ -71,6 +12,69 @@
             </el-tooltip>
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div v-show="visible" class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            label-suffix=":"
+            :inline="true"
+            @submit.prevent="handleQuery"
+          >
+            <el-form-item prop="title" label="标题">
+              <el-input v-model="queryFormData.title" placeholder="请输入标题" clearable />
+            </el-form-item>
+            <el-form-item v-if="isExpand" prop="created_time" label="创建时间">
+              <DatePicker
+                v-model="createdDateRange"
+                @update:model-value="handleCreatedDateRangeChange"
+              />
+            </el-form-item>
+            <el-form-item v-if="isExpand" prop="updated_time" label="更新时间">
+              <DatePicker
+                v-model="updatedDateRange"
+                @update:model-value="handleUpdatedDateRangeChange"
+              />
+            </el-form-item>
+            <!-- 查询、重置、展开/收起按钮 -->
+            <el-form-item>
+              <el-button
+                v-hasPerm="['module_example:demo:query']"
+                type="primary"
+                icon="search"
+                @click="handleQuery"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_example:demo:query']"
+                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>
       </template>
 
       <!-- 功能区域 -->
@@ -135,8 +139,8 @@
         :data="pageTableData"
         highlight-current-row
         class="data-table__content"
-        height="450"
-        max-height="450"
+        height="calc(100vh - 440px)"
+        max-height="calc(100vh - 440px)"
         border
         stripe
         @selection-change="handleSelectionChange"
diff --git a/frontend/src/views/module_application/myapp/index.vue b/frontend/src/views/module_application/myapp/index.vue
index 4cecb7ab..3d20d2a1 100644
--- a/frontend/src/views/module_application/myapp/index.vue
+++ b/frontend/src/views/module_application/myapp/index.vue
@@ -1,79 +1,8 @@
 <!-- 我的应用管理 -->
 <template>
   <div class="app-container">
-    <!-- 顶部搜索和操作区域 -->
-    <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <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
-            style="width: 170px"
-          >
-            <el-option label="启用" :value="true" />
-            <el-option label="停用" :value="false" />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="isExpand" prop="created_id" label="创建人">
-          <UserTableSelect
-            v-model="queryFormData.created_id"
-            @confirm-click="handleConfirm"
-            @clear-click="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item v-if="isExpand" prop="updated_id" label="更新人">
-          <UserTableSelect
-            v-model="queryFormData.updated_id"
-            @confirm-click="handleConfirm"
-            @clear-click="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item class="search-buttons">
-          <el-button
-            v-hasPerm="['module_module_application:myapp:query']"
-            type="primary"
-            icon="search"
-            native-type="submit"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_application:myapp:query']"
-            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="app-grid-card">
+    <el-card shadow="hover" class="data-table">
       <template #header>
         <div class="card-header">
           <span>
@@ -91,6 +20,81 @@
             创建应用
           </el-button>
         </div>
+        <!-- 顶部搜索和操作区域 -->
+        <div class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleQuery"
+          >
+            <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
+                style="width: 170px"
+              >
+                <el-option label="启用" :value="true" />
+                <el-option label="停用" :value="false" />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="isExpand" prop="created_id" label="创建人">
+              <UserTableSelect
+                v-model="queryFormData.created_id"
+                @confirm-click="handleConfirm"
+                @clear-click="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item v-if="isExpand" prop="updated_id" label="更新人">
+              <UserTableSelect
+                v-model="queryFormData.updated_id"
+                @confirm-click="handleConfirm"
+                @clear-click="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item class="search-buttons">
+              <el-button
+                v-hasPerm="['module_module_application:myapp:query']"
+                type="primary"
+                icon="search"
+                native-type="submit"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_application:myapp:query']"
+                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>
       </template>
 
       <!-- 应用网格 - 优化布局 -->
@@ -504,11 +508,11 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-.app-grid-card {
+.data-table {
   position: relative;
   display: flex;
   flex-direction: column;
-  height: calc(100vh - 200px);
+  height: calc(100vh - 100px);
 
   :deep(.el-card__footer) {
     display: flex;
diff --git a/frontend/src/views/module_example/demo/index.vue b/frontend/src/views/module_example/demo/index.vue
index eea652a2..4e02189a 100644
--- a/frontend/src/views/module_example/demo/index.vue
+++ b/frontend/src/views/module_example/demo/index.vue
@@ -1,91 +1,6 @@
 <!-- 演示示例 -->
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div v-show="visible" class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        label-suffix=":"
-        :inline="true"
-        @submit.prevent="handleQuery"
-      >
-        <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: 170px"
-            clearable
-          >
-            <el-option value="0" label="启用" />
-            <el-option value="1" label="停用" />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="isExpand" prop="created_id" label="创建人">
-          <UserTableSelect
-            v-model="queryFormData.created_id"
-            @confirm-click="handleConfirm"
-            @clear-click="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item v-if="isExpand" prop="updated_id" label="更新人">
-          <UserTableSelect
-            v-model="queryFormData.updated_id"
-            @confirm-click="handleConfirm"
-            @clear-click="handleQuery"
-          />
-        </el-form-item>
-        <!-- 时间范围，收起状态下隐藏 -->
-        <el-form-item v-if="isExpand" prop="created_time" label="创建时间">
-          <DatePicker
-            v-model="createdDateRange"
-            @update:model-value="handleCreatedDateRangeChange"
-          />
-        </el-form-item>
-        <el-form-item v-if="isExpand" prop="updated_time" label="更新时间">
-          <DatePicker
-            v-model="updatedDateRange"
-            @update:model-value="handleUpdatedDateRangeChange"
-          />
-        </el-form-item>
-        <!-- 查询、重置、展开/收起按钮 -->
-        <el-form-item>
-          <el-button
-            v-hasPerm="['module_example:demo:query']"
-            type="primary"
-            icon="search"
-            @click="handleQuery"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_example:demo:query']"
-            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 class="data-table">
       <template #header>
@@ -97,6 +12,95 @@
             </el-tooltip>
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div v-show="visible" class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            label-suffix=":"
+            :inline="true"
+            @submit.prevent="handleQuery"
+          >
+            <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: 170px"
+                clearable
+              >
+                <el-option value="0" label="启用" />
+                <el-option value="1" label="停用" />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="isExpand" prop="created_id" label="创建人">
+              <UserTableSelect
+                v-model="queryFormData.created_id"
+                @confirm-click="handleConfirm"
+                @clear-click="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item v-if="isExpand" prop="updated_id" label="更新人">
+              <UserTableSelect
+                v-model="queryFormData.updated_id"
+                @confirm-click="handleConfirm"
+                @clear-click="handleQuery"
+              />
+            </el-form-item>
+            <!-- 时间范围，收起状态下隐藏 -->
+            <el-form-item v-if="isExpand" prop="created_time" label="创建时间">
+              <DatePicker
+                v-model="createdDateRange"
+                @update:model-value="handleCreatedDateRangeChange"
+              />
+            </el-form-item>
+            <el-form-item v-if="isExpand" prop="updated_time" label="更新时间">
+              <DatePicker
+                v-model="updatedDateRange"
+                @update:model-value="handleUpdatedDateRangeChange"
+              />
+            </el-form-item>
+            <!-- 查询、重置、展开/收起按钮 -->
+            <el-form-item>
+              <el-button
+                v-hasPerm="['module_example:demo:query']"
+                type="primary"
+                icon="search"
+                @click="handleQuery"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_example:demo:query']"
+                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>
       </template>
 
       <!-- 功能区域 -->
@@ -212,8 +216,8 @@
         :data="pageTableData"
         highlight-current-row
         class="data-table__content"
-        height="450"
-        max-height="450"
+        height="calc(100vh - 440px)"
+        max-height="calc(100vh - 440px)"
         border
         stripe
         @selection-change="handleSelectionChange"
diff --git a/frontend/src/views/module_generator/gencode/index.vue b/frontend/src/views/module_generator/gencode/index.vue
index 08d2e31f..60808f12 100644
--- a/frontend/src/views/module_generator/gencode/index.vue
+++ b/frontend/src/views/module_generator/gencode/index.vue
@@ -1,52 +1,5 @@
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div class="search-container">
-      <el-form
-        ref="queryRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <el-form-item label="表名称" prop="table_name">
-          <el-input
-            v-model="queryFormData.table_name"
-            placeholder="请输入表名称"
-            clearable
-            style="width: 200px"
-            @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="表描述" prop="table_comment">
-          <el-input
-            v-model="queryFormData.table_comment"
-            placeholder="请输入表描述"
-            clearable
-            style="width: 200px"
-            @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item class="search-buttons">
-          <el-button
-            v-hasPerm="['module_generator:gencode:query']"
-            type="primary"
-            icon="search"
-            native-type="submit"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_generator:gencode:query']"
-            icon="refresh"
-            @click="handleRefresh"
-          >
-            重置
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-
     <!-- 内容区域 -->
     <el-card class="data-table">
       <template #header>
@@ -58,6 +11,52 @@
             生成代码
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div class="search-container">
+          <el-form
+            ref="queryRef"
+            :model="queryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleQuery"
+          >
+            <el-form-item label="表名称" prop="table_name">
+              <el-input
+                v-model="queryFormData.table_name"
+                placeholder="请输入表名称"
+                clearable
+                style="width: 200px"
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="表描述" prop="table_comment">
+              <el-input
+                v-model="queryFormData.table_comment"
+                placeholder="请输入表描述"
+                clearable
+                style="width: 200px"
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item class="search-buttons">
+              <el-button
+                v-hasPerm="['module_generator:gencode:query']"
+                type="primary"
+                icon="search"
+                native-type="submit"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_generator:gencode:query']"
+                icon="refresh"
+                @click="handleRefresh"
+              >
+                重置
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
       </template>
 
       <!-- 功能区域 -->
@@ -147,8 +146,8 @@
         :data="tableList"
         highlight-current-row
         class="data-table__content"
-        height="450"
-        max-height="450"
+        height="calc(100vh - 440px)"
+        max-height="calc(100vh - 440px)"
         border
         stripe
         @selection-change="handleTableSelectionChange"
@@ -293,7 +292,7 @@
     </el-dialog>
 
     <!-- 导入表 -->
-    <el-dialog v-model="importVisible" title="导入表" width="800px" top="5vh" append-to-body>
+    <el-dialog v-model="importVisible" title="导入表" append-to-body>
       <el-form ref="queryRef" :model="importQueryFormData" :inline="true">
         <el-form-item label="表名称" prop="table_name">
           <el-input
@@ -802,16 +801,6 @@
         <el-button v-if="activeStep != 0" type="success" :icon="Back" @click="prevStep">
           上一步
         </el-button>
-        <el-button
-          v-if="activeStep != 2"
-          v-hasPerm="['module_generator:gencode:update']"
-          type="warning"
-          :icon="Edit"
-          :loading="loading"
-          @click="submitForm"
-        >
-          保存配置
-        </el-button>
         <el-button v-if="activeStep != 2" type="primary" @click="nextStep">
           下一步
           <el-icon class="el-icon--right"><Right /></el-icon>
@@ -864,7 +853,6 @@ import {
   FolderOpened,
   Back,
   Download,
-  Edit,
 } from "@element-plus/icons-vue";
 import GencodeAPI, {
   type GenTableSchema,
@@ -907,7 +895,6 @@ const table = ref<TableInstance>();
 const cmRef = ref<CmComponentRef>();
 const sqlRef = ref<CmComponentRef>();
 const basicInfo = ref<FormInstance>();
-const dragTable = ref<TableInstance>();
 
 // 状态管理
 const loading = ref(false);
@@ -1444,6 +1431,9 @@ async function handleCreateTable(sql: string): Promise<void> {
     createTableVisible.value = false;
     createContent.value = "";
     loadingData();
+    // 创建成功后自动打开导入弹窗
+    importVisible.value = true;
+    await getDbList();
   } catch (error) {
     console.error("创建表数据失败:", error);
   } finally {
@@ -1471,6 +1461,20 @@ async function handleImportTable(): Promise<void> {
     await GencodeAPI.importTable(tableNames);
     importVisible.value = false;
     loadingData(); // 导入成功后刷新已导入的表列表
+    // 导入成功后自动打开代码生成抽屉
+    if (tables.value.length === 1) {
+      // 只导入了一个表，刷新列表后自动打开该表的代码生成
+      await loadingData();
+      const importedTable = tableList.value.find(
+        (t) => t.table_name === tables.value[0].table_name
+      );
+      if (importedTable) {
+        await handlePreviewTable(importedTable);
+      }
+    } else {
+      // 导入了多个表，刷新列表
+      ElMessage.success(`成功导入 ${tables.value.length} 个表`);
+    }
   } catch (error) {
     console.error("导入表失败:", error);
   } finally {
@@ -1607,6 +1611,23 @@ async function submitForm() {
 // 下一步
 async function nextStep(): Promise<void> {
   if (activeStep.value < 3) {
+    // 在进入下一步前先保存当前配置
+    if (activeStep.value === 0) {
+      // 第一步：基础配置
+      const basicInfoValid = await basicInfo.value?.validate().catch(() => false);
+      if (!basicInfoValid) return;
+    } else if (activeStep.value === 1) {
+      // 第二步：字段配置
+      if (!info.columns || info.columns.length === 0) {
+        ElMessage.error("请配置字段信息");
+        return;
+      }
+    }
+
+    // 保存配置
+    const saved = await submitForm();
+    if (!saved) return;
+
     activeStep.value++;
 
     // 当从字段配置进入预览步骤时，自动加载预览数据
diff --git a/frontend/src/views/module_monitor/cache/index.vue b/frontend/src/views/module_monitor/cache/index.vue
index e4518894..0152e897 100644
--- a/frontend/src/views/module_monitor/cache/index.vue
+++ b/frontend/src/views/module_monitor/cache/index.vue
@@ -142,7 +142,8 @@
                 :loading="loading"
                 :data="cacheNames"
                 row-key="cache_name"
-                height="600"
+                height="calc(100vh - 290px)"
+                max-height="calc(100vh - 290px)"
                 border
               >
                 <template #empty>
@@ -215,7 +216,8 @@
               <el-table
                 :loading="subLoading"
                 :data="cacheKeys.map((key) => ({ cacheKey: key }))"
-                height="600"
+                height="calc(100vh - 290px)"
+                max-height="calc(100vh - 290px)"
                 row-key="cacheKey"
                 border
               >
@@ -298,7 +300,7 @@
                   <el-input
                     v-model="cacheForm.cache_value"
                     type="textarea"
-                    :rows="18"
+                    :rows="20"
                     readonly
                     placeholder="缓存内容"
                   />
@@ -537,6 +539,6 @@ onUnmounted(() => {
 
 <style scoped lang="scss">
 .chart-container {
-  height: 406px;
+  height: calc(100vh - 490px);
 }
 </style>
diff --git a/frontend/src/views/module_monitor/online/index.vue b/frontend/src/views/module_monitor/online/index.vue
index 734c2e90..a11491a1 100644
--- a/frontend/src/views/module_monitor/online/index.vue
+++ b/frontend/src/views/module_monitor/online/index.vue
@@ -1,45 +1,6 @@
 <!-- 在线用户 -->
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <el-form-item prop="ipaddr" label="IP地址">
-          <el-input v-model="queryFormData.ipaddr" placeholder="请输入IP地址" clearable />
-        </el-form-item>
-        <el-form-item prop="name" label="用户名">
-          <el-input v-model="queryFormData.name" placeholder="请输入用户名" clearable />
-        </el-form-item>
-        <el-form-item prop="login_location" label="登录位置">
-          <el-input v-model="queryFormData.login_location" placeholder="请输入登录位置" clearable />
-        </el-form-item>
-        <!-- 查询、重置、展开/收起按钮 -->
-        <el-form-item class="search-buttons">
-          <el-button
-            v-hasPerm="['module_monitor:online:query']"
-            type="primary"
-            icon="search"
-            native-type="submit"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_monitor:online:query']"
-            icon="refresh"
-            @click="handleResetQuery"
-          >
-            重置
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-
     <!-- 内容区域 -->
     <el-card class="data-table">
       <template #header>
@@ -51,6 +12,48 @@
             在线用户列表
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleQuery"
+          >
+            <el-form-item prop="ipaddr" label="IP地址">
+              <el-input v-model="queryFormData.ipaddr" placeholder="请输入IP地址" clearable />
+            </el-form-item>
+            <el-form-item prop="name" label="用户名">
+              <el-input v-model="queryFormData.name" placeholder="请输入用户名" clearable />
+            </el-form-item>
+            <el-form-item prop="login_location" label="登录位置">
+              <el-input
+                v-model="queryFormData.login_location"
+                placeholder="请输入登录位置"
+                clearable
+              />
+            </el-form-item>
+            <!-- 查询、重置、展开/收起按钮 -->
+            <el-form-item class="search-buttons">
+              <el-button
+                v-hasPerm="['module_monitor:online:query']"
+                type="primary"
+                icon="search"
+                native-type="submit"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_monitor:online:query']"
+                icon="refresh"
+                @click="handleResetQuery"
+              >
+                重置
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
       </template>
 
       <!-- 功能区域 -->
@@ -105,8 +108,8 @@
         :data="pageTableData"
         highlight-current-row
         class="data-table__content"
-        height="450"
-        max-height="450"
+        height="calc(100vh - 440px)"
+        max-height="calc(100vh - 440px)"
         border
         stripe
         @selection-change="handleSelectionChange"
diff --git a/frontend/src/views/module_monitor/resource/index.vue b/frontend/src/views/module_monitor/resource/index.vue
index a80297ed..8cca66b5 100644
--- a/frontend/src/views/module_monitor/resource/index.vue
+++ b/frontend/src/views/module_monitor/resource/index.vue
@@ -1,43 +1,5 @@
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <el-form-item prop="name" label="关键词">
-          <el-input
-            v-model="queryFormData.name"
-            placeholder="请输入文件名或目录名"
-            clearable
-            style="width: 200px"
-            @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item class="search-buttons">
-          <el-button
-            v-hasPerm="['module_monitor:resource:query']"
-            type="primary"
-            icon="search"
-            native-type="submit"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_monitor:resource:query']"
-            icon="refresh"
-            @click="handleResetQuery"
-          >
-            重置
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-
     <!-- 内容区域 -->
     <el-card class="data-table">
       <template #header>
@@ -63,6 +25,43 @@
             </el-breadcrumb>
           </div>
         </div>
+        <!-- 搜索区域 -->
+        <div class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleQuery"
+          >
+            <el-form-item prop="name" label="关键词">
+              <el-input
+                v-model="queryFormData.name"
+                placeholder="请输入文件名或目录名"
+                clearable
+                style="width: 200px"
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item class="search-buttons">
+              <el-button
+                v-hasPerm="['module_monitor:resource:query']"
+                type="primary"
+                icon="search"
+                native-type="submit"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_monitor:resource:query']"
+                icon="refresh"
+                @click="handleResetQuery"
+              >
+                重置
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
       </template>
 
       <!-- 功能区域 -->
@@ -154,8 +153,8 @@
         :data="fileList"
         row-key="file_url"
         class="data-table__content"
-        height="450"
-        max-height="450"
+        height="calc(100vh - 440px)"
+        max-height="calc(100vh - 440px)"
         border
         stripe
         @selection-change="handleSelectionChange"
diff --git a/frontend/src/views/module_system/dept/index.vue b/frontend/src/views/module_system/dept/index.vue
index a97b6b32..fe77caac 100644
--- a/frontend/src/views/module_system/dept/index.vue
+++ b/frontend/src/views/module_system/dept/index.vue
@@ -1,68 +1,6 @@
 <!-- 部门配置 -->
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <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
-          >
-            <el-option value="0" label="启用" />
-            <el-option value="1" label="停用" />
-          </el-select>
-        </el-form-item>
-        <!-- 时间范围，收起状态下隐藏 -->
-        <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
-          <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
-        </el-form-item>
-        <!-- 查询、重置、展开/收起按钮 -->
-        <el-form-item class="search-buttons">
-          <el-button
-            v-hasPerm="['module_system:dept:query']"
-            type="primary"
-            icon="search"
-            native-type="submit"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_system:dept:query']"
-            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 class="data-table">
       <template #header>
@@ -74,6 +12,72 @@
             部门列表
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleQuery"
+          >
+            <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
+              >
+                <el-option value="0" label="启用" />
+                <el-option value="1" label="停用" />
+              </el-select>
+            </el-form-item>
+            <!-- 时间范围，收起状态下隐藏 -->
+            <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
+              <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
+            </el-form-item>
+            <!-- 查询、重置、展开/收起按钮 -->
+            <el-form-item class="search-buttons">
+              <el-button
+                v-hasPerm="['module_system:dept:query']"
+                type="primary"
+                icon="search"
+                native-type="submit"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_system:dept:query']"
+                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>
       </template>
 
       <!-- 功能区域 -->
@@ -151,8 +155,8 @@
         :data="pageTableData"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
         class="data-table__content"
-        height="540"
-        max-height="540"
+        height="calc(100vh - 350px)"
+        max-height="calc(100vh - 350px)"
         border
         stripe
         @selection-change="handleSelectionChange"
diff --git a/frontend/src/views/module_system/dict/components/DataDrawer.vue b/frontend/src/views/module_system/dict/components/DataDrawer.vue
index 3ccbd21f..6a0903bf 100644
--- a/frontend/src/views/module_system/dict/components/DataDrawer.vue
+++ b/frontend/src/views/module_system/dict/components/DataDrawer.vue
@@ -5,55 +5,6 @@
     :title="'【' + props.dictLabel + '】字典数据'"
     :size="drawerSize"
   >
-    <!-- 搜索区域 -->
-    <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <el-form-item prop="dict_label" label="字典数据标签">
-          <el-input v-model="queryFormData.dict_label" placeholder="请输入字典标签" clearable />
-        </el-form-item>
-        <el-form-item prop="status" label="状态">
-          <el-select
-            v-model="queryFormData.status"
-            placeholder="请选择状态"
-            style="width: 167.5px"
-            clearable
-          >
-            <el-option value="0" label="启用" />
-            <el-option value="1" label="停用" />
-          </el-select>
-        </el-form-item>
-        <!-- 时间范围，收起状态下隐藏 -->
-        <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
-          <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
-        </el-form-item>
-        <!-- 查询、重置、展开/收起按钮 -->
-        <el-form-item class="search-buttons">
-          <el-button type="primary" icon="search" native-type="submit">查询</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 class="data-table">
       <template #header>
@@ -65,6 +16,59 @@
             字典数据列表
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleQuery"
+          >
+            <el-form-item prop="dict_label" label="字典数据标签">
+              <el-input v-model="queryFormData.dict_label" placeholder="请输入字典标签" clearable />
+            </el-form-item>
+            <el-form-item prop="status" label="状态">
+              <el-select
+                v-model="queryFormData.status"
+                placeholder="请选择状态"
+                style="width: 167.5px"
+                clearable
+              >
+                <el-option value="0" label="启用" />
+                <el-option value="1" label="停用" />
+              </el-select>
+            </el-form-item>
+            <!-- 时间范围，收起状态下隐藏 -->
+            <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
+              <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
+            </el-form-item>
+            <!-- 查询、重置、展开/收起按钮 -->
+            <el-form-item class="search-buttons">
+              <el-button type="primary" icon="search" native-type="submit">查询</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>
       </template>
 
       <!-- 功能区域 -->
@@ -140,7 +144,8 @@
         :data="pageTableData"
         highlight-current-row
         class="data-table__content"
-        height="460"
+        height="calc(100vh - 430px)"
+        max-height="calc(100vh - 430px)"
         border
         stripe
         @selection-change="handleSelectionChange"
diff --git a/frontend/src/views/module_system/dict/index.vue b/frontend/src/views/module_system/dict/index.vue
index d7851cf8..0ed891be 100644
--- a/frontend/src/views/module_system/dict/index.vue
+++ b/frontend/src/views/module_system/dict/index.vue
@@ -1,71 +1,6 @@
 <!-- 字典 -->
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <el-form-item prop="dict_name" label="字典名称">
-          <el-input v-model="queryFormData.dict_name" placeholder="请输入字典名称" clearable />
-        </el-form-item>
-        <el-form-item prop="dict_type" label="字典类型">
-          <el-input v-model="queryFormData.dict_type" placeholder="请输入字典类型" clearable />
-        </el-form-item>
-        <el-form-item prop="status" label="状态">
-          <el-select
-            v-model="queryFormData.status"
-            placeholder="请选择状态"
-            style="width: 167.5px"
-            clearable
-          >
-            <el-option value="0" label="启用" />
-            <el-option value="1" label="停用" />
-          </el-select>
-        </el-form-item>
-        <!-- 时间范围，收起状态下隐藏 -->
-        <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
-          <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
-        </el-form-item>
-        <!-- 查询、重置、展开/收起按钮 -->
-        <el-form-item class="search-buttons">
-          <el-button
-            v-hasPerm="['module_system:dict_type:query']"
-            type="primary"
-            icon="search"
-            native-type="submit"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_system:dict_type:query']"
-            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 class="data-table">
       <template #header>
@@ -77,6 +12,75 @@
             字典列表
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleQuery"
+          >
+            <el-form-item prop="dict_name" label="字典名称">
+              <el-input v-model="queryFormData.dict_name" placeholder="请输入字典名称" clearable />
+            </el-form-item>
+            <el-form-item prop="dict_type" label="字典类型">
+              <el-input v-model="queryFormData.dict_type" placeholder="请输入字典类型" clearable />
+            </el-form-item>
+            <el-form-item prop="status" label="状态">
+              <el-select
+                v-model="queryFormData.status"
+                placeholder="请选择状态"
+                style="width: 167.5px"
+                clearable
+              >
+                <el-option value="0" label="启用" />
+                <el-option value="1" label="停用" />
+              </el-select>
+            </el-form-item>
+            <!-- 时间范围，收起状态下隐藏 -->
+            <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
+              <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
+            </el-form-item>
+            <!-- 查询、重置、展开/收起按钮 -->
+            <el-form-item class="search-buttons">
+              <el-button
+                v-hasPerm="['module_system:dict_type:query']"
+                type="primary"
+                icon="search"
+                native-type="submit"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_system:dict_type:query']"
+                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>
       </template>
 
       <!-- 功能区域 -->
@@ -170,8 +174,8 @@
         :data="pageTableData"
         highlight-current-row
         class="data-table__content"
-        height="450"
-        max-height="450"
+        height="calc(100vh - 440px)"
+        max-height="calc(100vh - 440px)"
         border
         stripe
         @selection-change="handleSelectionChange"
diff --git a/frontend/src/views/module_system/log/index.vue b/frontend/src/views/module_system/log/index.vue
index 9cfee018..c5eee4ef 100644
--- a/frontend/src/views/module_system/log/index.vue
+++ b/frontend/src/views/module_system/log/index.vue
@@ -1,75 +1,6 @@
 <!-- 日志管理 -->
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <el-form-item prop="request_path" label="请求路径">
-          <el-input v-model="queryFormData.request_path" 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="created_id" label="创建人">
-          <UserTableSelect
-            v-model="queryFormData.created_id"
-            @confirm-click="handleConfirm"
-            @clear-click="handleQuery"
-          />
-        </el-form-item>
-        <!-- 时间范围，收起状态下隐藏 -->
-        <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
-          <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
-        </el-form-item>
-        <!-- 查询、重置、展开/收起按钮 -->
-        <el-form-item class="search-buttons">
-          <el-button
-            v-hasPerm="['module_system:log:query']"
-            type="primary"
-            icon="search"
-            native-type="submit"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_system:log:query']"
-            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 class="data-table">
       <template #header>
@@ -81,6 +12,83 @@
             日志列表
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleQuery"
+          >
+            <el-form-item prop="request_path" label="请求路径">
+              <el-input
+                v-model="queryFormData.request_path"
+                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="created_id" label="创建人">
+              <UserTableSelect
+                v-model="queryFormData.created_id"
+                @confirm-click="handleConfirm"
+                @clear-click="handleQuery"
+              />
+            </el-form-item>
+            <!-- 时间范围，收起状态下隐藏 -->
+            <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
+              <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
+            </el-form-item>
+            <!-- 查询、重置、展开/收起按钮 -->
+            <el-form-item class="search-buttons">
+              <el-button
+                v-hasPerm="['module_system:log:query']"
+                type="primary"
+                icon="search"
+                native-type="submit"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_system:log:query']"
+                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>
       </template>
 
       <!-- 功能区域 -->
@@ -135,8 +143,8 @@
         :data="pageTableData"
         highlight-current-row
         class="data-table__content"
-        height="450"
-        max-height="450"
+        height="calc(100vh - 440px)"
+        max-height="calc(100vh - 440px)"
         border
         stripe
         @selection-change="handleSelectionChange"
diff --git a/frontend/src/views/module_system/menu/index.vue b/frontend/src/views/module_system/menu/index.vue
index 2de9635a..58cb1c96 100644
--- a/frontend/src/views/module_system/menu/index.vue
+++ b/frontend/src/views/module_system/menu/index.vue
@@ -1,68 +1,6 @@
 <!-- 菜单管理 -->
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <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
-          >
-            <el-option value="0" label="启用" />
-            <el-option value="1" label="停用" />
-          </el-select>
-        </el-form-item>
-        <!-- 时间范围，收起状态下隐藏 -->
-        <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
-          <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
-        </el-form-item>
-        <!-- 查询、重置、展开/收起按钮 -->
-        <el-form-item class="search-buttons">
-          <el-button
-            v-hasPerm="['module_system:menu:query']"
-            type="primary"
-            icon="search"
-            native-type="submit"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_system:menu:query']"
-            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 class="data-table">
       <template #header>
@@ -74,6 +12,72 @@
             菜单列表
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleQuery"
+          >
+            <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
+              >
+                <el-option value="0" label="启用" />
+                <el-option value="1" label="停用" />
+              </el-select>
+            </el-form-item>
+            <!-- 时间范围，收起状态下隐藏 -->
+            <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
+              <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
+            </el-form-item>
+            <!-- 查询、重置、展开/收起按钮 -->
+            <el-form-item class="search-buttons">
+              <el-button
+                v-hasPerm="['module_system:menu:query']"
+                type="primary"
+                icon="search"
+                native-type="submit"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_system:menu:query']"
+                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>
       </template>
 
       <!-- 功能区域 -->
@@ -145,8 +149,8 @@
         :data="pageTableData"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
         class="data-table__content"
-        height="540"
-        max-height="540"
+        height="calc(100vh - 350px)"
+        max-height="calc(100vh - 350px)"
         border
         stripe
         @selection-change="handleSelectionChange"
diff --git a/frontend/src/views/module_system/notice/index.vue b/frontend/src/views/module_system/notice/index.vue
index 4b96aba6..415ab785 100644
--- a/frontend/src/views/module_system/notice/index.vue
+++ b/frontend/src/views/module_system/notice/index.vue
@@ -1,90 +1,6 @@
 <!-- 公告通知配置 -->
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <el-form-item prop="notice_title" label="标题">
-          <el-input v-model="queryFormData.notice_title" placeholder="请输入标题" clearable />
-        </el-form-item>
-        <el-form-item prop="notice_type" label="类型">
-          <el-select
-            v-model="queryFormData.notice_type"
-            placeholder="请选择类型"
-            style="width: 167.5px"
-            clearable
-          >
-            <el-option
-              v-for="item in dictStore.getDictArray('sys_notice_type')"
-              :key="item.dict_value"
-              :value="item.dict_value"
-              :label="item.dict_label"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="status" label="状态">
-          <el-select
-            v-model="queryFormData.status"
-            placeholder="请选择状态"
-            style="width: 167.5px"
-            clearable
-          >
-            <el-option value="0" label="启用" />
-            <el-option value="1" label="停用" />
-          </el-select>
-        </el-form-item>
-        <!-- 时间范围，收起状态下隐藏 -->
-        <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
-          <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
-        </el-form-item>
-        <el-form-item v-if="isExpand" prop="created_id" label="创建人">
-          <UserTableSelect
-            v-model="queryFormData.created_id"
-            @confirm-click="handleConfirm"
-            @clear-click="handleQuery"
-          />
-        </el-form-item>
-        <!-- 查询、重置、展开/收起按钮 -->
-        <el-form-item class="search-buttons">
-          <el-button
-            v-hasPerm="['module_system:notice:query']"
-            type="primary"
-            icon="search"
-            native-type="submit"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_system:notice:query']"
-            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 class="data-table">
       <template #header>
@@ -96,6 +12,94 @@
             公告通知列表
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleQuery"
+          >
+            <el-form-item prop="notice_title" label="标题">
+              <el-input v-model="queryFormData.notice_title" placeholder="请输入标题" clearable />
+            </el-form-item>
+            <el-form-item prop="notice_type" label="类型">
+              <el-select
+                v-model="queryFormData.notice_type"
+                placeholder="请选择类型"
+                style="width: 167.5px"
+                clearable
+              >
+                <el-option
+                  v-for="item in dictStore.getDictArray('sys_notice_type')"
+                  :key="item.dict_value"
+                  :value="item.dict_value"
+                  :label="item.dict_label"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="status" label="状态">
+              <el-select
+                v-model="queryFormData.status"
+                placeholder="请选择状态"
+                style="width: 167.5px"
+                clearable
+              >
+                <el-option value="0" label="启用" />
+                <el-option value="1" label="停用" />
+              </el-select>
+            </el-form-item>
+            <!-- 时间范围，收起状态下隐藏 -->
+            <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
+              <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
+            </el-form-item>
+            <el-form-item v-if="isExpand" prop="created_id" label="创建人">
+              <UserTableSelect
+                v-model="queryFormData.created_id"
+                @confirm-click="handleConfirm"
+                @clear-click="handleQuery"
+              />
+            </el-form-item>
+            <!-- 查询、重置、展开/收起按钮 -->
+            <el-form-item class="search-buttons">
+              <el-button
+                v-hasPerm="['module_system:notice:query']"
+                type="primary"
+                icon="search"
+                native-type="submit"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_system:notice:query']"
+                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>
       </template>
 
       <!-- 功能区域 -->
@@ -189,14 +193,14 @@
         :data="pageTableData"
         highlight-current-row
         class="data-table__content"
-        height="450"
-        max-height="450"
+        height="calc(100vh - 440px)"
+        max-height="calc(100vh - 440px)"
         border
         stripe
         @selection-change="handleSelectionChange"
       >
         <template #empty>
-          <el-empty :image-size="80" description="暂无数据" />
+          <el-empty :image-size="70" description="暂无数据" />
         </template>
         <el-table-column
           v-if="tableColumns.find((col) => col.prop === 'selection')?.show"
diff --git a/frontend/src/views/module_system/param/index.vue b/frontend/src/views/module_system/param/index.vue
index 99eda3d7..d740d32f 100644
--- a/frontend/src/views/module_system/param/index.vue
+++ b/frontend/src/views/module_system/param/index.vue
@@ -1,70 +1,6 @@
 <!-- 系统配置 -->
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <el-form-item prop="config_name" label="配置名称">
-          <el-input v-model="queryFormData.config_name" placeholder="请输入配置名称" clearable />
-        </el-form-item>
-        <el-form-item prop="config_key" label="配置键名">
-          <el-input v-model="queryFormData.config_key" placeholder="请输入配置键名" clearable />
-        </el-form-item>
-        <el-form-item prop="config_type" label="系统内置">
-          <el-select
-            v-model="queryFormData.config_type"
-            placeholder="请选择系统内置"
-            style="width: 167.5px"
-            clearable
-          >
-            <el-option value="true" label="是" />
-            <el-option value="false" label="否" />
-          </el-select>
-        </el-form-item>
-        <!-- 时间范围，收起状态下隐藏 -->
-        <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
-          <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
-        </el-form-item>
-        <el-form-item class="search-buttons">
-          <el-button
-            v-hasPerm="['module_system:param:query']"
-            type="primary"
-            icon="search"
-            native-type="submit"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_system:param:query']"
-            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 class="data-table">
       <template #header>
@@ -76,6 +12,78 @@
             系统配置列表
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleQuery"
+          >
+            <el-form-item prop="config_name" label="配置名称">
+              <el-input
+                v-model="queryFormData.config_name"
+                placeholder="请输入配置名称"
+                clearable
+              />
+            </el-form-item>
+            <el-form-item prop="config_key" label="配置键名">
+              <el-input v-model="queryFormData.config_key" placeholder="请输入配置键名" clearable />
+            </el-form-item>
+            <el-form-item prop="config_type" label="系统内置">
+              <el-select
+                v-model="queryFormData.config_type"
+                placeholder="请选择系统内置"
+                style="width: 167.5px"
+                clearable
+              >
+                <el-option value="true" label="是" />
+                <el-option value="false" label="否" />
+              </el-select>
+            </el-form-item>
+            <!-- 时间范围，收起状态下隐藏 -->
+            <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
+              <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
+            </el-form-item>
+            <el-form-item class="search-buttons">
+              <el-button
+                v-hasPerm="['module_system:param:query']"
+                type="primary"
+                icon="search"
+                native-type="submit"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_system:param:query']"
+                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>
       </template>
 
       <!-- 功能区域 -->
@@ -156,8 +164,8 @@
         :data="pageTableData"
         highlight-current-row
         class="data-table__content"
-        height="450"
-        max-height="450"
+        height="calc(100vh - 440px)"
+        max-height="calc(100vh - 440px)"
         border
         stripe
         @selection-change="handleSelectionChange"
diff --git a/frontend/src/views/module_system/position/index.vue b/frontend/src/views/module_system/position/index.vue
index 4647e77c..92e597ec 100644
--- a/frontend/src/views/module_system/position/index.vue
+++ b/frontend/src/views/module_system/position/index.vue
@@ -1,75 +1,6 @@
 <!-- 岗位管理 -->
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <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
-          >
-            <el-option value="0" label="启用" />
-            <el-option value="1" label="停用" />
-          </el-select>
-        </el-form-item>
-        <!-- 时间范围，收起状态下隐藏 -->
-        <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
-          <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
-        </el-form-item>
-        <el-form-item v-if="isExpand" prop="created_id" label="创建人">
-          <UserTableSelect
-            v-model="queryFormData.created_id"
-            @confirm-click="handleConfirm"
-            @clear-click="handleQuery"
-          />
-        </el-form-item>
-        <!-- 查询、重置、展开/收起按钮 -->
-        <el-form-item class="search-buttons">
-          <el-button
-            v-hasPerm="['module_system:position:query']"
-            type="primary"
-            icon="search"
-            native-type="submit"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_system:position:query']"
-            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 class="data-table">
       <template #header>
@@ -81,6 +12,79 @@
             岗位列表
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleQuery"
+          >
+            <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
+              >
+                <el-option value="0" label="启用" />
+                <el-option value="1" label="停用" />
+              </el-select>
+            </el-form-item>
+            <!-- 时间范围，收起状态下隐藏 -->
+            <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
+              <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
+            </el-form-item>
+            <el-form-item v-if="isExpand" prop="created_id" label="创建人">
+              <UserTableSelect
+                v-model="queryFormData.created_id"
+                @confirm-click="handleConfirm"
+                @clear-click="handleQuery"
+              />
+            </el-form-item>
+            <!-- 查询、重置、展开/收起按钮 -->
+            <el-form-item class="search-buttons">
+              <el-button
+                v-hasPerm="['module_system:position:query']"
+                type="primary"
+                icon="search"
+                native-type="submit"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_system:position:query']"
+                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>
       </template>
 
       <!-- 功能区域 -->
@@ -174,8 +178,8 @@
         :data="pageTableData"
         highlight-current-row
         class="data-table__content"
-        height="450"
-        max-height="450"
+        height="calc(100vh - 440px)"
+        max-height="calc(100vh - 440px)"
         border
         stripe
         @selection-change="handleSelectionChange"
diff --git a/frontend/src/views/module_system/role/components/PermissonDrawer.vue b/frontend/src/views/module_system/role/components/PermissonDrawer.vue
index fb8a823b..05fab225 100644
--- a/frontend/src/views/module_system/role/components/PermissonDrawer.vue
+++ b/frontend/src/views/module_system/role/components/PermissonDrawer.vue
@@ -109,7 +109,7 @@
           </div>
         </div>
 
-        <div class="mt-5 max-h-[65vh] b-1 b-solid b-[#e5e7eb] p-10px overflow-auto box-border">
+        <div class="mt-5 max-h-[70vh] b-1 b-solid b-[#e5e7eb] p-10px overflow-auto box-border">
           <el-tree
             ref="permTreeRef"
             node-key="value"
diff --git a/frontend/src/views/module_system/role/index.vue b/frontend/src/views/module_system/role/index.vue
index 562fd3c4..72a36f0a 100644
--- a/frontend/src/views/module_system/role/index.vue
+++ b/frontend/src/views/module_system/role/index.vue
@@ -1,68 +1,6 @@
 <!-- 角色管理 -->
 <template>
   <div class="app-container">
-    <!-- 搜索区域 -->
-    <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <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
-          >
-            <el-option value="true" label="启用" />
-            <el-option value="false" label="停用" />
-          </el-select>
-        </el-form-item>
-        <!-- 时间范围，收起状态下隐藏 -->
-        <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
-          <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
-        </el-form-item>
-        <!-- 查询、重置、展开/收起按钮 -->
-        <el-form-item class="search-buttons">
-          <el-button
-            v-hasPerm="['module_system:role:query']"
-            type="primary"
-            icon="search"
-            native-type="submit"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_system:role:query']"
-            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 class="data-table">
       <template #header>
@@ -74,6 +12,72 @@
             角色管理列表
           </span>
         </div>
+        <!-- 搜索区域 -->
+        <div class="search-container">
+          <el-form
+            ref="queryFormRef"
+            :model="queryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleQuery"
+          >
+            <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
+              >
+                <el-option value="true" label="启用" />
+                <el-option value="false" label="停用" />
+              </el-select>
+            </el-form-item>
+            <!-- 时间范围，收起状态下隐藏 -->
+            <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
+              <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
+            </el-form-item>
+            <!-- 查询、重置、展开/收起按钮 -->
+            <el-form-item class="search-buttons">
+              <el-button
+                v-hasPerm="['module_system:role:query']"
+                type="primary"
+                icon="search"
+                native-type="submit"
+              >
+                查询
+              </el-button>
+              <el-button
+                v-hasPerm="['module_system:role:query']"
+                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>
       </template>
 
       <!-- 功能区域 -->
@@ -166,8 +170,8 @@
         :data="pageTableData"
         highlight-current-row
         class="data-table__content"
-        height="450"
-        max-height="450"
+        height="calc(100vh - 440px)"
+        max-height="calc(100vh - 440px)"
         border
         stripe
         @selection-change="handleSelectionChange"
diff --git a/frontend/src/views/module_system/user/index.vue b/frontend/src/views/module_system/user/index.vue
index 37264ddb..0dd049dd 100644
--- a/frontend/src/views/module_system/user/index.vue
+++ b/frontend/src/views/module_system/user/index.vue
@@ -9,83 +9,6 @@
 
       <!-- 用户列表 -->
       <el-col :span="20">
-        <!-- 搜索区域 -->
-        <div class="search-container">
-          <el-form
-            ref="queryFormRef"
-            :model="queryFormData"
-            :inline="true"
-            label-suffix=":"
-            @submit.prevent="handleQuery"
-          >
-            <el-form-item prop="username" label="账号">
-              <el-input v-model="queryFormData.username" placeholder="请输入账号" clearable />
-            </el-form-item>
-            <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
-              >
-                <el-option value="0" label="启用" />
-                <el-option value="1" label="停用" />
-              </el-select>
-            </el-form-item>
-            <!-- 时间范围，收起状态下隐藏 -->
-            <el-form-item v-if="isExpand" prop="start_time" label="创建时间">
-              <DatePicker v-model="dateRange" @update:model-value="handleDateRangeChange" />
-            </el-form-item>
-            <el-form-item v-if="isExpand" prop="created_id" label="创建人">
-              <UserTableSelect
-                v-model="queryFormData.created_id"
-                @confirm-click="handleConfirm"
-                @clear-click="handleQuery"
-              />
-            </el-form-item>
-            <!-- 查询、重置、展开/收起按钮 -->
-            <el-form-item class="search-buttons">
-              <el-button
-                v-hasPerm="['module_system:user:query']"
-                type="primary"
-                icon="search"
-                native-type="submit"
-              >
-                查询
-              </el-button>
-              <el-button
-                v-hasPerm="['module_system:user:query']"
-                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 class="data-table">
           <template #header>
             <div class="card-header">
@@ -96,6 +19,78 @@
                 用户列表
               </span>
             </div>
+            <!-- 搜索区域 -->
+            <div class="search-container">
+              <el-form
+                ref="queryFormRef"
+                :model="queryFormData"
+                :inline="true"
+                label-suffix=":"
+                @submit.prevent="handleQuery"
+              >
+                <el-form-item prop="username" label="账号">
+                  <el-input v-model="queryFormData.username" placeholder="请输入账号" clearable />
+                </el-form-item>
+                <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
+                  >
+                    <el-option value="0" label="启用" />
+                    <el-option value="1" label="停用" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item v-if="isExpand" prop="created_id" label="创建人">
+                  <UserTableSelect
+                    v-model="queryFormData.created_id"
+                    @confirm-click="handleConfirm"
+                    @clear-click="handleQuery"
+                  />
+                </el-form-item>
+                <!-- 查询、重置、展开/收起按钮 -->
+                <el-form-item class="search-buttons">
+                  <el-button
+                    v-hasPerm="['module_system:user:query']"
+                    type="primary"
+                    icon="search"
+                    native-type="submit"
+                  >
+                    查询
+                  </el-button>
+                  <el-button
+                    v-hasPerm="['module_system:user:query']"
+                    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>
           </template>
 
           <!-- 功能区域 -->
@@ -194,8 +189,8 @@
             :data="pageTableData"
             highlight-current-row
             class="data-table__content"
-            height="488"
-            max-height="488"
+            height="calc(100vh - 445px)"
+            max-height="calc(100vh - 445px)"
             border
             stripe
             @selection-change="handleSelectionChange"
@@ -228,13 +223,6 @@
                 </el-tag>
               </template>
             </el-table-column>
-            <el-table-column label="是否超管" prop="is_superuser" min-width="100">
-              <template #default="scope">
-                <el-tag :type="scope.row.is_superuser ? 'success' : 'info'">
-                  {{ scope.row.is_superuser ? "是" : "否" }}
-                </el-tag>
-              </template>
-            </el-table-column>
             <el-table-column label="部门" prop="dept" min-width="100">
               <template #default="scope">
                 {{ scope.row.dept ? scope.row.dept.name : "" }}
@@ -247,21 +235,8 @@
                 <el-tag v-else type="info">未知</el-tag>
               </template>
             </el-table-column>
-
-            <el-table-column label="手机号" prop="mobile" min-width="160" />
-            <el-table-column label="邮箱" prop="email" min-width="160" />
-            <el-table-column label="创建时间" prop="created_time" min-width="200" />
-            <el-table-column label="更新时间" prop="updated_time" min-width="200" />
-            <el-table-column label="创建人" prop="created_id" min-width="120">
-              <template #default="scope">
-                {{ scope.row.created_by?.name }}
-              </template>
-            </el-table-column>
-            <el-table-column label="更新人" prop="updated_id" min-width="120">
-              <template #default="scope">
-                {{ scope.row.updated_by?.name }}
-              </template>
-            </el-table-column>
+            <el-table-column label="创建时间" prop="created_time" min-width="160" />
+            <el-table-column label="更新时间" prop="updated_time" min-width="160" />
             <el-table-column fixed="right" label="操作" align="center" min-width="280">
               <template #default="scope">
                 <el-button
@@ -571,7 +546,6 @@ import { formatTree } from "@/utils/common";
 import PositionAPI from "@/api/module_system/position";
 import DeptAPI from "@/api/module_system/dept";
 import RoleAPI from "@/api/module_system/role";
-import { formatToDateTime } from "@/utils/dateUtil";
 
 import DeptTree from "./components/DeptTree.vue";
 import UserTableSelect from "./components/UserTableSelect.vue";
@@ -721,16 +695,6 @@ function handleConfirm() {
   handleQuery();
 }
 
-// 处理日期范围变化
-function handleDateRangeChange(range: [Date, Date]) {
-  dateRange.value = range;
-  if (range && range.length === 2) {
-    queryFormData.created_time = [formatToDateTime(range[0]), formatToDateTime(range[1])];
-  } else {
-    queryFormData.created_time = undefined;
-  }
-}
-
 // 列表刷新
 async function handleRefresh() {
   await loadingData();
diff --git a/frontend/src/views/module_task/job/index.vue b/frontend/src/views/module_task/job/index.vue
index 04108d94..24dd0156 100644
--- a/frontend/src/views/module_task/job/index.vue
+++ b/frontend/src/views/module_task/job/index.vue
@@ -4,7 +4,7 @@
       <template #header>
         <div class="card-header">
           <div class="status-content">
-            <span>任务列表</span>
+            <span>调度器任务列表</span>
             <div class="status-item">
               <span class="label">状态：</span>
               <el-tag :type="getSchedulerStatusType(schedulerStatus.status)" size="large">
@@ -23,7 +23,7 @@
             </div>
             <div class="status-actions">
               <el-button
-                v-hasPerm="['module_task:job:update']"
+                v-hasPerm="['module_task:job:scheduler']"
                 type="success"
                 icon="VideoPlay"
                 :disabled="schedulerStatus.status !== '停止'"
@@ -32,7 +32,7 @@
                 启动
               </el-button>
               <el-button
-                v-hasPerm="['module_task:job:update']"
+                v-hasPerm="['module_task:job:scheduler']"
                 type="warning"
                 icon="VideoPause"
                 :disabled="schedulerStatus.status !== '运行中'"
@@ -41,7 +41,7 @@
                 暂停
               </el-button>
               <el-button
-                v-hasPerm="['module_task:job:update']"
+                v-hasPerm="['module_task:job:scheduler']"
                 type="primary"
                 icon="RefreshRight"
                 :disabled="schedulerStatus.status !== '暂停'"
@@ -50,7 +50,7 @@
                 恢复
               </el-button>
               <el-button
-                v-hasPerm="['module_task:job:update']"
+                v-hasPerm="['module_task:job:scheduler']"
                 type="danger"
                 icon="SwitchButton"
                 :disabled="schedulerStatus.status === '停止'"
@@ -59,7 +59,7 @@
                 关闭
               </el-button>
               <el-button
-                v-hasPerm="['module_task:job:delete']"
+                v-hasPerm="['module_task:job:task']"
                 type="danger"
                 icon="Delete"
                 :disabled="schedulerStatus.job_count === 0"
@@ -76,234 +76,189 @@
                 控制台
               </el-button>
               <el-button
-                v-hasPerm="['module_task:job:update']"
-                type="warning"
+                v-hasPerm="['module_task:job:scheduler']"
+                type="primary"
                 icon="Refresh"
                 @click="handleSyncJobs"
               >
                 同步
               </el-button>
+              <el-button
+                v-hasPerm="['module_task:job:update']"
+                type="warning"
+                icon="Refresh"
+                @click="handleRefresh"
+              >
+                刷新
+              </el-button>
             </div>
           </div>
+          <div class="search-container">
+            <el-form
+              ref="queryFormRef"
+              :model="queryFormData"
+              :inline="true"
+              label-suffix=":"
+              @submit.prevent="handleQuery"
+            >
+              <el-form-item prop="name" label="任务名称">
+                <el-input
+                  v-model="queryFormData.name"
+                  placeholder="请输入任务名称"
+                  clearable
+                  style="width: 150px"
+                />
+              </el-form-item>
+              <el-form-item prop="status" label="任务状态">
+                <el-select
+                  v-model="queryFormData.status"
+                  placeholder="请选择状态"
+                  clearable
+                  style="width: 150px"
+                >
+                  <el-option value="运行中" label="运行中" />
+                  <el-option value="暂停" label="暂停" />
+                  <el-option value="停止" label="停止" />
+                </el-select>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="search" native-type="submit">查询</el-button>
+                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
         </div>
       </template>
 
-      <div class="search-container">
-        <el-form
-          ref="queryFormRef"
-          :model="queryFormData"
-          :inline="true"
-          label-suffix=":"
-          @submit.prevent="handleQuery"
-        >
-          <el-form-item prop="job_name" label="任务名称">
-            <el-input v-model="queryFormData.job_name" placeholder="请输入任务名称" clearable />
-          </el-form-item>
-          <el-form-item prop="status" label="执行状态">
-            <el-select
-              v-model="queryFormData.status"
-              placeholder="请选择状态"
-              clearable
-              style="width: 120px"
-            >
-              <el-option value="pending" label="待执行" />
-              <el-option value="running" label="执行中" />
-              <el-option value="success" label="成功" />
-              <el-option value="failed" label="失败" />
-              <el-option value="timeout" label="超时" />
-              <el-option value="cancelled" label="已取消" />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="trigger_type" label="触发方式">
-            <el-select
-              v-model="queryFormData.trigger_type"
-              placeholder="请选择"
-              clearable
-              style="width: 120px"
-            >
-              <el-option value="cron" label="Cron表达式" />
-              <el-option value="interval" label="时间间隔" />
-              <el-option value="date" label="固定日期" />
-              <el-option value="manual" label="一次性任务" />
-            </el-select>
-          </el-form-item>
-          <el-form-item class="search-buttons">
-            <el-button
-              v-hasPerm="['module_task:job:query']"
-              type="primary"
-              icon="search"
-              native-type="submit"
-            >
-              查询
-            </el-button>
-            <el-button
-              v-hasPerm="['module_task:job:query']"
-              icon="refresh"
-              @click="handleResetQuery"
-            >
-              重置
-            </el-button>
-          </el-form-item>
-        </el-form>
+      <div v-loading="loading" class="job-cards-container">
+        <el-empty v-if="schedulerJobs.length === 0" :image-size="80" description="暂无数据" />
+        <el-row v-else :gutter="16">
+          <el-col
+            v-for="(job, index) in schedulerJobs"
+            :key="job.id"
+            :xs="24"
+            :sm="12"
+            :md="8"
+            :lg="6"
+            class="job-card-col"
+          >
+            <el-card class="job-card" shadow="hover">
+              <template #header>
+                <div class="job-card-header">
+                  <div class="job-card-title">
+                    <span class="job-index">{{ index + 1 }}</span>
+                    <span class="job-name" :title="job.name">{{ job.name }}</span>
+                  </div>
+                  <el-tag :type="getJobStatusType(job.status)" size="small">
+                    {{ getJobStatusLabel(job.status) }}
+                  </el-tag>
+                </div>
+              </template>
+
+              <div class="job-card-body">
+                <div class="job-info-item">
+                  <span class="job-info-label">任务ID:</span>
+                  <span class="job-info-value">{{ job.id }}</span>
+                </div>
+                <div class="job-info-item">
+                  <span class="job-info-label">触发器:</span>
+                  <el-tag
+                    v-if="job.trigger.includes('cron')"
+                    type="primary"
+                    size="small"
+                    class="job-trigger-tag"
+                  >
+                    <el-icon><Clock /></el-icon>
+                    {{ formatTrigger(job.trigger) }}
+                  </el-tag>
+                  <el-tag
+                    v-else-if="job.trigger.includes('interval')"
+                    type="success"
+                    size="small"
+                    class="job-trigger-tag"
+                  >
+                    <el-icon><Timer /></el-icon>
+                    {{ formatTrigger(job.trigger) }}
+                  </el-tag>
+                  <el-tag
+                    v-else-if="job.trigger.includes('date')"
+                    type="warning"
+                    size="small"
+                    class="job-trigger-tag"
+                  >
+                    <el-icon><Calendar /></el-icon>
+                    {{ formatTrigger(job.trigger) }}
+                  </el-tag>
+                  <el-tag v-else type="info" size="small" class="job-trigger-tag">
+                    {{ formatTrigger(job.trigger) }}
+                  </el-tag>
+                </div>
+                <div class="job-info-item">
+                  <span class="job-info-label">下次执行:</span>
+                  <span class="job-info-value">{{ job.next_run_time || "无" }}</span>
+                </div>
+              </div>
+
+              <template #footer>
+                <div class="job-card-footer">
+                  <el-button
+                    v-if="job.status === '暂停中'"
+                    v-hasPerm="['module_task:job:task']"
+                    type="primary"
+                    size="small"
+                    icon="VideoPlay"
+                    @click="handleResumeJob(job.id)"
+                  >
+                    恢复
+                  </el-button>
+                  <el-button
+                    v-if="job.status === '运行中'"
+                    v-hasPerm="['module_task:job:task']"
+                    type="warning"
+                    size="small"
+                    icon="VideoPause"
+                    @click="handlePauseJob(job.id)"
+                  >
+                    暂停
+                  </el-button>
+                  <el-button
+                    v-if="job.status !== '已停止' && job.status !== '未知'"
+                    v-hasPerm="['module_task:job:task']"
+                    type="success"
+                    size="small"
+                    icon="CaretRight"
+                    @click="handleRunJobNow(job.id)"
+                  >
+                    立即调试
+                  </el-button>
+                  <el-button
+                    v-if="job.status !== '未知'"
+                    v-hasPerm="['module_task:job:task']"
+                    type="danger"
+                    size="small"
+                    icon="Close"
+                    @click="handleRemoveJob(job.id)"
+                  >
+                    移除
+                  </el-button>
+                  <el-button
+                    v-hasPerm="['module_task:job:query']"
+                    type="info"
+                    size="small"
+                    icon="List"
+                    @click="handleOpenExecutionLogDrawer(job)"
+                  >
+                    执行记录
+                  </el-button>
+                </div>
+              </template>
+            </el-card>
+          </el-col>
+        </el-row>
       </div>
-
-      <div class="data-table__toolbar">
-        <div class="data-table__toolbar--left">
-          <el-row :gutter="10">
-            <el-col :span="1.5">
-              <el-button
-                v-hasPerm="['module_task:job:delete']"
-                type="danger"
-                icon="delete"
-                :disabled="selectIds.length === 0"
-                @click="handleDeleteLog(selectIds)"
-              >
-                批量删除
-              </el-button>
-            </el-col>
-          </el-row>
-        </div>
-        <div class="data-table__toolbar--right">
-          <el-row :gutter="10">
-            <el-col :span="1.5">
-              <el-tooltip content="刷新">
-                <el-button type="primary" icon="refresh" circle @click="handleRefresh" />
-              </el-tooltip>
-            </el-col>
-          </el-row>
-        </div>
-      </div>
-
-      <el-table
-        ref="dataTableRef"
-        v-loading="logLoading"
-        :data="logTableData"
-        class="data-table__content"
-        highlight-current-row
-        border
-        stripe
-        height="450"
-        max-height="450"
-        @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" fixed label="序号" min-width="60">
-          <template #default="scope">
-            {{ (queryFormData.page_no - 1) * queryFormData.page_size + scope.$index + 1 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="任务ID" prop="job_id" min-width="80" show-overflow-tooltip />
-        <el-table-column label="任务名称" prop="job_name" min-width="140" />
-        <el-table-column label="触发方式" prop="trigger_type" min-width="120">
-          <template #default="scope">
-            <el-tag size="small">{{ getTriggerTypeLabel(scope.row.trigger_type) }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="状态" prop="status" min-width="80">
-          <template #default="scope">
-            <el-tag :type="getLogStatusType(scope.row.status)" size="small">
-              {{ getLogStatusLabel(scope.row.status) }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="下次执行时间"
-          prop="next_run_time"
-          min-width="300"
-          show-overflow-tooltip
-        />
-        <el-table-column label="任务状态" prop="job_state" min-width="100">
-          <template #default="scope">
-            <el-button
-              v-if="scope.row.job_state"
-              type="primary"
-              size="small"
-              link
-              icon="View"
-              @click="handleViewJobState(scope.row.job_state)"
-            >
-              查看
-            </el-button>
-            <span v-else>-</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="执行结果" prop="result" min-width="150" show-overflow-tooltip />
-        <el-table-column label="错误信息" prop="error" min-width="150" show-overflow-tooltip />
-        <el-table-column label="创建时间" prop="created_time" min-width="160" />
-        <el-table-column label="更新时间" prop="updated_time" min-width="160" />
-
-        <OperationColumn :list-data-length="logTableData.length">
-          <template #default="scope">
-            <el-space class="flex">
-              <el-button
-                v-hasPerm="['module_task:job:update']"
-                type="primary"
-                size="small"
-                link
-                icon="VideoPlay"
-                @click="handleResumeJob(scope.row.job_id)"
-              >
-                恢复
-              </el-button>
-              <el-button
-                v-hasPerm="['module_task:job:update']"
-                type="warning"
-                size="small"
-                link
-                icon="VideoPause"
-                @click="handlePauseJob(scope.row.job_id)"
-              >
-                暂停
-              </el-button>
-              <el-button
-                v-hasPerm="['module_task:job:update']"
-                type="success"
-                size="small"
-                link
-                icon="CaretRight"
-                @click="handleRunJobNow(scope.row.job_id)"
-              >
-                执行
-              </el-button>
-              <el-button
-                v-hasPerm="['module_task:job:delete']"
-                type="danger"
-                size="small"
-                link
-                icon="Close"
-                @click="handleRemoveJob(scope.row.job_id)"
-              >
-                移除
-              </el-button>
-              <el-button
-                v-hasPerm="['module_task:job:delete']"
-                type="danger"
-                size="small"
-                link
-                icon="delete"
-                @click="handleDeleteLog([scope.row.id])"
-              >
-                删除
-              </el-button>
-            </el-space>
-          </template>
-        </OperationColumn>
-      </el-table>
-
-      <template #footer>
-        <pagination
-          v-model:total="logTotal"
-          v-model:page="queryFormData.page_no"
-          v-model:limit="queryFormData.page_size"
-          @pagination="loadLogData"
-        />
-      </template>
     </el-card>
 
-    <el-dialog v-model="consoleVisible" title="调度器控制台" width="900px" top="5vh">
+    <el-dialog v-model="consoleVisible" title="调度器控制台">
       <div class="terminal-wrapper">
         <Terminal name="scheduler-console" :show-header="false" theme="dark" />
       </div>
@@ -314,7 +269,147 @@
       </template>
     </el-dialog>
 
-    <el-dialog v-model="jobStateVisible" title="任务状态" width="800px">
+    <el-drawer v-model="executionLogDrawerVisible" title="执行记录" direction="rtl" size="80%">
+      <div class="execution-log-drawer">
+        <div class="search-container">
+          <el-form
+            ref="logQueryFormRef"
+            :model="logQueryFormData"
+            :inline="true"
+            label-suffix=":"
+            @submit.prevent="handleLogQuery"
+          >
+            <el-form-item prop="status" label="执行状态">
+              <el-select
+                v-model="logQueryFormData.status"
+                placeholder="请选择状态"
+                clearable
+                style="width: 120px"
+              >
+                <el-option value="pending" label="待执行" />
+                <el-option value="running" label="执行中" />
+                <el-option value="success" label="成功" />
+                <el-option value="failed" label="失败" />
+                <el-option value="timeout" label="超时" />
+                <el-option value="cancelled" label="已取消" />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="trigger_type" label="触发方式">
+              <el-select
+                v-model="logQueryFormData.trigger_type"
+                placeholder="请选择"
+                clearable
+                style="width: 120px"
+              >
+                <el-option value="cron" label="Cron表达式" />
+                <el-option value="interval" label="时间间隔" />
+                <el-option value="date" label="固定日期" />
+                <el-option value="manual" label="一次性任务" />
+              </el-select>
+            </el-form-item>
+            <el-form-item class="search-buttons">
+              <el-button type="primary" icon="search" native-type="submit">查询</el-button>
+              <el-button icon="refresh" @click="handleResetLogQuery">重置</el-button>
+              <el-button
+                v-hasPerm="['module_task:job:delete']"
+                type="danger"
+                icon="delete"
+                :disabled="logSelectIds.length === 0"
+                @click="handleBatchDeleteExecutionLog"
+              >
+                批量删除
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+
+        <el-table
+          v-loading="logLoading"
+          :data="executionLogData"
+          class="data-table__content"
+          highlight-current-row
+          border
+          stripe
+          height="calc(100vh - 240px)"
+          max-height="calc(100vh - 240px)"
+          @selection-change="handleLogSelectionChange"
+        >
+          <template #empty>
+            <el-empty :image-size="80" description="暂无数据" />
+          </template>
+          <el-table-column type="selection" align="center" min-width="55" />
+          <el-table-column type="index" fixed label="序号" min-width="60">
+            <template #default="scope">
+              {{ (logQueryFormData.page_no - 1) * logQueryFormData.page_size + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="任务ID" prop="job_id" min-width="80" show-overflow-tooltip />
+          <el-table-column label="任务名称" prop="job_name" min-width="140" />
+          <el-table-column label="触发方式" prop="trigger_type" min-width="120">
+            <template #default="scope">
+              <el-tag size="small">{{ getTriggerTypeLabel(scope.row.trigger_type) }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" prop="status" min-width="80">
+            <template #default="scope">
+              <el-tag :type="getLogStatusType(scope.row.status)" size="small">
+                {{ getLogStatusLabel(scope.row.status) }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="下次执行时间"
+            prop="next_run_time"
+            min-width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column label="执行结果" prop="result" min-width="100" show-overflow-tooltip />
+          <el-table-column label="错误信息" prop="error" min-width="100" show-overflow-tooltip />
+          <el-table-column label="执行元数据" min-width="100">
+            <template #default="scope">
+              <el-button
+                v-if="scope.row.job_state"
+                type="primary"
+                size="small"
+                link
+                icon="View"
+                @click="handleViewJobState(scope.row)"
+              >
+                查看
+              </el-button>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" prop="created_time" min-width="160" />
+          <el-table-column label="更新时间" prop="updated_time" min-width="160" />
+          <el-table-column label="操作" min-width="80" fixed="right">
+            <template #default="scope">
+              <el-button
+                v-hasPerm="['module_task:job:delete']"
+                type="danger"
+                size="small"
+                link
+                icon="delete"
+                @click="handleDeleteExecutionLog(scope.row.id)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <div class="pagination-container">
+          <pagination
+            v-model:total="logTotal"
+            v-model:page="logQueryFormData.page_no"
+            v-model:limit="logQueryFormData.page_size"
+            @pagination="loadExecutionLogData"
+          />
+        </div>
+      </div>
+    </el-drawer>
+
+    <el-dialog v-model="jobStateVisible" title="执行元数据" width="800px">
       <JsonPretty :value="jobStateData" height="400px" />
       <template #footer>
         <el-button type="primary" @click="jobStateVisible = false">关闭</el-button>
@@ -329,16 +424,22 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import JobAPI, { SchedulerStatus, JobLogTable, JobLogPageQuery } from "@/api/module_task/job";
-import { onMounted } from "vue";
+import JobAPI, {
+  SchedulerStatus,
+  SchedulerJob,
+  JobLogPageQuery,
+  JobLogTable,
+} from "@/api/module_task/job";
+import { onMounted, reactive } from "vue";
 import { Terminal, TerminalApi } from "vue-web-terminal";
-import OperationColumn from "@/components/OperationColumn/index.vue";
 import JsonPretty from "@/components/JsonPretty/index.vue";
 
-const queryFormRef = ref();
-const logTotal = ref(0);
-const selectIds = ref<number[]>([]);
-const logLoading = ref(false);
+const loading = ref(false);
+
+const queryFormData = ref({
+  name: "",
+  status: "",
+});
 
 const schedulerStatus = ref<SchedulerStatus>({
   status: "未知",
@@ -348,12 +449,17 @@ const schedulerStatus = ref<SchedulerStatus>({
 
 const consoleVisible = ref(false);
 
+const schedulerJobs = ref<SchedulerJob[]>([]);
+
+const executionLogDrawerVisible = ref(false);
+const logLoading = ref(false);
+const logTotal = ref(0);
+const executionLogData = ref<JobLogTable[]>([]);
+const logSelectIds = ref<number[]>([]);
 const jobStateVisible = ref(false);
-const jobStateData = ref("");
+const jobStateData = ref<any>(null);
 
-const logTableData = ref<JobLogTable[]>([]);
-
-const queryFormData = reactive<JobLogPageQuery>({
+const logQueryFormData = reactive<JobLogPageQuery>({
   page_no: 1,
   page_size: 10,
   job_id: undefined,
@@ -375,56 +481,81 @@ function getSchedulerStatusType(status: string) {
   }
 }
 
-function getLogStatusType(status: string) {
+function getJobStatusType(status: string) {
   switch (status) {
-    case "success":
+    case "运行中":
       return "success";
-    case "running":
-      return "primary";
-    case "pending":
-      return "info";
-    case "failed":
-    case "timeout":
-      return "danger";
-    case "cancelled":
+    case "暂停中":
       return "warning";
+    case "已停止":
+      return "danger";
+    case "未知":
+      return "info";
     default:
       return "info";
   }
 }
 
-function getLogStatusLabel(status: string) {
+function getJobStatusLabel(status: string) {
   switch (status) {
-    case "pending":
-      return "待执行";
-    case "running":
-      return "执行中";
-    case "success":
-      return "成功";
-    case "failed":
-      return "失败";
-    case "timeout":
-      return "超时";
-    case "cancelled":
-      return "已取消";
+    case "运行中":
+      return "运行中";
+    case "暂停中":
+      return "暂停中";
+    case "已停止":
+      return "已停止";
+    case "未知":
+      return "未知";
     default:
       return status;
   }
 }
 
-function getTriggerTypeLabel(type: string | undefined) {
-  switch (type) {
-    case "cron":
-      return "Cron表达式";
-    case "interval":
-      return "时间间隔";
-    case "date":
-      return "固定日期";
-    case "manual":
-      return "一次性任务";
-    default:
-      return type || "-";
+function formatTrigger(trigger: string) {
+  if (!trigger) {
+    return "-";
   }
+
+  if (trigger.includes("cron")) {
+    const match = trigger.match(/cron\[([^\]]+)\]/);
+    if (match) {
+      const params = match[1];
+      // 提取关键参数
+      const month = params.match(/month='([^']+)'/);
+      const day = params.match(/day='([^']+)'/);
+      const hour = params.match(/hour='([^']+)'/);
+      const minute = params.match(/minute='([^']+)'/);
+      const second = params.match(/second='([^']+)'/);
+      const dayOfWeek = params.match(/day_of_week='([^']+)'/);
+
+      // 构建简化的 cron 表达式
+      const parts = [];
+      if (second && second[1] !== "'*'") parts.push(`秒:${second[1]}`);
+      if (minute && minute[1] !== "'*'") parts.push(`分:${minute[1]}`);
+      if (hour && hour[1] !== "'*'") parts.push(`时:${hour[1]}`);
+      if (day && day[1] !== "'*'") parts.push(`日:${day[1]}`);
+      if (month && month[1] !== "'*'") parts.push(`月:${month[1]}`);
+      if (dayOfWeek && dayOfWeek[1] !== "'*'") parts.push(`周:${dayOfWeek[1]}`);
+
+      if (parts.length === 0) {
+        return "Cron: 每分钟";
+      }
+      return `Cron: ${parts.join(" ")}`;
+    }
+    return trigger;
+  }
+
+  if (trigger.includes("interval")) {
+    const match = trigger.match(/interval\[([^\]]+)\]/);
+    return match ? `间隔时长: ${match[1]}` : trigger;
+  }
+
+  if (trigger.includes("date")) {
+    const match = trigger.match(/date\[([^\]]+)\]/);
+    return match ? `执行日期: ${match[1]}` : trigger;
+  }
+
+  return trigger;
 }
 
 async function loadSchedulerStatus() {
@@ -436,36 +567,49 @@ async function loadSchedulerStatus() {
   }
 }
 
-async function loadLogData() {
-  logLoading.value = true;
+async function loadSchedulerJobs() {
+  loading.value = true;
   try {
-    const response = await JobAPI.getJobLogList(queryFormData);
-    logTableData.value = response.data.data.items;
-    logTotal.value = response.data.data.total;
+    const response = await JobAPI.getSchedulerJobs();
+    let jobs = response.data.data || [];
+
+    if (queryFormData.value.name) {
+      jobs = jobs.filter((job) => job.name.includes(queryFormData.value.name));
+    }
+
+    if (queryFormData.value.status) {
+      jobs = jobs.filter((job) => job.status === queryFormData.value.status);
+    }
+
+    schedulerJobs.value = jobs;
   } catch (error: any) {
     console.error(error);
   } finally {
-    logLoading.value = false;
+    loading.value = false;
+  }
+}
+
+function handleQuery() {
+  loadSchedulerJobs();
+}
+
+function handleResetQuery() {
+  queryFormData.value.name = "";
+  queryFormData.value.status = "";
+  loadSchedulerJobs();
+}
+
+async function handleSyncJobs() {
+  try {
+    await JobAPI.syncJobsToDb();
+    await handleRefresh();
+  } catch (error: any) {
+    console.error(error);
   }
 }
 
 async function handleRefresh() {
-  await Promise.all([loadSchedulerStatus(), loadLogData()]);
-}
-
-async function handleQuery() {
-  queryFormData.page_no = 1;
-  loadLogData();
-}
-
-async function handleResetQuery() {
-  queryFormRef.value.resetFields();
-  queryFormData.page_no = 1;
-  loadLogData();
-}
-
-async function handleSelectionChange(selection: any) {
-  selectIds.value = selection.map((item: any) => item.id);
+  await Promise.all([loadSchedulerStatus(), loadSchedulerJobs()]);
 }
 
 async function handleStartScheduler() {
@@ -513,11 +657,18 @@ async function handleShutdownScheduler() {
 
 async function handleClearAllJobs() {
   try {
-    await ElMessageBox.confirm("确定要清空所有任务吗？此操作不可恢复！", "警告", {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "warning",
-    });
+    await ElMessageBox.confirm(
+      "确定要清空所有任务吗？\n" +
+        "此操作会将所有待执行任务的日志标记为已取消，不会删除历史执行记录。\n" +
+        "如需删除所有执行记录，请使用执行记录的批量删除功能。",
+      "警告",
+      {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        dangerouslyUseHTMLString: false,
+      }
+    );
     await JobAPI.clearAllJobs();
     await handleRefresh();
   } catch (error: any) {
@@ -554,20 +705,6 @@ function handleClearConsole() {
   TerminalApi.clear("scheduler-console");
 }
 
-async function handleSyncJobs() {
-  try {
-    await JobAPI.syncJobsToDb();
-    await handleRefresh();
-  } catch (error: any) {
-    console.error(error);
-  }
-}
-
-function handleViewJobState(jobState: string) {
-  jobStateData.value = jobState;
-  jobStateVisible.value = true;
-}
-
 async function handlePauseJob(jobId: string) {
   try {
     await JobAPI.pauseJob(jobId);
@@ -614,16 +751,124 @@ async function handleRemoveJob(jobId: string) {
     });
 }
 
-async function handleDeleteLog(ids: number[]) {
-  ElMessageBox.confirm("确认删除选中的记录?", "警告", {
+async function handleOpenExecutionLogDrawer(job: SchedulerJob) {
+  logQueryFormData.job_id = job.id;
+  logQueryFormData.job_name = undefined;
+  logQueryFormData.page_no = 1;
+  executionLogDrawerVisible.value = true;
+  await loadExecutionLogData();
+}
+
+async function loadExecutionLogData() {
+  logLoading.value = true;
+  try {
+    const response = await JobAPI.getJobLogList(logQueryFormData);
+    executionLogData.value = response.data.data.items;
+    logTotal.value = response.data.data.total;
+  } catch (error: any) {
+    console.error(error);
+  } finally {
+    logLoading.value = false;
+  }
+}
+
+function handleLogQuery() {
+  logQueryFormData.page_no = 1;
+  loadExecutionLogData();
+}
+
+function handleResetLogQuery() {
+  logQueryFormData.status = undefined;
+  logQueryFormData.trigger_type = undefined;
+  logQueryFormData.page_no = 1;
+  loadExecutionLogData();
+}
+
+function handleLogSelectionChange(selection: JobLogTable[]) {
+  logSelectIds.value = selection
+    .map((item) => item.id)
+    .filter((id): id is number => id !== undefined);
+}
+
+function getTriggerTypeLabel(type: string | undefined) {
+  const map: Record<string, string> = {
+    cron: "Cron表达式",
+    interval: "时间间隔",
+    date: "固定日期",
+    manual: "一次性任务",
+  };
+  return map[type || ""] || type || "-";
+}
+
+function getLogStatusType(status: string): "primary" | "success" | "warning" | "info" | "danger" {
+  const map: Record<string, "primary" | "success" | "warning" | "info" | "danger"> = {
+    pending: "info",
+    running: "primary",
+    success: "success",
+    failed: "danger",
+    timeout: "warning",
+    cancelled: "info",
+  };
+  return map[status] || "info";
+}
+
+function getLogStatusLabel(status: string) {
+  const map: Record<string, string> = {
+    pending: "待执行",
+    running: "执行中",
+    success: "成功",
+    failed: "失败",
+    timeout: "超时",
+    cancelled: "已取消",
+  };
+  return map[status] || status;
+}
+
+function handleViewJobState(row: JobLogTable) {
+  if (row.job_state) {
+    try {
+      jobStateData.value = JSON.parse(row.job_state);
+    } catch {
+      jobStateData.value = row.job_state;
+    }
+    jobStateVisible.value = true;
+  }
+}
+
+async function handleDeleteExecutionLog(id: number) {
+  ElMessageBox.confirm("确认删除该条执行记录?", "警告", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
   })
     .then(async () => {
       try {
-        await JobAPI.deleteJobLog(ids);
-        handleResetQuery();
+        await JobAPI.deleteJobLog([id]);
+        await loadExecutionLogData();
+      } catch (error: any) {
+        console.error(error);
+      }
+    })
+    .catch(() => {
+      ElMessageBox.close();
+    });
+}
+
+async function handleBatchDeleteExecutionLog() {
+  if (logSelectIds.value.length === 0) {
+    ElMessage.warning("请先选择要删除的执行记录");
+    return;
+  }
+  ElMessageBox.confirm(`确认删除选中的 ${logSelectIds.value.length} 条执行记录?`, "警告", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(async () => {
+      try {
+        await JobAPI.deleteJobLog(logSelectIds.value);
+        logSelectIds.value = [];
+        await loadExecutionLogData();
       } catch (error: any) {
         console.error(error);
       }
@@ -639,13 +884,12 @@ onMounted(async () => {
 </script>
 
 <style scoped>
-.status-card {
-  margin-bottom: 16px;
+.data-table {
+  height: calc(100vh - 100px);
 }
 
 .status-content {
   display: flex;
-  flex-wrap: wrap;
   gap: 24px;
   align-items: center;
 }
@@ -667,17 +911,77 @@ onMounted(async () => {
   margin-left: auto;
 }
 
-.search-container {
-  margin-bottom: 16px;
-}
-
-.data-table {
-  margin-bottom: 16px;
-}
-
 .terminal-wrapper {
   height: 500px;
+}
+
+.job-card-header {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.job-card-title {
+  display: flex;
+  flex: 1;
+  gap: 8px;
+  align-items: center;
+  min-width: 0;
+}
+
+.job-index {
+  display: inline-flex;
+  flex-shrink: 0;
+  align-items: center;
+  justify-content: center;
+  width: 24px;
+  height: 24px;
+  font-size: 12px;
+  background-color: #409eff;
+  border-radius: 50%;
+}
+
+.job-name {
   overflow: hidden;
-  border-radius: 6px;
+  text-overflow: ellipsis;
+  font-size: 14px;
+  font-weight: 500;
+  white-space: nowrap;
+}
+
+.job-info-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8px;
+  font-size: 13px;
+}
+
+.job-info-item:last-child {
+  margin-bottom: 0;
+}
+
+.job-info-label {
+  flex-shrink: 0;
+  width: 70px;
+  color: #909399;
+}
+
+.job-info-value {
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  color: #606266;
+  white-space: nowrap;
+}
+
+.job-card-footer {
+  display: flex;
+  gap: 8px;
+  justify-content: space-between;
+}
+
+.job-card-footer .el-button {
+  flex: 1;
 }
 </style>
diff --git a/frontend/src/views/module_task/node/index.vue b/frontend/src/views/module_task/node/index.vue
index 7f0ab440..cda13260 100644
--- a/frontend/src/views/module_task/node/index.vue
+++ b/frontend/src/views/module_task/node/index.vue
@@ -1,39 +1,5 @@
 <template>
   <div class="app-container">
-    <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryFormData"
-        :inline="true"
-        label-suffix=":"
-        @submit.prevent="handleQuery"
-      >
-        <el-form-item prop="name" label="节点名称">
-          <el-input v-model="queryFormData.name" placeholder="请输入节点名称" clearable />
-        </el-form-item>
-        <el-form-item prop="code" label="节点编码">
-          <el-input v-model="queryFormData.code" placeholder="请输入节点编码" clearable />
-        </el-form-item>
-        <el-form-item class="search-buttons">
-          <el-button
-            v-hasPerm="['module_task:node:query']"
-            type="primary"
-            icon="search"
-            native-type="submit"
-          >
-            查询
-          </el-button>
-          <el-button
-            v-hasPerm="['module_task:node:query']"
-            icon="refresh"
-            @click="handleResetQuery"
-          >
-            重置
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-
     <el-card class="data-table">
       <template #header>
         <div class="card-header">
@@ -43,6 +9,39 @@
             </el-tooltip>
             节点类型列表
           </span>
+          <div class="search-container">
+            <el-form
+              ref="queryFormRef"
+              :model="queryFormData"
+              :inline="true"
+              label-suffix=":"
+              @submit.prevent="handleQuery"
+            >
+              <el-form-item prop="name" label="节点名称">
+                <el-input v-model="queryFormData.name" placeholder="请输入节点名称" clearable />
+              </el-form-item>
+              <el-form-item prop="code" label="节点编码">
+                <el-input v-model="queryFormData.code" placeholder="请输入节点编码" clearable />
+              </el-form-item>
+              <el-form-item class="search-buttons">
+                <el-button
+                  v-hasPerm="['module_task:node:query']"
+                  type="primary"
+                  icon="search"
+                  native-type="submit"
+                >
+                  查询
+                </el-button>
+                <el-button
+                  v-hasPerm="['module_task:node:query']"
+                  icon="refresh"
+                  @click="handleResetQuery"
+                >
+                  重置
+                </el-button>
+              </el-form-item>
+            </el-form>
+          </div>
         </div>
       </template>
 
@@ -89,8 +88,8 @@
         :data="pageTableData"
         class="data-table__content"
         highlight-current-row
-        height="450"
-        max-height="450"
+        height="calc(100vh - 440px)"
+        max-height="calc(100vh - 440px)"
         border
         stripe
         @selection-change="handleSelectionChange"
@@ -114,6 +113,7 @@
           <template #default="scope">
             <el-space class="flex">
               <el-button
+                v-hasPerm="['module_task:node:execute']"
                 type="warning"
                 size="small"
                 link
@@ -203,7 +203,7 @@
               </el-form-item>
               <el-form-item label="位置参数" prop="args">
                 <div class="dynamic-params">
-                  <div v-for="(item, index) in argsList" :key="index" class="param-item">
+                  <div v-for="(_item, index) in argsList" :key="index" class="param-item">
                     <el-input v-model="argsList[index]" placeholder="参数值" />
                     <el-button
                       type="danger"
@@ -285,7 +285,7 @@
     <el-dialog
       v-model="executeDialogVisible"
       title="调试节点"
-      width="600px"
+      width="700px"
       @close="handleCloseExecuteDialog"
     >
       <el-form
@@ -300,7 +300,7 @@
         </el-form-item>
         <el-form-item label="执行方式" prop="trigger">
           <el-radio-group v-model="executeFormData.trigger">
-            <el-radio value="now">一次性任务</el-radio>
+            <el-radio value="now">立即执行</el-radio>
             <el-radio value="cron">Cron表达式</el-radio>
             <el-radio value="interval">时间间隔</el-radio>
             <el-radio value="date">固定日期</el-radio>
@@ -314,10 +314,10 @@
         >
           <el-popover
             :visible="openCron"
-            width="600px"
+            width="700px"
             trigger="click"
             :persistent="false"
-            placement="left"
+            placement="auto-end"
           >
             <template #reference>
               <el-input
@@ -337,10 +337,10 @@
         >
           <el-popover
             :visible="openInterval"
-            width="500px"
+            width="600px"
             trigger="click"
             :persistent="false"
-            placement="left"
+            placement="auto-end"
           >
             <template #reference>
               <el-input
@@ -404,7 +404,7 @@
 
       <template #footer>
         <el-button @click="handleCloseExecuteDialog">取消</el-button>
-        <el-button type="primary" @click="handleExecuteNode">确认调试</el-button>
+        <el-button type="primary" @click="handleExecuteNode">确认</el-button>
       </template>
     </el-dialog>
   </div>
@@ -418,8 +418,7 @@ defineOptions({
 
 import NodeAPI, { NodeTable, NodeForm, NodePageQuery, TriggerType } from "@/api/module_task/node";
 import { useDictStore } from "@/store/index";
-import { nextTick, onMounted, ref } from "vue";
-import { useRouter } from "vue-router";
+import { nextTick, onMounted, reactive, ref } from "vue";
 import { vue3CronPlus } from "vue3-cron-plus";
 import "vue3-cron-plus/dist/index.css";
 import OperationColumn from "@/components/OperationColumn/index.vue";
@@ -430,7 +429,6 @@ import "codemirror/mode/python/python.js";
 import "codemirror/theme/dracula.css";
 
 const dictStore = useDictStore();
-const router = useRouter();
 
 const codeEditorOptions: EditorConfiguration = {
   mode: "python",
@@ -653,11 +651,17 @@ async function handleSubmit() {
 }
 
 async function handleDelete(ids: number[]) {
-  ElMessageBox.confirm("确认删除该项数据?", "警告", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
-    type: "warning",
-  })
+  ElMessageBox.confirm(
+    "确认删除选中的节点吗？\n" +
+      "此操作将同时删除节点定义并移除调度器中的相关任务。\n" +
+      "正在运行的任务会被立即移除，待执行任务的日志将被标记为已取消。",
+    "警告",
+    {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "warning",
+    }
+  )
     .then(async () => {
       try {
         loading.value = true;
@@ -721,34 +725,11 @@ async function handleExecuteNode() {
     }
 
     await NodeAPI.executeNode(currentExecuteNode.value?.id as number, params);
-    ElMessage.success({
-      message: `节点调试${executeFormData.trigger === "now" ? "已启动" : "已创建"}`,
-      type: "success",
-      duration: 2000,
-    });
 
     handleCloseExecuteDialog();
 
     // 重新加载数据
     await loadingData();
-
-    // 如果是立即执行，提示用户查看执行记录
-    if (executeFormData.trigger === "now") {
-      ElMessageBox.confirm("调试任务已启动，是否跳转到执行记录页面查看执行结果？", "提示", {
-        confirmButtonText: "查看记录",
-        cancelButtonText: "稍后查看",
-        type: "info",
-      })
-        .then(() => {
-          // 跳转到执行记录页面
-          router.push({
-            path: "/task/job",
-          });
-        })
-        .catch(() => {
-          // 取消操作
-        });
-    }
   } catch (error: any) {
     ElMessage.error({
       message: error.response?.data?.msg || "调试失败",
@@ -812,4 +793,16 @@ onMounted(async () => {
   white-space: pre-wrap;
   border-radius: 4px;
 }
+
+.execution-log-drawer {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.pagination-container {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 16px;
+}
 </style>