diff --git a/src/api/log.ts b/src/api/log.ts index 9fb11b3c..a8c71e50 100644 --- a/src/api/log.ts +++ b/src/api/log.ts @@ -52,6 +52,8 @@ export default LogAPI; export interface LogPageQuery extends PageQuery { /** 搜索关键字 */ keywords?: string; + /** 操作时间 */ + createTime?: [string, string]; } /** diff --git a/src/api/user.ts b/src/api/user.ts index a2a5c095..c9a40966 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -175,7 +175,7 @@ export interface UserPageQuery extends PageQuery { deptId?: number; /** 开始时间 */ - createTimeRange?: [string, string]; + createTime?: [string, string]; } /** 用户分页对象 */ diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue index 41896de2..d234135c 100644 --- a/src/views/system/log/index.vue +++ b/src/views/system/log/index.vue @@ -10,12 +10,28 @@ @keyup.enter="handleQuery" /> + + + - 搜索 - 重置 + + + 搜索 + + + + 重置 + @@ -75,6 +91,7 @@ const queryParams = reactive({ pageNum: 1, pageSize: 10, keywords: "", + createTime: ["", ""], }); // 日志表格数据 @@ -96,6 +113,7 @@ function handleQuery() { function handleResetQuery() { queryFormRef.value.resetFields(); queryParams.pageNum = 1; + queryParams.createTime = undefined; handleQuery(); } diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 14867eee..811049b1 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -37,7 +37,7 @@