Merge branch 'lichang' into lite

src/views/neData/base-online/index.vue

@@ -6,11 +6,11 @@ import { SizeType } from 'ant-design-vue/es/config-provider';
 import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import { useRoute } from 'vue-router';
 import { listAMFNblist } from '@/api/neData/amf';
 import { listMMENblist } from '@/api/neData/mme';
-const neInfoStore = useNeInfoStore();
+const neListStore = useNeListStore();
 const route = useRoute();
 const { t } = useI18n();
 
@@ -264,57 +264,40 @@ function fnGetList(pageNum?: number) {
 
 onMounted(() => {
   // 获取网元网元列表
-  neInfoStore
-    .fnNelist()
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS) {
-        if (res.data.length > 0) {
-          // 过滤不可用的网元
-          for (const item of neInfoStore.getNeCascaderOptions) {
-            if (!['AMF', 'MME'].includes(item.value)) continue;
-            const v = JSON.parse(JSON.stringify(item));
+  for (const item of neListStore.getNeCascaderOptions) {
+    // 过滤不可用的网元
+    if (!['AMF', 'MME'].includes(item.value)) continue;
+    const v = JSON.parse(JSON.stringify(item));
 
-            if (v.label === 'AMF') {
-              v.label = '5G';
-            }
-            if (v.label === 'MME') {
-              v.label = '4G';
-            }
-            neCascaderOptions.value.push(v);
-          }
-
-          if (neCascaderOptions.value.length === 0) {
-            message.warning({
-              content: t('common.noData'),
-              duration: 2,
-            });
-            return;
-          }
-
-          // 无查询参数neType时 默认选择AMF
-          const queryNeType = (route.query.neType as string) || '5G';
-          const item = neCascaderOptions.value.find(
-            s => s.value === queryNeType
-          );
-          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 {
-        message.warning({
-          content: t('common.noData'),
-          duration: 2,
-        });
-      }
-    })
-    .finally(() => {
-      // 获取列表数据
-      fnGetList();
+    if (v.label === 'AMF') {
+      v.label = '5G';
+    }
+    if (v.label === 'MME') {
+      v.label = '4G';
+    }
+    neCascaderOptions.value.push(v);
+  }
+  if (neCascaderOptions.value.length === 0) {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
     });
+    return;
+  }
+
+  // 无查询参数neType时 默认选择AMF
+  const queryNeType = (route.query.neType as string) || '5G';
+  const item = neCascaderOptions.value.find(s => s.value === queryNeType);
+  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];
+  }
+
+  // 获取列表数据
+  fnGetList();
 });
 </script>
 

src/views/neData/base-station/list.vue

