From 322b5f18edb2a2cea5f51f22423f1224503fc4be Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 15 Jan 2025 17:55:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9F=BA=E7=AB=99=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AE=BE=E5=A4=87=E5=90=8D=E5=92=8C=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E7=94=A8=E6=88=B7=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts                              |  9 +++++----
 src/i18n/locales/zh-CN.ts                              |  1 +
 src/views/ne-data/base-station/components/list.vue     | 10 ++++++++--
 src/views/ne-data/base-station/components/topology.vue |  6 +++++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 03072e79..5bf4aba0 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -710,15 +710,16 @@ export default {
       baseStation: {
         list: "List",
         topology: "Topology",
-        nbName: "Equipment Name",
+        nbName: "RanNodeName",
+        ueNum: "UE Number",
         topologyTitle: "Radio State Graph",
-        name: "Radio Name",
+        name: "Name",
         namePlease: "text content length 0~64",
-        position: "Radio Address",
+        position: "Position",
         positionPlease: "location description. Prohibition of spaces, length of text content 0-64",
         address: "IP Address",
         addressPlease: "text content length 0~64",
-        state: "Radio State",
+        state: "State",
         online: "Online",
         offline: "Offline",
         time: "Change Time",
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 9c22b727..1227aa5c 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -711,6 +711,7 @@ export default {
         list: "列表",
         topology: "拓扑图",
         nbName: "设备名称",
+        ueNum: "在线用户数",
         topologyTitle: "基站状态关系图",
         name: "基站名称",
         namePlease: "文本内容长度0~64",
diff --git a/src/views/ne-data/base-station/components/list.vue b/src/views/ne-data/base-station/components/list.vue
index d823cd1e..0d9cad63 100644
--- a/src/views/ne-data/base-station/components/list.vue
+++ b/src/views/ne-data/base-station/components/list.vue
@@ -104,6 +104,12 @@ let tableColumns = ref<ColumnsType>([
     title: t('views.neData.baseStation.nbName'),
     dataIndex: 'nbName',
     align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.neData.baseStation.ueNum'),
+    dataIndex: 'ueNum',
+    align: 'left',
     width: 80,
   },
   {
@@ -114,12 +120,12 @@ let tableColumns = ref<ColumnsType>([
     width: 80,
   },
   {
-    title: t('views.neData.baseStation.time'), 
+    title: t('views.neData.baseStation.time'),
     align: 'left',
     width: 150,
     customRender(opt) {
       const record = opt.value;
-      console.log(opt)
+      console.log(opt);
       if (record.state === 'OFF') {
         return record.offTime || '-';
       }
diff --git a/src/views/ne-data/base-station/components/topology.vue b/src/views/ne-data/base-station/components/topology.vue
index 1c54a012..c25f2de8 100644
--- a/src/views/ne-data/base-station/components/topology.vue
+++ b/src/views/ne-data/base-station/components/topology.vue
@@ -142,7 +142,11 @@ const graphNodeTooltip = new Tooltip({
         <div>==============================</div>
         <div><strong>ID：</strong><span>${nInfo.index}</span></div>
         <div><strong>${t('views.neData.baseStation.address')}：</strong><span>
-        ${nInfo.address}</span></div>
+        ${nInfo.address ?? '--'}</span></div>
+        <div><strong>${t('views.neData.baseStation.nbName')}：</strong><span>
+        ${nInfo.nbName ?? '--'}</span></div>
+        <div><strong>${t('views.neData.baseStation.ueNum')}：</strong><span>
+        ${nInfo.ueNum ?? '--'}</span></div>
         <div><strong>${t('views.neData.baseStation.name')}：</strong><span>
         ${nInfo.name ?? '--'}
         </span></div>