From 7f50ebc956e0b1bffe4abf8d82e3f071b6d82086 Mon Sep 17 00:00:00 2001
From: D8D Developer <zyh320888@vip.qq.com>
Date: Fri, 27 Jun 2025 02:42:15 +0000
Subject: [PATCH] u

---
 ...protected_route.tsx => ProtectedRoute.tsx} |  0
 src/client/admin/index.tsx                    | 35 +++++++++++++++++--
 src/client/admin/layouts/MainLayout.tsx       |  7 ++--
 .../{pages_dashboard.tsx => Dashboard.tsx}    |  0
 .../pages/{pages_login_reg.tsx => Login.tsx}  |  0
 .../pages/{pages_users.tsx => Users.tsx}      |  0
 src/client/admin/routes.tsx                   |  8 ++---
 src/client/admin/style_amap.css               | 35 -------------------
 src/client/admin/web_app.tsx                  |  8 ++---
 9 files changed, 42 insertions(+), 51 deletions(-)
 rename src/client/admin/components/{components_protected_route.tsx => ProtectedRoute.tsx} (100%)
 rename src/client/admin/pages/{pages_dashboard.tsx => Dashboard.tsx} (100%)
 rename src/client/admin/pages/{pages_login_reg.tsx => Login.tsx} (100%)
 rename src/client/admin/pages/{pages_users.tsx => Users.tsx} (100%)
 delete mode 100644 src/client/admin/style_amap.css

diff --git a/src/client/admin/components/components_protected_route.tsx b/src/client/admin/components/ProtectedRoute.tsx
similarity index 100%
rename from src/client/admin/components/components_protected_route.tsx
rename to src/client/admin/components/ProtectedRoute.tsx
diff --git a/src/client/admin/index.tsx b/src/client/admin/index.tsx
index 3ce1ad4..af1dd7d 100644
--- a/src/client/admin/index.tsx
+++ b/src/client/admin/index.tsx
@@ -1,11 +1,42 @@
 import { createRoot } from 'react-dom/client'
-import Web_app from './web_app'
+import { RouterProvider } from 'react-router';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { App as AntdApp } from 'antd'
+import dayjs from 'dayjs';
+import weekday from 'dayjs/plugin/weekday';
+import localeData from 'dayjs/plugin/localeData';
+import 'dayjs/locale/zh-cn';
 
+import { AuthProvider } from './hooks/AuthProvider';
+import { router } from './routes';
+
+// 配置 dayjs 插件
+dayjs.extend(weekday);
+dayjs.extend(localeData);
+
+// 设置 dayjs 语言
+dayjs.locale('zh-cn');
+
+// 创建QueryClient实例
+const queryClient = new QueryClient();
+
+// 应用入口组件
+const App = () => {
+  return (
+    <QueryClientProvider client={queryClient}>
+      <AntdApp>
+        <AuthProvider>
+          <RouterProvider router={router} />
+        </AuthProvider>
+      </AntdApp>
+    </QueryClientProvider>
+  )
+};
 
 const rootElement = document.getElementById('root')
 if (rootElement) {
   const root = createRoot(rootElement)
   root.render(
-    <Web_app />
+    <App />
   )
 }
\ No newline at end of file
diff --git a/src/client/admin/layouts/MainLayout.tsx b/src/client/admin/layouts/MainLayout.tsx
index f761b94..a37a2b6 100644
--- a/src/client/admin/layouts/MainLayout.tsx
+++ b/src/client/admin/layouts/MainLayout.tsx
@@ -14,8 +14,8 @@ import {
   UserOutlined
 } from '@ant-design/icons';
 import { useAuth } from '../hooks/AuthProvider';
-import { useTheme } from '../hooks/ThemeProvider';
 import { useMenu, useMenuSearch, type MenuItem } from '../menu';
+import { getGlobalConfig } from '@/client/utils/utils';
 
 const { Header, Sider, Content } = Layout;
 
