From 20e32587ecbab27e4436f2f64a15faa3c89e4f41 Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期二, 20 五月 2025 21:39:59 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide
---
management/src/pages/logManagement/index.jsx | 66 +++++++++++++++-----------------
1 files changed, 31 insertions(+), 35 deletions(-)
diff --git a/management/src/pages/logManagement/index.jsx b/management/src/pages/logManagement/index.jsx
index 9df7999..3a05a6b 100644
--- a/management/src/pages/logManagement/index.jsx
+++ b/management/src/pages/logManagement/index.jsx
@@ -14,24 +14,24 @@
const columns = [
{
title: '操作时间',
- dataIndex: 'name',
+ dataIndex: 'createTime',
hideInTable: true,
valueType: 'dateRange',
order: 1,
},
{
title: '操作用户',
- dataIndex: 'reportUserName',
+ dataIndex: 'operatorName',
order: 5,
},
{
title: '联系电话',
- dataIndex: 'reportUserName',
+ dataIndex: 'operatorPhone',
order: 4,
},
{
title: '操作类型',
- dataIndex: 'reportUserPhone',
+ dataIndex: 'operatorCategory',
order: 3,
valueEnum: {
1: '登录',
@@ -48,45 +48,41 @@
},
{
title: '对象名称',
- dataIndex: 'name',
+ dataIndex: 'targetName',
hideInSearch: true,
},
{
title: '所在IP',
- dataIndex: 'name',
+ dataIndex: 'ip',
order: 2,
},
];
return (
- <div>
- <PageContainer header={{
- breadcrumb: {},
- }}
- title={'日志记录'}
- >
- <ProTable
- rowKey="id"
- actionRef={actionRef}
- columns={columns}
- formRef={formRef}
- request={async (params) => {
- if (params.time && params.time.length > 0) {
- params.startTime = moment(params.time[0]).format('YYYY-MM-DD HH:mm:ss');
- params.endTime = moment(params.time[1]).format('YYYY-MM-DD 23:59:59');
- delete params.time
- } else {
- delete params.startTime
- delete params.endTime
- }
-
-
- return buildProTableDataSource(getList, params);
- }}
- search={{ labelWidth: 'auto', defaultCollapsed: false }}
- />
- </PageContainer>
- </div>
+ <PageContainer header={{
+ breadcrumb: {},
+ }}
+ title={'日志记录'}
+ >
+ <ProTable
+ rowKey="id"
+ actionRef={actionRef}
+ columns={columns}
+ formRef={formRef}
+ request={async (params) => {
+ if (params.time && params.time.length > 0) {
+ params.startTime = moment(params.time[0]).format('YYYY-MM-DD HH:mm:ss');
+ params.endTime = moment(params.time[1]).format('YYYY-MM-DD 23:59:59');
+ delete params.time
+ } else {
+ delete params.startTime
+ delete params.endTime
+ }
+ return buildProTableDataSource(getList, params);
+ }}
+ search={{ labelWidth: 'auto', defaultCollapsed: false }}
+ />
+ </PageContainer>
);
};
-export default Account;
+export default Account;
\ No newline at end of file
--
Gitblit v1.7.1