From 52038687d9e3cb7ec178bb66c4e8e6acd54d1d58 Mon Sep 17 00:00:00 2001 From: zhangtao <9480807882@qq.com> Date: Tue, 17 Jun 2025 23:26:04 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=BB=E5=8A=A1=E8=B0=83=E5=BA=A6):?= =?UTF-8?q?=20=E7=A7=BB=E9=99=A4=E4=BB=BB=E5=8A=A1=E9=87=8D=E5=90=AF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat(标签页): 添加缓存刷新按钮并优化标签页组件 style(布局): 注释掉过渡动画中的冗余div标签 --- .../app/api/v1/services/system/job_service.py | 6 +++--- backend/app/core/ap_scheduler.py | 9 ++++++++- backend/dev_sql.db | Bin 282624 -> 307200 bytes frontend/src/components/TopTags/index.vue | 19 ++++++++++++------ frontend/src/layouts/basicLayout.vue | 4 ++-- frontend/src/views/system/job/index.vue | 4 ++-- 6 files changed, 28 insertions(+), 14 deletions(-) diff --git a/backend/app/api/v1/services/system/job_service.py b/backend/app/api/v1/services/system/job_service.py index 043be833..f8706215 100644 --- a/backend/app/api/v1/services/system/job_service.py +++ b/backend/app/api/v1/services/system/job_service.py @@ -77,9 +77,9 @@ class JobService: elif option == 2: SchedulerUtil().resume_job(job_id=id) await JobCRUD(auth).set_obj_field_crud(ids=[id], status=True) - elif option == 3: - SchedulerUtil().reschedule_job(job_id=id) - await JobCRUD(auth).set_obj_field_crud(ids=[id], status=False) + # elif option == 3: + # SchedulerUtil().reschedule_job(job_id=id) + # await JobCRUD(auth).set_obj_field_crud(ids=[id], status=False) @classmethod async def export_job_service(cls, data_list: List[Dict[str, Any]]) -> bytes: diff --git a/backend/app/core/ap_scheduler.py b/backend/app/core/ap_scheduler.py index b9b275f1..0eb905e4 100644 --- a/backend/app/core/ap_scheduler.py +++ b/backend/app/core/ap_scheduler.py @@ -260,10 +260,12 @@ class SchedulerUtil: :param job_id: 任务id :return: """ + logger.info(f"开始获取全部任务:{cls.get_all_jobs()}, 状态: {cls.get_job_status()}") query_job = cls.get_job(job_id=str(job_id)) if not query_job: raise ValueError(f"未找到该任务:{job_id}") scheduler.pause_job(job_id=str(job_id)) + logger.info(f"查看获取全部任务:{cls.get_all_jobs()}, 状态: {cls.get_job_status()}") @classmethod def resume_job(cls, job_id: Union[str, int]): @@ -272,10 +274,13 @@ class SchedulerUtil: :param job_id: 任务id :return: """ + + logger.info(f"开始获取全部任务:{cls.get_all_jobs()}, 状态: {cls.get_job_status()}") query_job = cls.get_job(job_id=str(job_id)) if not query_job: raise ValueError(f"未找到该任务:{job_id}") scheduler.resume_job(job_id=str(job_id)) + logger.info(f"查看获取全部任务:{cls.get_all_jobs()}, 状态: {cls.get_job_status()}") @classmethod def reschedule_job(cls, job_id: Union[str, int]) -> Job: @@ -284,10 +289,12 @@ class SchedulerUtil: :param job_id: 任务id :return: 重启后的任务对象 """ + logger.info(f"开始获取全部任务:{cls.get_all_jobs()}, 状态: {cls.get_job_status()}") query_job = cls.get_job(job_id=str(job_id)) if not query_job: raise CustomException(msg=f"未找到该任务:{job_id}") - return scheduler.reschedule_job(job_id=str(job_id)) + scheduler.reschedule_job(job_id=str(job_id)) + logger.info(f"查看获取全部任务:{cls.get_all_jobs()}, 状态: {cls.get_job_status()}") @classmethod def export_jobs(cls): diff --git a/backend/dev_sql.db b/backend/dev_sql.db index 6df4a45d5f05a55b49f57303064d618dc2e480ba..5ad2502ca015bdcd53104a1bcc6c479ce57a9d20 100644 GIT binary patch delta 15848 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 QcrtL=fCc2wBP8*8l(j delta 296 zcmZp8Ak?rxaDp_e9|Hq}>qG^6AVaULb7P86t&oASf|0S6v5}RbrJk9Qv4yeW8Jk*~SeQ(|R># - diff --git a/frontend/src/layouts/basicLayout.vue b/frontend/src/layouts/basicLayout.vue index 69c2a24d..b82f562a 100644 --- a/frontend/src/layouts/basicLayout.vue +++ b/frontend/src/layouts/basicLayout.vue @@ -130,12 +130,12 @@
-
+ -
+
diff --git a/frontend/src/views/system/job/index.vue b/frontend/src/views/system/job/index.vue index fdd370a8..2a2c1e49 100644 --- a/frontend/src/views/system/job/index.vue +++ b/frontend/src/views/system/job/index.vue @@ -102,7 +102,7 @@ 暂停 恢复 - 重启 + @@ -866,7 +866,7 @@ const handleClear = () => { }) } -// 操作按钮:操作类型 1: 暂停 2: 恢复 3: 重启 +// 操作按钮:操作类型 1: 暂停 2: 恢复 3: 重启(暂时移除重启) const handleOption = (row: tableJobType, option: number) => { OptionJob({ id: row.id, option: option }).then(() => { loadingData();