diff --git a/ui/src/components/sidebar/index.tsx b/ui/src/components/sidebar/index.tsx
index 16bdbb2..08284fd 100644
--- a/ui/src/components/sidebar/index.tsx
+++ b/ui/src/components/sidebar/index.tsx
@@ -57,14 +57,6 @@ const ADMIN_MENUS = [
show: true,
disabled: false,
},
- {
- label: '管理员',
- value: '/admin',
- pathname: 'admin',
- icon: 'icon-guanliyuan1',
- show: true,
- disabled: false,
- },
{
label: '通用设置',
value: '/general-setting',
diff --git a/ui/src/pages/admin/index.tsx b/ui/src/pages/admin/index.tsx
deleted file mode 100644
index 2a15d9e..0000000
--- a/ui/src/pages/admin/index.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import LoginHistory from './loginHistory';
-import AdminTable from './adminTable';
-import { Grid2 as Grid, Stack } from '@mui/material';
-
-const Admin = () => {
- return (
-
-
-
-
-
-
-
-
- );
-};
-
-export default Admin;
diff --git a/ui/src/pages/admin/loginHistory.tsx b/ui/src/pages/generalSetting/components/adminLoginHistory.tsx
similarity index 80%
rename from ui/src/pages/admin/loginHistory.tsx
rename to ui/src/pages/generalSetting/components/adminLoginHistory.tsx
index 2df5fbc..0bec985 100644
--- a/ui/src/pages/admin/loginHistory.tsx
+++ b/ui/src/pages/generalSetting/components/adminLoginHistory.tsx
@@ -12,7 +12,7 @@ type LoginHistory = NonNullable<
DomainListAdminLoginHistoryResp['login_histories']
>[number];
-const LoginHistory = () => {
+const AdminLoginHistory = () => {
const { data, loading } = useRequest(() => getAdminLoginHistory({}));
const columns: ColumnsType = [
{
@@ -55,9 +55,23 @@ const LoginHistory = () => {
direction='row'
justifyContent='space-between'
alignItems='center'
- sx={{ mb: 2 }}
+ sx={{
+ mb: 2,
+ height: 32,
+ fontWeight: 'bold',
+ }}
>
- 管理员登录记录
+ 管理员登录记录
{
);
};
-export default LoginHistory;
+export default AdminLoginHistory;
diff --git a/ui/src/pages/admin/adminTable.tsx b/ui/src/pages/generalSetting/components/adminUser.tsx
similarity index 87%
rename from ui/src/pages/admin/adminTable.tsx
rename to ui/src/pages/generalSetting/components/adminUser.tsx
index 0e8c041..207386a 100644
--- a/ui/src/pages/admin/adminTable.tsx
+++ b/ui/src/pages/generalSetting/components/adminUser.tsx
@@ -151,7 +151,7 @@ const AddAdminModal = ({
);
};
-const AdminTable = () => {
+const AdminUser = () => {
const [open, setOpen] = useState(false);
const { data, loading, refresh } = useRequest(() => getListAdminUser({}));
const onDeleteAdmin = (data: DomainAdminUser) => {
@@ -187,19 +187,27 @@ const AdminTable = () => {
},
},
{
- title: '最近活跃时间',
+ title: '加入时间',
+ dataIndex: 'created_at',
+ width: 140,
+ render: (text) => {
+ return dayjs.unix(text).fromNow();
+ },
+ },
+ {
+ title: '最近活跃',
dataIndex: 'last_active_at',
+ width: 140,
render: (text, record) => {
- return
- {record.created_at ? dayjs.unix(record.created_at).fromNow() + '加入' : '加入时间未知'}
- {record.last_active_at ? dayjs.unix(record.last_active_at).fromNow() + '活跃' : '活跃时间未知'}
-
+ return record.last_active_at === 0
+ ? '从未使用'
+ : dayjs.unix(text).fromNow();
},
},
{
title: '',
dataIndex: 'opt',
- width: 200,
+ width: 100,
render: (_, record) => {
return (