-
+
diff --git a/apps/web-antd/src/views/userlog/userlist/userlist.vue b/apps/web-antd/src/views/userlog/userlist/userlist.vue
index 8f37256..5867551 100644
--- a/apps/web-antd/src/views/userlog/userlist/userlist.vue
+++ b/apps/web-antd/src/views/userlog/userlist/userlist.vue
@@ -31,7 +31,8 @@ interface RowType {
LoginTime: number;
Online: string;
}
-
+const startDate = dayjs().subtract(7, 'day').startOf('day');
+const endDate = dayjs().endOf('day');
const formOptions: VbenFormProps = {
// 默认展开
collapsed: false,
@@ -93,6 +94,43 @@ const formOptions: VbenFormProps = {
},
fieldName: 'Uid',
label: 'Uid:',
+ },
+ {
+ component: 'DatePicker',
+ defaultValue: startDate,
+ componentProps: {
+ format: 'YYYY-MM-DD',
+ },
+ fieldName: 'StartTime',
+ label: '开始时间',
+ formItemClass: 'col-start-1',
+ },
+ {
+ component: 'TimePicker',
+ componentProps: {
+ placeholder: '时间',
+ },
+ fieldName: 'StartTime',
+ label: '--',
+
+ },
+ {
+ component: 'DatePicker',
+ defaultValue: endDate,
+ componentProps: {
+ format: 'YYYY-MM-DD',
+ },
+ fieldName: 'EndTime',
+ label: '结束时间',
+
+ },
+ {
+ component: 'TimePicker',
+ componentProps: {
+ placeholder: '时间',
+ },
+ fieldName: 'EndTime',
+ label: '--',
}
],
// 控制表单是否显示折叠按钮
@@ -149,7 +187,7 @@ const gridOptions: VxeGridProps = {
let Id = parseInt(formValues.AppId, 10);
let ServerId = parseInt(formValues.ServerId, 10);
let Uid = parseInt(formValues.Uid, 10);
- let r = await getUserListApi({ Id: Id, ServerId: ServerId, pageSize: page.pageSize, currentPage: page.currentPage, Uid: Uid });
+ let r = await getUserListApi({ Id: Id, ServerId: ServerId, pageSize: page.pageSize, currentPage: page.currentPage, Uid: Uid, StartTime: formValues.StartTime ? Math.floor(new Date(formValues.StartTime).getTime() / 1000) : undefined, EndTime: formValues.EndTime ? Math.floor(new Date(formValues.EndTime).getTime() / 1000) : undefined });
return r;
},
},