修正基站接口

src/api/neUser/base5G.ts

@@ -8,13 +8,17 @@ import { parseObjLineToHump } from '@/utils/parse-utils';
  * @returns object
  */
 export async function listBase5G(query: Record<string, any>) {
-  query.nbId = query.id;
-  const realName=query.neType;
+  const realName = query.neType[0];
   //delete query['neName'];
   const result = await request({
     url: `/api/rest/ueManagement/v1/elementType/${realName}/objectType/nbInfo`,
     method: 'get',
-    params: query,
+    params: {
+      neId: query.neType[1],
+      nbId: query.id,
+      pageNum: query.pageNum,
+      pageSize: query.pageSize,
+    },
   });
   let data: DataList = {
     total: 0,

src/views/neUser/base5G/index.vue

@@ -6,20 +6,25 @@ import { SizeType } from 'ant-design-vue/lib/config-provider';
 import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/lib/table';
 import { listBase5G } from '@/api/neUser/base5G';
-import useNeInfoStore from '@/store/modules/neinfo';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import useNeInfoStore from '@/store/modules/neinfo';
+const neInfoStore = useNeInfoStore();
+
 const { t } = useI18n();
 
 /**网元参数 */
 let neOtions = ref<Record<string, any>[]>([]);
 
+/**网元参数 */
+let neCascaderOptions = ref<Record<string, any>[]>([]);
+
 /**查询参数 */
 let queryParams = reactive({
   /**网元ID */
   neId: undefined,
   /**网元类型 */
-  neType: undefined,
+  neType: ['', ''],
   /**GNB_ID */
   id: '',
   /**当前页数 */
@@ -161,21 +166,61 @@ function fnGetList(pageNum?: number) {
 
 onMounted(() => {
   // 获取网元网元列表
-  useNeInfoStore()
+  // useNeInfoStore()
+  //   .fnNelist()
+  //   .then(res => {
+  //     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+  //       if (res.data.length > 0) {
+  //         let arr: Record<string, any>[] = [];
+  //         res.data.forEach(i => {
+  //           if (i.neType === 'AMF' || i.neType === 'MME') {
+  //             arr.push({ value: i.neType, label: i.neName });
+  //           }
+  //         });
+  //         neOtions.value = arr;
+  //         if (arr.length > 0) {
+  //           queryParams.neType = arr[0].value;
+  //           queryParams.neId = arr[0].label.split('_')[1];
+  //         }
+  //       }
+  //     } else {
+  //       message.warning({
+  //         content: t('common.noData'),
+  //         duration: 2,
+  //       });
+  //     }
+  //   })
+  //   .finally(() => {
+  //     // 获取列表数据
+  //     fnGetList();
+  //   });
+
+  neInfoStore
     .fnNelist()
     .then(res => {
       if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
         if (res.data.length > 0) {
-          let arr: Record<string, any>[] = [];
-          res.data.forEach(i => {
-            if (i.neType === 'AMF' || i.neType === 'MME') {
-              arr.push({ value: i.neType, label: i.neName });
+          // 过滤不可用的网元
+          neCascaderOptions.value = neInfoStore.getNeCascaderOptions.filter(
+            (item: any) => {
+              return ['AMF', 'MME'].includes(item.value);
             }
-          });
-          neOtions.value = arr;
-          if (arr.length > 0) {
-            queryParams.neType = arr[0].value;
-            queryParams.neId = arr[0].label.split('_')[1];
+          );
+          if (neCascaderOptions.value.length === 0) {
+            message.warning({
+              content: t('common.noData'),
+              duration: 2,
+            });
+            return;
+          }
+          // 默认选择UPF
+          const item = neCascaderOptions.value.find(s => s.value === 'AMF');
+          if (item && item.children) {
+            const info = item.children[0];
+            queryParams.neType = [info.neType, info.neId];
+          } else {
+            const info = neCascaderOptions.value[0].children[0];
+            queryParams.neType = [info.neType, info.neId];
           }
         }
       } else {
@@ -203,12 +248,20 @@ onMounted(() => {
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item :label="t('views.neUser.base5G.neType')" name="neId ">
+            <!-- <a-form-item :label="t('views.neUser.base5G.neType')" name="neId ">
               <a-select
                 v-model:value="queryParams.neType"
                 :options="neOtions"
                 :placeholder="t('common.selectPlease')"
               />
+            </a-form-item> -->
+            <a-form-item name="neId" :label="t('views.neUser.base5G.neType')">
+              <a-cascader
+                v-model:value="queryParams.neType"
+                :options="neCascaderOptions"
+                :allow-clear="false"
+                :placeholder="t('common.selectPlease')"
+              />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">