@@ -12,7 +12,7 @@ import { SizeType } from 'ant-design-vue/es/config-provider';
 import { ColumnsType } from 'ant-design-vue/es/table';
 import { ProModal } from 'antdv-pro-modal';
 import UploadModal from '@/components/UploadModal/index.vue';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import useI18n from '@/hooks/useI18n';
 const { t, currentLocale } = useI18n();
 import {
@@ -32,6 +32,8 @@ import saveAs from 'file-saver';
 import { readSheet, writeSheet } from '@/utils/execl-utils';
 import { useRoute } from 'vue-router';
 const route = useRoute();
+const neListStore = useNeListStore();
+
 // 异步加载组件
 const HistoryModal = defineAsyncComponent(
   () => import('./components/history.vue')
@@ -655,40 +657,32 @@ async function fnModalImportTemplate() {
 
 onMounted(() => {
   // 获取网元网元列表
-  useNeInfoStore()
-    .fnNelist()
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS) {
-        if (res.data.length > 0) {
-          let arr: Record<string, any>[] = [];
-          useNeInfoStore().neCascaderOptions.forEach(item => {
-            if (['AMF', 'MME'].includes(item.value)) {
-              arr.push(JSON.parse(JSON.stringify(item)));
-            }
-          });
-          neCascaderOptions.value = arr;
-          // 无查询参数neType时 默认选择AMF
-          const queryNeType = (route.query.neType as string) || 'AMF';
-          const item = arr.find(s => s.value === queryNeType);
-          if (item && item.children) {
-            const info = item.children[0];
-            neTypeAndId.value = [info.neType, info.neId];
-          } else {
-            const info = neCascaderOptions.value[0].children[0];
-            neTypeAndId.value = [info.neType, info.neId];
-          }
-        }
-      } else {
-        message.warning({
-          content: t('common.noData'),
-          duration: 2,
-        });
-      }
-    })
-    .finally(() => {
-      // 获取列表数据
-      fnGetList();
+  neListStore.neCascaderOptions.forEach(item => {
+    if (['AMF', 'MME'].includes(item.value)) {
+      neCascaderOptions.value.push(JSON.parse(JSON.stringify(item)));
+    }
+  });
+  if (neCascaderOptions.value.length === 0) {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
     });
+    return;
+  }
+  
+  // 无查询参数neType时 默认选择AMF
+  const queryNeType = (route.query.neType as string) || 'AMF';
+  const item = neCascaderOptions.value.find(s => s.value === queryNeType);
+  if (item && item.children) {
+    const info = item.children[0];
+    neTypeAndId.value = [info.neType, info.neId];
+  } else {
+    const info = neCascaderOptions.value[0].children[0];
+    neTypeAndId.value = [info.neType, info.neId];
+  }
+
+  // 获取列表数据
+  fnGetList();
 });
 </script>
 

src/views/neData/base-station/topology.vue

@@ -5,7 +5,7 @@ import { listAMFNbStatelist } from '@/api/neData/amf';
 import { parseBasePath } from '@/plugins/file-static-url';
 import { edgeLineAnimateState } from '@/views/monitor/topologyBuild/hooks/registerEdge';
 import { nodeImageAnimateState } from '@/views/monitor/topologyBuild/hooks/registerNode';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { stateNeInfo } from '@/api/ne/neInfo';
@@ -13,6 +13,7 @@ import { parseDateToStr } from '@/utils/date-utils';
 import { useFullscreen } from '@vueuse/core';
 import { listMMENbStatelist } from '@/api/neData/mme';
 const { t } = useI18n();
+const neListStore = useNeListStore();
 
 /**图DOM节点实例对象 */
 const graphG6Dom = useTemplateRef('graphG6Dom');
