fix: 看板拓扑网元状态改为ws数据获取

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

@@ -233,10 +233,11 @@ function handleRanderChart(
 
 function fnChangeData(data: any[], itemID: string) {
   let info = data.find((item: any) => item.id === itemID);
-  if (!info.neState.online) {
-    info = data.find((item: any) => item.id === 'OMC');
-    graphNodeClickID.value = 'OMC';
-  }
+  if (!info.neState.online) return;
+  // if (!info.neState.online) {
+  //   info = data.find((item: any) => item.id === itemID);
+  //   graphNodeClickID.value = itemID;
+  // }
   // console.log(info.id);
   // console.log(info.neState.cpu.nfCpuUsage);
   // console.log(info.neState.cpu.sysCpuUsage);

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

@@ -1,62 +1,26 @@
 <script setup lang="ts">
-import { reactive, onMounted, ref, onBeforeUnmount } from 'vue';
-import { PageContainer } from 'antdv-pro-layout';
+import { onMounted, ref, onBeforeUnmount } from 'vue';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { listNe, stateNe } from '@/api/ne/ne';
+import { listNe } from '@/api/ne/ne';
 import { message } from 'ant-design-vue/lib';
 import { getGraphData } from '@/api/monitor/topology';
-import { parseDateToStr } from '@/utils/date-utils';
-import { Graph, GraphData, Menu, Tooltip } from '@antv/g6';
+import { Graph, GraphData, Tooltip } from '@antv/g6';
+import { edgeLineAnimateState } from '@/views/monitor/topologyBuild/hooks/registerEdge';
+import { nodeImageAnimateState } from '@/views/monitor/topologyBuild/hooks/registerNode';
 import {
-  edgeCubicAnimateCircleMove,
-  edgeCubicAnimateLineDash,
-  edgeLineAnimateState,
-} from '@/views/monitor/topologyBuild/hooks/registerEdge';
-import {
-  nodeCircleAnimateShapeR,
-  nodeCircleAnimateShapeStroke,
-  nodeImageAnimateState,
-  nodeRectAnimateState,
-} from '@/views/monitor/topologyBuild/hooks/registerNode';
-import { graphState, graphNodeClickID } from '../../hooks/useTopology';
+  graphG6,
+  graphState,
+  graphNodeClickID,
+  notNeNodes,
+} from '../../hooks/useTopology';
 import useI18n from '@/hooks/useI18n';
+import useWS from '../../hooks/useWS';
 const { t } = useI18n();
-// const { graphState } = useTopology();
+const { wsSend } = useWS();
 
 /**图DOM节点实例对象 */
 const graphG6Dom = ref<HTMLElement | undefined>(undefined);
 
-/**图状态 */
-// const graphState = reactive<Record<string, any>>({
-//   /**当前图组名 */
-//   group: '5GC System Architecture2',
-//   /**图数据 */
-//   data: {
-//     combos: [],
-//     edges: [],
-//     nodes: [],
-//   },
-// });
-
-/**非网元元素 */
-const notNeNodes = [
-  '5GC',
-  'DN',
-  'UE',
-  'Base',
-  'lan',
-  'lan1',
-  'lan2',
-  'lan3',
-  'lan4',
-  'lan5',
-  'lan6',
-  'lan7',
-];
-
-/**图实例对象 */
-const graphG6 = ref<any>(null);
-
 /**图节点展示 */
 const graphNodeTooltip = new Tooltip({
   offsetX: 10,
@@ -129,13 +93,16 @@ function handleRanderGraph(
   if (!container) return;
   const { clientHeight, clientWidth } = container;
 
+  edgeLineAnimateState();
+  nodeImageAnimateState();
+
   const graph = new Graph({
     container: container,
     width: clientWidth,
     height: clientHeight - 36,
     fitCenter: true,
     fitView: true,
-    fitViewPadding: [40],
+    fitViewPadding: [20],
     autoPaint: true,
     modes: {
       default: ['drag-canvas', 'zoom-canvas'],
@@ -282,97 +249,22 @@ const stateTimeout = ref<any>(null);
 /**查询网元状态 */
 async function fnGetState() {
   clearTimeout(stateTimeout.value);
-  const { combos, edges, nodes } = graphState.data;
-  // console.log({ combos, edges, nodes })
-
   // 获取节点状态
-  for (const node of nodes) {
+  for (const node of graphState.data.nodes) {
     if (notNeNodes.includes(node.id)) continue;
-    const { neType, neId, neName } = node.neInfo;
+    const { neType, neId } = node.neInfo;
     if (!neType || !neId) continue;
-    const result = await stateNe(neType, neId);
-    if (result.code === RESULT_CODE_SUCCESS) {
-      // 更新网元状态
-      const newNeState = Object.assign(node.neState, result.data, {
-        refreshTime: parseDateToStr(result.data.refreshTime, 'HH:mm:ss'),
-      });
-
-      // 通过 ID 查询节点实例
-      const item = graphG6.value.findById(node.id);
-      if (item) {
-        const stateColor = newNeState.online ? '#52c41a' : '#f5222d'; // 状态颜色
-        // 图片类型不能填充
-        if (node.type.startsWith('image')) {
-          // 更新节点
-          graphG6.value.updateItem(item, {
-            label: neName,
-          });
-          // 设置状态
-          graphG6.value.setItemState(item, 'top-right-dot', stateColor);
-        } else {
-          // 更新节点
-          graphG6.value.updateItem(item, {
-            label: neName,
-            // neState: newNeState,
-            style: {
-              fill: stateColor, // 填充色
-              stroke: stateColor, // 填充色
-            },
-            // labelCfg: {
-            //   style: {
-            //     fill: '#ffffff', // 标签文本色
-            //   },
-            // },
-          });
-          // 设置状态
-          graphG6.value.setItemState(item, 'stroke', newNeState.online);
-        }
-      }
-    }
+    wsSend({
+      requestId: `neState_${neType}_${neId}`,
+      type: 'ne_state',
+      data: {
+        neType: neType,
+        neId: neId,
+      },
+    });
   }
 
-  // 设置边状态
-  for (const edge of edges) {
-    const edgeSource: string = edge.source;
-    const edgeTarget: string = edge.target;
-    const neS = nodes.find((n: any) => n.id === edgeSource);
-    const neT = nodes.find((n: any) => n.id === edgeTarget);
-    // console.log(neS, edgeSource, neT, edgeTarget);
-    // 通过 ID 查询节点实例
-    const item = graphG6.value.findById(edge.id);
-    if (neS && neT && item) {
-      // console.log(
-      //   `${edgeSource} - ${edgeTarget}`,
-      //   neS.neState.online && neT.neState.online
-      // );
-      const stateColor =
-        neS.neState.online && neT.neState.online ? '#000000' : '#ff4d4f'; // 状态颜色
-      // 更新边
-      // graphG6.value.updateItem(item, {
-      //   label: `${edgeSource} - ${edgeTarget}`,
-      //   style: {
-      //     stroke: stateColor, // 填充色
-      //   },
-      //   labelCfg: {
-      //     style: {
-      //       fill: '#ffffff', // 标签文本色
-      //     },
-      //   },
-      // });
-      // 设置状态
-      // graphG6.value.setItemState(
-      //   item,
-      //   'line-dash',
-      //   neS.neState.online && neT.neState.online
-      // );
-    }
-    if (neS && notNeNodes.includes(edgeTarget)) {
-    }
-    if (neT && notNeNodes.includes(edgeSource)) {
-    }
-  }
-
-  stateTimeout.value = setTimeout(() => fnGetState(), 5_000);
+  stateTimeout.value = setTimeout(() => fnGetState(), 10_000);
 }
 
 onMounted(() => {