From 6874508d3f404a543862b8ff97a84545de53fb5b Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Thu, 5 Sep 2024 16:42:43 +0800
Subject: [PATCH] =?UTF-8?q?neType=E7=A9=BA=E6=97=B6=E5=88=99=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=85=A8=E9=83=A8=E5=9F=BA=E7=AB=99=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/neUser/base5G/index.vue | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/views/neUser/base5G/index.vue b/src/views/neUser/base5G/index.vue
index 162b0be9..c657a151 100644
--- a/src/views/neUser/base5G/index.vue
+++ b/src/views/neUser/base5G/index.vue
@@ -74,6 +74,15 @@ let tableColumns = ref<TableColumnsType>([
     align: 'center',
     width: 100,
   },
+  {
+    title: 'NE Name',
+    dataIndex: 'neName',
+    align: 'left',
+    resizable: true,
+    width: 200,
+    minWidth: 150,
+    maxWidth: 400,
+  },
   {
     title: 'UE Number',
     dataIndex: 'ueNum',
@@ -89,6 +98,7 @@ let tableColumns = ref<TableColumnsType>([
     minWidth: 150,
     maxWidth: 400,
   },
+
   {
     title: 'Radio Address',
     dataIndex: 'address',
@@ -138,10 +148,11 @@ function fnGetList(pageNum?: number) {
     queryParams.pageNum = pageNum;
   }
   if (!queryParams.neType) {
+    tableState.data = [];
     promises.value = [];
     //同时获取45G基站信息 且在每条信息中添加45G字段(原始数据没有) 已经筛选后的
     neCascaderOptions.value.map((item: any) => {
-      item.children.forEach((child: any) => {
+      item.children.forEach((child: any) => { 
         promises.value.push(
           listBase5G({
             neId: child.neId,
@@ -149,6 +160,14 @@ function fnGetList(pageNum?: number) {
             nbId: queryParams.id,
             pageNum: queryParams.pageNum,
             pageSize: 10000,
+          }).then(res => {
+            // 添加 neName 字段到每一项数据
+            if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
+              res.rows.forEach(row => {
+                row.neName = `${child.neType}_${child.neId}`;
+              });
+            }
+            return res;
           })
         );
       });
@@ -182,6 +201,7 @@ function fnGetList(pageNum?: number) {
         }
       });
     });
+
     return;
   }
 
@@ -200,6 +220,11 @@ function fnGetList(pageNum?: number) {
       }
       tablePagination.total = res.total;
       tableState.data = res.rows;
+
+      res.rows.forEach((item: any) => {
+        item.neName = queryParams.neType.join('_');
+      });
+
       if (
         tablePagination.total <=
           (queryParams.pageNum - 1) * tablePagination.pageSize &&