Merge remote-tracking branch 'origin/main' into multi-tenant

src/views/dashboard/overview/hooks/useTopology.ts

@@ -22,7 +22,7 @@ export const notNeNodes = [
 /**图状态 */
 export const graphState = reactive<Record<string, any>>({
   /**当前图组名 */
-  group: '5GC System Architecture5',
+  group: '5GC System Architecture',
   /**图数据 */
   data: {
     combos: [],

src/views/dashboard/overview/hooks/useWS.ts

@@ -55,37 +55,37 @@ export default function useWS() {
     // 普通信息
     switch (requestId) {
       // AMF_UE会话事件
-      case '1010':
+      case 'amf_1010_001':
         if (Array.isArray(data.rows)) {
           eventListParse('amf_ue', data);
         }
         break;
       // MME_UE会话事件
-      case '1011':
+      case 'mme_1011_001':
         if (Array.isArray(data.rows)) {
           eventListParse('mme_ue', data);
         }
         break;
       // IMS_CDR会话事件
-      case '1005':
+      case 'ims_1005_001':
         if (Array.isArray(data.rows)) {
           eventListParse('ims_cdr', data);
         }
         break;
       //UPF-总流量数
-      case '1030_0':
+      case 'upf_001_0':
         const v0 = upfTFParse(data);
         upfTotalFlow.value[0].up = v0.up;
         upfTotalFlow.value[0].down = v0.down;
         upfTotalFlow.value[0].requestFlag = false;
         break;
-      case '1030_7':
+      case 'upf_001_7':
         const v7 = upfTFParse(data);
         upfTotalFlow.value[1].up = v7.up;
         upfTotalFlow.value[1].down = v7.down;
         upfTotalFlow.value[1].requestFlag = false;
         break;
-      case '1030_30':
+      case 'upf_001_30':
         const v30 = upfTFParse(data);
         upfTotalFlow.value[2].up = v30.up;
         upfTotalFlow.value[2].down = v30.down;
@@ -104,19 +104,19 @@ export default function useWS() {
         }
         break;
       // AMF_UE会话事件
-      case '1010':
+      case '1010_001':
         if (data.data) {
           queue.add(() => eventItemParseAndPush('amf_ue', data.data));
         }
         break;
       // MME_UE会话事件
-      case '1011':
+      case '1011_001':
         if (data.data) {
           queue.add(() => eventItemParseAndPush('mme_ue', data.data));
         }
         break;
       // IMS_CDR会话事件
-      case '1005':
+      case '1005_001':
         if (data.data) {
           queue.add(() => eventItemParseAndPush('ims_cdr', data.data));
         }
@@ -140,7 +140,7 @@ export default function useWS() {
     }
     upfTotalFlow.value[index].requestFlag = true;
     ws.send({
-      requestId: `1030_${day}`,
+      requestId: `upf_001_${day}`,
       type: 'upf_tf',
       data: {
         neType: 'UPF',
@@ -154,7 +154,7 @@ export default function useWS() {
   function userActivitySend() {
     // AMF_UE会话事件
     ws.send({
-      requestId: '1010',
+      requestId: 'amf_1010_001',
       type: 'amf_ue',
       data: {
         neType: 'AMF',
@@ -167,7 +167,7 @@ export default function useWS() {
     });
     // MME_UE会话事件
     ws.send({
-      requestId: '1011',
+      requestId: 'mme_1011_001',
       type: 'mme_ue',
       data: {
         neType: 'MME',
@@ -180,7 +180,7 @@ export default function useWS() {
     });
     // IMS_CDR会话事件
     ws.send({
-      requestId: '1005',
+      requestId: 'ims_1005_001',
       type: 'ims_cdr',
       data: {
         neType: 'IMS',
@@ -211,11 +211,11 @@ export default function useWS() {
         /**订阅通道组
          *
          * 指标UPF (GroupID:12_neId)
-         * AMF_UE会话事件(GroupID:1010)
-         * MME_UE会话事件(GroupID:1011)
-         * IMS_CDR会话事件(GroupID:1005)
+         * AMF_UE会话事件(GroupID:1010_neId)
+         * MME_UE会话事件(GroupID:1011_neId)
+         * IMS_CDR会话事件(GroupID:1005_neId)
          */
-        subGroupID: '12_' + rmUid + ',1010,1011,1005',
+        subGroupID: '12_' + rmUid + ',1010_001,1011_001,1005_001',
       },
       onmessage: wsMessage,
       onerror: wsError,