Merge branch 'lichang' into lite

src/views/dashboard/amfUE/index.vue

@@ -11,7 +11,7 @@ import {
   RESULT_CODE_SUCCESS,
 } from '@/constants/result-constants';
 import useDictStore from '@/store/modules/dict';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import { listAMFDataUE, delAMFDataUE, exportAMFDataUE } from '@/api/neData/amf';
 import { parseDateToStr } from '@/utils/date-utils';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
@@ -22,6 +22,7 @@ import { useClipboard } from '@vueuse/core';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
 const { getDict } = useDictStore();
+const neListStore = useNeListStore();
 const ws = new WS();
 const queue = new PQueue({ concurrency: 1, autoStart: true });
 /**网元可选 */
@@ -463,36 +464,29 @@ onMounted(() => {
   });
 
   // 获取网元网元列表
-  useNeInfoStore()
-    .fnNelist()
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
-        let arr: Record<string, any>[] = [];
-        res.data.forEach((v: any) => {
-          if (v.neType === 'AMF') {
-            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,
-          });
-        }
-      } else {
-        message.warning({
-          content: t('common.noData'),
-          duration: 2,
-        });
-      }
-    })
-    .finally(() => {
-      // 获取列表数据
-      fnGetList();
+  neListStore.neCascaderOptions.forEach(item => {
+    if (item.value === 'AMF') {
+      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;
+  } else {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
+    });
+  }
+
+  // 获取列表数据
+  fnGetList();
 });
 
 onBeforeUnmount(() => {
@@ -564,7 +558,7 @@ onBeforeUnmount(() => {
               :label="t('views.dashboard.cdr.time')"
               name="queryRangePicker"
             >
-            <a-range-picker
+              <a-range-picker
                 v-model:value="queryRangePicker"
                 :presets="rangePickerPresets"
                 :bordered="true"

src/views/dashboard/imsCDR/index.vue

@@ -11,7 +11,7 @@ import {
   RESULT_CODE_SUCCESS,
 } from '@/constants/result-constants';
 import useDictStore from '@/store/modules/dict';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import {
   delIMSDataCDR,
   exportIMSDataCDR,
@@ -26,6 +26,7 @@ import dayjs, { type Dayjs } from 'dayjs';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
 const { getDict } = useDictStore();
+const neListStore = useNeListStore();
 const ws = new WS();
 const queue = new PQueue({ concurrency: 1, autoStart: true });
 
@@ -525,34 +526,31 @@ onMounted(() => {
       dict.cdrSipCodeCause = resArr[2].value;
     }
   });
+
   // 获取网元网元列表
-  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;
+  } else {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
+    });
+  }
+
+  // 获取列表数据
+  fnGetList();
 });
 
 onBeforeUnmount(() => {

src/views/dashboard/mmeUE/index.vue

@@ -12,7 +12,7 @@ import {
   RESULT_CODE_SUCCESS,
 } from '@/constants/result-constants';
 import useDictStore from '@/store/modules/dict';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import { listMMEDataUE, delMMEDataUE, exportMMEDataUE } from '@/api/neData/mme';
 import { parseDateToStr } from '@/utils/date-utils';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
@@ -22,6 +22,7 @@ import { useClipboard } from '@vueuse/core';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
 const { getDict } = useDictStore();
+const neListStore = useNeListStore();
 const ws = new WS();
 const queue = new PQueue({ concurrency: 1, autoStart: true });
 
@@ -471,36 +472,29 @@ onMounted(() => {
   });
 
   // 获取网元网元列表
-  useNeInfoStore()
-    .fnNelist()
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
-        let arr: Record<string, any>[] = [];
-        res.data.forEach((v: any) => {
-          if (v.neType === 'MME') {
-            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,
-          });
-        }
-      } else {
-        message.warning({
-          content: t('common.noData'),
-          duration: 2,
-        });
-      }
-    })
-    .finally(() => {
-      // 获取列表数据
-      fnGetList();
+  neListStore.neCascaderOptions.forEach(item => {
+    if (item.value === 'MME') {
+      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;
+  } else {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
+    });
+  }
+
+  // 获取列表数据
+  fnGetList();
 });
 
 onBeforeUnmount(() => {

src/views/dashboard/overview/components/Topology/index.vue

@@ -103,9 +103,9 @@ function handleRanderGraph(
     fitView: true,
     fitViewPadding: [20],
     autoPaint: true,
-    modes: {
-      default: ['drag-canvas', 'zoom-canvas'],
-    },
+    // modes: {
+    //   default: ['drag-canvas', 'zoom-canvas'],
+    // },
     groupByTypes: false,
     nodeStateStyles: {
       selected: {

src/views/dashboard/overview/index.vue

@@ -27,13 +27,13 @@ import useWS from './hooks/useWS';
 import useAppStore from '@/store/modules/app';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { useRouter } from 'vue-router';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import { message } from 'ant-design-vue';
 import { upfWhoId } from './hooks/useWS';
 
-const neInfoStore = useNeInfoStore();
 const router = useRouter();
 const appStore = useAppStore();
+const neListStore = useNeListStore();
 const { t } = useI18n();
 const { wsSend, userActivitySend, upfTFSend, reSendUPF } = useWS();
 
@@ -192,18 +192,20 @@ async function fnGetSkim() {
   const results = await Promise.allSettled(requests.map(r => r.promise));
 
   // 重置
-  Object.assign(skimState, {
-    udmSubNum: 0,
-    smfUeNum: 0,
-    imsUeNum: 0,
-    gnbNum: 0,
-    gnbUeNum: 0,
-    enbNum: 0,
-    enbUeNum: 0,
-  });
+  // Object.assign(skimState, {
+  //   udmSubNum: 0,
+  //   smfUeNum: 0,
+  //   imsUeNum: 0,
+  //   gnbNum: 0,
+  //   gnbUeNum: 0,
+  //   enbNum: 0,
+  //   enbUeNum: 0,
+  // });
   results.forEach((result, index) => {
     if (result.status === 'fulfilled') {
       requests[index].process(result.value);
+    } else {
+      requests[index].process(0);
     }
   });
 
@@ -289,63 +291,39 @@ const getPopupContainer = () => {
 };
 
 onMounted(() => {
-  neInfoStore
-    .fnNelist()
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS) {
-        if (res.data.length > 0) {
-          // UPF
-          let arr: Record<string, any>[] = [];
-          res.data.forEach((v: any) => {
-            if (v.neType === 'UPF') {
-              arr.push({ value: v.neId, label: v.neName, rmUid: v.rmUid });
-            }
-          });
-          neOtions.value = arr;
-          if (arr.length > 0) {
-            //queryParams.neRealId = arr[0].value;
-            fnSelectNe(arr[0].value, arr[0]);
-          }
-
-          // UDM
-          let arr1: Record<string, any>[] = [];
-          res.data.forEach((v: any) => {
-            if (v.neType === 'UDM') {
-              arr1.push({ value: v.neId, label: v.neName, rmUid: v.rmUid });
-            }
-          });
-          udmOtions.value = arr1;
-          if (arr1.length > 0) {
-            fnSelectUDM({ key: arr1[0].value });
-          }
-
-          // 过滤不可用的网元
-          neCascaderOptions.value = neInfoStore.getNeCascaderOptions.filter(
-            (item: any) => {
-              return ['UDM', 'SMF', 'IMS', 'AMF', 'MME'].includes(item.value);
-            }
-          );
-          if (neCascaderOptions.value.length === 0) {
-            message.warning({
-              content: t('common.noData'),
-              duration: 2,
-            });
-            return;
-          }
-        }
-      } else {
-        message.warning({
-          content: t('common.noData'),
-          duration: 2,
-        });
-      }
-    })
-    .finally(() => {
-      initFlag = true;
-      fnGetSkim().then(() => {
-        loadData();
-      });
+  // 获取网元网元列表
+  neListStore.neCascaderOptions.forEach(item => {
+    if (item.value === 'UPF') {
+      neOtions.value = JSON.parse(JSON.stringify(item.children));
+    }
+    if (item.value === 'UDM') {
+      udmOtions.value = JSON.parse(JSON.stringify(item.children));
+    }
+  });
+  if (neOtions.value.length > 0) {
+    fnSelectNe(neOtions.value[0].value, neOtions.value[0]);
+  }
+  if (udmOtions.value.length > 0) {
+    fnSelectUDM({ key: udmOtions.value[0].value });
+  }
+  // 过滤不可用的网元
+  neCascaderOptions.value = neListStore.getNeCascaderOptions.filter(
+    (item: any) => {
+      return ['UDM', 'SMF', 'IMS', 'AMF', 'MME'].includes(item.value);
+    }
+  );
+  if (neCascaderOptions.value.length === 0) {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
     });
+    return;
+  }
+
+  initFlag = true;
+  fnGetSkim().then(() => {
+    loadData();
+  });
 });
 
 onBeforeUnmount(() => {
@@ -384,6 +362,7 @@ onBeforeUnmount(() => {
             <div
               class="item toRouter"
               :title="t('views.dashboard.overview.toRouter')"
+              v-if="neListStore.fnHasNe(['udm'])"
             >
               <div @click="fnToRouter('UdmSub_2001')">
                 <UserOutlined
@@ -399,7 +378,11 @@ onBeforeUnmount(() => {
                   </div>
                   <template #overlay>
                     <a-menu @click="fnSelectUDM">
-                      <a-menu-item v-for="v in udmOtions" :key="v.value" :disabled="udmNeId === v.value">
+                      <a-menu-item
+                        v-for="v in udmOtions"
+                        :key="v.value"
+                        :disabled="udmNeId === v.value"
+                      >
                         {{ v.label }}
                       </a-menu-item>
                     </a-menu>
@@ -413,6 +396,7 @@ onBeforeUnmount(() => {
               :title="t('views.dashboard.overview.toRouter')"
               style="margin: 0 12px"
               v-perms:has="['dashboard:overview:imsUeNum']"
+              v-if="neListStore.fnHasNe(['ims'])"
             >
               <div>
                 <img :src="svgUserIMS" style="width: 18px; margin-right: 8px" />
@@ -427,6 +411,7 @@ onBeforeUnmount(() => {
               @click="fnToRouter('SmfSub_2005')"
               :title="t('views.dashboard.overview.toRouter')"
               v-perms:has="['dashboard:overview:smfUeNum']"
+              v-if="neListStore.fnHasNe(['smf'])"
             >
               <div>
                 <img :src="svgUserSMF" style="width: 18px; margin-right: 8px" />
@@ -439,7 +424,11 @@ onBeforeUnmount(() => {
           </div>
         </div>
       </div>
-      <div class="skim panel base" v-perms:has="['dashboard:overview:gnbBase']">
+      <div
+        class="skim panel base"
+        v-perms:has="['dashboard:overview:gnbBase']"
+        v-if="neListStore.fnHasNe(['amf'])"
+      >
         <div class="inner">
           <h3>
             <GlobalOutlined style="color: #68d8fe" />&nbsp;&nbsp; 5G
@@ -476,7 +465,11 @@ onBeforeUnmount(() => {
           </div>
         </div>
       </div>
-      <div class="skim panel base" v-perms:has="['dashboard:overview:enbBase']">
+      <div
+        class="skim panel base"
+        v-perms:has="['dashboard:overview:enbBase']"
+        v-if="neListStore.fnHasNe(['mme'])"
+      >
         <div class="inner">
           <h3>
             <GlobalOutlined style="color: #68d8fe" />&nbsp;&nbsp; 4G

src/views/dashboard/sgwcCDR/index.vue

@@ -5,7 +5,7 @@ import { Modal, 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_ERROR,
@@ -23,6 +23,7 @@ import saveAs from 'file-saver';
 import { useClipboard } from '@vueuse/core';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
+const neListStore = useNeListStore();
 const ws = new WS();
 const queue = new PQueue({ concurrency: 1, autoStart: true });
 
@@ -480,36 +481,29 @@ function wsMessage(res: Record<string, any>) {
 
 onMounted(() => {
   // 获取网元网元列表
-  useNeInfoStore()
-    .fnNelist()
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
-        let arr: Record<string, any>[] = [];
-        res.data.forEach((v: any) => {
-          if (v.neType === 'SGWC') {
-            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,
-          });
-        }
-      } else {
-        message.warning({
-          content: t('common.noData'),
-          duration: 2,
-        });
-      }
-    })
-    .finally(() => {
-      // 获取列表数据
-      fnGetList();
+  neListStore.neCascaderOptions.forEach(item => {
+    if (item.value === 'SGWC') {
+      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;
+  } else {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
+    });
+  }
+
+  // 获取列表数据
+  fnGetList();
 });
 
 onBeforeUnmount(() => {

src/views/dashboard/smfCDR/index.vue

@@ -5,7 +5,7 @@ import { Modal, 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_ERROR,
@@ -23,6 +23,7 @@ import dayjs, { type Dayjs } from 'dayjs';
 import { useClipboard } from '@vueuse/core';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
+const neListStore = useNeListStore();
 const ws = new WS();
 const queue = new PQueue({ concurrency: 1, autoStart: true });
 
@@ -507,33 +508,29 @@ function wsMessage(res: Record<string, any>) {
 
 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;
+  } else {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
+    });
+  }
+
+  // 获取列表数据
+  fnGetList();
 });
 
 onBeforeUnmount(() => {

src/views/dashboard/smfCDRByIMSI/index.vue

@@ -35,9 +35,10 @@ import {
 } from '@/constants/result-constants';
 import { parseSizeFromByte } from '@/utils/parse-utils';
 import { message } from 'ant-design-vue';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import dayjs, { Dayjs } from 'dayjs';
 const { t, currentLocale } = useI18n();
+const neListStore = useNeListStore();
 const ws = new WS();
 
 /**图DOM节点实例对象 */
@@ -558,33 +559,30 @@ function fnRealTime() {
 
 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(() => {
-      fnRanderChart();
-      fnRealTime();
+  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;
+  } else {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
+    });
+  }
+
+  // 绘图
+  fnRanderChart();
+  fnRealTime();
 });
 
 onBeforeUnmount(() => {

src/views/dashboard/smscCDR/index.vue

@@ -11,7 +11,7 @@ import {
   RESULT_CODE_ERROR,
   RESULT_CODE_SUCCESS,
 } from '@/constants/result-constants';
-import useNeInfoStore from '@/store/modules/neinfo';
+import useNeListStore from '@/store/modules/ne_list';
 import {
   delSMSCDataCDR,
   exportSMSCDataCDR,
@@ -26,6 +26,7 @@ import { hasPermissions } from '@/plugins/auth-user';
 import dayjs, { type Dayjs } from 'dayjs';
 const { copy } = useClipboard({ legacy: true });
 const { getDict } = useDictStore();
+const neListStore = useNeListStore();
 const { t } = useI18n();
 const ws = new WS();
 const queue = new PQueue({ concurrency: 1, autoStart: true });
@@ -479,37 +480,31 @@ onMounted(() => {
       dict.cdrCauseCode = resArr[0].value;
     }
   });
+
   // 获取网元网元列表
-  useNeInfoStore()
-    .fnNelist()
-    .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
-        let arr: Record<string, any>[] = [];
-        res.data.forEach((v: any) => {
-          if (v.neType === 'SMSC') {
-            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,
-          });
-        }
-      } else {
-        message.warning({
-          content: t('common.noData'),
-          duration: 2,
-        });
-      }
-    })
-    .finally(() => {
-      // 获取列表数据
-      fnGetList();
+  neListStore.neCascaderOptions.forEach(item => {
+    if (item.value === 'SMSC') {
+      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;
+  } else {
+    message.warning({
+      content: t('common.noData'),
+      duration: 2,
+    });
+  }
+
+  // 获取列表数据
+  fnGetList();
 });
 
 onBeforeUnmount(() => {