@@ -358,9 +359,7 @@ function handleRanderGraph(container: HTMLElement | null, data: GraphData) {
 /**
  * 获取图组数据渲染到画布
  */
-async function fnGraphDataLoad() {
-  // 加载基础网元
-  await useNeInfoStore().fnNelist();
+async function fnGraphDataLoad() { 
   const dataNe = await fnGraphDataBase();
   Object.assign(graphData, dataNe);
   graphG6.value = handleRanderGraph(graphG6Dom.value, dataNe);
@@ -381,7 +380,7 @@ async function fnGraphDataBase() {
     edges: [],
   };
   // 添加基础网元
-  for (const item of useNeInfoStore().getNeSelectOtions) {
+  for (const item of neListStore.getNeSelectOtions) {
     if ('OMC' === item.value) {
       if (item.children?.length === 0) continue;
       // 是否存在OMC保证唯一

src/views/neData/ims-sub/index.vue

@@ -5,11 +5,12 @@ import { message } from 'ant-design-vue/es';
 import { SizeType } from 'ant-design-vue/es/config-provider';
 import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/es/table';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { listIMSSessionList } from '@/api/neData/ims';
 const { t } = useI18n();
+const neListStore = useNeListStore();
 
 /**网元参数 */
 let neOtions = ref<Record<string, any>[]>([]);
@@ -147,13 +148,13 @@ function fnGetList(pageNum?: number) {
     queryParams.pageNum = pageNum;
   }
   listIMSSessionList(toRaw(queryParams)).then(res => {
-     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
       // 取消勾选
       if (tableState.selectedRowKeys.length > 0) {
         tableState.selectedRowKeys = [];
       }
-      tablePagination.total =  res.data.length;
-      tableState.data =  res.data;
+      tablePagination.total = res.data.length;
+      tableState.data = res.data;
       if (
         tablePagination.total <=
           (queryParams.pageNum - 1) * tablePagination.pageSize &&
@@ -172,33 +173,24 @@ function fnGetList(pageNum?: number) {
 
 onMounted(() => {
   // 获取网元网元列表
-  useNeInfoStore()
-    .fnNelist()
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS) {
-        if (res.data.length > 0) {
-          let arr: Record<string, any>[] = [];
-          res.data.forEach((v: any) => {
-            if (v.neType === 'IMS') {
-              arr.push({ value: v.neId, label: v.neName });
-            }
-          });
-          neOtions.value = arr;
-          if (arr.length > 0) {
-            queryParams.neId = arr[0].value;
-          }
-        }
-      } else {
-        message.warning({
-          content: t('common.noData'),
-          duration: 2,
-        });
-      }
-    })
-    .finally(() => {
-      // 获取列表数据
-      fnGetList();
+  neListStore.neCascaderOptions.forEach(item => {
+    if (item.value === 'IMS') {
+      neOtions.value = JSON.parse(JSON.stringify(item.children));
+    }
+  });
+  if (neOtions.value.length === 0) {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
     });
+    return;
+  }
+  if (neOtions.value.length > 0) {
+    queryParams.neId = neOtions.value[0].value;
+  }
+
+  // 获取列表数据
+  fnGetList();
 });
 </script>
 
@@ -223,7 +215,11 @@ onMounted(() => {
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item label="IMSI" name="imsi">
-              <a-input v-model:value="queryParams.imsi" allow-clear :maxlength="15"></a-input>
+              <a-input
+                v-model:value="queryParams.imsi"
+                allow-clear
+                :maxlength="15"
+              ></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">

src/views/neData/smf-sub/index.vue

@@ -7,11 +7,11 @@ import { SizeType } from 'ant-design-vue/es/config-provider';
 import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/es/table';
 import { listSMFSubList } from '@/api/neData/smf';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 const { t } = useI18n();
-
+const neListStore = useNeListStore();
 /**网元参数 */
 let neOtions = ref<Record<string, any>[]>([]);
 
@@ -225,7 +225,7 @@ function fnGetList(pageNum?: number) {
     queryParams.pageNum = pageNum;
   }
   listSMFSubList(toRaw(queryParams)).then(res => {
-     if (res.code === RESULT_CODE_SUCCESS) {
+    if (res.code === RESULT_CODE_SUCCESS) {
       const { total, rows } = res.data;
       tablePagination.total = total;
       tableState.data = rows;
@@ -247,33 +247,24 @@ function fnGetList(pageNum?: number) {
 
 onMounted(() => {
   // 获取网元网元列表
-  useNeInfoStore()
-    .fnNelist()
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS) {
-        if (res.data.length > 0) {
-          let arr: Record<string, any>[] = [];
-          res.data.forEach((v: any) => {
-            if (v.neType === 'SMF') {
-              arr.push({ value: v.neId, label: v.neName });
-            }
-          });
-          neOtions.value = arr;
-          if (arr.length > 0) {
-            queryParams.neId = arr[0].value;
-          }
-        }
-      } else {
-        message.warning({
-          content: t('common.noData'),
-          duration: 2,
-        });
-      }
-    })
-    .finally(() => {
-      // 获取列表数据
-      fnGetList();
+  neListStore.neCascaderOptions.forEach(item => {
+    if (item.value === 'SMF') {
+      neOtions.value = JSON.parse(JSON.stringify(item.children));
+    }
+  });
+  if (neOtions.value.length === 0) {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
     });
+    return;
+  }
+  if (neOtions.value.length > 0) {
+    queryParams.neId = neOtions.value[0].value;
+  }
+
+  // 获取列表数据
+  fnGetList();
 });
 </script>
 

src/views/neData/udm-auth/index.vue

@@ -8,7 +8,7 @@ import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/es/table';
 import UploadModal from '@/components/UploadModal/index.vue';
 import TableColumnsDnd from '@/components/TableColumnsDnd/index.vue';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { saveAs } from 'file-saver';
@@ -27,7 +27,7 @@ import {
 import { uploadFile } from '@/api/tool/file';
 import { getNeViewFile } from '@/api/tool/neFile';
 const { t } = useI18n();
-
+const neListStore = useNeListStore();
 /**网元参数 */
 let neOtions = ref<Record<string, any>[]>([]);
 
@@ -739,33 +739,24 @@ function fnModalDownloadImportTemplate() {
 
 onMounted(() => {
   // 获取网元网元列表
-  useNeInfoStore()
-    .fnNelist()
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS) {
-        if (res.data.length > 0) {
-          let arr: Record<string, any>[] = [];
-          res.data.forEach((v: any) => {
-            if (v.neType === 'UDM') {
-              arr.push({ value: v.neId, label: v.neName });
-            }
-          });
-          neOtions.value = arr;
-          if (arr.length > 0) {
-            queryParams.neId = arr[0].value;
-          }
-        }
-      } else {
-        message.warning({
-          content: t('common.noData'),
-          duration: 2,
-        });
-      }
-    })
-    .finally(() => {
-      // 获取列表数据
-      fnGetList();
+  neListStore.neCascaderOptions.forEach(item => {
+    if (item.value === 'UDM') {
+      neOtions.value = JSON.parse(JSON.stringify(item.children));
+    }
+  });
+  if (neOtions.value.length === 0) {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
     });
+    return;
+  }
+  if (neOtions.value.length > 0) {
+    queryParams.neId = neOtions.value[0].value;
+  }
+
+  // 获取列表数据
+  fnGetList();
 });
 </script>
 

src/views/neData/udm-sub/index.vue

@@ -8,7 +8,7 @@ import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/es/table';
 import UploadModal from '@/components/UploadModal/index.vue';
 import TableColumnsDnd from '@/components/TableColumnsDnd/index.vue';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import saveAs from 'file-saver';
@@ -28,7 +28,7 @@ import { getNeConfigData, addNeConfigData } from '@/api/ne/neConfig';
 import { uploadFile } from '@/api/tool/file';
 import { getNeViewFile } from '@/api/tool/neFile';
 const { t } = useI18n();
-
+const neListStore = useNeListStore();
 /**网元参数 */
 let neOtions = ref<Record<string, any>[]>([]);
 
@@ -1241,33 +1241,24 @@ async function fnModalDownloadImportTemplate() {
 
 onMounted(() => {
   // 获取网元网元列表
-  useNeInfoStore()
-    .fnNelist()
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS) {
-        if (res.data.length > 0) {
-          let arr: Record<string, any>[] = [];
-          res.data.forEach((v: any) => {
-            if (v.neType === 'UDM') {
-              arr.push({ value: v.neId, label: v.neName });
-            }
-          });
-          neOtions.value = arr;
-          if (arr.length > 0) {
-            queryParams.neId = arr[0].value;
-          }
-        }
-      } else {
-        message.warning({
-          content: t('common.noData'),
-          duration: 2,
-        });
-      }
-    })
-    .finally(() => {
-      // 获取列表数据
-      fnGetList();
+  neListStore.neCascaderOptions.forEach(item => {
+    if (item.value === 'UDM') {
+      neOtions.value = JSON.parse(JSON.stringify(item.children));
+    }
+  });
+  if (neOtions.value.length === 0) {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
     });
+    return;
+  }
+  if (neOtions.value.length > 0) {
+    queryParams.neId = neOtions.value[0].value;
+  }
+
+  // 获取列表数据
+  fnGetList();
 });
 </script>
 

src/views/neData/udm-voip/index.vue

@@ -22,14 +22,13 @@ import {
   listUDMVOIP,
   resetUDMVOIP,
 } from '@/api/neData/udm_voip';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { saveAs } from 'file-saver';
 import { uploadFileToNE } from '@/api/tool/file';
-
 const { t } = useI18n();
-
+const neListStore = useNeListStore();
 /**网元参数 */
 let neOtions = ref<Record<string, any>[]>([]);
 
@@ -540,31 +539,24 @@ function fnModalDownloadImportTemplate() {
 
 onMounted(() => {
   // 获取网元网元列表
-  useNeInfoStore()
-    .fnNelist()
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS && res.data?.length > 0) {
-        let arr: Record<string, any>[] = [];
-        res.data.forEach((v: any) => {
-          if (v.neType === 'UDM') {
-            arr.push({ value: v.neId, label: v.neName });
-          }
-        });
-        neOtions.value = arr;
-        if (arr.length > 0) {
-          queryParams.neId = arr[0].value;
-        }
-      } else {
-        message.warning({
-          content: t('common.noData'),
-          duration: 2,
-        });
-      }
-    })
-    .finally(() => {
-      // 获取列表数据
-      fnGetList();
+  neListStore.neCascaderOptions.forEach(item => {
+    if (item.value === 'UDM') {
+      neOtions.value = JSON.parse(JSON.stringify(item.children));
+    }
+  });
+  if (neOtions.value.length === 0) {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
     });
+    return;
+  }
+  if (neOtions.value.length > 0) {
+    queryParams.neId = neOtions.value[0].value;
+  }
+  
+  // 获取列表数据
+  fnGetList();
 });
 </script>
 

src/views/neData/udm-volte/index.vue

@@ -12,17 +12,7 @@ import {
 import { SizeType } from 'ant-design-vue/es/config-provider';
 import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
 import UploadModal from '@/components/UploadModal/index.vue';
-import {
-  addUDMVOIP,
-  batchAddUDMVOIP,
-  batchDelUDMVOIP,
-  delUDMVOIP,
-  exportUDMVOIP,
-  importUDMVOIP,
-  listUDMVOIP,
-  resetUDMVOIP,
-} from '@/api/neData/udm_voip';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { saveAs } from 'file-saver';
@@ -33,12 +23,12 @@ import {
   batchDelUDMVolteIMS,
   delUDMVolteIMS,
   exportUDMVolteIMS,
+  importUDMVolteIMS,
   listUDMVolteIMS,
   resetUDMVolteIMS,
 } from '@/api/neData/udm_volte_ims';
-
 const { t } = useI18n();
-
+const neListStore = useNeListStore();
 /**字典数据 */
 let dict: {
   /**Tag标签类型 0=VoIP, 1=VoLTE */
@@ -554,7 +544,7 @@ function fnModalUploadImportUpload(file: File) {
   uploadFileToNE('UDM', neID, file, 5)
     .then(res => {
       if (res.code === RESULT_CODE_SUCCESS) {
-        return importUDMVOIP({
+        return importUDMVolteIMS({
           neId: neID,
           uploadPath: res.data,
         });
@@ -601,31 +591,24 @@ function fnModalDownloadImportTemplate() {
 
 onMounted(() => {
   // 获取网元网元列表
-  useNeInfoStore()
-    .fnNelist()
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS && res.data?.length > 0) {
-        let arr: Record<string, any>[] = [];
-        res.data.forEach((v: any) => {
-          if (v.neType === 'UDM') {
-            arr.push({ value: v.neId, label: v.neName });
-          }
-        });
-        neOtions.value = arr;
-        if (arr.length > 0) {
-          queryParams.neId = arr[0].value;
-        }
-      } else {
-        message.warning({
-          content: t('common.noData'),
-          duration: 2,
-        });
-      }
-    })
-    .finally(() => {
-      // 获取列表数据
-      fnGetList();
+  neListStore.neCascaderOptions.forEach(item => {
+    if (item.value === 'UDM') {
+      neOtions.value = JSON.parse(JSON.stringify(item.children));
+    }
+  });
+  if (neOtions.value.length === 0) {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
     });
+    return;
+  }
+  if (neOtions.value.length > 0) {
+    queryParams.neId = neOtions.value[0].value;
+  }
+
+  // 获取列表数据
+  fnGetList();
 });
 </script>