@@ -25,7 +25,6 @@ const { Header, Sider, Content } = Layout;
  */
 export const MainLayout = () => {
   const { user } = useAuth();
-  const { isDark } = useTheme();
   const [showBackTop, setShowBackTop] = useState(false);
   const location = useLocation();
   
@@ -105,7 +104,7 @@ export const MainLayout = () => {
 
   
   // 应用名称 - 从CONFIG中获取或使用默认值
-  const appName = window.CONFIG?.APP_NAME || '应用Starter';
+  const appName = getGlobalConfig('APP_NAME') || '应用Starter';
   
   return (
     <Layout style={{ minHeight: '100vh' }}>
@@ -145,7 +144,7 @@ export const MainLayout = () => {
         
         {/* 菜单列表 */}
         <Menu
-          theme={isDark ? 'dark' : 'light'}
+          theme='light'
           mode="inline"
           items={filteredMenuItems}
           openKeys={openKeys}
diff --git a/src/client/admin/pages/pages_dashboard.tsx b/src/client/admin/pages/Dashboard.tsx
similarity index 100%
rename from src/client/admin/pages/pages_dashboard.tsx
rename to src/client/admin/pages/Dashboard.tsx
diff --git a/src/client/admin/pages/pages_login_reg.tsx b/src/client/admin/pages/Login.tsx
similarity index 100%
rename from src/client/admin/pages/pages_login_reg.tsx
rename to src/client/admin/pages/Login.tsx
diff --git a/src/client/admin/pages/pages_users.tsx b/src/client/admin/pages/Users.tsx
similarity index 100%
rename from src/client/admin/pages/pages_users.tsx
rename to src/client/admin/pages/Users.tsx
diff --git a/src/client/admin/routes.tsx b/src/client/admin/routes.tsx
index 0e0d670..4438032 100644
--- a/src/client/admin/routes.tsx
+++ b/src/client/admin/routes.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
 import { createBrowserRouter, Navigate } from 'react-router';
-import { ProtectedRoute } from './components/components_protected_route';
+import { ProtectedRoute } from './components/ProtectedRoute';
 import { MainLayout } from './layouts/MainLayout';
 import { ErrorPage } from './components/ErrorPage';
 import { NotFoundPage } from './components/NotFoundPage';
-import { DashboardPage } from './pages/pages_dashboard';
-import { UsersPage } from './pages/pages_users';
-import { LoginPage } from './pages/pages_login_reg';
+import { DashboardPage } from './pages/Dashboard';
+import { UsersPage } from './pages/Users';
+import { LoginPage } from './pages/Login';
 
 export const router = createBrowserRouter([
   {
diff --git a/src/client/admin/style_amap.css b/src/client/admin/style_amap.css
deleted file mode 100644
index 9e8c842..0000000
--- a/src/client/admin/style_amap.css
+++ /dev/null
@@ -1,35 +0,0 @@
-
-.marker-label {
-  color: #333;
-  font-size: 12px;
-  background: #fff;
-  padding: 2px 6px;
-  border: 1px solid #ccc;
-  border-radius: 2px;
-  white-space: nowrap;
-  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
-  display: flex;
-  align-items: center;
-  gap: 4px;
-}
-
-.amap-marker-label {
-    border: none !important;
-    background: none !important;
-}
-
-.status-dot {
-  display: inline-block;
-  width: 8px;
-  height: 8px;
-  border-radius: 50%;
-  margin-left: 4px;
-}
-
-.status-dot.online {
-  background-color: #4CAF50;
-}
-
-.status-dot.offline {
-  background-color: #FF5252;
-}
\ No newline at end of file
diff --git a/src/client/admin/web_app.tsx b/src/client/admin/web_app.tsx
index 2254eb8..c2eb25e 100644
--- a/src/client/admin/web_app.tsx
+++ b/src/client/admin/web_app.tsx
@@ -21,17 +21,13 @@ const queryClient = new QueryClient();
 
 // 应用入口组件
 const App = () => {
-  return <RouterProvider router={router} />
-};
-
-export default () => {
   return (
     <QueryClientProvider client={queryClient}>
       <AntdApp>
         <AuthProvider>
-          <App />
+          <RouterProvider router={router} />
         </AuthProvider>
       </AntdApp>
     </QueryClientProvider>
   )
-};
+};
\ No newline at end of file