Merge branch 'main' into multi-tenant

src/views/neUser/base5G/index.vue

@@ -157,6 +157,53 @@ function fnGet45GList(pageNum?: number) {
   if (pageNum) {
     queryParams.pageNum = pageNum;
   }
+  if (!queryParams.neType) {
+    promises.value = [];
+    //同时获取45G基站信息 且在每条信息中添加45G字段(原始数据没有) 已经筛选后的
+    neCascaderOptions.value.map((item: any) => {
+      item.children.forEach((child: any) => {
+        promises.value.push(
+          listBase5G({
+            neId: child.neId,
+            neType: child.neType,
+            nbId: queryParams.id,
+            pageNum: queryParams.pageNum,
+            pageSize: 10000,
+          })
+        );
+      });
+    });
+
+    Promise.allSettled(promises.value).then(results => {
+      results.forEach(result => {
+        if (result.status === 'fulfilled') {
+          const allBaseData = result.value;
+          if (
+            allBaseData.code === RESULT_CODE_SUCCESS &&
+            Array.isArray(allBaseData.rows)
+          ) {
+            // 处理成功结果
+            tablePagination.total += allBaseData.total;
+            tableState.data = [...tableState.data, ...allBaseData.rows];
+            if (
+              tablePagination.total <=
+                (queryParams.pageNum - 1) * tablePagination.pageSize &&
+              queryParams.pageNum !== 1
+            ) {
+              tableState.loading = false;
+              fnGetList(queryParams.pageNum - 1);
+            }
+          } else {
+            //AMF返回404是代表没找到这个数据 GNB_NOT_FOUND
+            tablePagination.total = 0;
+            tableState.data = [];
+          }
+          tableState.loading = false;
+        }
+      });
+    });
+    return;
+  }
 
   const typeArr: any = [];
   const typeMapping: any = {