fix: 漏掉了登录日志日期查询
This commit is contained in:
parent
2e8563d808
commit
fffe2d0db9
@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
- 登录页面 关闭租户后下拉框没有正常隐藏
|
- 登录页面 关闭租户后下拉框没有正常隐藏
|
||||||
- 字典管理 关闭租户不应显示`同步租户字典`按钮
|
- 字典管理 关闭租户不应显示`同步租户字典`按钮
|
||||||
|
- 登录日志 漏掉了登录日志日期查询
|
||||||
|
|
||||||
**OTHERS**
|
**OTHERS**
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@ import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
|
|||||||
import { getPopupContainer } from '@vben/utils';
|
import { getPopupContainer } from '@vben/utils';
|
||||||
|
|
||||||
import { Modal, Popconfirm, Space } from 'ant-design-vue';
|
import { Modal, Popconfirm, Space } from 'ant-design-vue';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
import { useVbenVxeGrid, type VxeGridProps } from '#/adapter';
|
import { useVbenVxeGrid, type VxeGridProps } from '#/adapter';
|
||||||
import {
|
import {
|
||||||
@ -46,6 +47,20 @@ const gridOptions: VxeGridProps = {
|
|||||||
proxyConfig: {
|
proxyConfig: {
|
||||||
ajax: {
|
ajax: {
|
||||||
query: async ({ page }, formValues = {}) => {
|
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({
|
return await loginInfoList({
|
||||||
pageNum: page.currentPage,
|
pageNum: page.currentPage,
|
||||||
pageSize: page.pageSize,
|
pageSize: page.pageSize,
|
||||||
|
Loading…
Reference in New Issue
Block a user