From fffe2d0db9494ec94ace02ed67f38d480804e70c Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Thu, 10 Oct 2024 09:46:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=BC=8F=E6=8E=89=E4=BA=86=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=97=A5=E5=BF=97=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + .../src/views/monitor/logininfor/index.vue | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c063526..ab3d09ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - 登录页面 关闭租户后下拉框没有正常隐藏 - 字典管理 关闭租户不应显示`同步租户字典`按钮 +- 登录日志 漏掉了登录日志日期查询 **OTHERS** diff --git a/apps/web-antd/src/views/monitor/logininfor/index.vue b/apps/web-antd/src/views/monitor/logininfor/index.vue index ee668689..b586ad6d 100644 --- a/apps/web-antd/src/views/monitor/logininfor/index.vue +++ b/apps/web-antd/src/views/monitor/logininfor/index.vue @@ -7,6 +7,7 @@ import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui'; import { getPopupContainer } from '@vben/utils'; import { Modal, Popconfirm, Space } from 'ant-design-vue'; +import dayjs from 'dayjs'; import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; import { @@ -46,6 +47,20 @@ const gridOptions: VxeGridProps = { proxyConfig: { ajax: { query: async ({ page }, formValues = {}) => { + // 区间选择器处理 + if (formValues?.dateTime) { + formValues.params = { + beginTime: dayjs(formValues.dateTime[0]).format( + 'YYYY-MM-DD 00:00:00', + ), + endTime: dayjs(formValues.dateTime[1]).format( + 'YYYY-MM-DD 23:59:59', + ), + }; + Reflect.deleteProperty(formValues, 'dateTime'); + } else { + Reflect.deleteProperty(formValues, 'params'); + } return await loginInfoList({ pageNum: page.currentPage, pageSize: page.pageSize,