From 36de89570fc5a3bcf305a8ea8e20b2d2a40019eb Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 24 Jan 2025 20:28:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=BF=9D=E7=95=99List=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ne-data/base-station/components/list.vue  |  6 ++-
 .../base-station/components/topology.vue      |  2 +-
 src/views/ne-data/base-station/index.vue      | 42 +++++--------------
 3 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/src/views/ne-data/base-station/components/list.vue b/src/views/ne-data/base-station/components/list.vue
index ae646ed4..3d62cfff 100644
--- a/src/views/ne-data/base-station/components/list.vue
+++ b/src/views/ne-data/base-station/components/list.vue
@@ -315,11 +315,15 @@ let modalState: ModalStateType = reactive({
   openByEdit: false,
   title: 'NB Config List',
   from: {
-    index: undefined,
     address: '',
+    index: undefined,
     name: '',
+    nbName: undefined,
+    offTime: undefined,
+    onTime: undefined,
     position: '',
     state: undefined,
+    ueNum: undefined,
   },
   confirmLoading: false,
 });
diff --git a/src/views/ne-data/base-station/components/topology.vue b/src/views/ne-data/base-station/components/topology.vue
index 03a178e8..6c83a55d 100644
--- a/src/views/ne-data/base-station/components/topology.vue
+++ b/src/views/ne-data/base-station/components/topology.vue
@@ -573,7 +573,7 @@ const interval = ref<boolean>(false);
 
 /**递归刷新图状态 */
 function repeatFn(reload: boolean = false) {
-  if (!interval.value) {
+  if (!interval.value || !graphG6Dom.value) {
     return;
   }
   fnGraphState(reload)
diff --git a/src/views/ne-data/base-station/index.vue b/src/views/ne-data/base-station/index.vue
index ba74093f..3013d16b 100644
--- a/src/views/ne-data/base-station/index.vue
+++ b/src/views/ne-data/base-station/index.vue
@@ -1,44 +1,17 @@
 <script setup lang="ts">
-import {
-  onMounted,
-  type Component,
-  defineAsyncComponent,
-  shallowRef,
-  ref,
-} from 'vue';
+import { ref } from 'vue';
 import { PageContainer } from 'antdv-pro-layout';
+import ListComponent from '@/views/ne-data/base-station/components/list.vue';
+import TopologyComponent from '@/views/ne-data/base-station/components/topology.vue';
 import useI18n from '@/hooks/useI18n';
 const { t } = useI18n();
-const defineComponent = shallowRef<Component | null>(null);
-
 const value = ref<string>('list');
-function fnSwitch(evt: any) {
-  const name = evt.target?.value;
-  if (name === 'topology') {
-    defineComponent.value = defineAsyncComponent(
-      () => import('@/views/ne-data/base-station/components/topology.vue')
-    );
-  }
-  if (name === 'list') {
-    defineComponent.value = defineAsyncComponent(
-      () => import('@/views/ne-data/base-station/components/list.vue')
-    );
-  }
-}
-
-onMounted(() => {
-  fnSwitch({ target: { value: 'list' } });
-});
 </script>
 
 <template>
   <PageContainer>
     <template #extra>
-      <a-radio-group
-        v-model:value="value"
-        button-style="solid"
-        @change="fnSwitch"
-      >
+      <a-radio-group v-model:value="value" button-style="solid">
         <a-radio-button value="list">
           {{ t('views.neData.baseStation.list') }}
         </a-radio-button>
@@ -48,7 +21,12 @@ onMounted(() => {
       </a-radio-group>
     </template>
 
-    <component :is="defineComponent" />
+    <div v-show="value === 'list'">
+      <ListComponent></ListComponent>
+    </div>
+    <div v-if="value === 'topology'">
+      <TopologyComponent></TopologyComponent>
+    </div>
   </PageContainer>
 </template>