From 8b6e4b27e6cb750a832a763c73ac136f5f3e3f86 Mon Sep 17 00:00:00 2001
From: zhongzm <zhongzm@agt.com>
Date: Tue, 25 Feb 2025 14:50:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Aap=E8=AE=BE=E5=A4=87=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E5=92=8Cwlan?=
 =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/langs/en-us.ts          | 12 ++++++++----
 src/locales/langs/zh-cn.ts          |  1 +
 src/views/device/apdevice/index.vue | 29 ++++++++++++++++++++++++++---
 src/views/device/wlan/index.vue     |  6 +++---
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 46089d3..a728131 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -711,6 +711,7 @@ const local: any = {
       aptitle:'AP Device Management',
       online:'Online',
       outline:'Offline',
+      pending:'Pending',
       apname:'Device Name',
       ip:'IP',
       mac:'MAC',
@@ -765,10 +766,13 @@ const local: any = {
       name:'SSID Name',
       security:'Security',
       none:'None',
-      wpaEnterprise:'WPA-Enterprise',
-      wpaPersonal:'WPA-Personal',
-      ppskWithoutRadius:'PPSK without RADIUS',
-      ppskWithRadius:'PPSK with RADIUS',
+      security: {
+        security:'Security',
+        wpaEnterprise: 'WPA-Enterprise',
+        wpaPersonal: 'WPA-Personal',
+        ppskWithoutRadius: 'PPSK without RADIUS',
+        ppskWithRadius: 'PPSK with RADIUS',
+      },
       band:'Band',
       guestNetwork:'Guest Network',
       enable:'Enable',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 6bfd1f5..bae15cb 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -711,6 +711,7 @@ const local:any = {
       aptitle:'AP设备管理',
       online:'在线',
       outline:'离线',
+      pending:'待定',
       apname:'设备名称',
       ip:'IP地址',
       mac:'MAC地址',
diff --git a/src/views/device/apdevice/index.vue b/src/views/device/apdevice/index.vue
index a7b09ba..b3c86be 100644
--- a/src/views/device/apdevice/index.vue
+++ b/src/views/device/apdevice/index.vue
@@ -66,8 +66,8 @@
         >
           <template #bodyCell="{ column, record }">
             <template v-if="column.key === 'status'">
-              <ATag :color="record.status === 1 ? 'success' : 'error'">
-                {{ record.status === 1 ? t('page.apdevice.online') : t('page.apdevice.outline') }}
+              <ATag :color="getStatusColor(record.status)">
+                {{ getStatusText(record.status) }}
               </ATag>
             </template>
 
@@ -99,7 +99,7 @@
                   </a-tooltip>
                 </template>
 
-                <template v-if="record.status === 0">
+                <template v-if="record.status === 0 || record.status === 2">
                   <a-tooltip :title="t('page.apdevice.adopt')">
                     <a-button type="link" size="small" @click="handleAdopt(record)">
                       <template #icon>
@@ -709,6 +709,29 @@ const configFormRef = ref();
 onMounted(() => {
   getSiteList();
 });
+// 获取状态对应的颜色
+const getStatusColor = (status: number) => {
+  switch (status) {
+    case 1:
+      return 'success';
+    case 2:
+      return 'warning';
+    default:
+      return 'error';
+  }
+};
+
+// 获取状态对应的文本
+const getStatusText = (status: number) => {
+  switch (status) {
+    case 1:
+      return t('page.apdevice.online');
+    case 2:
+      return t('page.apdevice.pending');
+    default:
+      return t('page.apdevice.outline');
+  }
+};
 </script>
 
 <style scoped>
diff --git a/src/views/device/wlan/index.vue b/src/views/device/wlan/index.vue
index fc1ac87..162d34c 100644
--- a/src/views/device/wlan/index.vue
+++ b/src/views/device/wlan/index.vue
@@ -144,7 +144,7 @@
             <a-checkbox v-model:checked="addForm.guestNetEnable" />   {{t('page.wlan.open')}}
           </a-form-item>
 
-          <a-form-item name="security" :label="t('page.wlan.security')">
+          <a-form-item name="security" :label="t('page.wlan.security.security')">
             <a-select v-model:value="addForm.security">
               <a-select-option :value="0">{{ t('page.wlan.none') }}</a-select-option>
             </a-select>
@@ -209,7 +209,7 @@
             <a-checkbox v-model:checked="editForm.guestNetEnable" />   {{t('page.wlan.open')}}
           </a-form-item>
 
-          <a-form-item name="security" :label="t('page.wlan.security')">
+          <a-form-item name="security" :label="t('page.wlan.security.security')">
             <a-select v-model:value="editForm.security">
               <a-select-option :value="0">{{ t('page.wlan.none') }}</a-select-option>
             </a-select>
@@ -297,7 +297,7 @@ const {
       width: 150
     },
     {
-      title: t('page.wlan.security'),
+      title: t('page.wlan.security.security'),
       dataIndex: 'security',
       key: 'security',
       width: 100,