From 64544c109db13b59a895a6a8a96ba3676cc895a4 Mon Sep 17 00:00:00 2001
From: Monster <389264167@qq.com>
Date: Thu, 31 Jul 2025 18:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/components/sidebar/index.tsx           |  8 ----
 ui/src/pages/admin/index.tsx                  | 19 --------
 .../components/adminLoginHistory.tsx}         | 22 ++++++++--
 .../components/adminUser.tsx}                 | 44 ++++++++++++++-----
 .../components/cardAdminUser.tsx              | 25 +++++++++++
 .../cardServiceSettings.tsx}                  | 10 +++--
 ui/src/pages/generalSetting/index.tsx         |  9 ++--
 ui/src/pages/memberManage/memberManage.tsx    |  6 +--
 ui/src/router.tsx                             |  4 --
 9 files changed, 90 insertions(+), 57 deletions(-)
 delete mode 100644 ui/src/pages/admin/index.tsx
 rename ui/src/pages/{admin/loginHistory.tsx => generalSetting/components/adminLoginHistory.tsx} (80%)
 rename ui/src/pages/{admin/adminTable.tsx => generalSetting/components/adminUser.tsx} (87%)
 create mode 100644 ui/src/pages/generalSetting/components/cardAdminUser.tsx
 rename ui/src/pages/generalSetting/{baseURLSettings.tsx => components/cardServiceSettings.tsx} (93%)

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 (
-    <Grid container  spacing={2} sx={{ height: '100%' }}>
-        <Grid size={6}>
-          <AdminTable />
-        </Grid>
-        <Grid size={6}>
-          <LoginHistory />
-        </Grid>
-    </Grid>
-  );
-};
-
-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<LoginHistory> = [
     {
@@ -55,9 +55,23 @@ const LoginHistory = () => {
         direction='row'
         justifyContent='space-between'
         alignItems='center'
-        sx={{ mb: 2 }}
+        sx={{ 
+          mb: 2,
+          height: 32,
+          fontWeight: 'bold',
+         }}
       >
-        <Box sx={{ fontWeight: 700, lineHeight: '36px' }}>管理员登录记录</Box>
+        <Box sx={{
+          '&::before': {
+            content: '""',
+            display: 'inline-block',
+            width: 4,
+            height: 12,
+            bgcolor: 'common.black',
+            borderRadius: '2px',
+            mr: 1,
+          },
+        }}>管理员登录记录</Box>
       </Stack>
       <Table
         columns={columns}
@@ -71,4 +85,4 @@ const LoginHistory = () => {
   );
 };
 
-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 <Stack direction='column'>
-            <Box sx={{ color: 'text.secondary' }}>{record.created_at ? dayjs.unix(record.created_at).fromNow() + '加入' : '加入时间未知'}</Box>
-            <Box sx={{ color: 'text.secondary' }}>{record.last_active_at ? dayjs.unix(record.last_active_at).fromNow() + '活跃' : '活跃时间未知'}</Box>
-          </Stack>
+        return record.last_active_at === 0
+          ? '从未使用'
+          : dayjs.unix(text).fromNow();
       },
     },
     {
       title: '',
       dataIndex: 'opt',
-      width: 200,
+      width: 100,
       render: (_, record) => {
         return (
           <Button
@@ -215,14 +223,28 @@ const AdminTable = () => {
     },
   ];
   return (
-    <Card sx={{ height: '100%' }}>
+    <Card>
       <Stack
         direction='row'
         justifyContent='space-between'
         alignItems='center'
-        sx={{ mb: 2 }}
+        sx={{ 
+          mb: 2,
+          height: 32,
+          fontWeight: 'bold',
+         }}
       >
-        <Box sx={{ fontWeight: 700, lineHeight: '36px' }}>管理员</Box>
+        <Box sx={{
+          '&::before': {
+            content: '""',
+            display: 'inline-block',
+            width: 4,
+            height: 12,
+            bgcolor: 'common.black',
+            borderRadius: '2px',
+            mr: 1,
+          },
+        }}>管理员清单</Box>
         <Button
           variant='contained'
           color='primary'
@@ -249,4 +271,4 @@ const AdminTable = () => {
   );
 };
 
-export default AdminTable;
+export default AdminUser;
diff --git a/ui/src/pages/generalSetting/components/cardAdminUser.tsx b/ui/src/pages/generalSetting/components/cardAdminUser.tsx
new file mode 100644
index 0000000..993157b
--- /dev/null
+++ b/ui/src/pages/generalSetting/components/cardAdminUser.tsx
@@ -0,0 +1,25 @@
+import Card from '@/components/card';
+import { Box, Stack } from "@mui/material"
+import AdminUser from './adminUser';
+import AdminLoginHistory from './adminLoginHistory';
+
+
+const CardAdminUser = () => {
+
+  return <Card sx={{ p : 0, }}>
+    <Box sx={{
+      fontWeight: 'bold',
+      px: 2,
+      py: 1.5,
+      bgcolor: 'rgb(248, 249, 250)',
+      borderTopLeftRadius: '10px',
+      borderTopRightRadius: '10px',
+    }}>管理员配置</Box>
+    <Stack direction='column'>
+      <AdminUser />
+      <AdminLoginHistory />
+    </Stack>
+  </Card>
+}
+
+export default CardAdminUser;
\ No newline at end of file
diff --git a/ui/src/pages/generalSetting/baseURLSettings.tsx b/ui/src/pages/generalSetting/components/cardServiceSettings.tsx
similarity index 93%
rename from ui/src/pages/generalSetting/baseURLSettings.tsx
rename to ui/src/pages/generalSetting/components/cardServiceSettings.tsx
index 81a9532..b0f718d 100644
--- a/ui/src/pages/generalSetting/baseURLSettings.tsx
+++ b/ui/src/pages/generalSetting/components/cardServiceSettings.tsx
@@ -5,7 +5,7 @@ import { useEffect, useState } from "react"
 import { getGetSetting, putUpdateSetting } from '@/api/Admin';
 import { DomainUpdateSettingReq } from '@/api/types';
 
-const BaseURLSettings = () => {
+const CardServiceSettings = () => {
   const [baseURL, setBaseURL] = useState('');
   const [initialBaseURL, setInitialBaseURL] = useState('');
 
@@ -69,12 +69,14 @@ const BaseURLSettings = () => {
 
   const hasValueChanged = baseURL !== initialBaseURL;
 
-  return <Card sx={{p : 0}}>
+  return <Card sx={{p : 0, borderBottom: '1px solid #e0e0e0'}}>
     <Box sx={{
       fontWeight: 'bold',
       px: 2,
       py: 1.5,
-      bgcolor: 'rgb(248, 249, 250)'
+      bgcolor: 'rgb(248, 249, 250)',
+      borderTopLeftRadius: '10px',
+      borderTopRightRadius: '10px',
     }}>MonkeyCode 服务配置</Box>
     <Stack direction='column'>
       <Box sx={{ width: '100%' }}>
@@ -117,4 +119,4 @@ const BaseURLSettings = () => {
   </Card>
 }
 
-export default BaseURLSettings;
\ No newline at end of file
+export default CardServiceSettings;
\ No newline at end of file
diff --git a/ui/src/pages/generalSetting/index.tsx b/ui/src/pages/generalSetting/index.tsx
index 7306aa1..0459e7f 100644
--- a/ui/src/pages/generalSetting/index.tsx
+++ b/ui/src/pages/generalSetting/index.tsx
@@ -1,14 +1,15 @@
-import React from 'react';
-import BaseURLSettings from './baseURLSettings';
-import { Grid2 as Grid, Stack } from '@mui/material';
+import CardServiceSettings from './components/cardServiceSettings';
+import { Grid2 as Grid } from '@mui/material';
+import CardAdminUser from './components/cardAdminUser';
 
 const GeneralSetting = () => {
   return (
     <Grid container  spacing={2} sx={{ height: '100%' }}>
         <Grid size={6}>
-          <BaseURLSettings />
+          <CardServiceSettings />
         </Grid>
         <Grid size={6}>
+          <CardAdminUser />
         </Grid>
     </Grid>
   );
diff --git a/ui/src/pages/memberManage/memberManage.tsx b/ui/src/pages/memberManage/memberManage.tsx
index bd7ac5a..a32a7b7 100644
--- a/ui/src/pages/memberManage/memberManage.tsx
+++ b/ui/src/pages/memberManage/memberManage.tsx
@@ -266,7 +266,7 @@ const MemberManage = () => {
     {
       title: '加入时间',
       dataIndex: 'created_at',
-      width: 120,
+      width: 140,
       render: (text) => {
         return dayjs.unix(text).fromNow();
       },
@@ -274,7 +274,7 @@ const MemberManage = () => {
     {
       title: '最近活跃',
       dataIndex: 'last_active_at',
-      width: 120,
+      width: 140,
       render: (text, record) => {
         return record.last_active_at === 0
           ? '从未使用'
@@ -284,7 +284,7 @@ const MemberManage = () => {
     {
       title: '',
       dataIndex: 'action',
-      width: 100,
+      width: 80,
       render: (_, record) => {
         return (
           <IconButton
diff --git a/ui/src/router.tsx b/ui/src/router.tsx
index 9a4e85f..0ebba31 100644
--- a/ui/src/router.tsx
+++ b/ui/src/router.tsx
@@ -83,10 +83,6 @@ const routerConfig = [
         path: 'member-management',
         element: <MemberManage />,
       },
-      {
-        path: 'admin',
-        element: <Admin />,
-      },
       {
         path: 'general-setting',
         element: <GeneralSetting />,