From 6ce34dd63c8be339a55a4b7bc5b513ef3d564c03 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 26 Feb 2025 14:24:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=A4=9A=E8=AF=AD=E8=A8=80=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8Dkey/=E5=9B=BE=E6=A0=87=E5=BC=95=E7=94=A8=E7=BC=BA?=
 =?UTF-8?q?=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/langs/en-us.ts      |  1 -
 src/locales/langs/zh-cn.ts      | 12 +++++++-----
 src/views/manage/user/index.vue |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 83a0578..15cbbb6 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -768,7 +768,6 @@ const local: any = {
       selectGroup:'No Group',
       total:'Total',
       name:'SSID Name',
-      security:'Security',
       none:'None',
       security: {
         security:'Security',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 803e6da..8250fda 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -769,12 +769,14 @@ const local:any = {
       selectGroup:'无网络组',
       total:'共',
       name:'SSID名称',
-      security:'安全性',
       none:'无',
-      wpaEnterprise:'WPA-Enterprise',
-      wpaPersonal:'WPA-Personal',
-      ppskWithoutRadius:'PPSK without RADIUS',
-      ppskWithRadius:'PPSK with RADIUS',
+      security: {
+        security:'安全性',
+        wpaEnterprise: 'WPA-Enterprise',
+        wpaPersonal: 'WPA-Personal',
+        ppskWithoutRadius: 'PPSK without RADIUS',
+        ppskWithRadius: 'PPSK with RADIUS',
+      },
       band:'频段',
       guestNetwork:'访客网络',
       enable:'开启',
diff --git a/src/views/manage/user/index.vue b/src/views/manage/user/index.vue
index 1bed535..95e1369 100644
--- a/src/views/manage/user/index.vue
+++ b/src/views/manage/user/index.vue
@@ -7,7 +7,7 @@ import { enableStatusRecord } from '@/constants/business';
 import { SimpleScrollbar } from '~/packages/materials/src';
 import UserOperateDrawer from './modules/user-operate-drawer.vue';
 import UserSearch from './modules/user-search.vue';
-import {  LockOutlined } from '@ant-design/icons-vue';
+import { UserOutlined, LockOutlined } from '@ant-design/icons-vue';
 
 const wrapperEl = shallowRef<HTMLElement | null>(null);
 const { height: wrapperElHeight } = useElementSize(wrapperEl);

From c38b67ff57b1cb55f26d0c6e149b019198da34c1 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 26 Feb 2025 14:25:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=B8=83=E5=B1=80horizontal-mix?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9B=AE=E5=BD=95=E8=B7=B3=E8=BD=AC=E9=A6=96?=
 =?UTF-8?q?=E4=B8=AA=E5=AD=90=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/modules/global-menu/horizontal-mix-menu.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/layouts/modules/global-menu/horizontal-mix-menu.vue b/src/layouts/modules/global-menu/horizontal-mix-menu.vue
index 1a57b2d..0fea3f1 100644
--- a/src/layouts/modules/global-menu/horizontal-mix-menu.vue
+++ b/src/layouts/modules/global-menu/horizontal-mix-menu.vue
@@ -12,7 +12,10 @@ const { routerPushByKey } = useRouterPush();
 
 function handleSelectMixMenu(menu: App.Global.Menu) {
   setActiveFirstLevelMenuKey(menu.key);
-
+  // 选择首个子菜单
+  if (Array.isArray(menu.children) && menu.children.length > 0) {
+    routerPushByKey(menu.children[0].routeKey);
+  }
   if (!menu.children?.length) {
     routerPushByKey(menu.routeKey);
   }