diff --git a/src/views/dashboard/overview/index.vue b/src/views/dashboard/overview/index.vue index 4f1f052a..c535e372 100644 --- a/src/views/dashboard/overview/index.vue +++ b/src/views/dashboard/overview/index.vue @@ -73,9 +73,9 @@ let neCascaderOptions = ref[]>([]); const viewportDom = ref(null); const { isFullscreen, toggle } = useFullscreen(viewportDom); +let initFlag = false; /**10s调度器 */ const interval10s = ref(null); - /**5s调度器 */ const interval5s = ref(null); @@ -118,16 +118,28 @@ async function fnGetSkim() { 'SMF', { request: (neId: string) => listSMFSubNum(neId), - process: (res: any) => - res.code === RESULT_CODE_SUCCESS && (skimState.smfUeNum += res.data), + process: (res: any) => { + if ( + res.code === RESULT_CODE_SUCCESS && + typeof res.data === 'number' + ) { + skimState.smfUeNum += res.data; + } + }, }, ], [ 'IMS', { request: (neId: string) => listIMSSessionNum(neId), - process: (res: any) => - res.code === RESULT_CODE_SUCCESS && (skimState.imsUeNum += res.data), + process: (res: any) => { + if ( + res.code === RESULT_CODE_SUCCESS && + typeof res.data === 'number' + ) { + skimState.imsUeNum += res.data; + } + }, }, ], [ @@ -135,7 +147,7 @@ async function fnGetSkim() { { request: (neId: string) => listAMFNblist({ neId }), process: (res: any) => { - if (res.code === RESULT_CODE_SUCCESS) { + if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) { skimState.gnbNum += res.data.length; skimState.gnbUeNum += res.data.reduce( (sum: number, item: any) => sum + item.ueNum, @@ -150,7 +162,7 @@ async function fnGetSkim() { { request: (neId: string) => listMMENblist({ neId }), process: (res: any) => { - if (res.code === RESULT_CODE_SUCCESS) { + if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) { skimState.enbNum += res.data.length; skimState.enbUeNum += res.data.reduce( (sum: number, item: any) => sum + item.ueNum, @@ -206,7 +218,7 @@ function loadData() { clearInterval(interval10s.value); interval10s.value = setInterval(() => { - if (!interval10s.value) return; + if (!interval10s.value || !initFlag) return; if (upfTFActive.value === '0') { upfTFSend('7'); upfTFActive.value = '7'; @@ -221,7 +233,7 @@ function loadData() { clearInterval(interval5s.value); interval5s.value = setInterval(() => { - if (!interval5s.value) return; + if (!interval5s.value || !initFlag) return; fnGetSkim(); // 获取概览信息 fnGetNeState(); // 获取网元状态 }, 5_000); @@ -305,6 +317,7 @@ onMounted(() => { } }) .finally(() => { + initFlag = true; fnGetSkim().then(() => { loadData(); }); @@ -316,6 +329,7 @@ onBeforeUnmount(() => { interval10s.value = null; clearInterval(interval5s.value); interval5s.value = null; + initFlag = false; }); @@ -397,7 +411,7 @@ onBeforeUnmount(() => {
@@ -411,7 +425,7 @@ onBeforeUnmount(() => {
@@ -434,7 +448,7 @@ onBeforeUnmount(() => {
@@ -448,7 +462,7 @@ onBeforeUnmount(() => {
diff --git a/src/views/ne-data/base-station/list.vue b/src/views/ne-data/base-station/list.vue index 2fa1e01c..9b3c7407 100644 --- a/src/views/ne-data/base-station/list.vue +++ b/src/views/ne-data/base-station/list.vue @@ -30,6 +30,8 @@ import { import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import saveAs from 'file-saver'; import { readSheet, writeSheet } from '@/utils/execl-utils'; +import { useRoute } from 'vue-router'; +const route = useRoute(); // 异步加载组件 const HistoryModal = defineAsyncComponent( () => import('./components/history.vue') @@ -277,7 +279,7 @@ function fnGetList() { return; } req.then(res => { - if (res.code === RESULT_CODE_SUCCESS) { + if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) { // 取消勾选 if (tableState.selectedRowKeys.length > 0) { tableState.selectedRowKeys = []; @@ -666,7 +668,8 @@ onMounted(() => { }); neCascaderOptions.value = arr; // 无查询参数neType时 默认选择AMF - const item = arr.find(s => s.value === '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];