From 15d5dc93c05a1f1d7dea93be056a86c2de8a1e52 Mon Sep 17 00:00:00 2001
From: wmp <17516219072@163.com>
Date: Tue, 21 Oct 2025 11:21:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(root)/gatewayMonitor/page.tsx |  9 ++-------
 src/app/(root)/layout.tsx              | 23 +++++++++++++++--------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/app/(root)/gatewayMonitor/page.tsx b/src/app/(root)/gatewayMonitor/page.tsx
index a53159b..5c5779f 100644
--- a/src/app/(root)/gatewayMonitor/page.tsx
+++ b/src/app/(root)/gatewayMonitor/page.tsx
@@ -218,7 +218,6 @@ function GatewayConfigContent() {
       setGatewayPairs(gatewayPairsList)
       setCurrentTotal(matrix.length)
       setTotalCount(Object.values(macConfigMap).reduce((sum, configs) => sum + configs.length, 0))
-      console.log('矩阵构建完成：', { 表头列数: gatewayPairsList.length, 矩阵行数: matrix.length })
     }
     catch (error) {
       toast.error('构建矩阵数据失败')
@@ -383,12 +382,8 @@ function GatewayConfigContent() {
               </FormItem>
             )}
           />
-          <Button type="submit" className="ml-2 mt-6 px-4 py-2 bg-blue-600 hover:bg-blue-700">
-            查询
-          </Button>
-          <Button type="button" variant="outline" className="ml-2 mt-6 px-4 py-2" onClick={() => form.reset()}>
-            重置
-          </Button>
+          <Button type="submit" className="ml-2 mt-6 px-4 py-2 bg-blue-600 hover:bg-blue-700">查询</Button>
+          <Button type="button" variant="outline" className="ml-2 mt-6 px-4 py-2" onClick={() => form.reset()}>重置</Button>
         </form>
       </Form>
 
diff --git a/src/app/(root)/layout.tsx b/src/app/(root)/layout.tsx
index 825c138..a461e0e 100644
--- a/src/app/(root)/layout.tsx
+++ b/src/app/(root)/layout.tsx
@@ -6,6 +6,13 @@ import { logout } from '@/actions/auth'
 import { LogOutIcon } from 'lucide-react'
 import Link from 'next/link'
 import { cn } from '@/lib/utils'
+import { DoorClosedIcon } from 'lucide-react'
+import { DoorClosedLockedIcon } from 'lucide-react'
+import { DoorOpenIcon } from 'lucide-react'
+import { MapPinnedIcon } from 'lucide-react'
+import { ContainerIcon } from 'lucide-react'
+import { GitForkIcon } from 'lucide-react'
+import { SettingsIcon } from 'lucide-react'
 
 export default function DashboardLayout({
   children,
@@ -64,13 +71,13 @@ export default function DashboardLayout({
       <div className="flex-auto overflow-hidden flex">
         {/* 侧边栏 */}
         <nav className="flex-none basis-64 p-3 space-y-2 border-r flex flex-col">
-          <NavbarItem href="/gatewayinfo" active={isActive('/gatewayinfo')}>网关信息</NavbarItem>
-          <NavbarItem href="/gatewayConfig" active={isActive('/gatewayConfig')}>网关配置</NavbarItem>
-          <NavbarItem href="/gatewayMonitor" active={isActive('/gatewayMonitor')}>网关查询</NavbarItem>
-          <NavbarItem href="/cityNodeStats" active={isActive('/cityNodeStats')}>城市信息</NavbarItem>
-          <NavbarItem href="/allocationStatus" active={isActive('/allocationStatus')}>分配状态</NavbarItem>
-          <NavbarItem href="/edge" active={isActive('/edge')}>节点信息</NavbarItem>
-          <NavbarItem href="/settings" active={isActive('/settings')}>设置</NavbarItem>
+          <NavbarItem href="/gatewayinfo" active={isActive('/gatewayinfo')}><DoorClosedIcon size={20} />网关信息</NavbarItem>
+          <NavbarItem href="/gatewayConfig" active={isActive('/gatewayConfig')}><DoorClosedLockedIcon size={20} />网关配置</NavbarItem>
+          <NavbarItem href="/gatewayMonitor" active={isActive('/gatewayMonitor')}><DoorOpenIcon size={20} />配置总览</NavbarItem>
+          <NavbarItem href="/cityNodeStats" active={isActive('/cityNodeStats')}><MapPinnedIcon size={20} />城市信息</NavbarItem>
+          <NavbarItem href="/allocationStatus" active={isActive('/allocationStatus')}><ContainerIcon size={20} />分配状态</NavbarItem>
+          <NavbarItem href="/edge" active={isActive('/edge')}><GitForkIcon size={20} />节点信息</NavbarItem>
+          <NavbarItem href="/settings" active={isActive('/settings')}><SettingsIcon size={20} />设置</NavbarItem>
         </nav>
 
         {/* 内容区域 */}
@@ -92,7 +99,7 @@ function NavbarItem(props: {
       href={props.href}
       className={cn(
         'transition-colors duration-150 ease-in-out',
-        'p-2 rounded-md text-sm flex items-center',
+        'p-2 gap-2 rounded-md text-sm flex items-center',
         props.active
           ? 'text-primary bg-primary/10'
           : 'hover:bg-muted',