Merge branch 'main' into multi-tenant

src/views/ne/neConfig/hooks/useConfigList.ts

@@ -53,6 +53,13 @@ export default function useConfigList({
 
   /**单列表编辑 */
   function listEdit(row: Record<string, any>) {
+    if (
+      listState.confirmLoading ||
+      ['read-only', 'read', 'ro'].includes(row.access)
+    ) {
+      return;
+    }
+
     listState.editRecord = Object.assign({}, row);
   }
 

src/views/ne/neConfig/index.vue

@@ -597,9 +597,8 @@ onMounted(() => {
                         @click="listEdit(record)"
                         style="margin-left: 18px"
                         v-if="
-                          !['read-only', 'read', 'ro'].includes(
-                            record.access
-                          ) && !listState.confirmLoading
+                          !listState.confirmLoading &&
+                          !['read-only', 'read', 'ro'].includes(record.access)
                         "
                       />
                     </div>
@@ -658,7 +657,14 @@ onMounted(() => {
                       </a-button>
                     </a-tooltip>
                     <a-tooltip
-                      v-if="treeState.selectNode.paramPerms.includes('delete')"
+                      v-if="
+                        treeState.selectNode.paramPerms.includes('delete') &&
+                        !(
+                          neTypeSelect[0] === 'IMS' &&
+                          treeState.selectNode.paramName === 'plmn' &&
+                          text['value'] === 0
+                        )
+                      "
                     >
                       <template #title>{{ t('common.deleteText') }}</template>
                       <a-button type="link" @click.prevent="arrayDelete(text)">

src/views/ne/neInfo/index.vue

@@ -364,8 +364,18 @@ function fnGetList(pageNum?: number) {
       tablePagination.total = res.total;
       // 遍历处理资源情况数值
       tableState.data = res.rows.map(item => {
+        let resouresUsage = {
+          sysDiskUsage: 0,
+          sysMemUsage: 0,
+          sysCpuUsage: 0,
+          nfCpuUsage: 0,
+        };
         const neState = item.serverState;
-        const resouresUsage = parseResouresUsage(neState);
+        if (neState) {
+          resouresUsage = parseResouresUsage(neState);
+        } else {
+          item.serverState = { online: false };
+        }
         Reflect.set(item, 'resoures', resouresUsage);
         return item;
       });

src/views/ne/neQuickSetup/index.vue

@@ -47,13 +47,6 @@ function fnNext() {
 
       <div style="padding: 24px 12px 0; text-align: end">
         <a-space :size="8" align="center">
-          <a-button
-            type="primary"
-            :loading="state.confirmLoading"
-            @click="fnNext()"
-          >
-            {{ t('views.ne.neQuickSetup.stepNext') }}
-          </a-button>
           <a-button
             type="default"
             :disabled="state.confirmLoading"
@@ -62,6 +55,13 @@ function fnNext() {
             <template #icon><ReloadOutlined /></template>
             {{ t('views.ne.neQuickSetup.reloadPara5G') }}
           </a-button>
+          <a-button
+            type="primary"
+            :loading="state.confirmLoading"
+            @click="fnNext()"
+          >
+            {{ t('views.ne.neQuickSetup.stepNext') }}
+          </a-button>
         </a-space>
       </div>
     </a-card>

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 = {