From 805bb9e4b04d0574d1e5285792c8cd8a1ccac32f Mon Sep 17 00:00:00 2001 From: mizhexiaoxiao <1157861072@qq.com> Date: Sat, 14 Sep 2024 17:16:49 +0800 Subject: [PATCH 1/3] Update --- web/src/main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web/src/main.js b/web/src/main.js index d872791..7b6c336 100644 --- a/web/src/main.js +++ b/web/src/main.js @@ -2,7 +2,6 @@ import '@/styles/reset.css' import 'uno.css' import '@/styles/global.scss' -import 'virtual:svg-icons-register' import { createApp } from 'vue' import { setupRouter } from '@/router' From 887a3fb975f9bfd0c9992bb7f02e48ea358e224b Mon Sep 17 00:00:00 2001 From: mizhexiaoxiao <1157861072@qq.com> Date: Wed, 18 Sep 2024 11:21:33 +0800 Subject: [PATCH 2/3] Update --- app/models/admin.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/admin.py b/app/models/admin.py index da675bb..44e641a 100644 --- a/app/models/admin.py +++ b/app/models/admin.py @@ -24,7 +24,7 @@ class User(BaseModel, TimestampMixin): class Role(BaseModel, TimestampMixin): name = fields.CharField(max_length=20, unique=True, description="角色名称", index=True) - desc = fields.CharField(max_length=500, null=True, blank=True, description="角色描述") + desc = fields.CharField(max_length=500, null=True, description="角色描述") menus = fields.ManyToManyField("models.Menu", related_name="role_menus") apis = fields.ManyToManyField("models.Api", related_name="role_apis") @@ -44,16 +44,16 @@ class Api(BaseModel, TimestampMixin): class Menu(BaseModel, TimestampMixin): name = fields.CharField(max_length=20, description="菜单名称", index=True) - remark = fields.JSONField(null=True, description="保留字段", blank=True) - menu_type = fields.CharEnumField(MenuType, null=True, blank=True, description="菜单类型") - icon = fields.CharField(max_length=100, null=True, blank=True, description="菜单图标") + remark = fields.JSONField(null=True, description="保留字段") + menu_type = fields.CharEnumField(MenuType, null=True, description="菜单类型") + icon = fields.CharField(max_length=100, null=True, description="菜单图标") path = fields.CharField(max_length=100, description="菜单路径", index=True) order = fields.IntField(default=0, description="排序", index=True) parent_id = fields.IntField(default=0, max_length=10, description="父菜单ID", index=True) is_hidden = fields.BooleanField(default=False, description="是否隐藏") component = fields.CharField(max_length=100, description="组件") keepalive = fields.BooleanField(default=True, description="存活") - redirect = fields.CharField(max_length=100, null=True, blank=True, description="重定向") + redirect = fields.CharField(max_length=100, null=True, description="重定向") class Meta: table = "menu" @@ -61,7 +61,7 @@ class Menu(BaseModel, TimestampMixin): class Dept(BaseModel, TimestampMixin): name = fields.CharField(max_length=20, unique=True, description="部门名称", index=True) - desc = fields.CharField(max_length=500, null=True, blank=True, description="备注") + desc = fields.CharField(max_length=500, null=True, description="备注") is_deleted = fields.BooleanField(default=False, description="软删除标记", index=True) order = fields.IntField(default=0, description="排序", index=True) parent_id = fields.IntField(default=0, max_length=10, description="父部门ID", index=True) From 060a7695c8d868338a0ef16564e9949d3a862686 Mon Sep 17 00:00:00 2001 From: mizhexiaoxiao <1157861072@qq.com> Date: Fri, 20 Sep 2024 14:54:50 +0800 Subject: [PATCH 3/3] Update --- app/api/v1/auditlog/auditlog.py | 6 +++ web/src/components/table/CrudTable.vue | 2 +- web/src/views/system/auditlog/index.vue | 63 ++++++++++--------------- 3 files changed, 32 insertions(+), 39 deletions(-) diff --git a/app/api/v1/auditlog/auditlog.py b/app/api/v1/auditlog/auditlog.py index f8d9564..5386e5a 100644 --- a/app/api/v1/auditlog/auditlog.py +++ b/app/api/v1/auditlog/auditlog.py @@ -14,7 +14,9 @@ async def get_audit_log_list( page_size: int = Query(10, description="每页数量"), username: str = Query("", description="操作人名称"), module: str = Query("", description="功能模块"), + method: str = Query("", description="请求方法"), summary: str = Query("", description="接口描述"), + status: int = Query(None, description="状态码"), start_time: str = Query("", description="开始时间"), end_time: str = Query("", description="结束时间"), ): @@ -23,8 +25,12 @@ async def get_audit_log_list( q &= Q(username__icontains=username) if module: q &= Q(module__icontains=module) + if method: + q &= Q(method__icontains=method) if summary: q &= Q(summary__icontains=summary) + if status: + q &= Q(status__icontains=status) if start_time and end_time: q &= Q(created_at__range=[start_time, end_time]) elif start_time: diff --git a/web/src/components/table/CrudTable.vue b/web/src/components/table/CrudTable.vue index d3d4ba2..e8ca036 100644 --- a/web/src/components/table/CrudTable.vue +++ b/web/src/components/table/CrudTable.vue @@ -124,7 +124,7 @@ function handleSearch() { async function handleReset() { const queryItems = { ...props.queryItems } for (const key in queryItems) { - queryItems[key] = '' + queryItems[key] = null } emit('update:queryItems', { ...queryItems, ...initQuery }) await nextTick() diff --git a/web/src/views/system/auditlog/index.vue b/web/src/views/system/auditlog/index.vue index 5792b58..a18ed4b 100644 --- a/web/src/views/system/auditlog/index.vue +++ b/web/src/views/system/auditlog/index.vue @@ -1,47 +1,18 @@