ref: v3变更,，表结构对应相关接口功能

src/api/faultManage/actAlarm.ts

@@ -6,15 +6,14 @@ import { parseObjLineToHump } from '@/utils/parse-utils';
  * 获取活动告警数
  * @returns object
  */
-export async function getActiveAlarmTotal(coreUid: string) {
+export async function getActiveAlarmTotal() {
   // 发起请求
   const result = await request({
     url: `/ne/data/alarm/list`,
     method: 'GET',
     params: {
-      coreUid: coreUid,
       alarmStatus: 'Active',
-      sortField: 'event_time',
+      sortField: 'createdTime',
       sortOrder: 'desc',
       pageNum: 1,
       pageSize: 1,
@@ -106,11 +105,11 @@ export function getPass() {
  * @param id 记录ID
  * @returns object
  */
-export function clearAlarm(id: number, coreUid: string) {
+export function clearAlarm(id: number | string) {
   return request({
     url: `/ne/data/alarm/clear`,
     method: 'PUT',
-    data: { id, coreUid },
+    data: { id },
   });
 }
 
@@ -191,13 +190,12 @@ export async function exportAll(query: Record<string, any>) {
  * @param query 查询参数
  * @returns bolb
  */
-export async function origGet(coreUid: string) {
+export async function origGet(alarmStatus: 'Active' | 'Clear') {
   return await request({
     url: `/ne/data/alarm/count/severity`,
     method: 'GET',
     params: {
-      coreUid: coreUid,
+      alarmStatus: alarmStatus,
-      alarmStatus: 'Active',
     },
   });
 }
@@ -207,13 +205,12 @@ export async function origGet(coreUid: string) {
  * @param filterFlag 查询参数
  * @returns object
  */
-export async function top3Sel(coreUid: string) {
+export async function top3Sel(alarmStatus: 'Active' | 'Clear') {
   return await request({
     url: `/ne/data/alarm/count/top`,
     method: 'GET',
     params: {
-      coreUid: coreUid,
+      alarmStatus: alarmStatus,
-      alarmStatus: 'Active',
       top: 3,
     },
   });

src/api/mmlManage/neOperate.ts

@@ -57,21 +57,15 @@ export async function sendMML(data: Record<string, any>) {
 
 /**
  * 发送网元的mml命令
- * @param coreUid 网元类型
  * @param neUid 网元ID
  * @param cmdArr 命令数组
  * @returns
  */
-export async function sendMMlByGeneral(
+export async function sendMMlByGeneral(neUid: string, cmdArr: string[]) {
-  coreUid: string,
-  neUid: string,
-  cmdArr: string[]
-) {
   return request({
     url: '/tool/mml/command',
     method: 'POST',
     data: {
-      coreUid: coreUid,
       neUid: neUid,
       type: 'General',
       command: cmdArr,

src/api/ne/neAction.ts

@@ -1,50 +1,46 @@
 import { request } from '@/plugins/http-fetch';
 
 /**
- * 查询网元状态
+ * 查询网元状态 
- * @param coreUid 核心网ID
  * @param neUid 网元ID
  * @returns object
  */
-export function stateNeInfo(coreUid: string, neUid: string) {
+export function stateNeInfo(neUid: string) {
   return request({
     url: '/ne/info/state',
     method: 'GET',
-    params: { coreUid, neUid },
+    params: { neUid },
   });
 }
 
 /**
  * 查询网元信息
- * @param coreUid 核心网ID
  * @param neUid 网元ID
  * @returns object
  */
-export function getNeInfoByNF(coreUid: string, neUid: string) {
+export function getNeInfoByNF(neUid: string) {
   return request({
     url: '/ne/info/nf',
     method: 'GET',
-    params: { coreUid, neUid },
+    params: { neUid },
   });
 }
 
 /**
  * 网元端OAM配置文件读取
- * @param coreUid 核心网ID
  * @param neUid 网元ID
  * @returns object
  */
-export function getOAMFile(coreUid: string, neUid: string) {
+export function getOAMFile(neUid: string) {
   return request({
     url: '/ne/info/file/oam',
     method: 'GET',
-    params: { coreUid, neUid },
+    params: { neUid },
   });
 }
 
 /**
- * 网元端配置文件写入
+ * 网元端配置文件写入 
- * @param coreUid 核心网ID
  * @param neUid 网元ID
  * @param content 用json对象
  * @param sync  同步到网元
@@ -73,7 +69,7 @@ export function getPara5GFilee() {
 /**
  * 网元端公共配置文件写入
  * @param content txt内容为字符串 其他文件格式都用json对象
- * @param syncNe  同步到网元端 coreUid@ neUid
+ * @param syncNe  同步到网元端 neUid
  * @returns object
  */
 export function savePara5GFile(data: Record<string, any>) {
@@ -87,7 +83,7 @@ export function savePara5GFile(data: Record<string, any>) {
 
 /**
  * 网元服务操作
- * @param data 对象 {coreUid, neUid, action}
+ * @param data 对象 {neUid, action}
  * @returns object
  */
 export function serviceNeAction(data: Record<string, any>) {

src/api/ne/neConfig.ts

@@ -68,11 +68,10 @@ export function delNeConfigData(params: Record<string, any>) {
 
 /**
  * 从参数配置PCF中获取对应信息提供给PCF用户策略输入框
- * @param coreUid 核心网标识
  * @param neUid 网元标识
  * @returns object {pccRules,sessionRules,qosTemplate,headerEnrichTemplate,serviceAreaRestriction}
  */
-export async function getPCFRule(coreUid: string, neUid: string) {
+export async function getPCFRule(neUid: string) {
   const paramNameArr = [
     'pccRules',
     'sessionRules',
@@ -85,7 +84,7 @@ export async function getPCFRule(coreUid: string, neUid: string) {
     reqArr.push(
       request({
         url: `/ne/config/data`,
-        params: { neType: 'PCF', coreUid, neUid, paramName },
+        params: { neType: 'PCF', neUid, paramName },
         method: 'GET',
       })
     );

src/api/ne/neInfo.ts

@@ -21,11 +21,11 @@ export function listNeInfo(query: Record<string, any>) {
  * @param infoId 信息ID
  * @returns object
  */
-export function getNeInfo(coreUid: string, id: string | number) {
+export function getNeInfo(id: string | number) {
   return request({
     url: `/ne/info`,
     method: 'GET',
-    params: { coreUid, id },
+    params: { id },
   });
 }
 
@@ -61,7 +61,7 @@ export function updateNeInfo(data: Record<string, any>) {
 
 /**
  * 网元信息删除
- * @param query 查询参数 coreUid, neUid id
+ * @param query 查询参数 id
  * @returns object
  */
 export function delNeInfo(query: Record<string, any>) {
@@ -75,7 +75,7 @@ export function delNeInfo(query: Record<string, any>) {
 
 /**
  * 查询网元列表全部无分页
- * @param query 查询参数 coreUid, neUid bandStatus bandHost
+ * @param query 查询参数 coreId, neUid bandStatus bandHost
  * @returns object
  */
 export function listAllNeInfo(query: Record<string, any>) {
@@ -86,3 +86,31 @@ export function listAllNeInfo(query: Record<string, any>) {
     timeout: 60_000,
   });
 }
+
+/**
+ * 网元授权激活授权申请码
+ * @param neType 网元类型
+ * @param neId 网元id
+ * @returns object
+ */
+export function codeNeLicense(neUid: string) {
+  return request({
+    url: `/ne/info/license/code`,
+    method: 'GET',
+    params: { neUid },
+  });
+}
+
+/**
+ * 网元授权激活授权文件替换
+ * @param data 网元对象 {"neUid": "", "licensePath": "", "reload": true}
+ * @returns object
+ */
+export function updateNeLicense(data: Record<string, any>) {
+  return request({
+    url: `/ne/info/license/update`,
+    method: 'POST',
+    data: data,
+    timeout: 180_000,
+  });
+}

src/api/ne/neLicense.ts

@@ -1,84 +0,0 @@
-import { request } from '@/plugins/http-fetch';
-
-/**
- * 查询网元授权列表
- * @param query 查询参数
- * @returns object
- */
-export function listNeLicense(query: Record<string, any>) {
-  return request({
-    url: '/ne/license/list',
-    method: 'GET',
-    params: query,
-    timeout: 60_000,
-  });
-}
-
-/**
- * 查询网元授权详细
- * @param licenseId 信息ID
- * @returns object
- */
-export function getNeLicense(coreUid: string, id: string | number) {
-  return request({
-    url: `/ne/license`,
-    method: 'GET',
-    params: { coreUid, id },
-  });
-}
-
-/**
- * 网元neType和neID查询
- * @param neType 网元类型
- * @param neUid 网元ID
- * @returns object
- */
-export function getNeLicenseByNF(coreUid: string, neUid: string) {
-  return request({
-    url: `/ne/license/nf`,
-    method: 'GET',
-    params: { coreUid, neUid },
-  });
-}
-
-/**
- * 网元授权激活授权申请码
- * @param neType 网元类型
- * @param neId 网元id
- * @returns object
- */
-export function codeNeLicense(coreUid: string, neUid: string) {
-  return request({
-    url: `/ne/license/code`,
-    method: 'GET',
-    params: { coreUid, neUid },
-  });
-}
-
-/**
- * 网元授权激活授权文件替换
- * @param data 网元对象 {"neType": "", "neId": "", "licensePath": "", "reload": true}
- * @returns object
- */
-export function changeNeLicense(data: Record<string, any>) {
-  return request({
-    url: `/ne/license/change`,
-    method: 'POST',
-    data: data,
-    timeout: 180_000,
-  });
-}
-
-/**
- * 网元授权激活状态
- * @param coreUid 核心uid
- * @param neUid 网元uid
- * @returns object
- */
-export function stateNeLicense(coreUid: string, neUid: string) {
-  return request({
-    url: `/ne/license/state`,
-    method: 'GET',
-    params: { coreUid, neUid },
-  });
-}

src/api/neDataNf/amf.ts

@@ -44,7 +44,7 @@ export function exportAMFDataUE(query: Record<string, any>) {
 
 /**
  * AMF-接入基站信息列表
- * @param query 查询参数 coreUid=001&neUid=001&id=1
+ * @param query 查询参数 neUid=001&id=1
  * @returns object
  */
 export function listAMFNblist(query: Record<string, any>) {
@@ -58,7 +58,7 @@ export function listAMFNblist(query: Record<string, any>) {
 
 /**
  * AMF-接入基站状态信息列表
- * @param query 查询参数 coreUid=001&neUid=001&state=1
+ * @param query 查询参数 neUid=001&state=1
  * @returns object
  */
 export function listAMFNbStatelist(query: Record<string, any>) {
@@ -76,18 +76,13 @@ export function listAMFNbStatelist(query: Record<string, any>) {
  * @param data 数据 { "index": 1, "name": "Gnb", "address": "192.168.8.1", "position": "Area-B" }
  * @returns object
  */
-export function addAMFNbState(
+export function addAMFNbState(neUid: string, data: Record<string, any>) {
-  coreUid: string,
-  neUid: string,
-  data: Record<string, any>
-) {
   return request({
     url: `/ne/config/data`,
     method: 'POST',
     data: {
       neType: 'AMF',
       neUid: neUid,
-      coreUid: coreUid,
       paramName: 'gnbList',
       paramData: data,
       loc: `${data.index}`,
@@ -97,23 +92,17 @@ export function addAMFNbState(
 
 /**
  * AMF-接入基站状态信息修改
- * @param coreUid 核心网标识
  * @param neUid 网元标识
  * @param data 数据 { "index": 1, "name": "Gnb", "address": "192.168.8.1", "position": "Area-B" }
  * @returns object
  */
-export function editAMFNbState(
+export function editAMFNbState(neUid: string, data: Record<string, any>) {
-  coreUid: string,
-  neUid: string,
-  data: Record<string, any>
-) {
   return request({
     url: `/ne/config/data`,
     method: 'PUT',
     data: {
       neType: 'AMF',
       neUid: neUid,
-      coreUid: coreUid,
       paramName: 'gnbList',
       paramData: data,
       loc: `${data.index}`,
@@ -123,23 +112,17 @@ export function editAMFNbState(
 
 /**
  * AMF-接入基站状态信息删除
- * @param coreUid 核心网标识
  * @param neUid 网元标识
  * @param index 数据index
  * @returns object
  */
-export function delAMFNbState(
+export function delAMFNbState(neUid: string, index: string | number) {
-  coreUid: string,
-  neUid: string,
-  index: string | number
-) {
   return request({
     url: `/ne/config/data`,
     method: 'DELETE',
     params: {
       neType: 'AMF',
       neUid: neUid,
-      coreUid: coreUid,
       paramName: 'gnbList',
       loc: `${index}`,
     },

src/api/neDataNf/ims.ts

@@ -47,17 +47,17 @@ export function exportIMSDataCDR(query: Record<string, any>) {
  * @param query 查询参数
  * @returns object
  */
-export function listIMSSessionNum(coreUid: string, neUid: string) {
+export function listIMSSessionNum(neUid: string) {
   return request({
     url: '/nf/ims/session/num',
     method: 'GET',
-    params: { coreUid, neUid },
+    params: { neUid },
   });
 }
 
 /**
  * IMS-在线会话用户列表信息
- * @param query 查询参数 {coreUid, neUid, imsi, msisdn}
+ * @param query 查询参数 { neUid, imsi, msisdn}
  * @returns objectv
  */
 export function listIMSSessionList(query: Record<string, any>) {

src/api/neDataNf/mme.ts

@@ -72,23 +72,17 @@ export function listMMENbStatelist(query: Record<string, any>) {
 
 /**
  * MME-接入基站状态信息新增
- * @param coreUid 核心网标识
  * @param neUid 网元标识
  * @param data 数据 { "index": 1, "name": "Enb", "address": "192.168.8.1", "position": "Area-B" }
  * @returns object
  */
-export function addMMENbState(
+export function addMMENbState(neUid: string, data: Record<string, any>) {
-  coreUid: string,
-  neUid: string,
-  data: Record<string, any>
-) {
   return request({
     url: `/ne/config/data`,
     method: 'POST',
     data: {
       neType: 'MME',
       neUid: neUid,
-      coreUid: coreUid,
       paramName: 'enbList',
       paramData: data,
       loc: `${data.index}`,
@@ -98,23 +92,17 @@ export function addMMENbState(
 
 /**
  * MME-接入基站状态信息修改
- * @param coreUid 核心网标识
  * @param neUid 网元标识
  * @param data 数据 { "index": 1, "name": "Enb", "address": "192.168.8.1", "position": "Area-B" }
  * @returns object
  */
-export function editMMENbState(
+export function editMMENbState(neUid: string, data: Record<string, any>) {
-  coreUid: string,
-  neUid: string,
-  data: Record<string, any>
-) {
   return request({
     url: `/ne/config/data`,
     method: 'PUT',
     data: {
       neType: 'MME',
       neUid: neUid,
-      coreUid: coreUid,
       paramName: 'enbList',
       paramData: data,
       loc: `${data.index}`,
@@ -124,23 +112,17 @@ export function editMMENbState(
 
 /**
  * MME-接入基站状态信息删除
- * @param coreUid 核心网标识
  * @param neUid 网元标识
  * @param index 数据index
  * @returns object
  */
-export function delMMENbState(
+export function delMMENbState(neUid: string, index: string | number) {
-  coreUid: string,
-  neUid: string,
-  index: string | number
-) {
   return request({
     url: `/ne/config/data`,
     method: 'DELETE',
     params: {
       neType: 'MME',
       neUid: neUid,
-      coreUid: coreUid,
       paramName: 'enbList',
       loc: `${index}`,
     },

src/api/neDataNf/smf.ts

@@ -47,17 +47,17 @@ export function exportSMFDataCDR(query: Record<string, any>) {
  * @param query 查询参数
  * @returns object
  */
-export function listSMFSubNum(coreUid: string, neUid: string) {
+export function listSMFSubNum(neUid: string) {
   return request({
     url: '/nf/smf/sub/num',
     method: 'GET',
-    params: { coreUid, neUid },
+    params: { neUid },
   });
 }
 
 /**
  * SMF-在线订阅用户列表信息
- * @param query 查询参数 {coreUid, neUid, pageNum, imsi, msisdn, upstate}
+ * @param query 查询参数 { neUid, pageNum, imsi, msisdn, upstate}
  * @returns object
  */
 export function listSMFSubList(query: Record<string, any>) {

src/api/neDataNf/udm_auth.ts

@@ -2,15 +2,14 @@ import { request } from '@/plugins/http-fetch';
 
 /**
  * UDM鉴权用户重载数据
- * @param coreUid 核心网标识
  * @param neUid 网元标识
  * @returns object
  */
-export function resetUDMAuth(coreUid: string, neUid: string) {
+export function resetUDMAuth(neUid: string) {
   return request({
     url: `/nf/udm/auth/reset`,
     method: 'PUT',
-    params: { coreUid, neUid },
+    params: { neUid },
     timeout: 180_000,
   });
 }

src/api/neDataNf/udm_sub.ts

@@ -2,15 +2,14 @@ import { request } from '@/plugins/http-fetch';
 
 /**
  * UDM签约用户重载数据
- * @param coreUid 核心网ID
  * @param neUid 网元ID
  * @returns object
  */
-export function resetUDMSub(coreUid: string, neUid: string) {
+export function resetUDMSub(neUid: string) {
   return request({
     url: `/nf/udm/sub/reset`,
     method: 'PUT',
-    params: { coreUid, neUid },
+    params: { neUid },
     timeout: 180_000,
   });
 }

src/api/neDataNf/udm_voip.ts

@@ -2,15 +2,14 @@ import { request } from '@/plugins/http-fetch';
 
 /**
  * UDMVoIP用户重载数据
- * @param coreUid 核心网ID
  * @param neUid 网元ID
  * @returns object
  */
-export function resetUDMVoIP(coreUid: string, neUid: string) {
+export function resetUDMVoIP(neUid: string) {
   return request({
     url: `/nf/udm/voip/reset`,
     method: 'PUT',
-    params: { coreUid, neUid },
+    params: { neUid },
     timeout: 180_000,
   });
 }

src/api/neDataNf/udm_volte_ims.ts

@@ -2,15 +2,14 @@ import { request } from '@/plugins/http-fetch';
 
 /**
  * UDMVolteIMS用户重载数据
- * @param coreUid 核心网ID
  * @param neUid 网元ID
  * @returns object
  */
-export function resetUDMVolteIMS(coreUid: string, neUid: string) {
+export function resetUDMVolteIMS(neUid: string) {
   return request({
     url: `/nf/udm/volte-ims/reset`,
     method: 'PUT',
-    params: { coreUid, neUid },
+    params: { neUid },
     timeout: 180_000,
   });
 }
@@ -60,7 +59,6 @@ export function addUDMVolteIMS(data: Record<string, any>) {
 
 /**
  * UDMVolteIMS用户删除
- * @param coreUid 核心网ID
  * @param neUid 网元ID
  * @param imsi IMSI
  * @param msisdn MSISDN

src/api/tool/file.ts

@@ -278,7 +278,6 @@ export function transferStaticFile(data: Record<string, any>) {
 export async function uploadFileToNE(
   neType: string,
   neuid: string,
-  coreUid: string,
   fileData: File,
   chunkSize: number = 1
 ) {
@@ -291,7 +290,6 @@ export async function uploadFileToNE(
         uploadPath: uploadChunkRes.data.filePath,
         neType,
         neuid,
-        coreUid,
         delTemp: true,
       },
       timeout: 60_000,

src/api/tool/mml.ts

@@ -1,12 +1,11 @@
 import { request } from '@/plugins/http-fetch';
 
 // 更新网元配置重新载入
-export function updateNeConfigReload(coreUid: string, neUid: string) {
+export function updateNeConfigReload(neUid: string) {
   return request({
     url: '/tool/mml/command',
     method: 'POST',
     data: {
-      coreUid: coreUid,
       neUid: neUid,
       type: 'General',
       command: ['reload'],

src/api/trace/task.ts

@@ -20,11 +20,11 @@ export async function listTraceTask(query: Record<string, any>) {
  * @param id 网元ID
  * @returns object
  */
-export async function getTraceTask(coreUid: string, id: string | number) {
+export async function getTraceTask(id: string | number) {
   return request({
     url: `/trace/task`,
     method: 'GET',
-    params: { coreUid, id },
+    params: { id },
   });
 }
 
@@ -59,11 +59,11 @@ export function updateTraceTask(data: Record<string, any>) {
  * @param ids ID多个逗号分隔
  * @returns object
  */
-export async function delTraceTask(coreUid: string, id: string | number) {
+export async function delTraceTask(id: string | number) {
   return request({
     url: `/trace/task`,
     method: 'DELETE',
-    params: { coreUid, id },
+    params: { id },
   });
 }
 

src/components/TerminalSSHView/index.vue

@@ -28,12 +28,6 @@ const props = defineProps({
     type: String,
     required: true,
   },
-  /**核心网标识 */
-  coreUid: {
-    type: String,
-    default: '',
-    required: true,
-  },
   /**窗口单行字符数 */
   cols: {
     type: Number,
@@ -118,7 +112,6 @@ function wsOpen(ev: any) {
       rows: terminal.value.rows,
       neType: props.neType,
       neUid: props.neUid,
-      coreUid: props.coreUid,
       id: props.id,
     });
   });
@@ -150,7 +143,6 @@ function wsClose(code: number) {
     code: code,
     neType: props.neType,
     neUid: props.neUid,
-    coreUid: props.coreUid,
     id: props.id,
   });
 }
@@ -210,14 +202,13 @@ function processMessage(data: string): string {
 }
 
 onMounted(() => {
-  if (props.neType && props.neUid && props.coreUid) {
+  if (props.neType && props.neUid) {
     // 建立链接
     const options: OptionsType = {
       url: props.url,
       params: {
         neType: props.neType,
         neUid: props.neUid,
-        coreUid: props.coreUid,
         cols: props.cols,
         rows: props.rows,
       },

src/hooks/useCoreUid.ts

@@ -1,5 +1,35 @@
-import { CACHE_SESSION_CORE_UID } from '@/constants/cache-keys-constants';
+import {
-import { sessionGet } from '@/utils/cache-session-utils';
+  CACHE_SESSION_CORE,
+  CACHE_SESSION_CORE_UID,
+} from '@/constants/cache-keys-constants';
+import {
+  sessionGet,
+  sessionGetJSON,
+  sessionSet,
+  sessionSetJSON,
+} from '@/utils/cache-session-utils';
+
+/**
+ * 核心路网元层由路径
+ * @returns 核心路网元层路径
+ */
+export const CORE_NE_PATH = '/core-ne';
+
+/**
+ * 获取当前coreUid
+ * @returns coreUid
+ */
+export function current() {
+  return sessionGetJSON(CACHE_SESSION_CORE) || {};
+}
+
+/**
+ * 获取当前coreUid
+ * @returns coreUid
+ */
+export function changeCurrent(v: Record<string, any>) {
+  sessionSetJSON(CACHE_SESSION_CORE, v);
+}
 
 /**
  * 获取当前coreUid
@@ -8,3 +38,11 @@ import { sessionGet } from '@/utils/cache-session-utils';
 export function currentCoreUid() {
   return sessionGet(CACHE_SESSION_CORE_UID) || '';
 }
+
+/**
+ * 切换coreUid
+ * @param coreUid coreUid
+ */
+export function changeCoreUid(coreUid: string) {
+  sessionSet(CACHE_SESSION_CORE_UID, coreUid);
+}

src/i18n/locales/en-US.ts

@@ -553,6 +553,7 @@ export default {
         stopTip: 'Are you sure you want to stop the [{ne}] NE Service?',
         reload: 'Reload',
         reloadTip: 'Confirm that you want to reload the network element configuration information?',
+        license: 'License Update',
         oam: 'OAM',
         log: 'Logs',
       },

src/i18n/locales/zh-CN.ts

@@ -553,6 +553,7 @@ export default {
         stopTip: '确认要停止【{ne}】网元服务吗?',
         reload: '重载',
         reloadTip: '确认要重载网元配置信息吗?',
+        license: '更新许可',
         oam: 'OAM',
         log: '日志',
       },

src/layouts/BasicLayout.vue

@@ -25,17 +25,20 @@ import useAppStore from '@/store/modules/app';
 import useNeStore from '@/store/modules/ne';
 import useRouterStore from '@/store/modules/router';
 import useTabsStore from '@/store/modules/tabs';
-import useI18n from '@/hooks/useI18n';
 import useAlarmStore from '@/store/modules/alarm';
+import useCoreStore from '@/store/modules/core';
+import useI18n from '@/hooks/useI18n';
 import { getServerTime } from '@/api';
 import { MENU_PATH_INLINE } from '@/constants/menu-constants';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { APP_SERVER_TYPE_M } from '@/constants/app-constants';
 import { getTimezoneOffset, parseDateUTCToStr } from '@/utils/date-utils';
 import { parseUrlPath } from '@/plugins/file-static-url';
+import { CORE_NE_PATH } from '@/hooks/useCoreUid';
 const { proConfig, waterMarkContent } = useLayoutStore();
 const { t, currentLocale } = useI18n();
 const routerStore = useRouterStore();
+const coreStore = useCoreStore();
 const neStore = useNeStore();
 const tabsStore = useTabsStore();
 const appStore = useAppStore();
@@ -53,12 +56,29 @@ watch(
   router.currentRoute,
   v => {
     const matched = v.matched.concat();
-    layoutState.openKeys = matched
+    let openKeys: string[] = [];
-      .filter(r => r.path !== v.path)
+    let selectedKeys: string[] = [];
-      .map(r => r.path);
+
-    layoutState.selectedKeys = matched
+    // 多核心网切换菜单显示
-      .filter(r => r.name !== 'Root')
+    if (
-      .map(r => r.path);
+      appStore.serverType === APP_SERVER_TYPE_M &&
+      coreStore.globalDefaultCoreUid !== coreStore.currentCoreUid
+    ) {
+      openKeys = matched
+        .filter(r => r.path !== CORE_NE_PATH)
+        .filter(r => r.path !== v.path)
+        .map(r => r.path.replace(CORE_NE_PATH, ''));
+      selectedKeys = matched
+        .filter(r => r.path !== CORE_NE_PATH)
+        .map(r => r.path.replace(CORE_NE_PATH, ''));
+    } else {
+      openKeys = matched.filter(r => r.path !== v.path).map(r => r.path);
+      selectedKeys = matched.filter(r => r.name !== 'Root').map(r => r.path);
+    }
+
+    layoutState.openKeys = openKeys;
+    layoutState.selectedKeys = selectedKeys;
+
     // 路由地址含有内嵌地址标识又是隐藏菜单需要处理打开高亮菜单栏
     if (v.path.includes(MENU_PATH_INLINE) && v.meta.hideInMenu) {
       const idx = v.path.lastIndexOf(MENU_PATH_INLINE);
@@ -73,17 +93,36 @@ watch(
 const menuData = computed(() => {
   const rootRoute = router.getRoutes().find(r => r.name === 'Root');
   if (rootRoute) {
-    const children = routerStore.setRootRouterData(rootRoute.children);
+    const rootRouteChildren = routerStore.setRootRouterData(rootRoute.children);
     const buildRouterData = routerStore.buildRouterData;
     if (buildRouterData.length > 0) {
-      rootRoute.children = children.concat(buildRouterData);
+      // 多核心网切换菜单显示
+      if (appStore.serverType === APP_SERVER_TYPE_M) {
+        const filterRoute = buildRouterData.filter(v => {
+          if (coreStore.globalDefaultCoreUid === coreStore.currentCoreUid) {
+            return v.path !== CORE_NE_PATH;
+          } else {
+            return v.path === CORE_NE_PATH;
+          }
+        });
+        if (filterRoute.length === 1 && filterRoute[0].children) {
+          rootRoute.children = rootRouteChildren.concat(
+            filterRoute[0].children
+          );
+        } else {
+          rootRoute.children = rootRouteChildren.concat(filterRoute);
+        }
+      } else {
+        // 单核心网切换菜单显示
+        rootRoute.children = rootRouteChildren.concat(buildRouterData);
+      }
     } else {
-      rootRoute.children = children;
+      rootRoute.children = rootRouteChildren;
     }
   }
   const neTypes = neStore.getNeSelectOtions.map(v => v.value);
   let routes = clearMenuItem(router.getRoutes());
-  routes = routerStore.clearMenuItemByNeList(routes, '12345678', neTypes);
+  routes = routerStore.clearMenuItemByNeList(routes, neTypes);
   const { menuData } = getMenuData(routes);
   return menuData;
 });
@@ -309,21 +348,18 @@ onUnmounted(() => {
       </template>
 
       <!--插槽-渲染顶部内容区域，仅布局side有效-->
-      <template #headerContentRender></template>
+      <template
+        #headerContentRender
+        v-if="appStore.serverType === APP_SERVER_TYPE_M"
+      >
+        <CoreSelect></CoreSelect>
+      </template>
 
       <!--插槽-渲染顶部内容右端区域-->
       <template #headerContentRightRender>
         <HeaderContentRight />
       </template>
 
-      <!--插槽-渲染顶部内容区域，仅布局side有效-->
-      <template
-        #menuHeaderExtraRender
-        v-if="useAppStore().serverType === APP_SERVER_TYPE_M"
-      >
-        <CoreSelect></CoreSelect>
-      </template>
-
       <!--插槽-导航标签项-->
       <template #tabRender="{ width, fixedHeader, headerRender }">
         <Tabs

src/layouts/components/CoreSelect.vue

@@ -1,25 +1,34 @@
 <script lang="ts" setup>
-import useCoreStore from '@/store/modules/core';
-import useI18n from '@/hooks/useI18n';
 import { ref } from 'vue';
+import { useRouter } from 'vue-router';
+import useCoreStore from '@/store/modules/core';
+import useNeStore from '@/store/modules/ne';
+import useI18n from '@/hooks/useI18n';
 const coreStore = useCoreStore();
+const neStore = useNeStore();
+const router = useRouter();
 const { t } = useI18n();
 
 /**当前选中 */
-const coreValue = ref(coreStore.current?.value || 'Global');
+const coreValue = ref(coreStore.currentCoreUid);
 /**选择列表数据 */
 const coreOtions = ref(coreStore.getSelectOtions);
 /**选择过滤名称 */
-const coreName = ref();
+const coreName = ref('');
 
 /**选择 */
-function handleSelect(v: any, item: any) {
+async function handleSelect(v: any, item: any) {
-  if (v === 'all') {
+  coreValue.value = v;
-    coreValue.value = 'Global';
+  if (v === coreStore.globalDefaultCoreUid) {
+    coreStore.setCurrent(coreStore.globalDefaultSelect);
   } else {
-    coreValue.value = v;
+    coreStore.setCurrent(item);
   }
-  coreStore.setCurrent(item);
+  await neStore.fnNelistRefresh();
+  // 切换核心网后，刷新路由
+  await router.replace({ name: 'Index' }).finally(() => {
+    // location.replace(location.origin);
+  });
 }
 
 /**搜索过滤 */
@@ -29,43 +38,36 @@ function handleSearchFilter(e: any) {
     return item.label.indexOf(label) !== -1;
   });
 }
-
-/**内容挂载DOM */
-function getPopupContainer(): any {
-  return document.querySelector('.ant-pro-sider');
-}
 </script>
 
 <template>
   <a-select
     v-model:value="coreValue"
     :options="coreOtions"
-    style="width: 100%"
+    style="width: 200px"
-    :getPopupContainer="getPopupContainer"
     @change="handleSelect"
   >
     <template #option="{ label }">
       <span>{{ label }}</span>
     </template>
     <template #dropdownRender="{ menuNode: menu }">
-      <strong>Core</strong>
+      <strong>核心网</strong>
-      <a-button
+      <!-- <a-button
         type="default"
         :block="true"
-        @click="handleSelect('all', { label: 'Global', value: 'all' })"
+        @click="handleSelect(globalCoreUid(), {})"
       >
         <template #icon> <HomeOutlined /> </template>
         Global
-      </a-button>
+      </a-button> -->
       <a-input-search
         placeholder="Search Core Name"
         style="width: 100%; margin: 4px 0"
+        size="small"
         v-model:value="coreName"
         @change="handleSearchFilter"
+        @keydown.enter="handleSearchFilter"
       >
-        <template #enterButton>
-          <ReloadOutlined />
-        </template>
       </a-input-search>
       <a-divider style="margin: 4px 0" />
       <component :is="menu" />

src/router/index.ts

@@ -13,6 +13,8 @@ import useAppStore from '@/store/modules/app';
 import useRouterStore from '@/store/modules/router';
 import useCoreStore from '@/store/modules/core';
 import useNeStore from '@/store/modules/ne';
+import { APP_SERVER_TYPE_M } from '@/constants/app-constants';
+import { CORE_NE_PATH } from '@/hooks/useCoreUid';
 
 // NProgress Configuration
 NProgress.configure({ showSpinner: false });
@@ -96,48 +98,66 @@ router.beforeEach(async (to, from, next) => {
 
   // 有Token
   if (token) {
+    // 防止重复访问登录页面
     if (to.path === '/login') {
-      // 防止重复访问登录页面
       next({ name: 'Index' });
-    } else {
+      return;
-      // 判断当前用户是否有角色信息
+    }
-      const user = useUserStore();
+
-      if (user.roles && user.roles.length === 0) {
+    // 多核心网菜单跳转判断非网元路径
-        try {
+    const useCore = useCoreStore();
-          // 获取核心网列表
+    if (
-          await useCoreStore().fnCorelist();
+      appStore.serverType === APP_SERVER_TYPE_M &&
-          // 获取网元信息
+      useCore.currentCoreUid == useCore.globalDefaultCoreUid &&
-          await useNeStore().fnNelist();
+      to.path.startsWith(CORE_NE_PATH)
-          // 获取用户信息
+    ) {
-          await user.fnGetInfo();
+      next({ name: 'NotPermission' });
-          // 获取路由信息
+      return;
-          const accessRoutes = await useRouterStore().generateRoutes();
+    }
-          // 根据后台配置生成可访问的路由表
+
-          if (accessRoutes && accessRoutes.length !== 0) {
+    // 判断当前用户是否有角色信息
-            for (const route of accessRoutes) {
+    const useUser = useUserStore();
-              // 动态添加可访问路由表，http开头会异常
+    const useNe = useNeStore();
-              if (!validHttp(route.path)) {
+    if (useUser.roles && useUser.roles.length === 0) {
-                router.addRoute(route);
+      try {
-              }
+        // 获取核心网列表
+        await useCore.fnCorelist();
+        // 获取网元信息
+        await useNe.fnNelist();
+        // 获取用户信息
+        await useUser.fnGetInfo();
+        // 获取路由信息
+        const accessRoutes = await useRouterStore().generateRoutes();
+        // 根据后台配置生成可访问的路由表
+        if (accessRoutes && accessRoutes.length !== 0) {
+          for (const route of accessRoutes) {
+            // 动态添加可访问路由表，http开头会异常
+            if (!validHttp(route.path)) {
+              router.addRoute(route);
             }
           }
-          // 刷新替换原先路由，确保addRoutes已完成
-          next({ ...to, replace: true });
-        } catch (error: any) {
-          console.error(`[${to.path}]: ${error.message}`);
-          await user.fnLogOut();
-          next({ name: 'Login' });
         }
-      } else if (
+        // 刷新替换原先路由，确保addRoutes已完成
-        to.meta.neType &&
+        next({ ...to, replace: true });
-        to.meta.neType.length > 0 &&
+      } catch (error: any) {
-        !useNeStore().fnHasNe(to.meta.neType)
+        console.error(`[${to.path}]: ${error.message}`);
-      ) {
+        await useUser.fnLogOut();
-        next({ name: 'NotPermission' });
+        next({ name: 'Login' });
-      } else {
-        next();
       }
+      return;
     }
+
+    // 网元是否存在权限判断
+    if (
+      Array.isArray(to.meta.neType) &&
+      to.meta.neType.length > 0 &&
+      !useNe.fnHasNe(to.meta.neType)
+    ) {
+      next({ name: 'NotPermission' });
+      return;
+    }
+
+    next();
   }
 });
 

src/store/modules/alarm.ts

@@ -1,6 +1,5 @@
 import { getActiveAlarmTotal } from '@/api/faultManage/actAlarm';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { defineStore } from 'pinia';
 
 /**告警数据信息类型 */
@@ -16,8 +15,8 @@ const useAlarmStore = defineStore('alarm', {
   getters: {},
   actions: {
     // 获取活动告警数
-    async fnGetActiveAlarmInfo() { 
+    async fnGetActiveAlarmInfo() {
-      const res = await getActiveAlarmTotal(currentCoreUid());
+      const res = await getActiveAlarmTotal();
       if (res.code === RESULT_CODE_SUCCESS) {
         this.activeAlarmTotal = res.data;
       }

src/store/modules/core.ts

@@ -5,30 +5,41 @@ import {
 import { defineStore } from 'pinia';
 import { listAllCoreInfo } from '@/api/core/coreInfo';
 import {
-  sessionGetJSON,
+  changeCoreUid,
-  sessionSet,
+  changeCurrent,
-  sessionSetJSON,
+  current,
-} from '@/utils/cache-session-utils';
+  currentCoreUid,
-import {
+} from '@/hooks/useCoreUid';
-  CACHE_SESSION_CORE,
-  CACHE_SESSION_CORE_UID,
-} from '@/constants/cache-keys-constants';
 
 /**核心网信息类型 */
 type Core = {
   /**核心网列表 */
   coreList: Record<string, any>[];
+
   /**当前选择 */
-  current: Record<string, any>;
+  currentSelect: Record<string, any>;
+  /**当前核心网标识 */
+  currentCoreUid: string;
+
   /**选择器单级父类型 */
   coreSelectOtions: Record<string, any>[];
+  /**全局选择 */
+  globalDefaultSelect: Record<string, any>;
+  /**默认核心网标识 */
+  globalDefaultCoreUid: string;
 };
 
 const useCoreStore = defineStore('core', {
   state: (): Core => ({
     coreList: [],
-    current: sessionGetJSON(CACHE_SESSION_CORE),
+    currentSelect: current(),
+    currentCoreUid: currentCoreUid(),
     coreSelectOtions: [],
+    globalDefaultSelect: {
+      label: 'Global',
+      value: 'YYMMDDHH',
+    },
+    globalDefaultCoreUid: 'YYMMDDHH',
   }),
   getters: {
     getSelectOtions(): Record<string, any>[] {
@@ -37,9 +48,11 @@ const useCoreStore = defineStore('core', {
   },
   actions: {
     setCurrent(v: Record<string, any> = {}) {
-      this.current = v;
+      this.currentSelect = v;
-      sessionSetJSON(CACHE_SESSION_CORE, v);
+      this.currentCoreUid = v.value;
-      sessionSet(CACHE_SESSION_CORE_UID, v.value);
+      // 存储
+      changeCurrent(v);
+      changeCoreUid(v.value);
     },
     // 刷新核心网列表
     async fnCorelistRefresh() {
@@ -70,11 +83,8 @@ const useCoreStore = defineStore('core', {
         });
       }
       // 当前未选择时
-      if (!this.current) {
+      if (!this.currentSelect) {
-        this.setCurrent({
+        this.setCurrent(this.globalDefaultSelect);
-          label: 'Global',
-          value: 'YYMMDDHH',
-        });
       }
       return res;
     },

src/store/modules/ne.ts

@@ -5,7 +5,6 @@ import {
 } from '@/constants/result-constants';
 import { listAllNeInfo } from '@/api/ne/neInfo';
 import { parseDataToOptions } from '@/utils/parse-tree-utils';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 
 /**网元信息类型 */
 type Ne = {
@@ -66,7 +65,6 @@ const useNeStore = defineStore('ne', {
         };
       }
       const res = await listAllNeInfo({
-        coreUid: currentCoreUid(),
         bandStatus: false,
         bandHost: false,
       });

src/store/modules/router.ts

@@ -16,11 +16,6 @@ import {
   MENU_COMPONENT_LAYOUT_LINK,
 } from '@/constants/menu-constants';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import useAppStore from '@/store/modules/app';
-import {
-  APP_SERVER_TYPE_M,
-  APP_SERVER_TYPE_O,
-} from '@/constants/app-constants';
 
 /**路由构建参数类型 */
 type RouterStore = {
@@ -63,42 +58,20 @@ const useRouterStore = defineStore('router', {
     /**
      * 根据网元类型过滤菜单
      * @param routes 经过clearMenuItem(router.getRoutes())处理
-     * @param coreUid 核心网元uid
      * @param neTypes 网元类型
      * @returns 过滤后的菜单
      */
     clearMenuItemByNeList(
       routes: RouteRecord[] | RouteRecordRaw[],
-      coreUid: string,
       neTypes: string[]
     ): RouteRecordRaw[] {
       return routes
         .map((item: RouteRecord | RouteRecordRaw) => {
           const finalItem = { ...item };
 
-          // 过滤核心网菜单
-          switch (useAppStore().serverType) {
-            case APP_SERVER_TYPE_O:
-              break;
-            case APP_SERVER_TYPE_M:
-              // 过滤核心网菜单
-              if (coreUid.length < 8 && finalItem.meta?.core == true) {
-                // 全局 网元菜单
-                return null;
-              }
-              if (coreUid.length == 8 && finalItem.meta?.core == false) {
-                // 核心网 非网元菜单
-                return null;
-              }
-              break;
-          }
-
           // 过滤网元类型
-          if (
+          let metaNeType: string[] = finalItem.meta?.neType || [];
-            Array.isArray(finalItem.meta?.neType) &&
+          if (Array.isArray(metaNeType) && metaNeType.length > 0) {
-            finalItem.meta?.neType.length > 0
-          ) {
-            let metaNeType: string[] = finalItem.meta.neType;
             let match = false; // 匹配
             for (const netype of metaNeType) {
               if (netype.indexOf('+') > -1) {
@@ -121,7 +94,6 @@ const useRouterStore = defineStore('router', {
           if (finalItem.children && finalItem.children.length > 0) {
             const children = this.clearMenuItemByNeList(
               finalItem.children,
-              coreUid,
               neTypes
             );
             // 如果子菜单都被过滤掉了，就不显示

src/views/alarm/active/index.vue

@@ -26,7 +26,6 @@ import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { readLoalXlsx } from '@/utils/execl-utils';
 import { parseDateToStr } from '@/utils/date-utils';
 import dayjs, { type Dayjs } from 'dayjs';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const neStore = useNeStore();
 const { getDict } = useDictStore();
 const { t, currentLocale } = useI18n();
@@ -71,10 +70,8 @@ let rangePickerPresets = ref([
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   alarmStatus: 'Active',
-  sortField: 'event_time',
+  sortField: 'createdTime',
   sortOrder: 'desc',
   /**告警设备类型 */
   neType: '',
@@ -219,6 +216,12 @@ let tableColumns: ColumnsType = [
     align: 'left',
     width: 100,
   },
+  {
+    title: t('views.ne.common.neName'),
+    dataIndex: 'neName',
+    align: 'left',
+    width: 150,
+  },
   {
     title: t('common.operate'),
     key: 'id',
@@ -442,7 +445,6 @@ function fnModalOk() {
   const hide = message.loading(t('common.loading'), 0);
   ackAlarm({
     id: from.id,
-    coreUid: from.coreUid,
     ackState: true,
   })
     .then(res => {
@@ -502,12 +504,10 @@ function fnTableSelectedRowKeys(keys: (string | number)[], rows: any[]) {
   tableState.selectedRows = rows.map(item => {
     return {
       id: item.id,
-      coreUid: item.coreUid,
       neUid: item.neUid,
       neType: item.neType,
     };
   });
-  console.log( tableState.selectedRows)
 }
 
 /**
@@ -524,7 +524,6 @@ function fnCancelConfirm() {
         reqArr.push(
           ackAlarm({
             id: item.id,
-            coreUid: item.coreUid,
             ackState: false,
           })
         );
@@ -586,9 +585,8 @@ function fnClear() {
     onOk() {
       const hide = message.loading(t('common.loading'), 0);
       let reqArr: any = [];
-      tableState.selectedRows.forEach(item => {
+      const ids = tableState.selectedRowKeys.join(',');
-        reqArr.push(clearAlarm(item.id, item.coreUid));
+      reqArr.push(clearAlarm(ids));
-      });
       Promise.all(reqArr)
         .then(resArr => {
           if (resArr.every((item: any) => item.code === RESULT_CODE_SUCCESS)) {

src/views/alarm/event/index.vue

@@ -15,7 +15,6 @@ import { writeSheet } from '@/utils/execl-utils';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { parseDateToStr } from '@/utils/date-utils';
 import dayjs, { type Dayjs } from 'dayjs';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const neStore = useNeStore();
 const { t } = useI18n();
 
@@ -42,9 +41,7 @@ let rangePickerPresets = ref([
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
+  sortField: 'createdTime',
-  coreUid: currentCoreUid(),
-  sortField: 'event_time',
   sortOrder: 'desc',
   /**告警设备类型 */
   neType: '',

src/views/alarm/forwarding/index.vue

@@ -10,8 +10,7 @@ import { listForwarding } from '@/api/logManage/forwarding';
 import useNeStore from '@/store/modules/ne';
 import useDictStore from '@/store/modules/dict';
 import useI18n from '@/hooks/useI18n';
-import dayjs, { type Dayjs } from 'dayjs';
+import dayjs, { type Dayjs } from 'dayjs'; 
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { getDict } = useDictStore();
 const { t } = useI18n();
 const neStore = useNeStore();
@@ -48,12 +47,10 @@ let rangePickerPresets = ref([
 ]);
 
 /**查询参数 */
-let queryParams = reactive({
+let queryParams = reactive({ 
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元类型 */
   neType: '',
-  sortField: 'event_time',
+  sortField: 'createdTime',
   sortOrder: 'desc',
   /**开始时间 */
   beginTime: undefined as undefined | number,
@@ -192,7 +189,7 @@ let tableColumns: ColumnsType = reactive([
   },
   {
     title: t('views.logManage.forwarding.logTime'),
-    dataIndex: 'createdAt',
+    dataIndex: 'eventTime',
     align: 'left',
     customRender(opt) {
       if (!opt.value) return '';

src/views/alarm/history/index.vue

@@ -20,7 +20,6 @@ import { writeSheet } from '@/utils/execl-utils';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { parseDateToStr } from '@/utils/date-utils';
 import dayjs, { type Dayjs } from 'dayjs';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const neStore = useNeStore();
 const { getDict } = useDictStore();
 const { t } = useI18n();
@@ -62,10 +61,8 @@ let rangePickerPresets = ref([
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   alarmStatus: 'Clear',
-  sortField: 'event_time',
+  sortField: 'createdTime',
   sortOrder: 'desc',
   /**告警设备类型 */
   neType: '',

src/views/alarm/log/index.vue

@@ -11,7 +11,6 @@ import useNeStore from '@/store/modules/ne';
 import useDictStore from '@/store/modules/dict';
 import useI18n from '@/hooks/useI18n';
 import dayjs, { type Dayjs } from 'dayjs';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const neStore = useNeStore();
 const { getDict } = useDictStore();
 const { t } = useI18n();
@@ -49,15 +48,13 @@ let rangePickerPresets = ref([
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元类型 */
   neType: '',
   /**告警状态 */
   alarmStatus: undefined,
   /**告警类型 */
   origSeverity: undefined,
-  sortField: 'event_time',
+  sortField: 'createdTime',
   sortOrder: 'desc',
   /**开始时间 */
   beginTime: undefined as undefined | number,
@@ -178,7 +175,7 @@ let tableColumns: ColumnsType = [
   },
   {
     title: t('views.logManage.alarm.logTime'),
-    dataIndex: 'createdAt',
+    dataIndex: 'eventTime',
     align: 'left',
     width: 200,
     customRender(opt) {

src/views/alarm/overview/index.vue

@@ -21,7 +21,6 @@ import { origGet } from '@/api/faultManage/actAlarm';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useI18n from '@/hooks/useI18n';
 import { useFullscreen } from '@vueuse/core';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 
 const { t } = useI18n();
 
@@ -206,7 +205,7 @@ async function fetchLatestAlarmsHis() {
 async function fetchAlarmData() {
   try {
     loading.value = true;
-    const res = await origGet(currentCoreUid());
+    const res = await origGet('Active');
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
       // 重置告警数据
       alarmData.critical = 0;
@@ -323,10 +322,10 @@ onMounted(() => {
   fetchAlarmTrend(); // 定时刷新趋势数据
 
   // 设置定时刷新 - 每10秒刷新一次
-  refreshTimer = setInterval(() => {
+  // refreshTimer = setInterval(() => {
-    fetchAlarmData();
+  //   fetchAlarmData();
-    fetchAlarmTrend(); // 定时刷新趋势数据
+  //   fetchAlarmTrend(); // 定时刷新趋势数据
-  }, 10000);
+  // }, 10000);
 
   // 初始化告警趋势图
   nextTick(() => {

src/views/core-ne/monitor/index.vue

@@ -0,0 +1,16 @@
+<script setup lang="ts">
+import { onMounted } from 'vue';
+import { PageContainer } from 'antdv-pro-layout';
+
+onMounted(() => {});
+</script>
+
+<template>
+  <PageContainer>
+    <a-card :bordered="false" :body-style="{ padding: '0px' }">
+      <h1>核心网列表</h1>
+    </a-card>
+  </PageContainer>
+</template>
+
+<style lang="less" scoped></style>

src/views/core-ne/ne/index.vue

@@ -0,0 +1,16 @@
+<script setup lang="ts">
+import { onMounted } from 'vue';
+import { PageContainer } from 'antdv-pro-layout';
+
+onMounted(() => {});
+</script>
+
+<template>
+  <PageContainer>
+    <a-card :bordered="false" :body-style="{ padding: '0px' }">
+      <h1>Overview 核心网 概览</h1>
+    </a-card>
+  </PageContainer>
+</template>
+
+<style lang="less" scoped></style>

src/views/mml/log/index.vue

@@ -69,18 +69,6 @@ let tableColumns: ColumnsType = reactive([
     align: 'left',
     width: 80,
   },
-  {
-    title: t('views.logManage.mml.account'),
-    dataIndex: 'user',
-    align: 'left',
-    width: 100,
-  },
-  {
-    title: t('views.logManage.mml.ip'),
-    dataIndex: 'ip',
-    align: 'left',
-    width: 100,
-  },
   {
     title: t('views.ne.common.neType'),
     dataIndex: 'neType',
@@ -88,14 +76,14 @@ let tableColumns: ColumnsType = reactive([
     width: 100,
   },
   {
-    title: t('views.ne.common.neUid'),
+    title: t('views.ne.common.neName'),
-    dataIndex: 'neUid',
+    dataIndex: 'neName',
     align: 'left',
     width: 100,
   },
   {
     title: t('views.logManage.mml.logTime'),
-    dataIndex: 'logTime',
+    dataIndex: 'createTime',
     align: 'left',
     width: 200,
     customRender(opt) {

src/views/mml/ne/index.vue

@@ -10,7 +10,6 @@ import useI18n from '@/hooks/useI18n';
 import { getMMLByNE, sendMML } from '@/api/mmlManage/neOperate';
 import { uploadFileToNE } from '@/api/tool/file';
 import { UploadRequestOption } from 'ant-design-vue/es/vc-upload/interface';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const neStore = useNeStore();
 const { t } = useI18n();
 
@@ -180,7 +179,6 @@ function fnSendMML() {
   state.from.sendLoading = true;
   const [neType, neUid] = state.neType;
   sendMML({
-    coreUid: currentCoreUid(),
     neUid: neUid,
     neType: neType,
     type: objectType,
@@ -218,7 +216,7 @@ function fnUpload(up: UploadRequestOption, name: string) {
       const hide = message.loading(t('common.loading'), 0);
       state.from.uploadLoading = true;
       const [neType, neUid] = state.neType;
-      uploadFileToNE(neType, neUid, currentCoreUid(), up.file as File, 5)
+      uploadFileToNE(neType, neUid, up.file as File, 5)
         .then(res => {
           // 文件转存
           if (res.code === RESULT_CODE_SUCCESS) {

src/views/mml/omc/index.vue

@@ -10,7 +10,6 @@ import useI18n from '@/hooks/useI18n';
 import { getMMLByOMC, sendMMlByOMC } from '@/api/mmlManage/omcOperate';
 import { uploadFileToNE } from '@/api/tool/file';
 import { UploadRequestOption } from 'ant-design-vue/es/vc-upload/interface';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const neStore = useNeStore();
 /**网元参数 */
@@ -218,7 +217,7 @@ function fnUpload(up: UploadRequestOption, name: string) {
     onOk() {
       const hide = message.loading(t('common.loading'), 0);
       state.from.uploadLoading = true;
-      uploadFileToNE('OMC', neUid, currentCoreUid(), up.file as File, 5)
+      uploadFileToNE('OMC', neUid, up.file as File, 5)
         .then(res => {
           // 文件转存
           if (res.code === RESULT_CODE_SUCCESS) {
@@ -521,7 +520,7 @@ onMounted(() => {
   if (neOptions.value.length > 0) {
     state.neUid = neOptions.value[0].value;
   }
-  
+
   // 获取列表数据
   fnGetList();
 });

src/views/mml/udm/index.vue

@@ -10,7 +10,6 @@ import useI18n from '@/hooks/useI18n';
 import { getMMLByUDM, sendMMlByGeneral } from '@/api/mmlManage/neOperate';
 import { UploadRequestOption } from 'ant-design-vue/es/vc-upload/interface';
 import { uploadFileToNE } from '@/api/tool/file';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const neStore = useNeStore();
 /**网元参数 */
@@ -178,7 +177,7 @@ function fnSendMML() {
 
   // 发送
   state.from.sendLoading = true;
-  sendMMlByGeneral(currentCoreUid(), state.neUid, cmdArr)
+  sendMMlByGeneral(state.neUid, cmdArr)
     .then(res => {
       state.from.sendLoading = false;
       if (res.code === RESULT_CODE_SUCCESS) {
@@ -218,7 +217,7 @@ function fnUpload(up: UploadRequestOption, name: string) {
     onOk() {
       const hide = message.loading(t('common.loading'), 0);
       state.from.uploadLoading = true;
-      uploadFileToNE('UDM', neUid, currentCoreUid(), up.file as File, 5)
+      uploadFileToNE('UDM', neUid, up.file as File, 5)
         .then(res => {
           // 文件转存
           if (res.code === RESULT_CODE_SUCCESS) {

src/views/monitor/overview/components/AlarnTypeBar/index.vue

@@ -23,7 +23,6 @@ import { markRaw, onMounted, ref } from 'vue';
 import { origGet, top3Sel } from '@/api/faultManage/actAlarm';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 
 const { t } = useI18n();
 
@@ -86,8 +85,7 @@ const alarmTypeTypeTop = ref<any>([
 
 //
 function initPicture() {
-  const coreUid = currentCoreUid();
+  Promise.allSettled([origGet('Active'), top3Sel('Active')])
-  Promise.allSettled([origGet(coreUid), top3Sel(coreUid)])
     .then(resArr => {
       if (resArr[0].status === 'fulfilled') {
         const res0 = resArr[0].value;

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

@@ -15,7 +15,6 @@ import {
   notNeNodes,
 } from '../../hooks/useTopology';
 import useI18n from '@/hooks/useI18n';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 
 /**图DOM节点实例对象 */
@@ -53,7 +52,7 @@ const graphNodeTooltip = new Tooltip({
         ${neState.refreshTime ?? '--'}
         </span></div>
         <div>========================</div>
-        <div><strong>ID：</strong><span>${neState.neUid}</span></div>
+        <div><strong>UID：</strong><span>${neState.neUid}</span></div>
         <div><strong>${t('views.monitor.topology.name')}：</strong><span>
         ${neState.neName ?? '--'}
         </span></div>
@@ -155,7 +154,6 @@ function fnGraphDataLoad(reload: boolean = false) {
   Promise.all([
     getGraphData(graphState.group),
     listAllNeInfo({
-      coreUid: currentCoreUid(),
       bandStatus: false,
     }),
   ])

src/views/monitor/overview/components/UPFFlow/index.vue

@@ -16,8 +16,11 @@ import { CanvasRenderer } from 'echarts/renderers';
 import { markRaw } from 'vue';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { upfNeUId, upfFlowData, upfFlowParse } from '../../hooks/useUPFTotalFlow';
+import {
-import { currentCoreUid } from '@/hooks/useCoreUid';
+  upfNeUId,
+  upfFlowData,
+  upfFlowParse,
+} from '../../hooks/useUPFTotalFlow';
 
 const { t } = useI18n();
 
@@ -207,7 +210,6 @@ function fnGetInitData() {
   const nowDate = new Date().getTime();
 
   listKPIData({
-    coreUid: currentCoreUid(),
     neUid: upfNeUId.value,
     neType: 'UPF',
     beginTime: nowDate - 5 * 60 * 1000,

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

@@ -23,7 +23,6 @@ import {
   WS_GROUP_KPI,
   WS_GROUP_MME_UE,
 } from '@/constants/ne-constants';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 
 /**websocket连接 */
 export default function useWS() {
@@ -45,11 +44,10 @@ export default function useWS() {
     }
     // 网元状态
     if (requestId && requestId.startsWith('neState')) {
-      const neType = requestId.split('_')[3];
+      const neType = requestId.split('_')[2];
       neStateParse(neType, data);
       return;
     }
-    const coreUid = currentCoreUid();
 
     // 普通信息
     switch (requestId) {
@@ -91,25 +89,25 @@ export default function useWS() {
     }
     switch (data.groupId) {
       // kpiEvent 指标UPF
-      case `${WS_GROUP_KPI}_${coreUid}_${upfNeUId.value}`:
+      case `${WS_GROUP_KPI}_${upfNeUId.value}`:
         if (data.data) {
           upfFlowParse(data.data);
         }
         break;
       // AMF_UE会话事件
-      case `${WS_GROUP_AMF_UE}_${coreUid}_${eventNeUid.value.AMF}`:
+      case `${WS_GROUP_AMF_UE}_${eventNeUid.value.AMF}`:
         if (data.data) {
           queue.add(() => eventItemParseAndPush('amf_ue', data.data));
         }
         break;
       // MME_UE会话事件
-      case `${WS_GROUP_MME_UE}_${coreUid}_${eventNeUid.value.MME}`:
+      case `${WS_GROUP_MME_UE}_${eventNeUid.value.MME}`:
         if (data.data) {
           queue.add(() => eventItemParseAndPush('mme_ue', data.data));
         }
         break;
       // IMS_CDR会话事件
-      case `${WS_GROUP_IMS_CDR}_${coreUid}_${eventNeUid.value.IMS}`:
+      case `${WS_GROUP_IMS_CDR}_${eventNeUid.value.IMS}`:
         if (data.data) {
           queue.add(() => eventItemParseAndPush('ims_cdr', data.data));
         }
@@ -128,7 +126,6 @@ export default function useWS() {
       requestId: `upf_${upfNeUId.value}_${day}`,
       type: 'upf_tf',
       data: {
-        coreUid: currentCoreUid(),
         neUid: upfNeUId.value,
         neType: 'UPF',
         day: Number(day),
@@ -143,7 +140,6 @@ export default function useWS() {
       requestId: 'amf_1010_001',
       type: 'amf_ue',
       data: {
-        coreUid: currentCoreUid(),
         neUid: eventNeUid.value.AMF,
         neType: 'AMF',
         sortField: 'timestamp',
@@ -157,7 +153,6 @@ export default function useWS() {
       requestId: 'mme_1011_001',
       type: 'mme_ue',
       data: {
-        coreUid: currentCoreUid(),
         neUid: eventNeUid.value.MME,
         neType: 'MME',
         sortField: 'timestamp',
@@ -171,7 +166,6 @@ export default function useWS() {
       requestId: 'ims_1005_001',
       type: 'ims_cdr',
       data: {
-        coreUid: currentCoreUid(),
         neUid: eventNeUid.value.IMS,
         neType: 'IMS',
         recordType: 'MOC',
@@ -193,14 +187,11 @@ export default function useWS() {
       neStateRequestMap.value = new Map();
       //topologyReset();
     }
-    const coreUid = currentCoreUid();
     let subGroupIDArr: string[] = [];
-    subGroupIDArr.push(`${WS_GROUP_KPI}_${coreUid}_${upfNeUId.value}`);
+    subGroupIDArr.push(`${WS_GROUP_KPI}_${upfNeUId.value}`);
-    subGroupIDArr.push(`${WS_GROUP_AMF_UE}_${coreUid}_${eventNeUid.value.AMF}`);
+    subGroupIDArr.push(`${WS_GROUP_AMF_UE}_${eventNeUid.value.AMF}`);
-    subGroupIDArr.push(`${WS_GROUP_MME_UE}_${coreUid}_${eventNeUid.value.MME}`);
+    subGroupIDArr.push(`${WS_GROUP_MME_UE}_${eventNeUid.value.MME}`);
-    subGroupIDArr.push(
+    subGroupIDArr.push(`${WS_GROUP_IMS_CDR}_${eventNeUid.value.IMS}`);
-      `${WS_GROUP_IMS_CDR}_${coreUid}_${eventNeUid.value.IMS}`
-    );
     const options: OptionsType = {
       url: '/ws',
       params: {

src/views/monitor/overview/index.vue

@@ -29,7 +29,6 @@ import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { useRouter } from 'vue-router';
 import useNeStore from '@/store/modules/ne';
 import { message } from 'ant-design-vue';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { eventNeUid } from './hooks/useUserActivity';
 
 const router = useRouter();
@@ -85,17 +84,16 @@ function fnGetNeState() {
   // 获取节点状态
   for (const node of graphState.data.nodes) {
     if (notNeNodes.includes(node.id)) continue;
-    const { neType, coreUid, neUid } = node.neInfo;
+    const { neType, neUid } = node.neInfo;
     if (!neType || !neUid) continue;
     // 请求标记检查避免重复发送
     if (neStateRequestMap.value.get(neType)) continue;
     neStateRequestMap.value.set(neType, true);
 
     wsSend({
-      requestId: `neState_${coreUid}_${neUid}_${neType}`,
+      requestId: `neState_${neUid}_${neType}`,
       type: 'ne_state',
       data: {
-        coreUid: coreUid,
         neType: neType,
         neUid: neUid,
       },
@@ -109,8 +107,7 @@ async function fnGetSkim() {
     // [
     //   'UDM',
     //   {
-    //     request: (coreUid: string, neUid: string) =>
+    //     request: (neUid: string) => listUDMSub({ neUid, pageNum: 1, pageSize: 1 }),
-    //       listUDMSub({ coreUid, neUid, pageNum: 1, pageSize: 1 }),
     //     process: (res: any) =>
     //       res.code === RESULT_CODE_SUCCESS &&
     //       (skimState.udmSubNum += res.data.total),
@@ -119,9 +116,9 @@ async function fnGetSkim() {
     [
       'SMF',
       {
-        request: (coreUid: string, neUid: string) => {
+        request: (neUid: string) => {
           eventNeUid.value.SMF = neUid;
-          return listSMFSubNum(coreUid, neUid);
+          return listSMFSubNum(neUid);
         },
         process: (res: any) => {
           if (
@@ -136,9 +133,9 @@ async function fnGetSkim() {
     [
       'IMS',
       {
-        request: (coreUid: string, neUid: string) => {
+        request: (neUid: string) => {
           eventNeUid.value.IMS = neUid;
-          return listIMSSessionNum(coreUid, neUid);
+          return listIMSSessionNum(neUid);
         },
         process: (res: any) => {
           if (
@@ -153,9 +150,9 @@ async function fnGetSkim() {
     [
       'AMF',
       {
-        request: (coreUid: string, neUid: string) => {
+        request: (neUid: string) => {
           eventNeUid.value.AMF = neUid;
-          return listAMFNblist({ coreUid, neUid });
+          return listAMFNblist({ neUid });
         },
         process: (res: any) => {
           if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
@@ -171,9 +168,9 @@ async function fnGetSkim() {
     [
       'MME',
       {
-        request: (coreUid: string, neUid: string) => {
+        request: (neUid: string) => {
           eventNeUid.value.MME = neUid;
-          return listMMENblist({ coreUid, neUid });
+          return listMMENblist({ neUid });
         },
         process: (res: any) => {
           if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
@@ -195,7 +192,7 @@ async function fnGetSkim() {
           const handler = neHandlers.get(child.neType);
           return handler
             ? {
-                promise: handler.request(child.coreUid, child.neUid),
+                promise: handler.request(child.neUid),
                 process: handler.process,
               }
             : null;
@@ -225,7 +222,6 @@ async function fnGetSkim() {
 
   // UDM
   listUDMSub({
-    coreUid: currentCoreUid(),
     neUid: udmNeUid.value,
     pageNum: 1,
     pageSize: 1,
@@ -295,7 +291,6 @@ let udmOtions = ref<Record<string, any>[]>([]);
 function fnSelectUDM(e: any) {
   udmNeUid.value = e.key;
   listUDMSub({
-    coreUid: currentCoreUid(),
     neUid: e.key,
     pageNum: 1,
     pageSize: 1,

src/views/monitor/overview2/components/AlarnTypeBar/index.vue

@@ -22,8 +22,7 @@ import { CanvasRenderer } from 'echarts/renderers';
 import { markRaw, onMounted, ref } from 'vue';
 import { origGet, top3Sel } from '@/api/faultManage/actAlarm';
 import useI18n from '@/hooks/useI18n';
-import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; 
-import { currentCoreUid } from '@/hooks/useCoreUid';
 
 const { t } = useI18n();
 
@@ -85,9 +84,8 @@ const alarmTypeTypeTop = ref<any>([
 ]);
 
 //
-function initPicture() {
+function initPicture() { 
-  const coreUid = currentCoreUid()
+  Promise.allSettled([origGet('Active'), top3Sel('Active')])
-  Promise.allSettled([origGet(coreUid), top3Sel(coreUid)])
     .then(resArr => {
       if (resArr[0].status === 'fulfilled') {
         const res0 = resArr[0].value;

src/views/monitor/overview2/components/Topology/index.vue

@@ -15,7 +15,6 @@ import {
   notNeNodes,
 } from '../../hooks/useTopology';
 import useI18n from '@/hooks/useI18n';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 
 /**图DOM节点实例对象 */
@@ -214,7 +213,6 @@ function fnGraphDataLoad(reload: boolean = false) {
   Promise.all([
     getGraphData(graphState.group),
     listAllNeInfo({
-      coreUid: currentCoreUid(),
       bandStatus: false,
     }),
   ])

src/views/monitor/overview2/components/UPFFlow/index.vue

@@ -21,7 +21,6 @@ import {
   upfFlowData,
   upfFlowParse,
 } from '../../hooks/useUPFTotalFlow';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 
 const { t } = useI18n();
 
@@ -211,7 +210,6 @@ function fnGetInitData() {
   const nowDate = new Date().getTime();
 
   listKPIData({
-    coreUid: currentCoreUid(),
     neUid: upfNeUId.value,
     neType: 'UPF',
     beginTime: nowDate - 5 * 60 * 1000,

src/views/monitor/overview2/hooks/useWS.ts

@@ -23,7 +23,6 @@ import {
   WS_GROUP_MME_UE,
   WS_GROUP_IMS_CDR,
 } from '@/constants/ne-constants';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 
 /**websocket连接 */
 export default function useWS() {
@@ -50,7 +49,6 @@ export default function useWS() {
       neStateParse(neType, data, neUid);
       return;
     }
-    const coreUid = currentCoreUid();
 
     // 普通信息
     switch (requestId) {
@@ -92,25 +90,25 @@ export default function useWS() {
     }
     switch (data.groupId) {
       // kpiEvent 指标UPF
-      case `${WS_GROUP_KPI}_${coreUid}_${upfNeUId.value}`:
+      case `${WS_GROUP_KPI}_${upfNeUId.value}`:
         if (data.data) {
           upfFlowParse(data.data);
         }
         break;
       // AMF_UE会话事件
-      case `${WS_GROUP_AMF_UE}_${coreUid}_${eventNeUid.value.AMF}`:
+      case `${WS_GROUP_AMF_UE}_${eventNeUid.value.AMF}`:
         if (data.data) {
           queue.add(() => eventItemParseAndPush('amf_ue', data.data));
         }
         break;
       // MME_UE会话事件
-      case `${WS_GROUP_MME_UE}_${coreUid}_${eventNeUid.value.MME}`:
+      case `${WS_GROUP_MME_UE}_${eventNeUid.value.MME}`:
         if (data.data) {
           queue.add(() => eventItemParseAndPush('mme_ue', data.data));
         }
         break;
       // IMS_CDR会话事件
-      case `${WS_GROUP_IMS_CDR}_${coreUid}_${eventNeUid.value.IMS}`:
+      case `${WS_GROUP_IMS_CDR}_${eventNeUid.value.IMS}`:
         if (data.data) {
           queue.add(() => eventItemParseAndPush('ims_cdr', data.data));
         }
@@ -130,7 +128,6 @@ export default function useWS() {
       requestId: `upf_${upfNeUId.value}_${day}`,
       type: 'upf_tf',
       data: {
-        coreUid: currentCoreUid(),
         neUid: upfNeUId.value,
         neType: 'UPF',
         day: Number(day),
@@ -145,7 +142,6 @@ export default function useWS() {
       requestId: 'amf_1010_001',
       type: 'amf_ue',
       data: {
-        coreUid: currentCoreUid(),
         neUid: eventNeUid.value.AMF,
         neType: 'AMF',
         sortField: 'timestamp',
@@ -159,7 +155,6 @@ export default function useWS() {
       requestId: 'mme_1011_001',
       type: 'mme_ue',
       data: {
-        coreUid: currentCoreUid(),
         neUid: eventNeUid.value.MME,
         neType: 'MME',
         sortField: 'timestamp',
@@ -173,7 +168,6 @@ export default function useWS() {
       requestId: 'ims_1005_001',
       type: 'ims_cdr',
       data: {
-        coreUid: currentCoreUid(),
         neUid: eventNeUid.value.IMS,
         neType: 'IMS',
         recordType: 'MOC',
@@ -195,14 +189,11 @@ export default function useWS() {
       neStateRequestMap.value = new Map();
       //topologyReset();
     }
-    const coreUid = currentCoreUid();
     let subGroupIDArr: string[] = [];
-    subGroupIDArr.push(`${WS_GROUP_KPI}_${coreUid}_${upfNeUId.value}`);
+    subGroupIDArr.push(`${WS_GROUP_KPI}_${upfNeUId.value}`);
-    subGroupIDArr.push(`${WS_GROUP_AMF_UE}_${coreUid}_${eventNeUid.value.AMF}`);
+    subGroupIDArr.push(`${WS_GROUP_AMF_UE}_${eventNeUid.value.AMF}`);
-    subGroupIDArr.push(`${WS_GROUP_MME_UE}_${coreUid}_${eventNeUid.value.MME}`);
+    subGroupIDArr.push(`${WS_GROUP_MME_UE}_${eventNeUid.value.MME}`);
-    subGroupIDArr.push(
+    subGroupIDArr.push(`${WS_GROUP_IMS_CDR}_${eventNeUid.value.IMS}`);
-      `${WS_GROUP_IMS_CDR}_${coreUid}_${eventNeUid.value.IMS}`
-    );
     const options: OptionsType = {
       url: '/ws',
       params: {

src/views/monitor/overview2/index.vue

@@ -28,7 +28,6 @@ import { message } from 'ant-design-vue';
 import { listAMFNbStatelist } from '@/api/neDataNf/amf';
 import { listMMENbStatelist } from '@/api/neDataNf/mme';
 import { eventNeUid } from './hooks/useUserActivity';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 
 const neStore = useNeStore();
 const router = useRouter();
@@ -97,10 +96,9 @@ function fnGetNeState() {
       if (!neInfo.neType || !neInfo.neUid) continue;
 
       wsSend({
-        requestId: `neState_${neInfo.coreUid}_${neInfo.neUid}_${neInfo.neType}`,
+        requestId: `neState_${neInfo.neUid}`,
         type: 'ne_state',
         data: {
-          coreUid: neInfo.coreUid,
           neType: neInfo.neType,
           neUid: neInfo.neUid,
         },
@@ -127,9 +125,9 @@ async function fnGetSkim() {
     [
       'SMF',
       {
-        request: (coreUid: string, neUid: string) => {
+        request: (neUid: string) => {
           eventNeUid.value.SMF = neUid;
-          return listSMFSubNum(coreUid, neUid);
+          return listSMFSubNum(neUid);
         },
         process: (res: any) => {
           if (
@@ -144,9 +142,9 @@ async function fnGetSkim() {
     [
       'IMS',
       {
-        request: (coreUid: string, neUid: string) => {
+        request: (neUid: string) => {
           eventNeUid.value.IMS = neUid;
-          return listIMSSessionNum(coreUid, neUid);
+          return listIMSSessionNum(neUid);
         },
         process: (res: any) => {
           if (
@@ -176,18 +174,18 @@ async function fnGetSkim() {
     [
       'AMF',
       {
-        request: (coreUid: string, neUid: string) => {
+        request: (neUid: string) => {
           eventNeUid.value.AMF = neUid;
-          return listAMFNblist({ coreUid, neUid });
+          return listAMFNblist({ neUid });
         },
-        process: async (res: any, coreUid: any, neUid: any) => {
+        process: async (res: any, neUid: any) => {
           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,
               0
             );
-            const amfNbRes = await listAMFNbStatelist({ coreUid, neUid });
+            const amfNbRes = await listAMFNbStatelist({ neUid });
             if (
               amfNbRes.code === RESULT_CODE_SUCCESS &&
               Array.isArray(amfNbRes.data)
@@ -217,11 +215,11 @@ async function fnGetSkim() {
     [
       'MME',
       {
-        request: (coreUid: string, neUid: string) => {
+        request: (neUid: string) => {
           eventNeUid.value.MME = neUid;
-          return listMMENblist({ coreUid, neUid });
+          return listMMENblist({ neUid });
         },
-        process: async (res: any, coreUid: any, neUid: any) => {
+        process: async (res: any, neUid: any) => {
           if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
             skimState.enbNum += res.data.length;
             skimState.enbUeNum += res.data.reduce(
@@ -229,7 +227,7 @@ async function fnGetSkim() {
               0
             );
 
-            const mmeNbRes = await listMMENbStatelist({ coreUid, neUid });
+            const mmeNbRes = await listMMENbStatelist({ neUid });
             if (
               mmeNbRes.code === RESULT_CODE_SUCCESS &&
               Array.isArray(mmeNbRes.data)
@@ -251,9 +249,8 @@ async function fnGetSkim() {
           const handler = neHandlers.get(child.neType);
           return handler
             ? {
-                promise: handler.request(child.coreUid, child.neUid),
+                promise: handler.request(child.neUid),
                 process: handler.process,
-                coreUid: child.coreUid,
                 neUid: child.neUid,
               }
             : null;
@@ -284,9 +281,9 @@ async function fnGetSkim() {
   const processPromises = results.map((result: any, index: any) => {
     const req = requests[index];
     if (result.status === 'fulfilled') {
-      return req.process(result.value, req.coreUid, req.neUid);
+      return req.process(result.value, req.neUid);
     } else {
-      return req.process(0, req.coreUid, req.neUid);
+      return req.process(0, req.neUid);
     }
   });
 
@@ -296,7 +293,6 @@ async function fnGetSkim() {
 
   // UDM
   listUDMSub({
-    coreUid: currentCoreUid(),
     neUid: udmNeUid.value,
     pageNum: 1,
     pageSize: 1,
@@ -379,7 +375,6 @@ async function fnSelectUDM(e: any) {
   udmNeUid.value = e.key;
   try {
     const res = await listUDMSub({
-      coreUid: currentCoreUid(),
       neUid: udmNeUid.value,
       pageNum: 1,
       pageSize: 1,

src/views/monitor/topology/graph.ts

@@ -1625,11 +1625,11 @@ export function randerGroph(
         ${serverState.refreshTime ?? '--'}
         </span></div>
         <div>========================</div>
-        <div><strong>ID：</strong><span>${serverState.neId}</span></div>
+        <div><strong>UID：</strong><span>${serverState.neUid}</span></div>
         <div><strong>${t('views.monitor.topology.name')}：</strong><span>
         ${serverState.neName ?? '--'}
         </span></div>
-        <div><strong>IP：</strong><span>${serverState.neIP}</span></div>
+        <div><strong>IP：</strong><span>${serverState.ipAddr}</span></div>
         <div><strong>${t('views.monitor.topology.version')}：</strong><span>
         ${serverState.version ?? '--'}
         </span></div>

src/views/monitor/topology/index.vue

@@ -9,7 +9,6 @@ import { message } from 'ant-design-vue/es';
 import { randerGroph, switchLayout } from './graph';
 import { parseDateToStr } from '@/utils/date-utils';
 import { parseBasePath } from '@/plugins/file-static-url';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 
 /**图DOM节点实例对象 */
@@ -40,7 +39,7 @@ async function fnGetState() {
     if (!interval.value) return;
     const ne = node.info;
     // if (ne.neType === 'OMC') continue;
-    const result = await stateNeInfo(ne.coreUid, ne.neUid);
+    const result = await stateNeInfo(ne.neUid);
     if (result.code === RESULT_CODE_SUCCESS) {
       ne.serverState = result.data;
       ne.serverState.refreshTime = parseDateToStr(
@@ -58,7 +57,6 @@ async function fnGetState() {
 /**查询全部网元数据列表 */
 function fnGetList(refresh: boolean = false) {
   listAllNeInfo({
-    coreUid: currentCoreUid(),
     bandStatus: false,
   })
     .then(res => {
@@ -68,7 +66,7 @@ function fnGetList(refresh: boolean = false) {
         res.data.length > 0
       ) {
         // 根网管
-        let rootNodeInfo = { neName: 'OMC_001' };
+        let rootNodeInfo = { neName: 'OMC_ROOT' };
         const nodes = [];
         const edges = [];
         for (const item of res.data) {

src/views/monitor/topologyArchitecture/index.vue

@@ -25,7 +25,6 @@ import useNeOptions from '@/views/ne/neInfo/hooks/useNeOptions';
 import useI18n from '@/hooks/useI18n';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import { parseBasePath } from '@/plugins/file-static-url';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const { fnNeRestart, fnNeStop, fnNeLogFile } = useNeOptions();
 const ws = new WS();
@@ -106,17 +105,17 @@ const graphNodeMenu = new Menu({
   },
   handleMenuClick(target, item) {
     const { neInfo }: any = item?.getModel();
-    const { neName, neType, neUid, coreUid } = neInfo;
+    const { neName, neType, neUid } = neInfo;
     const targetId = target.id;
     switch (targetId) {
       case 'restart':
-        fnNeRestart({ neName, neType, neUid, coreUid });
+        fnNeRestart({ neName, neType, neUid });
         break;
       case 'stop':
-        fnNeStop({ neName, neType, neUid, coreUid });
+        fnNeStop({ neName, neType, neUid });
         break;
       case 'log':
-        fnNeLogFile({ neType, neUid, coreUid });
+        fnNeLogFile({ neType, neUid });
         break;
     }
   },
@@ -260,7 +259,6 @@ function fnGraphDataLoad(reload: boolean = false) {
   Promise.all([
     getGraphData(graphState.group),
     listAllNeInfo({
-      coreUid: currentCoreUid(),
       bandStatus: false,
     }),
   ])
@@ -371,7 +369,7 @@ function fnGetState() {
   // 获取节点状态
   for (const node of graphState.data.nodes) {
     if (notNeNodes.includes(node.id)) continue;
-    const { neType, neUid, coreUid } = node.neInfo;
+    const { neType, neUid } = node.neInfo;
     if (!neType || !neUid) continue;
     ws.send({
       requestId: `${neType}_${neUid}`,
@@ -379,7 +377,6 @@ function fnGetState() {
       data: {
         neType: neType,
         neUid: neUid,
-        coreUid: coreUid,
       },
     });
   }

src/views/ne/core/index.vue

@@ -1,41 +1,36 @@
 <script setup lang="ts">
-import {
+import { reactive, ref, onMounted, toRaw } from 'vue';
-  reactive,
-  ref,
-  onMounted,
-  toRaw,
-  defineAsyncComponent,
-  nextTick,
-} from 'vue';
 import { PageContainer } from 'antdv-pro-layout';
-import { Modal, TableColumnsType, message } from 'ant-design-vue/es';
+import { ProModal } from 'antdv-pro-modal';
+import { message, Form, Modal } 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 useNeStore from '@/store/modules/ne';
-import useI18n from '@/hooks/useI18n';
 import useDictStore from '@/store/modules/dict';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { listNeLicense, stateNeLicense } from '@/api/ne/neLicense';
+import useI18n from '@/hooks/useI18n';
-import { parseDateToStr } from '@/utils/date-utils';
+import {
-import { currentCoreUid } from '@/hooks/useCoreUid';
+  addCoreInfo,
+  delCoreInfo,
+  listCoreInfo,
+  updateCoreInfo,
+} from '@/api/core/coreInfo';
 const { t } = useI18n();
 const { getDict } = useDictStore();
 const neStore = useNeStore();
-const EditModal = defineAsyncComponent(
-  () => import('./components/EditModal.vue')
-);
 
-/**字典数据-状态 */
+/**字典数据 */
-let dictStatus = ref<DictType[]>([]);
+let dict: {
+  sysNormalDisable: DictType[];
+} = reactive({
+  sysNormalDisable: [],
+});
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
+  /**参数键名 */
-  coreUid: currentCoreUid(),
+  name: '',
-  /**网元类型 */
-  neType: undefined,
-  /**序列号 */
-  serialNum: '',
   /**当前页数 */
   pageNum: 1,
   /**每页条数 */
@@ -45,8 +40,7 @@ let queryParams = reactive({
 /**查询参数重置 */
 function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
-    neType: undefined,
+    name: '',
-    serialNum: '',
     pageNum: 1,
     pageSize: 20,
   });
@@ -61,19 +55,25 @@ type TabeStateType = {
   loading: boolean;
   /**紧凑型 */
   size: SizeType;
+  /**搜索栏 */
+  seached: boolean;
   /**记录数据 */
-  data: any[];
+  data: object[];
+  /**勾选记录 */
+  selectedRowKeys: (string | number)[];
 };
 
 /**表格状态 */
 let tableState: TabeStateType = reactive({
   loading: false,
   size: 'middle',
+  seached: true,
   data: [],
+  selectedRowKeys: [],
 });
 
 /**表格字段列 */
-let tableColumns = ref<TableColumnsType>([
+let tableColumns = ref<ColumnsType>([
   {
     title: t('common.rowId'),
     dataIndex: 'id',
@@ -81,73 +81,23 @@ let tableColumns = ref<TableColumnsType>([
     width: 100,
   },
   {
-    title: t('views.ne.common.neType'),
+    title: 'Core UID',
-    dataIndex: 'neType',
+    dataIndex: 'coreUid',
     align: 'left',
     width: 100,
   },
   {
-    title: t('views.ne.neLicense.status'),
+    title: 'Core Name',
-    dataIndex: 'status',
+    dataIndex: 'name',
-    key: 'status',
     align: 'left',
-    width: 120,
-  },
-  {
-    title: t('views.ne.common.serialNum'),
-    dataIndex: 'serialNum',
-    align: 'left',
-    width: 120,
-  },
-  {
-    title: t('views.ne.common.expiryDate'),
-    dataIndex: 'expiryDate',
-    align: 'left',
-    width: 120,
-  },
-  {
-    title: t('views.ne.common.ueNumber'),
-    dataIndex: 'ueNumber',
-    align: 'left',
-    customRender(opt) {
-      if (['UDM', 'AMF', 'MME'].includes(opt.record.neType)) {
-        return opt.value;
-      }
-      return '-';
-    },
     width: 100,
   },
   {
-    title: t('views.ne.common.nbNumber'),
+    title: 'SN',
-    dataIndex: 'nbNumber',
+    dataIndex: 'sn',
     align: 'left',
-    customRender(opt) {
-      if (['AMF', 'MME'].includes(opt.record.neType)) {
-        return opt.value;
-      }
-      return '-';
-    },
-    width: 100,
-  },
-  {
-    title: t('common.remark'),
-    dataIndex: 'remark',
-    key: 'remark',
-    align: 'left',
-    width: 150,
-    resizable: true,
-    minWidth: 100,
-    maxWidth: 300,
-  },
-  {
-    title: t('common.updateTime'),
-    dataIndex: 'updateTime',
-    align: 'left',
-    customRender(opt) {
-      if (!opt.value) return '';
-      return parseDateToStr(opt.value);
-    },
     width: 200,
+    ellipsis: true,
   },
   {
     title: t('common.operate'),
@@ -174,7 +124,8 @@ let tablePagination = reactive({
   showSizeChanger: true,
   /**数据总数 */
   total: 0,
-  showTotal: (total: number) => t('common.tablePaginationTotal', { total }),
+  showTotal: (total: number) =>
+    t('common.tablePaginationTotal', { total: total }),
   onChange: (page: number, pageSize: number) => {
     tablePagination.current = page;
     tablePagination.pageSize = pageSize;
@@ -189,48 +140,19 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
-/**查询列表, pageNum初始页数 */
+/**表格多选 */
-function fnGetList(pageNum?: number) {
+function fnTableSelectedRowKeys(keys: (string | number)[]) {
-  if (tableState.loading) return;
+  tableState.selectedRowKeys = keys;
-  tableState.loading = true;
-  if (pageNum) {
-    queryParams.pageNum = pageNum;
-  }
-  listNeLicense(toRaw(queryParams)).then(res => {
-    if (res.code === RESULT_CODE_SUCCESS) {
-      const { total, rows } = res.data;
-      let totalV = total;
-      let rowsV = rows.filter((s: any) => {
-        if (s.neType !== 'OMC') {
-          return true;
-        }
-        totalV -= 1;
-        return false;
-      });
-      tableState.data = rowsV;
-      tablePagination.total = totalV;
-      if (
-        tablePagination.total <=
-          (queryParams.pageNum - 1) * tablePagination.pageSize &&
-        queryParams.pageNum !== 1
-      ) {
-        tableState.loading = false;
-        fnGetList(queryParams.pageNum - 1);
-      }
-    } else {
-      tablePagination.total = 0;
-      tableState.data = [];
-    }
-    tableState.loading = false;
-  });
 }
 
 /**对话框对象信息状态类型 */
 type ModalStateType = {
   /**新增框或修改框是否显示 */
   openByEdit: boolean;
-  coreUid: string;
+  /**标题 */
-  id: number;
+  title: string;
+  /**表单数据 */
+  from: Record<string, any>;
   /**确定按钮 loading */
   confirmLoading: boolean;
 };
@@ -238,31 +160,110 @@ type ModalStateType = {
 /**对话框对象信息状态 */
 let modalState: ModalStateType = reactive({
   openByEdit: false,
-  coreUid: '',
+  title: 'KPI Title',
-  id: 0,
+  from: {
+    id: undefined,
+    cnTitle: '',
+    enTitle: '',
+    kpiId: '',
+    neType: '',
+    statusFlag: '1',
+  },
   confirmLoading: false,
 });
 
+/**对话框内表单属性和校验规则 */
+const modalStateFrom = Form.useForm(
+  modalState.from,
+  reactive({
+    neType: [
+      {
+        required: true,
+        message: t('common.inputPlease'),
+      },
+    ],
+    kpiId: [
+      {
+        required: true,
+        message: t('common.inputPlease'),
+      },
+    ],
+    cnTitle: [
+      {
+        required: true,
+        message: t('common.inputPlease'),
+      },
+    ],
+    enTitle: [
+      {
+        required: true,
+        message: t('common.inputPlease'),
+      },
+    ],
+    statusFlag: [
+      {
+        required: true,
+        message: t('common.selectPlease'),
+      },
+    ],
+  })
+);
+
 /**
  * 对话框弹出显示为 新增或者修改
- * @param row id
+ * @param configId 参数编号id, 不传为新增
  */
-function fnModalVisibleByEdit(row: Record<string, any>) {
+function fnModalVisibleByEdit(row?: Record<string, any>) {
-  modalState.coreUid = row.coreUid;
+  if (!row) {
-  modalState.id = row.id;
+    modalStateFrom.resetFields();
-  nextTick(() => {
+    modalState.title = 'Add Core Info';
     modalState.openByEdit = true;
-  });
+    return;
+  }
+  // 编辑
+  if (modalState.confirmLoading) return;
+  Object.assign(modalState.from, row);
+  modalState.title = 'Update Info';
+  modalState.openByEdit = true;
 }
 
 /**
  * 对话框弹出确认执行函数
  * 进行表达规则校验
  */
-function fnModalOk(e: any) {
+function fnModalOk() {
-  // 刷新授权状态
+  modalStateFrom
-  stateNeLicense(e.coreUid, e.neUid);
+    .validate()
-  setTimeout(() => fnGetList(), 2_000);
+    .then(() => {
+      modalState.confirmLoading = true;
+      const hide = message.loading(t('common.loading'), 0);
+      const from = toRaw(modalState.from);
+      const req = from.id ? updateCoreInfo(from) : addCoreInfo(from);
+      req
+        .then(res => {
+          if (res.code === RESULT_CODE_SUCCESS) {
+            message.success({
+              content: t('common.msgSuccess', { msg: modalState.title }),
+              duration: 2,
+            });
+            modalState.openByEdit = false;
+            modalStateFrom.resetFields();
+            fnGetList(1);
+          } else {
+            message.error({
+              content: `${res.msg}`,
+              duration: 2,
+            });
+          }
+        })
+        .finally(() => {
+          hide();
+          modalState.confirmLoading = false;
+        });
+    })
+    .catch(e => {
+      message.error(t('common.errorFields', { num: e.errorFields.length }), 3);
+    });
 }
 
 /**
@@ -271,88 +272,89 @@ function fnModalOk(e: any) {
  */
 function fnModalCancel() {
   modalState.openByEdit = false;
-  modalState.coreUid = '';
+  modalStateFrom.resetFields();
-  modalState.id = 0;
 }
 
-/**刷新网元授权状态 */
+/**
-function fnRecordState(row: Record<string, any>) {
+ * 配置删除
-  if (modalState.confirmLoading) return;
+ * @param id 编号ID
+ */
+function fnRecordDelete(id: string = '0') {
+  if (id === '0') {
+    id = tableState.selectedRowKeys.join(',');
+  }
   Modal.confirm({
     title: t('common.tipTitle'),
-    content: t('views.ne.neLicense.reloadTip'),
+    content: t('views.system.config.delTip', { num: id }),
     onOk() {
-      modalState.confirmLoading = true;
       const hide = message.loading(t('common.loading'), 0);
-      stateNeLicense(row.coreUid, row.neUid)
+      delCoreInfo(id)
         .then(res => {
           if (res.code === RESULT_CODE_SUCCESS) {
-            row.status = '1';
+            message.success({
-            row.serialNum = res.data.sn;
+              content: t('views.system.config.delOk'),
-            row.expiryDate = res.data.expire;
+              duration: 2,
-            row.ueNumber = res.data.ueNumber;
+            });
-            row.nbNumber = res.data.nbNumber;
+            fnGetList();
-            row.updateTime = new Date().getTime();
-            message.success(
-              `${row.id} ${row.neType} ${dictStatus.value[1].label}`,
-              3
-            );
           } else {
-            row.status = '0';
+            message.error({
-            message.warning(
+              content: `${res.msg}`,
-              `${row.id} ${row.neType} ${dictStatus.value[0].label}`,
+              duration: 2,
-              3
+            });
-            );
           }
         })
         .finally(() => {
-          modalState.confirmLoading = false;
           hide();
         });
     },
   });
 }
 
-/**刷新网元授权状态 重载 */
+/**查询参数配置列表, pageNum初始页数 */
-function fnRecordStateReload() {
+function fnGetList(pageNum?: number) {
-  if (modalState.confirmLoading) return;
+  if (tableState.loading) return;
-  Modal.confirm({
+  tableState.loading = true;
-    title: t('common.tipTitle'),
+  if (pageNum) {
-    content: t('views.ne.neLicense.reloadBatchTip'),
+    queryParams.pageNum = pageNum;
-    onOk: async () => {
+  }
-      modalState.confirmLoading = true;
+
-      const hide = message.loading(t('common.loading'), 0);
+  listCoreInfo(toRaw(queryParams)).then(res => {
-      for (const row of tableState.data) {
+    if (res.code === RESULT_CODE_SUCCESS) {
-        if (row.neType.toUpperCase() === 'OMC') {
+      // 取消勾选
-          continue;
+      if (tableState.selectedRowKeys.length > 0) {
-        }
+        tableState.selectedRowKeys = [];
-        await stateNeLicense(row.coreUid, row.neUid);
       }
-      hide();
+      tablePagination.total = res.data.total;
-      message.success(t('common.operateOk'), 3);
+      tableState.data = res.data.rows;
-      modalState.confirmLoading = false;
+      if (
-      // 获取列表数据
+        tablePagination.total <=
-      fnGetList();
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
-    },
+        queryParams.pageNum !== 1
+      ) {
+        tableState.loading = false;
+        fnGetList(queryParams.pageNum - 1);
+      }
+    }
+    tableState.loading = false;
   });
 }
 
 onMounted(() => {
   // 初始字典数据
-  getDict('ne_license_status')
+  Promise.allSettled([getDict('sys_normal_disable')]).then(resArr => {
-    .then(res => {
+    if (resArr[0].status === 'fulfilled') {
-      dictStatus.value = res;
+      dict.sysNormalDisable = resArr[0].value;
-    })
+    }
-    .finally(() => {
+  });
-      // 获取列表数据
+  // 获取列表数据
-      fnGetList();
+  fnGetList();
-    });
 });
 </script>
 
 <template>
   <PageContainer>
     <a-card
+      v-show="tableState.seached"
       :bordered="false"
       :body-style="{ marginBottom: '24px', paddingBottom: 0 }"
     >
@@ -360,27 +362,15 @@ onMounted(() => {
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item :label="t('views.ne.common.neType')" name="neType ">
+            <a-form-item label="Name" name="name">
-              <a-auto-complete
-                v-model:value="queryParams.neType"
-                :options="neStore.getNeSelectOtions"
-                :allow-clear="true"
-                :placeholder="t('common.inputPlease')"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.ne.common.serialNum')"
-              name="serialNum"
-            >
               <a-input
-                v-model:value="queryParams.serialNum"
+                v-model:value="queryParams.name"
-                :allow-clear="true"
+                allow-clear
                 :placeholder="t('common.inputPlease')"
               ></a-input>
             </a-form-item>
           </a-col>
+
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
@@ -403,13 +393,18 @@ onMounted(() => {
       <!-- 插槽-卡片左侧侧 -->
       <template #title>
         <a-space :size="8" align="center">
+          <a-button type="primary" @click.prevent="fnModalVisibleByEdit()">
+            <template #icon><PlusOutlined /></template>
+            {{ t('common.addText') }}
+          </a-button>
           <a-button
             type="default"
-            :loading="modalState.confirmLoading"
+            danger
-            @click.prevent="fnRecordStateReload()"
+            :disabled="tableState.selectedRowKeys.length <= 0"
+            @click.prevent="fnRecordDelete()"
           >
-            <template #icon><SyncOutlined /></template>
+            <template #icon><DeleteOutlined /></template>
-            {{ t('views.ne.neLicense.reloadBatch') }}
+            {{ t('common.deleteText') }}
           </a-button>
         </a-space>
       </template>
@@ -417,6 +412,21 @@ onMounted(() => {
       <!-- 插槽-卡片右侧 -->
       <template #extra>
         <a-space :size="8" align="center">
+          <a-tooltip>
+            <template #title>{{ t('common.searchBarText') }}</template>
+            <a-switch
+              v-model:checked="tableState.seached"
+              :checked-children="t('common.switch.show')"
+              :un-checked-children="t('common.switch.hide')"
+              size="small"
+            />
+          </a-tooltip>
+          <a-tooltip>
+            <template #title>{{ t('common.reloadText') }}</template>
+            <a-button type="text" @click.prevent="fnGetList()">
+              <template #icon><ReloadOutlined /></template>
+            </a-button>
+          </a-tooltip>
           <a-tooltip placement="topRight">
             <template #title>{{ t('common.sizeText') }}</template>
             <a-dropdown placement="bottomRight" trigger="click">
@@ -453,45 +463,32 @@ onMounted(() => {
         :data-source="tableState.data"
         :size="tableState.size"
         :pagination="tablePagination"
-        :scroll="{ x: tableColumns.length * 140 }"
+        :scroll="{ x: tableColumns.length * 120 }"
-        @resizeColumn="(w:number, col:any) => (col.width = w)"
+        :row-selection="{
+          type: 'checkbox',
+          selectedRowKeys: tableState.selectedRowKeys,
+          onChange: fnTableSelectedRowKeys,
+        }"
       >
         <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'status'">
-            <DictTag :options="dictStatus" :value="record.status" />
-          </template>
-          <template v-if="column.key === 'remark'">
-            <a-tooltip placement="topLeft">
-              <template #title>{{ record.remark }}</template>
-              <div
-                style="
-                  overflow: hidden;
-                  text-overflow: ellipsis;
-                  white-space: nowrap;
-                  cursor: pointer;
-                  width: 50px;
-                "
-                :style="{ width: column.width + 'px' }"
-              >
-                {{ record.remark }}
-              </div>
-            </a-tooltip>
-          </template>
           <template v-if="column.key === 'id'">
             <a-space :size="8" align="center">
-              <a-tooltip placement="topRight">
+              <a-tooltip>
-                <template #title>{{ t('views.ne.neLicense.reload') }}</template>
+                <template #title>{{ t('common.editText') }}</template>
-                <a-button type="link" @click.prevent="fnRecordState(record)">
-                  <template #icon><SyncOutlined /> </template>
-                </a-button>
-              </a-tooltip>
-              <a-tooltip placement="topRight">
-                <template #title>{{ t('views.ne.neLicense.change') }}</template>
                 <a-button
                   type="link"
                   @click.prevent="fnModalVisibleByEdit(record)"
                 >
-                  <template #icon><UploadOutlined /> </template>
+                  <template #icon><FormOutlined /></template>
+                </a-button>
+              </a-tooltip>
+              <a-tooltip>
+                <template #title>{{ t('common.deleteText') }}</template>
+                <a-button
+                  type="link"
+                  @click.prevent="fnRecordDelete(record.id)"
+                >
+                  <template #icon><DeleteOutlined /></template>
                 </a-button>
               </a-tooltip>
             </a-space>
@@ -500,14 +497,55 @@ onMounted(() => {
       </a-table>
     </a-card>
 
-    <!-- 文件上传框 -->
+    <!-- 新增框或修改框 -->
-    <EditModal
+    <ProModal
-      v-model:open="modalState.openByEdit"
+      :drag="true"
-      :core-uid="modalState.coreUid"
+      :width="800"
-      :id="modalState.id"
+      :destroyOnClose="true"
+      :keyboard="false"
+      :mask-closable="false"
+      :open="modalState.openByEdit"
+      :title="modalState.title"
+      :confirm-loading="modalState.confirmLoading"
       @ok="fnModalOk"
       @cancel="fnModalCancel"
-    ></EditModal>
+    >
+      <a-form
+        name="modalStateFrom"
+        layout="horizontal"
+        :label-col="{ span: 6 }"
+        :label-wrap="true"
+      >
+        <a-row>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item
+              label="Name"
+              name="name"
+              v-bind="modalStateFrom.validateInfos.name"
+            >
+              <a-input
+                v-model:value="modalState.from.name"
+                allow-clear
+                :placeholder="t('common.inputPlease')"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item
+              label="SN"
+              name="sn"
+              v-bind="modalStateFrom.validateInfos.sn"
+            >
+              <a-input
+                v-model:value="modalState.from.sn"
+                allow-clear
+                :placeholder="t('common.inputPlease')"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </ProModal>
   </PageContainer>
 </template>
 

src/views/ne/neConfig/hooks/useArrayBatchDel.ts

@@ -1,6 +1,5 @@
 import { delNeConfigData } from '@/api/ne/neConfig';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { message } from 'ant-design-vue';
 import { reactive } from 'vue';
 
@@ -51,7 +50,6 @@ export default function useArrayBatch({
       const res = await delNeConfigData({
         neType: neTypeSelect.value[0],
         neUid: neTypeSelect.value[1],
-        coreUid: currentCoreUid(),
         paramName: batchState.paramName,
         loc: `${i}`,
       });

src/views/ne/neConfig/hooks/useArrayImport.ts

@@ -4,7 +4,6 @@ import { readSheet } from '@/utils/execl-utils';
 import { message } from 'ant-design-vue';
 import { reactive } from 'vue';
 import saveAs from 'file-saver';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 
 /**
  * 导入文件加array
@@ -140,7 +139,6 @@ export default function useArrayImport({
             result = await editNeConfigData({
               neType: neTypeSelect.value[0],
               neUid: neTypeSelect.value[1],
-              coreUid: currentCoreUid(),
               paramName: importState.paramName,
               paramData: rowItem,
               loc: `${rowItem.index}`,
@@ -155,7 +153,6 @@ export default function useArrayImport({
             result = await addNeConfigData({
               neType: neTypeSelect.value[0],
               neUid: neTypeSelect.value[1],
-              coreUid: currentCoreUid(),
               paramName: importState.paramName,
               paramData: Object.assign(rowItem, { index }),
               loc: `${index}`,

src/views/ne/neConfig/hooks/useConfigArray.ts

@@ -4,7 +4,6 @@ import {
   editNeConfigData,
 } from '@/api/ne/neConfig';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { Modal, message } from 'ant-design-vue/es';
 import { SizeType } from 'ant-design-vue/es/config-provider';
 import { reactive, watch } from 'vue';
@@ -136,7 +135,6 @@ export default function useConfigArray({
     editNeConfigData({
       neType: neTypeSelect.value[0],
       neUid: neTypeSelect.value[1],
-      coreUid: currentCoreUid(),
       paramName: treeState.selectNode.paramName,
       paramData: data,
       loc: loc,
@@ -177,7 +175,6 @@ export default function useConfigArray({
         delNeConfigData({
           neType: neTypeSelect.value[0],
           neUid: neTypeSelect.value[1],
-          coreUid: currentCoreUid(),
           paramName: treeState.selectNode.paramName,
           loc: loc,
         }).then(res => {
@@ -272,7 +269,6 @@ export default function useConfigArray({
     addNeConfigData({
       neType: neTypeSelect.value[0],
       neUid: neTypeSelect.value[1],
-      coreUid: currentCoreUid(),
       paramName: treeState.selectNode.paramName,
       paramData: data,
       loc: `${from['index']['value']}`,

src/views/ne/neConfig/hooks/useConfigArrayChild.ts

@@ -4,7 +4,6 @@ import {
   delNeConfigData,
 } from '@/api/ne/neConfig';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { Modal, message } from 'ant-design-vue/es';
 import { SizeType } from 'ant-design-vue/es/config-provider';
 import { nextTick, reactive } from 'vue';
@@ -204,7 +203,6 @@ export default function useConfigArrayChild({
     editNeConfigData({
       neType: neTypeSelect.value[0],
       neUid: neTypeSelect.value[1],
-      coreUid: currentCoreUid(),
       paramName: treeState.selectNode.paramName,
       paramData: data,
       loc,
@@ -246,7 +244,6 @@ export default function useConfigArrayChild({
         delNeConfigData({
           neType: neTypeSelect.value[0],
           neUid: neTypeSelect.value[1],
-          coreUid: currentCoreUid(),
           paramName: treeState.selectNode.paramName,
           loc,
         }).then(res => {
@@ -317,7 +314,6 @@ export default function useConfigArrayChild({
     addNeConfigData({
       neType: neTypeSelect.value[0],
       neUid: neTypeSelect.value[1],
-      coreUid: currentCoreUid(),
       paramName: treeState.selectNode.paramName,
       paramData: data,
       loc,

src/views/ne/neConfig/hooks/useConfigList.ts

@@ -3,7 +3,6 @@ import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { SizeType } from 'ant-design-vue/es/config-provider';
 import { message } from 'ant-design-vue/es';
 import { reactive, toRaw } from 'vue';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 
 /**
  * list类型参数处理
@@ -90,7 +89,6 @@ export default function useConfigList({
     editNeConfigData({
       neType: neTypeSelect.value[0],
       neUid: neTypeSelect.value[1],
-      coreUid: currentCoreUid(),
       paramName: treeState.selectNode.paramName,
       paramData: {
         [from['name']]: from['value'],

src/views/ne/neConfig/hooks/useOptions.ts

@@ -1,5 +1,4 @@
 import { getNeConfigData } from '@/api/ne/neConfig';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { regExpIPv4, regExpIPv6, validURL } from '@/utils/regular-utils';
 import { ref } from 'vue';
 
@@ -171,7 +170,6 @@ export default function useOptions({ t }: any) {
     getNeConfigData({
       neType: 'SMF',
       neUid: neUid,
-      coreUid: currentCoreUid(),
       paramName: 'upfConfig',
     }).then(res => {
       smfByUPFIdOptions.value = [];

src/views/ne/neConfig/index.vue

@@ -16,7 +16,6 @@ import useConfigArrayChild from './hooks/useConfigArrayChild';
 import useArrayImport from './hooks/useArrayImport';
 import useArrayBatchDel from './hooks/useArrayBatchDel';
 import { getAllNeConfig, getNeConfigData } from '@/api/ne/neConfig';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const neStore = useNeStore();
 const { t } = useI18n();
 const route = useRoute();
@@ -109,7 +108,6 @@ function fnActiveConfigNode(key: string | number) {
   getNeConfigData({
     neType: neTypeSelect.value[0],
     neUid: neTypeSelect.value[1],
-    coreUid: currentCoreUid(),
     paramName: key,
   }).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {

src/views/ne/neConfigBackup/index.vue

@@ -19,7 +19,6 @@ import {
 } from '@/api/ne/neConfigBackup';
 import { pushBackupFTP } from '@/api/neData/backup';
 import saveAs from 'file-saver';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const { getDict } = useDictStore();
 const neStore = useNeStore();
@@ -29,8 +28,6 @@ let dictStatus = ref<DictType[]>([]);
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元类型 */
   neType: undefined,
   /**名称 */
@@ -168,7 +165,6 @@ function fnTableSelectedRowKeys(keys: (string | number)[], rows: any[]) {
   tableState.selectedRows = rows.map(item => {
     return {
       id: item.id,
-      coreUid: item.coreUid,
       neUid: item.neUid,
       neType: item.neType,
     };
@@ -207,7 +203,7 @@ function fnDownloadFile(row: Record<string, any>) {
     content: t('views.ne.neConfigBackup.downTip', { txt: row.name }),
     onOk() {
       const hide = message.loading(t('common.loading'), 0);
-      downNeConfigBackup({ id: row.id, coreUid: row.coreUid, neUid: row.neUid })
+      downNeConfigBackup({ id: row.id, neUid: row.neUid })
         .then(res => {
           if (res.code === RESULT_CODE_SUCCESS) {
             message.success({
@@ -251,7 +247,6 @@ function fnRecordDelete(id: string) {
         tableState.selectedRows.forEach(item => {
           reqArr.push(
             delNeConfigBackup({
-              coreUid: item.coreUid,
               neUid: item.neUid,
               id: item.id,
             })
@@ -262,7 +257,6 @@ function fnRecordDelete(id: string) {
           if (item.id === id) {
             reqArr.push(
               delNeConfigBackup({
-                coreUid: item.coreUid,
                 neUid: item.neUid,
                 id: item.id,
               })
@@ -308,7 +302,6 @@ let modalState: ModalStateType = reactive({
   title: '备份记录',
   from: {
     id: undefined,
-    coreUid: '',
     neUid: '',
     neType: '',
     name: '',

src/views/ne/neFile/components/ViewDrawer.vue

@@ -28,13 +28,7 @@ const props = defineProps({
     type: String,
     default: '',
     required: true,
-  },
+  }, 
-  /**核心网标识 */
-  coreUid: {
-    type: String,
-    default: '',
-    required: true,
-  },
 });
 
 /**对话框对象信息状态类型 */
@@ -132,8 +126,7 @@ function fnReload() {
       prefix="tail"
       url="/ws/view"
       :ne-type="neType"
-      :ne-uid="neUid"
+      :ne-uid="neUid" 
-      :core-uid="coreUid"
       style="height: calc(100% - 36px)"
       @connect="fnInit()"
     ></TerminalSSHView>

src/views/ne/neFile/index.vue

@@ -13,7 +13,6 @@ import ViewDrawer from './components/ViewDrawer.vue';
 import saveAs from 'file-saver';
 import { useRoute } from 'vue-router';
 import { parseSizeFromFile } from '@/utils/parse-utils';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const neStore = useNeStore();
 const { t } = useI18n();
 const route = useRoute();
@@ -26,8 +25,6 @@ let neTypeSelect = ref<string[]>([]);
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元类型 */
   neType: '',
   neUid: '',
@@ -153,7 +150,6 @@ function fnDownloadFile(row: Record<string, any>) {
       getNeFile({
         neType: queryParams.neType,
         neUid: queryParams.neUid,
-        coreUid: queryParams.coreUid,
         path: queryParams.path,
         fileName: row.fileName,
         delTemp: true,
@@ -276,7 +272,6 @@ const viewDrawerState = reactive({
   neType: '',
   /**网元ID */
   neUid: '',
-  coreUid: '',
 });
 
 /**打开抽屉查看 */
@@ -284,7 +279,6 @@ function fnDrawerOpen(row: Record<string, any>) {
   viewDrawerState.filePath = [...nePathArr.value, row.fileName].join('/');
   viewDrawerState.neType = neTypeSelect.value[0];
   viewDrawerState.neUid = neTypeSelect.value[1];
-  viewDrawerState.coreUid = currentCoreUid();
   viewDrawerState.open = !viewDrawerState.open;
 }
 
@@ -392,7 +386,6 @@ onMounted(() => {
       :file-path="viewDrawerState.filePath"
       :ne-type="viewDrawerState.neType"
       :ne-uid="viewDrawerState.neUid"
-      :core-uid="viewDrawerState.coreUid"
     ></ViewDrawer>
   </PageContainer>
 </template>

src/views/ne/neInfo/components/BackConfModal.vue

@@ -20,10 +20,6 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  coreUid: {
-    type: String,
-    default: '',
-  },
   neUid: {
     type: String,
     default: '',
@@ -45,11 +41,10 @@ const importState = reactive({
 
 /**查询网元远程服务器备份文件 */
 function backupSearch(name?: string) {
-  const { neType, neUid, coreUid } = props;
+  const { neType, neUid } = props;
   listNeConfigBackup({
     neType,
     neUid,
-    coreUid,
     name,
     pageNum: 1,
     pageSize: 20,
@@ -91,7 +86,6 @@ type ModalStateType = {
   from: {
     neType: string;
     neUid: string;
-    coreUid: string;
     type: 'upload' | 'backup';
     path: string | undefined;
   };
@@ -108,7 +102,6 @@ let modalState: ModalStateType = reactive({
   from: {
     neType: '',
     neUid: '',
-    coreUid: '',
     type: 'upload',
     path: undefined,
   },
@@ -233,10 +226,9 @@ watch(
   () => props.open,
   val => {
     if (val) {
-      if (props.neType && props.neUid && props.coreUid) {
+      if (props.neType && props.neUid) {
         modalState.from.neType = props.neType;
         modalState.from.neUid = props.neUid;
-        modalState.from.coreUid = props.coreUid;
         modalState.title = t('views.ne.neInfo.backConf.title');
         modalState.openByEdit = true;
       }
@@ -248,13 +240,13 @@ watch(
  * 网元导出配置
  * @param row 网元编号ID
  */
-function fnExportConf(coreUid: string, neUid: string, neType: string) {
+function fnExportConf(neUid: string, neType: string) {
   Modal.confirm({
     title: t('common.tipTitle'),
     content: t('views.ne.neInfo.backConf.exportTip'),
     onOk() {
       const hide = message.loading(t('common.loading'), 0);
-      exportNeConfigBackup({ neType, coreUid, neUid })
+      exportNeConfigBackup({ neType, neUid })
         .then(res => {
           if (res.code === RESULT_CODE_SUCCESS) {
             notification.success({

src/views/ne/neInfo/components/EditModal.vue

@@ -9,7 +9,6 @@ import { addNeInfo, updateNeInfo, getNeInfo } from '@/api/ne/neInfo';
 import { neHostAuthorizedRSA, testNeHost } from '@/api/ne/neHost';
 import useDictStore from '@/store/modules/dict';
 import useI18n from '@/hooks/useI18n';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { getDict } = useDictStore();
 const { t } = useI18n();
 const emit = defineEmits(['ok', 'cancel', 'update:open']);
@@ -22,10 +21,6 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
-  coreUid: {
-    type: String,
-    default: '',
-  },
 });
 
 /**字典数据 */
@@ -113,7 +108,6 @@ let modalState: ModalStateType = reactive({
     ipAddr: '',
     port: 33030,
     pvFlag: 'PNF',
-    coreUid: currentCoreUid(),
     neUid: '',
     macAddr: '',
     dn: '',
@@ -202,11 +196,10 @@ function modalStateFromEqualIPV4AndIPV6(
 
 /**
  * 对话框弹出显示为 新增或者修改
- * @param coreUid 核心网ID
+ * @param id 网元ID
- * @param neUid 网元ID
  */
-function fnModalVisibleByEdit(coreUid: string, id: number) {
+function fnModalVisibleByEdit(id: number) {
-  if (!coreUid || !id) {
+  if (!id) {
     modalStateFrom.resetFields();
     modalState.title = t('views.ne.neInfo.addTitle');
     modalState.openByEdit = true;
@@ -214,7 +207,7 @@ function fnModalVisibleByEdit(coreUid: string, id: number) {
     if (modalState.confirmLoading) return;
     const hide = message.loading(t('common.loading'), 0);
     modalState.confirmLoading = true;
-    getNeInfo(coreUid, id).then(res => {
+    getNeInfo(id).then(res => {
       modalState.confirmLoading = false;
       hide();
       if (res.code === RESULT_CODE_SUCCESS) {
@@ -329,7 +322,7 @@ function fnNeIPChange(e: any) {
 watch(
   () => props.open,
   val => {
-    if (val) fnModalVisibleByEdit(props.coreUid, props.id);
+    if (val) fnModalVisibleByEdit(props.id);
   }
 );
 

src/views/ne/neInfo/components/LicenseEditModal.vue

@@ -4,16 +4,12 @@ import { ProModal } from 'antdv-pro-modal';
 import { Form, Modal, Upload, message } from 'ant-design-vue/es';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import {
-  changeNeLicense,
-  getNeLicense,
-  getNeLicenseByNF,
-} from '@/api/ne/neLicense';
 import { UploadRequestOption } from 'ant-design-vue/es/vc-upload/interface';
 import { FileType } from 'ant-design-vue/es/upload/interface';
 import { uploadFile } from '@/api/tool/file';
 import { useClipboard } from '@vueuse/core';
 import saveAs from 'file-saver';
+import { getNeInfo, codeNeLicense, updateNeLicense } from '@/api/ne/neInfo';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
 const emit = defineEmits(['ok', 'cancel', 'update:open']);
@@ -22,22 +18,16 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  /**网元ID */
   id: {
     type: Number,
     default: 0,
-  },
+    required: true,
-  coreUid: {
-    type: String,
-    default: '',
   },
   neUid: {
     type: String,
     default: '',
   },
-  neType: {
-    type: String,
-    default: '',
-  },
   /**是否重启服务 */
   reload: {
     type: Boolean,
@@ -55,10 +45,10 @@ type ModalStateType = {
   from: {
     id: number | undefined;
     neType: string;
+    neName: string;
     neId: string;
     activationRequestCode: string;
     licensePath: string;
-    remark: string;
     reload: boolean;
   };
   /**确定按钮 loading */
@@ -75,9 +65,9 @@ let modalState: ModalStateType = reactive({
     id: undefined,
     neType: '',
     neId: '',
+    neName: '',
     activationRequestCode: '',
     licensePath: '',
-    remark: '',
     reload: false,
   },
   confirmLoading: false,
@@ -110,7 +100,7 @@ function fnModalOk() {
       modalState.confirmLoading = true;
       const hide = message.loading(t('common.loading'), 0);
       const from = toRaw(modalState.from);
-      changeNeLicense(from).then(res => {
+      updateNeLicense(from).then(res => {
         if (res.code === RESULT_CODE_SUCCESS) {
           message.success({
             content: t('common.operateOk'),
@@ -202,7 +192,7 @@ function fnCopyCode() {
 
 /**下载授权申请码文件 */
 function fnDownCode() {
-  const { activationRequestCode, neType, neId } = modalState.from;
+  const { activationRequestCode, neType, neName } = modalState.from;
   if (!activationRequestCode) return;
   Modal.confirm({
     title: t('common.tipTitle'),
@@ -211,7 +201,7 @@ function fnDownCode() {
       const blob = new Blob([activationRequestCode], {
         type: 'text/plain',
       });
-      saveAs(blob, `${neType}_${neId}_code.txt`);
+      saveAs(blob, `${neType}_${neName}_code.txt`);
     },
   });
 }
@@ -220,35 +210,19 @@ function fnDownCode() {
  * 对话框弹出显示为 ID编辑
  * @param id id
  */
-function fnModalVisibleById(coreUid: string, id: number) {
+function fnModalVisibleById(id: number) {
   const hide = message.loading(t('common.loading'), 0);
-  getNeLicense(coreUid, id)
+  codeNeLicense(props.neUid)
     .then(res => {
       if (res.code === RESULT_CODE_SUCCESS) {
-        Object.assign(modalState.from, res.data);
+        return getNeInfo(id);
-        modalState.from.licensePath = '';
-        modalState.from.reload = props.reload;
-        modalState.title = t('views.ne.neLicense.updateTtile');
-        modalState.openByEdit = true;
       } else {
         message.error(res.msg, 3);
+        return undefined;
       }
     })
-    .finally(() => {
-      modalState.confirmLoading = false;
-      hide();
-    });
-}
-
-/**
- * 对话框弹出显示为 新增或者修改
- * @param neType 网元类型
- * @param neId 网元ID
- */
-function fnModalVisibleByTypeAndId(coreUid: string, neUid: string) {
-  const hide = message.loading(t('common.loading'), 0);
-  getNeLicenseByNF(coreUid, neUid)
     .then(res => {
+      if (!res) return;
       if (res.code === RESULT_CODE_SUCCESS) {
         Object.assign(modalState.from, res.data);
         modalState.from.licensePath = '';
@@ -269,13 +243,8 @@ function fnModalVisibleByTypeAndId(coreUid: string, neUid: string) {
 watch(
   () => props.open,
   val => {
-    if (val && props.coreUid) {
+    if (val && props.id && props.neUid) {
-      if (props.neUid) {
+      fnModalVisibleById(props.id);
-        fnModalVisibleByTypeAndId(props.coreUid, props.neUid);
-      }
-      if (props.id) {
-        fnModalVisibleById(props.coreUid, props.id);
-      }
     }
   }
 );
@@ -316,10 +285,10 @@ onMounted(() => {});
         <a-col :lg="12" :md="12" :xs="24">
           <a-form-item
             :label-col="{ span: 12 }"
-            :label="t('views.ne.common.neUid')"
+            :label="t('views.ne.common.neName')"
-            name="neId"
+            name="neName"
           >
-            {{ modalState.from.neId }}
+            {{ modalState.from.neName }}
           </a-form-item>
         </a-col>
       </a-row>
@@ -381,15 +350,6 @@ onMounted(() => {});
       <a-form-item label="NE Reload" name="reload" v-if="false">
         <a-switch v-model:checked="modalState.from.reload"> </a-switch>
       </a-form-item>
-
-      <a-form-item :label="t('common.remark')" name="remark">
-        <a-textarea
-          v-model:value="modalState.from.remark"
-          :maxlength="200"
-          :show-count="true"
-          :placeholder="t('common.inputPlease')"
-        />
-      </a-form-item>
     </a-form>
   </ProModal>
 </template>

src/views/ne/neInfo/components/OAMModal.vue

@@ -12,10 +12,6 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  coreUid: {
-    type: String,
-    default: '',
-  },
   neUid: {
     type: String,
     default: '',
@@ -75,9 +71,9 @@ const modalStateFrom = Form.useForm(
  * @param neType 网元类型
  * @param neId 网元ID
  */
-function fnModalVisibleByTypeAndId(coreUid: string, neUid: string) {
+function fnModalVisibleByTypeAndId(neUid: string) {
   const hide = message.loading(t('common.loading'), 0);
-  getOAMFile(coreUid, neUid)
+  getOAMFile(neUid)
     .then(res => {
       if (res.code === RESULT_CODE_SUCCESS) {
         const data = res.data;
@@ -119,7 +115,6 @@ function fnModalOk() {
       const hide = message.loading(t('common.loading'), 0);
       const from = toRaw(modalState.from);
       saveOAMFile({
-        coreUid: props.coreUid,
         neUid: props.neUid,
         content: from,
         sync: true,
@@ -132,7 +127,6 @@ function fnModalOk() {
               serviceNeAction({
                 neType: props.neType,
                 neUid: props.neUid,
-                coreUid: props.coreUid,
                 action: 'restart',
               });
             }
@@ -172,8 +166,8 @@ watch(
   () => props.open,
   val => {
     if (val) {
-      if (props.coreUid && props.neUid) {
+      if (props.neUid) {
-        fnModalVisibleByTypeAndId(props.coreUid, props.neUid);
+        fnModalVisibleByTypeAndId(props.neUid);
       }
     }
   }

src/views/ne/neInfo/hooks/useNeOptions.ts

@@ -25,7 +25,6 @@ export default function useNeOptions() {
         serviceNeAction({
           neType: row.neType,
           neUid: row.neUid,
-          coreUid: row.coreUid,
           action: 'start',
         })
           .then(res => {
@@ -62,7 +61,6 @@ export default function useNeOptions() {
         serviceNeAction({
           neType: row.neType,
           neUid: row.neUid,
-          coreUid: row.coreUid,
           action: 'restart',
         })
           .then(res => {
@@ -111,7 +109,6 @@ export default function useNeOptions() {
         serviceNeAction({
           neType: row.neType,
           neUid: row.neUid,
-          coreUid: row.coreUid,
           action: 'stop',
         })
           .then(res => {
@@ -144,7 +141,7 @@ export default function useNeOptions() {
       content: t('views.ne.common.reloadTip'),
       onOk() {
         const hide = message.loading(t('common.loading'), 0);
-        updateNeConfigReload(row.coreUid, row.neUid)
+        updateNeConfigReload(row.neUid)
           .then(res => {
             if (res.code === RESULT_CODE_SUCCESS) {
               message.success(t('common.operateOk'), 3);
@@ -169,7 +166,6 @@ export default function useNeOptions() {
       query: {
         neType: row.neType,
         neUid: row.neUid,
-        coreUid: row.coreUid,
       },
     });
   }

src/views/ne/neInfo/index.vue

@@ -12,7 +12,6 @@ import { listNeInfo, delNeInfo } from '@/api/ne/neInfo';
 import { stateNeInfo } from '@/api/ne/neAction';
 import useDictStore from '@/store/modules/dict';
 import useNeOptions from './hooks/useNeOptions';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { getDict } = useDictStore();
 const neStore = useNeStore();
 const { t } = useI18n();
@@ -31,6 +30,10 @@ const EditModal = defineAsyncComponent(
 const OAMModal = defineAsyncComponent(
   () => import('./components/OAMModal.vue')
 );
+// 软件授权上传
+const LicenseEditModal = defineAsyncComponent(
+  () => import('./components/LicenseEditModal.vue')
+);
 // 配置备份文件导入
 const BackConfModal = defineAsyncComponent(
   () => import('./components/BackConfModal.vue')
@@ -47,8 +50,6 @@ let dict: {
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元类型 */
   neType: '',
   /**带状态信息 */
@@ -129,6 +130,42 @@ let tableColumns: ColumnsType = [
     align: 'left',
     width: 100,
   },
+  {
+    title: t('views.ne.common.serialNum'),
+    dataIndex: 'serialNum',
+    align: 'left',
+    width: 120,
+  },
+  {
+    title: t('views.ne.common.expiryDate'),
+    dataIndex: 'expiryDate',
+    align: 'left',
+    width: 150,
+  },
+  {
+    title: t('views.ne.common.ueNumber'),
+    dataIndex: 'ueNumber',
+    align: 'left',
+    customRender(opt) {
+      if (['UDM', 'AMF', 'MME'].includes(opt.record.neType)) {
+        return opt.value;
+      }
+      return '';
+    },
+    width: 120,
+  },
+  {
+    title: t('views.ne.common.nbNumber'),
+    dataIndex: 'nbNumber',
+    align: 'left',
+    customRender(opt) {
+      if (['AMF', 'MME'].includes(opt.record.neType)) {
+        return opt.value;
+      }
+      return '';
+    },
+    width: 120,
+  },
   {
     title: t('views.ne.neInfo.state'),
     dataIndex: 'status',
@@ -182,7 +219,6 @@ function fnTableSelectedRowKeys(keys: (string | number)[], rows: any[]) {
   tableState.selectedRows = rows.map(item => {
     return {
       id: item.id,
-      coreUid: item.coreUid,
       neUid: item.neUid,
       neType: item.neType,
     };
@@ -191,6 +227,8 @@ function fnTableSelectedRowKeys(keys: (string | number)[], rows: any[]) {
 
 /**对话框对象信息状态类型 */
 type ModalStateType = {
+  /**软件授权上传框是否显示 */
+  openByLicense: boolean;
   /**配置备份框是否显示 */
   openByBackConf: boolean;
   /**OAM文件配置框是否显示 */
@@ -199,7 +237,6 @@ type ModalStateType = {
   openByEdit: boolean;
   /**新增框或修改框ID */
   id: number;
-  coreUid: string;
   neUid: string;
   neType: string;
   /**确定按钮 loading */
@@ -208,11 +245,11 @@ type ModalStateType = {
 
 /**对话框对象信息状态 */
 let modalState: ModalStateType = reactive({
+  openByLicense: false,
   openByBackConf: false,
   openByOAM: false,
   openByEdit: false,
   id: 0,
-  coreUid: '',
   neUid: '',
   neType: '',
   confirmLoading: false,
@@ -225,12 +262,10 @@ let modalState: ModalStateType = reactive({
 function fnModalVisibleByEdit(row?: Record<string, any>) {
   if (!row) {
     modalState.id = 0;
-    modalState.coreUid = '';
     modalState.neUid = '';
     modalState.neType = '';
   } else {
     modalState.id = row.id;
-    modalState.coreUid = row.coreUid;
     modalState.neUid = row.neUid;
     modalState.neType = row.neType;
   }
@@ -253,14 +288,13 @@ function fnModalEditOk(from: Record<string, any>) {
 
 /**局部更新信息 */
 function reloadRowInfo(row: Record<string, any>) {
-  stateNeInfo(row.coreUid, row.neUid)
+  stateNeInfo(row.neUid)
     .then(res => {
       // 找到编辑更新的网元
       const item = tableState.data.find(s => s.id === row.id);
       if (item && res.code === RESULT_CODE_SUCCESS) {
         item.neType = row.neType;
         item.neUid = row.neUid;
-        item.coreUid = row.coreUid;
         item.neName = row.neName;
         item.ipAddr = row.ipAddr;
         item.port = row.port;
@@ -287,7 +321,6 @@ function reloadRowInfo(row: Record<string, any>) {
  * 进行表达规则校验
  */
 function fnModalEditCancel() {
-  modalState.coreUid = '';
   modalState.neUid = '';
   modalState.neType = '';
   modalState.openByEdit = false;
@@ -314,18 +347,13 @@ function fnRecordDelete(id: string) {
       const hide = message.loading(t('common.loading'), 0);
       let reqArr: any = [];
       if (id === '0') {
-        tableState.selectedRows.forEach(item => {
+        const ids = tableState.selectedRowKeys.join(',');
-          reqArr.push(
+        delNeInfo({ id: ids });
-            delNeInfo({ coreUid: item.coreUid, neUid: item.neUid, id: item.id })
-          );
-        });
       } else {
         tableState.data.forEach(item => {
           if (item.id === id) {
             reqArr.push(
               delNeInfo({
-                coreUid: item.coreUid,
-                neUid: item.neUid,
                 id: item.id,
               })
             );
@@ -385,16 +413,20 @@ function fnRecordMore(type: string | number, row: Record<string, any>) {
       fnNeLogFile(row);
       break;
     case 'oam':
-      modalState.coreUid = row.coreUid;
       modalState.neUid = row.neUid;
       modalState.neType = row.neType;
       modalState.openByOAM = !modalState.openByOAM;
       break;
+    case 'license':
+      modalState.id = row.id;
+      modalState.neUid = row.neUid;
+      modalState.neType = row.neType;
+      modalState.openByLicense = !modalState.openByLicense;
+      break;
     case 'backConfExport':
-      backConf.value.exportConf(row.coreUid, row.neUid, row.neType);
+      backConf.value.exportConf(row.neUid, row.neType);
       break;
     case 'backConfImport':
-      modalState.coreUid = row.coreUid;
       modalState.neUid = row.neUid;
       modalState.neType = row.neType;
       modalState.openByBackConf = !modalState.openByBackConf;
@@ -642,6 +674,13 @@ onMounted(() => {
                         <FileTextOutlined />
                         {{ t('views.ne.common.oam') }}
                       </a-menu-item>
+                      <a-menu-item
+                        key="license"
+                        v-if="!['OMC'].includes(record.neType)"
+                      >
+                        <FileTextOutlined />
+                        {{ t('views.ne.common.license') }}
+                      </a-menu-item>
                       <!-- 配置备份 -->
                       <a-menu-item key="backConfExport">
                         <ExportOutlined />
@@ -680,6 +719,21 @@ onMounted(() => {
                 <span>{{ t('views.ne.common.expiryDate') }}：</span>
                 <span>{{ record.serverState.expire }}</span>
               </div>
+              <div>
+                <span>{{ t('views.ne.common.ueNumber') }}：</span>
+                <span
+                  v-if="
+                    ['UDM', 'AMF', 'MME'].includes(record.serverState.neType)
+                  "
+                >
+                  {{ record.serverState.ueNumber }}
+                </span>
+                <span v-else> - </span>
+              </div>
+              <div v-if="['AMF', 'MME'].includes(record.serverState.neType)">
+                <span>{{ t('views.ne.common.nbNumber') }}：</span>
+                <span> {{ record.serverState.nbNumber }} </span>
+              </div>
             </a-col>
             <a-col :offset="2" :lg="8" :md="8" :xs="8">
               <a-divider orientation="left">
@@ -750,7 +804,6 @@ onMounted(() => {
     <!-- 新增框或修改框 -->
     <EditModal
       v-model:open="modalState.openByEdit"
-      :core-uid="modalState.coreUid"
       :id="modalState.id"
       @ok="fnModalEditOk"
       @cancel="fnModalEditCancel"
@@ -759,7 +812,6 @@ onMounted(() => {
     <!-- OAM编辑框 -->
     <OAMModal
       v-model:open="modalState.openByOAM"
-      :core-uid="modalState.coreUid"
       :ne-uid="modalState.neUid"
       :ne-type="modalState.neType"
       @cancel="fnModalEditCancel"
@@ -769,11 +821,20 @@ onMounted(() => {
     <BackConfModal
       ref="backConf"
       v-model:open="modalState.openByBackConf"
-      :core-uid="modalState.coreUid"
       :ne-uid="modalState.neUid"
       :ne-type="modalState.neType"
       @cancel="fnModalEditCancel"
     ></BackConfModal>
+
+    <!-- 文件上传框 -->
+    <LicenseEditModal
+      v-model:open="modalState.openByLicense"
+      :id="modalState.id"
+      :ne-uid="modalState.neUid"
+      :ne-type="modalState.neType"
+      @ok="fnModalEditOk"
+      @cancel="fnModalEditCancel"
+    ></LicenseEditModal>
   </PageContainer>
 </template>
 

src/views/ne/neOverview/index.vue

@@ -20,12 +20,13 @@ import { PieChart } from 'echarts/charts';
 import { LabelLayout } from 'echarts/features';
 import { useRoute } from 'vue-router';
 import useAppStore from '@/store/modules/app';
+import useCoreStore from '@/store/modules/core';
 import useDictStore from '@/store/modules/dict';
 import { listAllNeInfo } from '@/api/ne/neInfo';
 import { parseDateToStr } from '@/utils/date-utils';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { getDict } = useDictStore();
 const appStore = useAppStore();
+const coreStore = useCoreStore();
 const route = useRoute();
 const { t } = useI18n();
 
@@ -128,7 +129,7 @@ async function fnGetList(reload: boolean = false) {
   tableState.loading = !reload;
   try {
     const res = await listAllNeInfo({
-      coreUid: currentCoreUid(),
+      coreUid: coreStore.currentCoreUid,
       bandStatus: true,
     });
     tableState.data = res.data;

src/views/ne/neQuickSetup/components/NeInfoConfig.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Form, Modal, message } from 'ant-design-vue/es';
 import { onMounted, reactive, toRaw } from 'vue';
-import { addNeInfo, getNeInfo, updateNeInfo } from '@/api/ne/neInfo';
+import { addNeInfo, getNeInfo } from '@/api/ne/neInfo';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { NE_TYPE_LIST } from '@/constants/ne-constants';
 import { regExpIPv4, regExpIPv6 } from '@/utils/regular-utils';
@@ -9,8 +9,6 @@ import { fnRestStepState, fnToStepName, stepState } from '../hooks/useStep';
 import useI18n from '@/hooks/useI18n';
 import useDictStore from '@/store/modules/dict';
 import useNeStore from '@/store/modules/ne';
-import { currentCoreUid } from '@/hooks/useCoreUid';
-import { getNeInfoByNF } from '@/api/ne/neAction';
 const { getDict } = useDictStore();
 const neStore = useNeStore();
 const { t } = useI18n();
@@ -47,7 +45,7 @@ let modalState: ModalStateType = reactive({
   title: '网元',
   from: {
     id: undefined,
-    coreUid: currentCoreUid(),
+    coreId: undefined,
     neUid: '',
     neType: '',
     neName: '',
@@ -174,7 +172,7 @@ function fnModalOk() {
             return;
           }
           neStore.fnNelistRefresh(); // 刷新缓存的网元信息
-          getNeInfo(from.coreUid, neId).then(res => {
+          getNeInfo(neId).then(res => {
             if (res.code === RESULT_CODE_SUCCESS) {
               stepState.neInfo = res.data; // 保存网元信息
               modalState.stepNext = true; // 开启下一步

src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue

@@ -158,7 +158,6 @@ type StateType = {
   /**软件包信息数据 */
   from: {
     neType: string; // 版本需要
-    coreUid: string; // 版本需要
     neUid: string; // 版本需要
     name: string; // 软件需要
     path: string;
@@ -177,8 +176,7 @@ let state: StateType = reactive({
   depType: [],
   from: {
     id: undefined,
-    neType: '',
+    neType: '', 
-    coreUid: '',
     neUid: '',
     name: '',
     path: '',
@@ -245,7 +243,6 @@ function fnRecordInstall() {
         preinput = { pisCSCF: 'y', updateMFetc: 'No', updateMFshare: 'No' };
       }
       const res = await operateNeVersion({
-        coreUid: from.coreUid,
         neUid: from.neUid,
         neType: from.neType,
         action: 'install',
@@ -290,12 +287,11 @@ function fnStepNext() {
 }
 
 onMounted(() => {
-  const { neType,neUid, coreUid } = stepState.neInfo;
+  const { neType, neUid } = stepState.neInfo;
-  if (neType && neUid && coreUid) {
+  if (neType && neUid) {
     tableState.queryParams.neType = neType;
     state.from.neUid = neUid;
     state.from.neType = neType;
-    state.from.coreUid = coreUid;
     fnGetList(1);
   }
 });

src/views/ne/neQuickSetup/components/NeInfoSoftwareLicense.vue

@@ -16,7 +16,6 @@ type StateType = {
   openByFile: boolean;
   /**授权信息数据 */
   from: {
-    coreUid: string;
     neUid: string;
     neType: string;
     // 下面是状态检查结果
@@ -36,7 +35,6 @@ type StateType = {
 let state: StateType = reactive({
   openByFile: false,
   from: {
-    coreUid: '',
     neUid: '',
     neType: '',
     // 下面是状态检查结果
@@ -62,7 +60,7 @@ function fnModalOk(e: any) {
       return;
     }
     if (state.timeCount % 5 === 0) {
-      stateNeLicense(e.neType, e.neId).then(res => {
+      stateNeLicense(e.neId).then(res => {
         if (res.code === RESULT_CODE_SUCCESS && res.data) {
           state.from.sn = res.data.sn;
           state.from.expire = res.data.expire;
@@ -97,18 +95,17 @@ function fnStepEnd() {
 }
 
 onMounted(() => {
-  const { coreUid, neUid } = stepState.neInfo;
+  const { neUid } = stepState.neInfo;
-  if (coreUid && neUid) {
+  if (neUid) {
-    state.from.coreUid = coreUid;
     state.from.neUid = neUid;
     state.confirmLoading = true;
-    stateNeLicense(coreUid, neUid)
+    stateNeLicense(neUid)
       .then(res => {
         if (res.code === RESULT_CODE_SUCCESS && res.data) {
           state.from.sn = res.data.sn;
           state.from.expire = res.data.expire;
         } else {
-          return codeNeLicense(coreUid, neUid);
+          return codeNeLicense(neUid);
         }
       })
       .finally(() => {
@@ -181,8 +178,7 @@ onUnmounted(() => {
   <EditModal
     v-model:open="state.openByFile"
     :ne-type="state.from.neType"
-    :ne-uid="state.from.neUid"
+    :ne-uid="state.from.neUid" 
-    :core-uid="state.from.coreUid"
     :reload="true"
     @ok="fnModalOk"
     @cancel="fnModalCancel"

src/views/ne/neVersion/index.vue

@@ -17,7 +17,6 @@ import { parseDateToStr } from '@/utils/date-utils';
 import useI18n from '@/hooks/useI18n';
 import useDictStore from '@/store/modules/dict';
 import useMaskStore from '@/store/modules/mask';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const maskStore = useMaskStore();
 const neStore = useNeStore();
 const { t } = useI18n();
@@ -36,8 +35,6 @@ let dictStatus = ref<DictType[]>([]);
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元类型 */
   neType: undefined,
   /**当前页数 */
@@ -327,7 +324,6 @@ function fnRecordVersion(
       operateNeVersion({
         neType: row.neType,
         neUid: row.neUid,
-        coreUid: row.coreUid,
         action: action,
         preinput: preinput,
       })
@@ -597,8 +593,7 @@ onMounted(() => {
             <a-tooltip
               placement="topRight"
               v-if="
-                record.version &&
+                record.version && (record.path === '' || record.path === '-')
-                (record.path === '' || record.path === '-')
               "
             >
               <template #title>

src/views/ne/trace/task/analyze.vue

@@ -21,7 +21,6 @@ import useDictStore from '@/store/modules/dict';
 import useTabsStore from '@/store/modules/tabs';
 import saveAs from 'file-saver';
 import { parseDateToStr } from '@/utils/date-utils';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { getDict } = useDictStore();
 const { t } = useI18n();
 const route = useRoute();
@@ -34,8 +33,6 @@ const wk = new wkUtil.WK();
 const traceId = ref<string>(route.query.traceId as string);
 /**任务编号 */
 const id = ref<string>(route.query.id as string);
-/**核心uid */
-const coreUid = currentCoreUid();
 
 /**关闭跳转 */
 function fnClose() {
@@ -593,7 +590,7 @@ onBeforeUnmount(() => {
             <strong>{{ traceId }}</strong>
           </span>
           <!-- 任务信息 -->
-          <TaskInfoIcon :coreUid="coreUid" :id="id" />
+          <TaskInfoIcon :id="id" />
         </a-space>
       </template>
 

src/views/ne/trace/task/components/EditModal.vue

@@ -6,7 +6,6 @@ import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { regExpIPv4, regExpIPv6 } from '@/utils/regular-utils';
 import useDictStore from '@/store/modules/dict';
 import useI18n from '@/hooks/useI18n';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import {
   addTraceTask,
   delTraceTask,
@@ -23,11 +22,6 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  coreUid: {
-    type: String,
-    default: '',
-    required: true,
-  },
   id: {
     type: Number,
     default: 0,
@@ -65,7 +59,8 @@ type ModalStateType = {
   /**表单数据 */
   from: {
     id?: string;
-    neList: string; // 网元列表 neType_neUid 例如 UDM_001,AMF_001
+    coreId: number; // 核心网元ID
+    neIds: string; // 网元ID列表 例如 1,3
     startTime?: number;
     endTime?: number;
     title: string;
@@ -96,8 +91,8 @@ let modalState: ModalStateType = reactive({
   timeRangePicker: undefined,
   from: {
     id: undefined,
-    coreUid: currentCoreUid(),
+    coreId: 0,
-    neList: '',
+    neIds: '',
     traceId: undefined,
     startTime: undefined,
     endTime: undefined,
@@ -190,16 +185,16 @@ function fnNeChange(p: any, c: any) {
     const v = p[i];
     if (v.length === 1) {
       c[i][0].children.forEach((item: any) => {
-        neList.push(`${item.neType}_${item.neUid}`);
+        neList.push(`${item.id}`);
       });
     } else if (v.length === 2) {
       neList.push(`${v[0]}_${v[1]}`);
     }
   }
   if (neList.length > 0) {
-    modalState.from.neList = neList.join(',');
+    modalState.from.neIds = neList.join(',');
   } else {
-    modalState.from.neList = '';
+    modalState.from.neIds = '';
   }
 }
 
@@ -242,7 +237,7 @@ function fnModalOpenByEdit() {
     if (modalState.confirmLoading) return;
     const hide = message.loading(t('common.loading'), 0);
     modalState.confirmLoading = true;
-    getTraceTask(props.coreUid, props.id).then(res => {
+    getTraceTask(props.id).then(res => {
       modalState.confirmLoading = false;
       hide();
       if (res.code === RESULT_CODE_SUCCESS && res.data) {

src/views/ne/trace/task/components/TaskInfoIcon.vue

@@ -9,11 +9,6 @@ const { t } = useI18n();
 const { getDict } = useDictStore();
 
 const props = defineProps({
-  coreUid: {
-    type: String,
-    default: '',
-    required: true,
-  },
   id: {
     type: [String, Number],
     default: 0,
@@ -36,7 +31,7 @@ const task = ref<Record<string, any>>({});
 
 /**查询任务信息 */
 function fnGetTaskInfo() {
-  getTraceTask(props.coreUid, props.id).then(res => {
+  getTraceTask(props.id).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       Object.assign(task.value, res.data);
       task.value.neList = task.value.neList

src/views/ne/trace/task/data.vue

@@ -15,7 +15,6 @@ import useI18n from '@/hooks/useI18n';
 import { getTraceData, listTraceData } from '@/api/trace/task';
 import { decode } from 'js-base64';
 import { useRoute, useRouter } from 'vue-router';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const { getDict } = useDictStore();
 const tabsStore = useTabsStore();
@@ -25,9 +24,7 @@ const route = useRoute();
 /**跟踪编号 */
 const traceId = ref<string>(route.query.traceId as string);
 /**任务编号 */
-const id = ref<string>(route.query.id as string);
+const id = ref<string>(route.query.id as string); 
-/**核心uid */
-const coreUid = currentCoreUid();
 
 /**关闭跳转 */
 function fnClose() {
@@ -436,7 +433,7 @@ onMounted(() => {
             <strong>{{ traceId }}</strong>
           </span>
           <!-- 任务信息 -->
-          <TaskInfoIcon :coreUid="coreUid" :id="id" />
+          <TaskInfoIcon :id="id" />
         </a-space>
       </template>
 

src/views/ne/trace/task/index.vue

@@ -29,7 +29,6 @@ import {
 import useDictStore from '@/store/modules/dict';
 import dayjs, { Dayjs } from 'dayjs';
 import { parseObjHumpToLine } from '@/utils/parse-utils';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const neStore = useNeStore();
 const { getDict } = useDictStore();
 const { t } = useI18n();
@@ -58,8 +57,6 @@ let neCascaderOptions = ref<Record<string, any>[]>([]);
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元类型 */
   neType: '',
   /**开始时间 */
@@ -69,7 +66,7 @@ let queryParams = reactive({
   /**标题 */
   title: '',
   /**排序字段 */
-  sortField: 'start_time',
+  sortField: 'endTime',
   /**排序方式 */
   sortOrder: 'asc',
   /**当前页数 */
@@ -210,7 +207,6 @@ function fnTableSelectedRowKeys(keys: (string | number)[], rows: any[]) {
   tableState.selectedRows = rows.map(item => {
     return {
       id: item.id,
-      coreUid: item.coreUid,
     };
   });
 }
@@ -245,13 +241,11 @@ function fnRecordDelete(id: string) {
       const hide = message.loading(t('common.loading'), 0);
       let reqArr: any = [];
       if (id === '0') {
-        tableState.selectedRows.forEach(item => {
+        reqArr.push(delTraceTask(tableState.selectedRowKeys.join(',')));
-          reqArr.push(delTraceTask(item.coreUid, item.id));
-        });
       } else {
         tableState.data.forEach(item => {
           if (item.id === id) {
-            reqArr.push(delTraceTask(item.coreUid, item.id));
+            reqArr.push(delTraceTask(item.id));
           }
         });
       }
@@ -320,14 +314,12 @@ function fnGetList(pageNum?: number) {
 type ModalStateType = {
   open: boolean;
   id: number;
-  coreUid: string;
 };
 
 /**对话框对象信息状态 */
 let modalState: ModalStateType = reactive({
   open: false,
   id: 0,
-  coreUid: '',
 });
 
 /**
@@ -336,7 +328,6 @@ let modalState: ModalStateType = reactive({
  */
 function fnModalOpenByEdit(id: number) {
   modalState.id = id;
-  modalState.coreUid = currentCoreUid();
   nextTick(() => {
     modalState.open = !modalState.open;
   });
@@ -355,7 +346,6 @@ function fnModalEditOk(from: Record<string, any>) {
  * 进行表达规则校验
  */
 function fnModalEditCancel() {
-  modalState.coreUid = '';
   modalState.id = 0;
   modalState.open = false;
 }
@@ -609,7 +599,6 @@ onMounted(() => {
     <!-- 新增框或修改框 -->
     <EditModal
       v-model:open="modalState.open"
-      :core-uid="modalState.coreUid"
       :id="modalState.id"
       :options="neCascaderOptions"
       @ok="fnModalEditOk"

src/views/neData/amf-ue/index.vue

@@ -18,8 +18,7 @@ import { OptionsType, WS } from '@/plugins/ws-websocket';
 import dayjs, { Dayjs } from 'dayjs';
 import saveAs from 'file-saver';
 import PQueue from 'p-queue';
-import { useClipboard } from '@vueuse/core';
+import { useClipboard } from '@vueuse/core'; 
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { WS_GROUP_AMF_UE } from '@/constants/ne-constants';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
@@ -66,9 +65,7 @@ let rangePickerPresets = ref([
 ]);
 
 /**查询参数 */
-let queryParams = reactive({
+let queryParams = reactive({ 
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: undefined,
   eventType: '',
@@ -390,8 +387,7 @@ const realTimeData = ref<boolean>(false);
 function fnRealTime() {
   realTimeData.value = !realTimeData.value;
   if (realTimeData.value) {
-    const neUid = queryParams.neUid;
+    const neUid = queryParams.neUid; 
-    const coreUid = queryParams.coreUid;
     tableState.seached = false;
     // 建立链接
     const options: OptionsType = {
@@ -399,9 +395,9 @@ function fnRealTime() {
       params: {
         /**订阅通道组
          *
-         * AMF_UE会话事件(GroupID:1010_coreUid_neUid)
+         * AMF_UE会话事件(GroupID:1010_neUid)
          */
-        subGroupID: `${WS_GROUP_AMF_UE}_${coreUid}_${neUid}`,
+        subGroupID: `${WS_GROUP_AMF_UE}_${neUid}`,
       },
       onmessage: wsMessage,
       onerror: (ev: any) => {
@@ -428,10 +424,9 @@ function wsMessage(res: Record<string, any>) {
   if (!data?.groupId) {
     return;
   }
-  const neUid = queryParams.neUid;
+  const neUid = queryParams.neUid; 
-  const coreUid = queryParams.coreUid;
   // ueEvent AMF_UE会话事件
-  if (data.groupId === `${WS_GROUP_AMF_UE}_${coreUid}_${neUid}`) {
+  if (data.groupId === `${WS_GROUP_AMF_UE}_${neUid}`) {
     const ueEvent = data.data;
     queue.add(async () => {
       modalState.maxId += 1;

src/views/neData/base-online/index.vue

@@ -10,7 +10,6 @@ import useNeStore from '@/store/modules/ne';
 import { useRoute } from 'vue-router';
 import { listAMFNblist } from '@/api/neDataNf/amf';
 import { listMMENblist } from '@/api/neDataNf/mme';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const neStore = useNeStore();
 const route = useRoute();
 const { t } = useI18n();
@@ -20,8 +19,6 @@ let neCascaderOptions = ref<Record<string, any>[]>([]);
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: '',
   /**网元类型 */
@@ -158,7 +155,6 @@ function fnGetList(pageNum?: number) {
       item.children.forEach((child: any) => {
         let resq = null;
         let s = {
-          coreUid: queryParams.coreUid,
           neUid: child.neUid,
           neType: child.neType,
           nbId: queryParams.id,
@@ -222,7 +218,6 @@ function fnGetList(pageNum?: number) {
   let toBack: Record<string, any> = {
     neType: queryParams.neType[0],
     neUid: queryParams.neType[1],
-    coreUid: queryParams.coreUid,
     nbId: queryParams.id,
     pageNum: queryParams.pageNum,
     pageSize: queryParams.pageSize,

src/views/neData/base-station/components/history.vue

@@ -9,7 +9,6 @@ import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useI18n from '@/hooks/useI18n';
 import { exportNBState, listNBState } from '@/api/neData/nb-state';
 import { Dayjs } from 'dayjs';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const emit = defineEmits(['cancel', 'update:open']);
 const props = defineProps({
@@ -21,17 +20,12 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  /**网元ID */
+  /**网元标识 */
   neUid: {
     type: String,
     default: '',
     required: true,
   },
-  coreUid: {
-    type: String,
-    default: '',
-    required: true,
-  },
 });
 
 /**开始结束时间 */
@@ -54,8 +48,6 @@ const nbStateOptions = ref<DictType[]>([
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: props.coreUid,
   /**网元标识 */
   neUid: props.neUid,
   /**排序字段 */
@@ -285,7 +277,6 @@ watch(
   () => props.open,
   val => {
     if (val) {
-      queryParams.coreUid = props.coreUid;
       queryParams.neUid = props.neUid;
       // 获取列表数据
       fnGetList();

src/views/neData/base-station/list.vue

@@ -31,7 +31,6 @@ 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';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const route = useRoute();
 const neStore = useNeStore();
 
@@ -61,8 +60,6 @@ let neCascaderOptions = ref<Record<string, any>[]>([]);
 let neTypeAndId = ref<string[]>([]);
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: '',
   /**IMSI */
@@ -222,7 +219,6 @@ function fnRecordDelete(index: string) {
     title: t('common.tipTitle'),
     content: msg,
     onOk() {
-      const coreUid = currentCoreUid();
       const reqArr = [];
       if (index === '0') {
         if (tableState.selectedRowKeys.length <= 0) {
@@ -230,18 +226,18 @@ function fnRecordDelete(index: string) {
         }
         for (const v of tableState.selectedRowKeys) {
           if (neType === 'MME') {
-            reqArr.push(delMMENbState(coreUid, neUid, v));
+            reqArr.push(delMMENbState(neUid, v));
           }
           if (neType === 'AMF') {
-            reqArr.push(delAMFNbState(coreUid, neUid, v));
+            reqArr.push(delAMFNbState(neUid, v));
           }
         }
       } else {
         if (neType === 'MME') {
-          reqArr.push(delMMENbState(coreUid, neUid, index));
+          reqArr.push(delMMENbState(neUid, index));
         }
         if (neType === 'AMF') {
-          reqArr.push(delAMFNbState(coreUid, neUid, index));
+          reqArr.push(delAMFNbState(neUid, index));
         }
       }
       if (reqArr.length <= 0) return;
@@ -408,7 +404,6 @@ function fnModalVisibleByEdit(edit?: string | number) {
 function fnModalOk() {
   const [neType, neUid] = neTypeAndId.value;
   if (!neUid) return;
-  const coreUid = currentCoreUid();
   const from = JSON.parse(JSON.stringify(modalState.from));
   modalStateFrom
     .validate()
@@ -418,13 +413,13 @@ function fnModalOk() {
       let result: any = null;
       if (neType === 'MME') {
         result = from.state
-          ? editMMENbState(coreUid, neUid, from)
+          ? editMMENbState(neUid, from)
-          : addMMENbState(coreUid, neUid, from);
+          : addMMENbState(neUid, from);
       }
       if (neType === 'AMF') {
         result = from.state
-          ? editAMFNbState(coreUid, neUid, from)
+          ? editAMFNbState(neUid, from)
-          : addAMFNbState(coreUid, neUid, from);
+          : addAMFNbState(neUid, from);
       }
       if (result === null) {
         return;
@@ -565,7 +560,6 @@ function fnModalImportUpload(file: File) {
         return;
       }
       // 开始导入
-      const coreUid = currentCoreUid();
       modalState.confirmLoading = true;
       for (const row of rows) {
         const rowId = row[t('common.rowId')];
@@ -581,7 +575,6 @@ function fnModalImportUpload(file: File) {
           // 定义则更新名称位置
           if (neType === 'MME') {
             result = await editMMENbState(
-              coreUid,
               neUid,
               Object.assign({}, hasAddress, {
                 name,
@@ -591,7 +584,6 @@ function fnModalImportUpload(file: File) {
           }
           if (neType === 'AMF') {
             result = await editAMFNbState(
-              coreUid,
               neUid,
               Object.assign({}, hasAddress, {
                 name,
@@ -617,10 +609,10 @@ function fnModalImportUpload(file: File) {
             address: `${address}`,
           };
           if (neType === 'MME') {
-            result = await addMMENbState(coreUid, neUid, form);
+            result = await addMMENbState(neUid, form);
           }
           if (neType === 'AMF') {
-            result = await addAMFNbState(coreUid, neUid, form);
+            result = await addAMFNbState(neUid, form);
           }
           let msg = `${t('common.rowId')}: ${rowId} ${t(
             'views.neData.baseStation.addRadio'
@@ -917,7 +909,6 @@ onMounted(() => {
       :title="t('views.neData.baseStation.history')"
       :ne-type="neTypeAndId[0]"
       :ne-uid="neTypeAndId[1]"
-      :core-uid="queryParams.coreUid"
       @cancel="fnModalCancel"
     ></HistoryModal>
 

src/views/neData/base-station/topology.vue

@@ -394,7 +394,6 @@ async function fnGraphDataBase() {
         img: parseBasePath('/svg/service_db.svg'),
         nInfo: {
           online: false,
-          coreUid: omcInfo.coreUid,
           neUid: omcInfo.neUid,
           neType: omcInfo.neType,
         },
@@ -407,14 +406,13 @@ async function fnGraphDataBase() {
     if (['AMF', 'MME'].includes(item.value)) {
       if (item.children?.length === 0) continue;
       for (const child of item.children) {
-        const id = `${child.coreUid}_${child.neUid}`;
+        const id = `${child.neType}_${child.neUid}`;
         const node = {
           id: id,
           label: child.neName,
           img: parseBasePath('/svg/service.svg'),
           nInfo: {
             online: false,
-            coreUid: child.coreUid,
             neUid: child.neUid,
             neType: child.neType,
           },
@@ -440,9 +438,8 @@ async function fnGraphDataNb(data: GraphData) {
   if (arr === undefined || arr.length === 0) return data;
   for (const item of arr) {
     if (item.nType === 'AMF') {
-      const coreUid = (item.nInfo as any).coreUid;
       const neUid = (item.nInfo as any).neUid;
-      const res = await listAMFNbStatelist({ coreUid, neUid });
+      const res = await listAMFNbStatelist({ neUid });
       if (res.code !== RESULT_CODE_SUCCESS || !Array.isArray(res.data)) {
         continue;
       }
@@ -462,12 +459,8 @@ async function fnGraphDataNb(data: GraphData) {
       }
     }
     if (item.nType === 'MME') {
-      const coreUid = (item.nInfo as any).coreUid;
       const neUid = (item.nInfo as any).neUid;
-      const res = await listMMENbStatelist({
+      const res = await listMMENbStatelist({ neUid });
-        coreUid,
-        neUid,
-      });
       if (res.code !== RESULT_CODE_SUCCESS || !Array.isArray(res.data)) {
         continue;
       }
@@ -502,7 +495,7 @@ async function fnGraphState(reload: boolean = false) {
   if (onc) {
     const { id, nInfo } = onc as any;
     if (!nInfo) return;
-    const res = await stateNeInfo(nInfo.coreUid, nInfo.neUid);
+    const res = await stateNeInfo(nInfo.neUid);
     if (res.code === RESULT_CODE_SUCCESS) {
       Object.assign(nInfo, res.data, {
         refreshTime: parseDateToStr(res.data.refreshTime, 'HH:mm:ss'),
@@ -517,7 +510,7 @@ async function fnGraphState(reload: boolean = false) {
     .forEach(async (v: any) => {
       const { id, nInfo } = v;
       if (!nInfo) return;
-      const res = await stateNeInfo(nInfo.coreUid, nInfo.neUid);
+      const res = await stateNeInfo(nInfo.neUid);
       if (res.code === RESULT_CODE_SUCCESS) {
         Object.assign(nInfo, res.data, {
           refreshTime: parseDateToStr(res.data.refreshTime, 'HH:mm:ss'),
@@ -529,7 +522,6 @@ async function fnGraphState(reload: boolean = false) {
       // 重载时更新下级基站状态
       if (reload && nInfo.neType === 'AMF') {
         const res = await listAMFNbStatelist({
-          coreUid: nInfo.coreUid,
           neUid: nInfo.neUid,
         });
         if (res.code == RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
@@ -551,7 +543,6 @@ async function fnGraphState(reload: boolean = false) {
       }
       if (reload && nInfo.neType === 'MME') {
         const res = await listMMENbStatelist({
-          coreUid: nInfo.coreUid,
           neUid: nInfo.neUid,
         });
         if (res.code == RESULT_CODE_SUCCESS && Array.isArray(res.data)) {

src/views/neData/ims-cdr/index.vue

@@ -23,7 +23,6 @@ import saveAs from 'file-saver';
 import PQueue from 'p-queue';
 import { useClipboard } from '@vueuse/core';
 import dayjs, { type Dayjs } from 'dayjs';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { WS_GROUP_IMS_CDR } from '@/constants/ne-constants';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
@@ -72,8 +71,6 @@ let rangePickerPresets = ref([
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: undefined,
   recordType: '',
@@ -448,7 +445,6 @@ function fnRealTime() {
   realTimeData.value = !realTimeData.value;
   if (realTimeData.value) {
     const neUid = queryParams.neUid;
-    const coreUid = queryParams.coreUid;
     tableState.seached = false;
     // 建立链接
     const options: OptionsType = {
@@ -458,7 +454,7 @@ function fnRealTime() {
          *
          * IMS_CDR会话事件(GroupID:1005)
          */
-        subGroupID: `${WS_GROUP_IMS_CDR}_${coreUid}_${neUid}`,
+        subGroupID: `${WS_GROUP_IMS_CDR}_${neUid}`,
       },
       onmessage: wsMessage,
       onerror: (ev: any) => {
@@ -486,9 +482,8 @@ function wsMessage(res: Record<string, any>) {
     return;
   }
   const neUid = queryParams.neUid;
-  const coreUid = queryParams.coreUid;
   // cdrEvent CDR会话事件
-  if (data.groupId === `${WS_GROUP_IMS_CDR}_${coreUid}_${neUid}`) {
+  if (data.groupId === `${WS_GROUP_IMS_CDR}_${neUid}`) {
     const cdrEvent = data.data;
     let cdrJSON = {};
     try {

src/views/neData/ims-sub/index.vue

@@ -9,7 +9,6 @@ import useNeStore from '@/store/modules/ne';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { listIMSSessionList } from '@/api/neDataNf/ims';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const neStore = useNeStore();
 
@@ -18,8 +17,6 @@ let neOtions = ref<Record<string, any>[]>([]);
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: undefined,
   /**IMSI */

src/views/neData/mme-ue/index.vue

@@ -13,13 +13,16 @@ import {
 } from '@/constants/result-constants';
 import useDictStore from '@/store/modules/dict';
 import useNeStore from '@/store/modules/ne';
-import { listMMEDataUE, delMMEDataUE, exportMMEDataUE } from '@/api/neDataNf/mme';
+import {
+  listMMEDataUE,
+  delMMEDataUE,
+  exportMMEDataUE,
+} from '@/api/neDataNf/mme';
 import { parseDateToStr } from '@/utils/date-utils';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import saveAs from 'file-saver';
 import PQueue from 'p-queue';
 import { useClipboard } from '@vueuse/core';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { WS_GROUP_MME_UE } from '@/constants/ne-constants';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
@@ -68,13 +71,11 @@ let rangePickerPresets = ref([
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: undefined,
   eventType: '',
   imsi: '',
-  sortField: 'timestamp',
+  sortField: 'createdTime',
   sortOrder: 'desc',
   /**开始时间 */
   beginTime: undefined as undefined | number,
@@ -392,18 +393,17 @@ const realTimeData = ref<boolean>(false);
 function fnRealTime() {
   realTimeData.value = !realTimeData.value;
   if (realTimeData.value) {
-        const neUid = queryParams.neUid;
+    const neUid = queryParams.neUid;
-    const coreUid = queryParams.coreUid;
     tableState.seached = false;
     // 建立链接
     const options: OptionsType = {
       url: '/ws',
       params: {
-      /**订阅通道组
+        /**订阅通道组
          *
-         * MME_UE会话事件(GroupID:1011_coreUid_neUid)
+         * MME_UE会话事件(GroupID:1011_neUid)
          */
-        subGroupID: `${WS_GROUP_MME_UE}_${coreUid}_${neUid}`,
+        subGroupID: `${WS_GROUP_MME_UE}_${neUid}`,
       },
       onmessage: wsMessage,
       onerror: (ev: any) => {
@@ -431,7 +431,7 @@ function wsMessage(res: Record<string, any>) {
     return;
   }
   // ueEvent MME_UE会话事件
- if (data.groupId === `${WS_GROUP_MME_UE}_${queryParams.coreUid}_${queryParams.neUid}`) {
+  if (data.groupId === `${WS_GROUP_MME_UE}_${queryParams.neUid}`) {
     const ueEvent = data.data;
     queue.add(async () => {
       modalState.maxId += 1;

src/views/neData/n3iwf-sub/index.vue

@@ -9,7 +9,6 @@ import { listN3IWFSubList } from '@/api/neDataNf/n3iwf';
 import useNeStore from '@/store/modules/ne';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const neStore = useNeStore();
 /**网元参数 */
@@ -17,8 +16,6 @@ let neOtions = ref<Record<string, any>[]>([]);
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: undefined,
   /**imsi */

src/views/neData/nssf-amf/index.vue

@@ -7,7 +7,6 @@ import { ColumnsType } from 'ant-design-vue/es/table';
 import { listNSSFAmfList } from '@/api/neDataNf/nssf';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import useNeStore from '@/store/modules/ne';
 import { message } from 'ant-design-vue';
 const { t } = useI18n();
@@ -17,8 +16,6 @@ let neOtions = ref<Record<string, any>[]>([]);
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: undefined,
   /**imsi */

src/views/neData/nssf-sub/index.vue

@@ -7,7 +7,6 @@ import { ColumnsType } from 'ant-design-vue/es/table';
 import { listNSSFSubList } from '@/api/neDataNf/nssf';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import useNeStore from '@/store/modules/ne';
 import { message } from 'ant-design-vue';
 const { t } = useI18n();
@@ -17,8 +16,6 @@ let neOtions = ref<Record<string, any>[]>([]);
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: undefined,
   /**imsi */
@@ -73,7 +70,7 @@ let tableColumns: ColumnsType = [
   {
     title: 'Event',
     dataIndex: 'event',
-    align: 'left', 
+    align: 'left',
   },
 ];
 

src/views/neData/pcf-sub/index.vue

@@ -20,7 +20,6 @@ import { getPCFRule } from '@/api/ne/neConfig';
 import { uploadFileToNE } from '@/api/tool/file';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { saveAs } from 'file-saver';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const neStore = useNeStore();
 /**网元参数 */
@@ -37,8 +36,6 @@ const pcfRuleOption = ref<Record<string, any[]>>({
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: undefined,
   /**移动编号 */
@@ -283,8 +280,7 @@ const modalStateFrom = Form.useForm(
  */
 function fnModalVisibleByEdit(row?: Record<string, any>) {
   const neUid = queryParams.neUid || '-';
-  const coreUid = queryParams.coreUid || '-';
+  getPCFRule(neUid)
-  getPCFRule(coreUid, neUid)
     .then((data: any) => {
       pcfRuleOption.value = data;
     })
@@ -336,7 +332,6 @@ function fnModalVisibleByEdit(row?: Record<string, any>) {
 function fnModalOk() {
   const from = JSON.parse(JSON.stringify(modalState.from));
   const neUid = queryParams.neUid || '-';
-  const coreUid = queryParams.coreUid || '-';
   from.rfsp = Number(from.rfsp) || 0;
   // 处理多选框数据
   let pccRules = modalState.from.pccRules;
@@ -375,7 +370,6 @@ function fnModalOk() {
       if (modalState.isBatch) {
         if (modalState.type === 'add') {
           result = addPCFRule({
-            coreUid: coreUid,
             neUid: neUid,
             num: from.num,
             paramData: from,
@@ -383,7 +377,6 @@ function fnModalOk() {
         }
         if (modalState.type === 'update') {
           result = editPCFRule({
-            coreUid: coreUid,
             neUid: neUid,
             num: from.num,
             paramData: from,
@@ -391,7 +384,6 @@ function fnModalOk() {
         }
         if (modalState.type === 'delete') {
           result = delPCFRule({
-            coreUid: coreUid,
             neUid: neUid,
             num: from.num,
             imsi: from.imsi,
@@ -400,7 +392,6 @@ function fnModalOk() {
       } else {
         if (modalState.type === 'add') {
           result = addPCFRule({
-            coreUid: coreUid,
             neUid: neUid,
             num: 0,
             paramData: from,
@@ -408,7 +399,6 @@ function fnModalOk() {
         }
         if (modalState.type === 'update') {
           result = editPCFRule({
-            coreUid: coreUid,
             neUid: neUid,
             num: 0,
             paramData: from,
@@ -477,8 +467,7 @@ function fnModalCancel() {
  */
 function fnModalVisibleByBatch(type: 'delete' | 'add' | 'update') {
   const neUid = queryParams.neUid || '-';
-  const coreUid = queryParams.coreUid || '-';
+  getPCFRule(neUid)
-  getPCFRule(coreUid, neUid)
     .then((data: any) => {
       pcfRuleOption.value = data;
       console.log(data);
@@ -509,8 +498,7 @@ function fnModalVisibleByBatch(type: 'delete' | 'add' | 'update') {
  */
 function fnRecordDelete(imsi: string) {
   const neUid = queryParams.neUid || '-';
-  const coreUid = queryParams.coreUid || '-';
+  if (!neUid) return;
-  if (!coreUid || !neUid) return;
   let imsiMsg = imsi;
   if (imsi === '0') {
     imsiMsg = `${tableState.selectedRowKeys[0]}... ${tableState.selectedRowKeys.length}`;
@@ -523,7 +511,6 @@ function fnRecordDelete(imsi: string) {
     onOk() {
       const hide = message.loading(t('common.loading'), 0);
       delPCFRule({
-        coreUid: coreUid,
         neUid: neUid,
         imsi: imsi,
       })
@@ -551,11 +538,9 @@ function fnRecordDelete(imsi: string) {
 /**列表导出 */
 function fnExportList(type: string) {
   const neUid = queryParams.neUid || '-';
-  const coreUid = queryParams.coreUid || '-';
+  if (!neUid) return;
-  if (!coreUid || !neUid) return;
   const hide = message.loading(t('common.loading'), 0);
   exportPCFRule({
-    coreUid: coreUid,
     neUid: neUid,
     fileType: type,
   })
@@ -640,14 +625,13 @@ function fnModalUploadImportClose() {
 /**对话框表格信息导入上传 */
 function fnModalUploadImportUpload(file: File) {
   const neUid = queryParams.neUid || '-';
-  const coreUid = queryParams.coreUid || '-';
+  if (!neUid) {
-  if (!neUid || !coreUid) {
     return Promise.reject('Unknown network element');
   }
   const hide = message.loading(t('common.loading'), 0);
   uploadImportState.loading = true;
   // 上传文件
-  uploadFileToNE('PCF', neUid, coreUid, file, 3)
+  uploadFileToNE('PCF', neUid, file, 3)
     .then(res => {
       if (res.code === RESULT_CODE_SUCCESS) {
         return res.data;
@@ -662,7 +646,6 @@ function fnModalUploadImportUpload(file: File) {
       // 文件导入
       return importPCFRule({
         neUid: neUid,
-        coreUid: coreUid,
         fileType: 'txt',
         filePath: filePath,
       });

src/views/neData/sgwc-cdr/index.vue

@@ -21,7 +21,6 @@ import dayjs, { type Dayjs } from 'dayjs';
 import PQueue from 'p-queue';
 import saveAs from 'file-saver';
 import { useClipboard } from '@vueuse/core';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { WS_GROUP_SGWC_CDR } from '@/constants/ne-constants';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
@@ -55,8 +54,6 @@ let rangePickerPresets = ref([
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: undefined,
   imsi: '',
@@ -418,7 +415,6 @@ function fnRealTime() {
   realTimeData.value = !realTimeData.value;
   if (realTimeData.value) {
     const neUid = queryParams.neUid;
-    const coreUid = queryParams.coreUid;
     tableState.seached = false;
     // 建立链接
     const options: OptionsType = {
@@ -428,7 +424,7 @@ function fnRealTime() {
          *
          * CDR会话事件-SGWC (GroupID:1008_neId)
          */
-        subGroupID: `${WS_GROUP_SGWC_CDR}_${coreUid}_${neUid}`,
+        subGroupID: `${WS_GROUP_SGWC_CDR}_${neUid}`,
       },
       onmessage: wsMessage,
       onerror: (ev: any) => {
@@ -456,9 +452,8 @@ function wsMessage(res: Record<string, any>) {
     return;
   }
   const neUid = queryParams.neUid;
-  const coreUid = queryParams.coreUid;
   // cdrEvent CDR会话事件
-  if (data.groupId === `${WS_GROUP_SGWC_CDR}_${coreUid}_${neUid}`) {
+  if (data.groupId === `${WS_GROUP_SGWC_CDR}_${neUid}`) {
     const cdrEvent = data.data;
     let cdrJSON = {};
     try {

src/views/neData/smf-cdr-imsi/index.vue

@@ -37,8 +37,7 @@ import { parseSizeFromByte } from '@/utils/parse-utils';
 import { message } from 'ant-design-vue';
 import useNeStore from '@/store/modules/ne';
 import dayjs, { Dayjs } from 'dayjs';
-import { parseDateToStr } from '@/utils/date-utils';
+import { parseDateToStr } from '@/utils/date-utils'; 
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { WS_GROUP_SMF_CDR } from '@/constants/ne-constants';
 const { t, currentLocale } = useI18n();
 const neStore = useNeStore();
@@ -266,14 +265,12 @@ let rangePickerPresets = ref([
 ]);
 
 /**查询参数 */
-let queryParams = reactive({
+let queryParams = reactive({ 
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: undefined,
   subscriberID: '',
   dnn: '',
-  sortField: 'timestamp',
+  sortField: 'createdTime',
   sortOrder: 'desc',
   /**开始时间 */
   beginTime: undefined as undefined | number,
@@ -487,7 +484,6 @@ function fnRealTime() {
     ws.close();
   }
   const neUid = queryParams.neUid;
-  const coreUid = queryParams.coreUid;
   // 建立链接
   const options: OptionsType = {
     url: '/ws',
@@ -496,7 +492,7 @@ function fnRealTime() {
        *
        * CDR会话事件-SMF (GroupID:1006)
        */
-      subGroupID: `${WS_GROUP_SMF_CDR}_${coreUid}_${neUid}`,
+      subGroupID: `${WS_GROUP_SMF_CDR}_${neUid}`,
     },
     onmessage: (res: Record<string, any>) => {
       const { code, requestId, data } = res;
@@ -510,7 +506,7 @@ function fnRealTime() {
         return;
       }
       // cdrEvent CDR会话事件
-      if (data.groupId === `${WS_GROUP_SMF_CDR}_${coreUid}_${neUid}`) {
+      if (data.groupId === `${WS_GROUP_SMF_CDR}_${neUid}`) {
         const cdrEvent = data.data;
         let cdrJSON: any = {};
         try {

src/views/neData/smf-cdr/index.vue

@@ -21,7 +21,6 @@ import PQueue from 'p-queue';
 import saveAs from 'file-saver';
 import dayjs, { type Dayjs } from 'dayjs';
 import { useClipboard } from '@vueuse/core';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { WS_GROUP_SMF_CDR } from '@/constants/ne-constants';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
@@ -55,12 +54,10 @@ let rangePickerPresets = ref([
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: undefined,
   subscriberID: '',
-  sortField: 'timestamp',
+  sortField: 'createdTime',
   sortOrder: 'desc',
   /**开始时间 */
   beginTime: undefined as undefined | number,
@@ -445,7 +442,6 @@ function fnRealTime() {
   realTimeData.value = !realTimeData.value;
   if (realTimeData.value) {
     const neUid = queryParams.neUid;
-    const coreUid = queryParams.coreUid;
     tableState.seached = false;
     // 建立链接
     const options: OptionsType = {
@@ -455,7 +451,7 @@ function fnRealTime() {
          *
          * CDR会话事件-SMF (GroupID:1006)
          */
-        subGroupID: `${WS_GROUP_SMF_CDR}_${coreUid}_${neUid}`,
+        subGroupID: `${WS_GROUP_SMF_CDR}_${neUid}`,
       },
       onmessage: wsMessage,
       onerror: (ev: any) => {
@@ -483,9 +479,8 @@ function wsMessage(res: Record<string, any>) {
     return;
   }
   const neUid = queryParams.neUid;
-  const coreUid = queryParams.coreUid;
   // cdrEvent CDR会话事件
-  if (data.groupId === `${WS_GROUP_SMF_CDR}_${coreUid}_${neUid}`) {
+  if (data.groupId === `${WS_GROUP_SMF_CDR}_${neUid}`) {
     const cdrEvent = data.data;
     let cdrJSON = {};
     try {

src/views/neData/smf-sub/index.vue

@@ -9,17 +9,14 @@ import { ColumnsType } from 'ant-design-vue/es/table';
 import { listSMFSubList } from '@/api/neDataNf/smf';
 import useNeStore from '@/store/modules/ne';
 import useI18n from '@/hooks/useI18n';
-import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; 
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const neStore = useNeStore();
 /**网元参数 */
 let neOtions = ref<Record<string, any>[]>([]);
 
 /**查询参数 */
-let queryParams = reactive({
+let queryParams = reactive({ 
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: undefined,
   /**IMSI */

src/views/neData/smsc-cdr/index.vue

@@ -24,7 +24,6 @@ import PQueue from 'p-queue';
 import { useClipboard } from '@vueuse/core';
 import { hasPermissions } from '@/plugins/auth-user';
 import dayjs, { type Dayjs } from 'dayjs';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { WS_GROUP_SMSC_CDR } from '@/constants/ne-constants';
 const { copy } = useClipboard({ legacy: true });
 const { getDict } = useDictStore();
@@ -67,8 +66,6 @@ let rangePickerPresets = ref([
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元标识 */
   neUid: undefined,
   recordType: '',
@@ -412,7 +409,6 @@ function fnRealTime() {
   realTimeData.value = !realTimeData.value;
   if (realTimeData.value) {
     const neUid = queryParams.neUid;
-    const coreUid = queryParams.coreUid;
     tableState.seached = false;
     // 建立链接
     const options: OptionsType = {
@@ -422,7 +418,7 @@ function fnRealTime() {
          *
          * SMSC_CDR会话事件(GroupID:1007_neId)
          */
-        subGroupID: `${WS_GROUP_SMSC_CDR}_${coreUid}_${neUid}`,
+        subGroupID: `${WS_GROUP_SMSC_CDR}_${neUid}`,
       },
       onmessage: wsMessage,
       onerror: (ev: any) => {
@@ -449,10 +445,9 @@ function wsMessage(res: Record<string, any>) {
   if (!data?.groupId) {
     return;
   }
-    const neUid = queryParams.neUid;
+  const neUid = queryParams.neUid;
-    const coreUid = queryParams.coreUid;
   // cdrEvent CDR会话事件
-  if (data.groupId === `${WS_GROUP_SMSC_CDR}_${coreUid}_${neUid}`) {
+  if (data.groupId === `${WS_GROUP_SMSC_CDR}_${neUid}`) {
     const cdrEvent = data.data;
     let cdrJSON = {};
     try {

src/views/neData/udm-auth/index.vue

@@ -24,7 +24,6 @@ import {
 } from '@/api/neDataNf/udm_auth';
 import { uploadFile } from '@/api/tool/file';
 import { getNeViewFile } from '@/api/tool/neFile';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 import { parseDateToStr } from '@/utils/date-utils';
 const { t } = useI18n();
 const neStore = useNeStore();
@@ -33,8 +32,6 @@ let neOtions = ref<Record<string, any>[]>([]);
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元ID */
   neUid: undefined,
   /**移动编号 */
@@ -119,7 +116,7 @@ let tableColumns = ref<ColumnsType>([
     align: 'left',
     width: 100,
   },
-    {
+  {
     title: 'Create Time',
     dataIndex: 'createTime',
     align: 'left',
@@ -218,7 +215,6 @@ let modalState: ModalStateType = reactive({
   from: {
     num: 1,
     id: undefined,
-    coreUid: '',
     neUid: '',
     neType: 'UDM',
     imsi: '',
@@ -288,8 +284,7 @@ function fnModalVisibleByEdit(row?: Record<string, any>) {
     const hide = message.loading(t('common.loading'), 0);
     modalState.confirmLoading = true;
     getUDMAuth({
-      coreUid: row.coreUid,
+      neUid: queryParams.neUid,
-      neUid: row.neUid,
       imsi: row.imsi,
     })
       .then(res => {
@@ -331,7 +326,6 @@ function fnModalOk() {
       modalState.confirmLoading = true;
       const from = toRaw(modalState.from);
       from.algoIndex = `${from.algoIndex}`;
-      from.coreUid = queryParams.coreUid || '-';
       from.neUid = queryParams.neUid || '-';
       from.neType = 'UDM';
       const result = from.id ? updateUDMAuth(from) : addUDMAuth(from);
@@ -399,32 +393,29 @@ function fnBatchDelModalOk() {
       modalState.confirmLoading = true;
       const from = toRaw(modalState.BatchDelForm);
       const neUid = queryParams.neUid || '-';
-      const coreUid = queryParams.coreUid || '-';
+      delUDMAuth({ neUid, imsi: from.imsi, num: from.num }).then(res => {
-      delUDMAuth({ coreUid, neUid, imsi: from.imsi, num: from.num }).then(
+        if (res.code === RESULT_CODE_SUCCESS) {
-        res => {
+          const timerS = Math.ceil(+from.num / 800) + 1;
-          if (res.code === RESULT_CODE_SUCCESS) {
+          notification.success({
-            const timerS = Math.ceil(+from.num / 800) + 1;
+            message: modalState.title,
-            notification.success({
+            description: t('common.operateOk'),
-              message: modalState.title,
+            duration: timerS,
-              description: t('common.operateOk'),
+          });
-              duration: timerS,
+          setTimeout(() => {
-            });
+            modalState.openByBatchDel = false;
-            setTimeout(() => {
-              modalState.openByBatchDel = false;
-              modalState.confirmLoading = false;
-              modalStateBatchDelFrom.resetFields();
-              fnGetList(1);
-            }, timerS * 1000);
-          } else {
             modalState.confirmLoading = false;
-            notification.error({
+            modalStateBatchDelFrom.resetFields();
-              message: modalState.title,
+            fnGetList(1);
-              description: res.msg,
+          }, timerS * 1000);
-              duration: 3,
+        } else {
-            });
+          modalState.confirmLoading = false;
-          }
+          notification.error({
+            message: modalState.title,
+            description: res.msg,
+            duration: 3,
+          });
         }
-      );
+      });
     })
     .catch(e => {
       message.error(t('common.errorFields', { num: e.errorFields.length }), 3);
@@ -455,8 +446,7 @@ function fnModalCancel() {
  */
 function fnRecordDelete(imsi: string) {
   const neUid = queryParams.neUid;
-  const coreUid = queryParams.coreUid;
+  if (!neUid) return;
-  if (!neUid || !coreUid) return;
   let imsiMsg = imsi;
   if (imsi === '0') {
     imsiMsg = `${tableState.selectedRowKeys[0]}... ${t(
@@ -471,7 +461,7 @@ function fnRecordDelete(imsi: string) {
     onOk() {
       modalState.loadDataLoading = true;
       const hide = message.loading(t('common.loading'), 0);
-      delUDMAuth({ coreUid, neUid, imsi, num: 0 })
+      delUDMAuth({ neUid, imsi, num: 0 })
         .then(res => {
           if (res.code === RESULT_CODE_SUCCESS) {
             const msgContent = t('common.msgSuccess', {
@@ -504,12 +494,11 @@ function fnRecordExport(type: string = 'txt') {
   const selectLen = tableState.selectedRowKeys.length;
   if (selectLen <= 0) return;
   const neUid = queryParams.neUid;
-  const coreUid = queryParams.coreUid;
+  if (!neUid) return;
-  if (!neUid || !coreUid) return;
   const hide = message.loading(t('common.loading'), 0);
   queryParams.pageNum = 1;
   queryParams.pageSize = tablePagination.total;
-  exportUDMAuth({ type, coreUid, neUid, imsis: tableState.selectedRowKeys })
+  exportUDMAuth({ type, neUid, imsis: tableState.selectedRowKeys })
     .then(res => {
       if (res.code === RESULT_CODE_SUCCESS) {
         message.success(t('common.msgSuccess', { msg: t('common.export') }), 3);
@@ -526,8 +515,7 @@ function fnRecordExport(type: string = 'txt') {
 /**列表导出全部数据 */
 function fnExportList(type: string) {
   const neUid = queryParams.neUid;
-  const coreUid = queryParams.coreUid;
+  if (!neUid) return;
-  if (!neUid || !coreUid) return;
   const hide = message.loading(t('common.loading'), 0);
   exportUDMAuth(Object.assign({ type: type }, queryParams))
     .then(res => {
@@ -545,14 +533,13 @@ function fnExportList(type: string) {
 
 /**重新加载数据 */
 function fnLoadData() {
-  const coreUid = queryParams.coreUid;
   const neUid = queryParams.neUid;
-  if (tableState.loading || !neUid || !coreUid) return;
+  if (tableState.loading || !neUid) return;
   modalState.loadDataLoading = true;
   tablePagination.total = 0;
   tableState.data = [];
   tableState.loading = true; // 表格loading
-  resetUDMAuth(coreUid, neUid).then(res => {
+  resetUDMAuth(neUid).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       const num = res.data;
       const timerS = Math.ceil(+num / 800) + 3;
@@ -696,8 +683,7 @@ function fnModalUploadImportClose() {
 /**对话框表格信息导入上传 */
 function fnModalUploadImportUpload(file: File) {
   const neUid = queryParams.neUid;
-  const coreUid = queryParams.coreUid;
+  if (!neUid) {
-  if (!neUid || !coreUid) {
     return Promise.reject('Unknown network element');
   }
   const hide = message.loading(t('common.loading'), 0);
@@ -720,7 +706,6 @@ function fnModalUploadImportUpload(file: File) {
       if (!filePath) return;
       // 文件导入
       return importUDMAuth({
-        coreUid: coreUid,
         neUid: neUid,
         uploadPath: filePath,
         ...uploadImportState.from,

src/views/neData/udm-sub/index.vue

@@ -24,7 +24,6 @@ import {
 } from '@/api/neDataNf/udm_sub';
 import { uploadFile } from '@/api/tool/file';
 import { getNeViewFile } from '@/api/tool/neFile';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const neStore = useNeStore();
 /**网元参数 */
@@ -32,8 +31,6 @@ let neOtions = ref<Record<string, any>[]>([]);
 
 /**查询参数 */
 let queryParams = reactive({
-  /**核心网标识 */
-  coreUid: currentCoreUid(),
   /**网元ID */
   neUid: undefined,
   /**移动编号 */
@@ -397,8 +394,7 @@ function fnModalVisibleByEdit(row?: Record<string, any>) {
     const hide = message.loading(t('common.loading'), 0);
     modalState.confirmLoading = true;
     getUDMSub({
-      coreUid: row.coreUid,
+      neUid: queryParams.neUid,
-      neUid: row.neUid,
       imsi: row.imsi,
     })
       .then(res => {
@@ -649,7 +645,6 @@ function fnModalOk() {
       from.rfspIndex = `${from.rfspIndex}`;
       from.regTimer = `${from.regTimer}`;
       from.ueUsageType = `${from.ueUsageType}`;
-      from.coreUid = queryParams.coreUid || '-';
       from.neUid = queryParams.neUid || '-';
       from.neType = 'UDM';
       const result = from.id ? updateUDMSub(from) : addUDMSub(from);
@@ -725,32 +720,29 @@ function fnBatchDelModalOk() {
       modalState.confirmLoading = true;
       const from = toRaw(modalState.BatchDelForm);
       const neUid = queryParams.neUid || '-';
-      const coreUid = queryParams.coreUid || '-';
+      delUDMSub({ neUid, imsi: from.imsi, num: from.num }).then(res => {
-      delUDMSub({ coreUid, neUid, imsi: from.imsi, num: from.num }).then(
+        if (res.code === RESULT_CODE_SUCCESS) {
-        res => {
+          const timerS = Math.ceil(+from.num / 800) + 1;
-          if (res.code === RESULT_CODE_SUCCESS) {
+          notification.success({
-            const timerS = Math.ceil(+from.num / 800) + 1;
+            message: modalState.title,
-            notification.success({
+            description: t('common.operateOk'),
-              message: modalState.title,
+            duration: timerS,
-              description: t('common.operateOk'),
+          });
-              duration: timerS,
+          setTimeout(() => {
-            });
+            modalState.openByBatchDel = false;
-            setTimeout(() => {
-              modalState.openByBatchDel = false;
-              modalState.confirmLoading = false;
-              modalStateBatchDelFrom.resetFields();
-              fnGetList();
-            }, timerS * 1000);
-          } else {
             modalState.confirmLoading = false;
-            notification.error({
+            modalStateBatchDelFrom.resetFields();
-              message: modalState.title,
+            fnGetList();
-              description: res.msg,
+          }, timerS * 1000);
-              duration: 3,
+        } else {
-            });
+          modalState.confirmLoading = false;
-          }
+          notification.error({
+            message: modalState.title,
+            description: res.msg,
+            duration: 3,
+          });
         }
-      );
+      });
     })
     .catch(e => {
       message.error(t('common.errorFields', { num: e.errorFields.length }), 3);
@@ -805,8 +797,7 @@ function fnBatchDelModalCancel() {
  */
 function fnRecordDelete(imsi: string) {
   const neUid = queryParams.neUid;
-  const coreUid = queryParams.coreUid;
+  if (!neUid) return;
-  if (!neUid || !coreUid) return;
   let imsiMsg = imsi;
   if (imsi === '0') {
     imsiMsg = `${tableState.selectedRowKeys[0]}... ${t(
@@ -821,7 +812,7 @@ function fnRecordDelete(imsi: string) {
     onOk() {
       modalState.loadDataLoading = true;
       const hide = message.loading(t('common.loading'), 0);
-      delUDMSub({ coreUid, neUid, imsi, num: 0 })
+      delUDMSub({ neUid, imsi, num: 0 })
         .then(res => {
           if (res.code === RESULT_CODE_SUCCESS) {
             const msgContent = t('common.msgSuccess', {
@@ -854,10 +845,9 @@ function fnRecordExport(type: string = 'txt') {
   const selectLen = tableState.selectedRowKeys.length;
   if (selectLen <= 0) return;
   const neUid = queryParams.neUid;
-  const coreUid = queryParams.coreUid;
+  if (!neUid) return;
-  if (!neUid || !coreUid) return;
   const hide = message.loading(t('common.loading'), 0);
-  exportUDMSub({ type, coreUid, neUid, imsis: tableState.selectedRowKeys })
+  exportUDMSub({ type, neUid, imsis: tableState.selectedRowKeys })
     .then(res => {
       if (res.code === RESULT_CODE_SUCCESS) {
         message.success({
@@ -880,8 +870,7 @@ function fnRecordExport(type: string = 'txt') {
 /**列表导出 */
 function fnExportList(type: string) {
   const neUid = queryParams.neUid;
-  const coreUid = queryParams.coreUid;
+  if (!neUid) return;
-  if (!neUid || !coreUid) return;
   const hide = message.loading(t('common.loading'), 0);
   queryParams.pageNum = 1;
   queryParams.pageSize = tablePagination.total;
@@ -907,14 +896,13 @@ function fnExportList(type: string) {
 
 /**重新加载数据 */
 function fnLoadData() {
-  const coreUid = queryParams.coreUid;
   const neUid = queryParams.neUid;
-  if (tableState.loading || !neUid || !coreUid) return;
+  if (tableState.loading || !neUid) return;
   modalState.loadDataLoading = true;
   tablePagination.total = 0;
   tableState.data = [];
   tableState.loading = true; // 表格loading
-  resetUDMSub(coreUid, neUid).then(res => {
+  resetUDMSub(neUid).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       const num = res.data;
       const timerS = Math.ceil(+num / 800) + 3;
@@ -1039,8 +1027,7 @@ function fnModalUploadImportClose() {
 /**对话框表格信息导入上传 */
 function fnModalUploadImportUpload(file: File) {
   const neUid = queryParams.neUid;
-  const coreUid = queryParams.coreUid;
+  if (!neUid) {
-  if (!neUid || !coreUid) {
     return Promise.reject('Unknown network element');
   }
   const hide = message.loading(t('common.loading'), 0);
@@ -1063,7 +1050,6 @@ function fnModalUploadImportUpload(file: File) {
       if (!filePath) return;
       // 文件导入
       return importUDMSub({
-        coreUid: coreUid,
         neUid: neUid,
         uploadPath: filePath,
       });