ref: v3变更,，api路由调整

src/api/faultManage/actAlarm.ts

@@ -9,7 +9,7 @@ import { parseObjLineToHump } from '@/utils/parse-utils';
 export async function getActiveAlarmTotal(coreUid: string) {
   // 发起请求
   const result = await request({
-    url: `/neData/alarm/list`,
+    url: `/ne/data/alarm/list`,
     method: 'GET',
     params: {
       coreUid: coreUid,
@@ -35,7 +35,7 @@ export async function getActiveAlarmTotal(coreUid: string) {
  */
 export async function listAct(query: Record<string, any>) {
   return await request({
-    url: `/neData/alarm/list`,
+    url: `/ne/data/alarm/list`,
     method: 'GET',
     params: query,
   });
@@ -49,7 +49,7 @@ export async function listAct(query: Record<string, any>) {
  */
 export function ackAlarm(data: Record<string, any>) {
   return request({
-    url: `/neData/alarm/ack'`,
+    url: `/ne/data/alarm/ack'`,
     method: 'PUT',
     data,
   });
@@ -108,7 +108,7 @@ export function getPass() {
  */
 export function clearAlarm(id: number, coreUid: string) {
   return request({
-    url: `/neData/alarm/clear`,
+    url: `/ne/data/alarm/clear`,
     method: 'PUT',
     data: { id, coreUid },
   });
@@ -121,7 +121,7 @@ export function clearAlarm(id: number, coreUid: string) {
  */
 export function exportAlarm(params: Record<string, any>) {
   return request({
-    url: '/neData/alarm/export',
+    url: '/ne/data/alarm/export',
     method: 'GET',
     params: params,
     responseType: 'blob',
@@ -193,7 +193,7 @@ export async function exportAll(query: Record<string, any>) {
  */
 export async function origGet(coreUid: string) {
   return await request({
-    url: `/neData/alarm/count/severity`,
+    url: `/ne/data/alarm/count/severity`,
     method: 'GET',
     params: {
       coreUid: coreUid,
@@ -209,7 +209,7 @@ export async function origGet(coreUid: string) {
  */
 export async function top3Sel(coreUid: string) {
   return await request({
-    url: `/neData/alarm/count/top`,
+    url: `/ne/data/alarm/count/top`,
     method: 'GET',
     params: {
       coreUid: coreUid,

src/api/faultManage/eventAlarm.ts

@@ -9,7 +9,7 @@ import { parseObjLineToHump } from '@/utils/parse-utils';
  */
 export async function listAct(query: Record<string, any>) {
   return await request({
-    url: `/neData/alarm/log/event`,
+    url: `/ne/data/alarm/log/event`,
     method: 'GET',
     params: query,
   });

src/api/logManage/alarm.ts

@@ -7,7 +7,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export async function listAlarm(query: Record<string, any>) {
   return await request({
-    url: `/neData/alarm/log/list`,
+    url: `/ne/data/alarm/log/list`,
     method: 'GET',
     params: query,
   });

src/api/logManage/forwarding.ts

@@ -7,7 +7,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export async function listForwarding(query: Record<string, any>) {
   return await request({
-    url: `/neData/alarm/forward/log/list`,
+    url: `/ne/data/alarm/forward/log/list`,
     method: 'GET',
     params: query,
   });

src/api/neData/backup.ts

@@ -6,7 +6,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function getBackupFTP() {
   return request({
-    url: '/neData/backup/ftp',
+    url: '/nf/backup/ftp',
     method: 'GET',
   });
 }
@@ -18,7 +18,7 @@ export function getBackupFTP() {
  */
 export function pushBackupFTP(data: Record<string, any>) {
   return request({
-    url: '/neData/backup/ftp',
+    url: '/nf/backup/ftp',
     method: 'POST',
     data,
   });
@@ -31,7 +31,7 @@ export function pushBackupFTP(data: Record<string, any>) {
  */
 export function updateBackupFTP(data: Record<string, any>) {
   return request({
-    url: '/neData/backup/ftp',
+    url: '/nf/backup/ftp',
     method: 'PUT',
     data,
   });

src/api/neData/kpi-title.ts

@@ -1,5 +1,22 @@
 import { request } from '@/plugins/http-fetch';
 
+/**
+ * 查询黄金指标数据kpi.id转换title
+ * @param neType 网元类型
+ * @returns object
+ */
+export async function getKPITitle(neType: string) {
+  // 发起请求
+  const result = await request({
+    url: `/ne/data/kpi/title`,
+    method: 'GET',
+    params: { neType },
+  });
+  // 解析数据//
+  return result;
+}
+
+
 /**
  * 查询统计指标
  * @param query 查询参数
@@ -7,7 +24,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export async function listKPITitle(query?: Record<string, any>) {
   return await request({
-    url: `/neData/kpi/title/list`,
+    url: `/ne/data/kpi/title/list`,
     method: 'GET',
     params: query,
   });
@@ -20,7 +37,7 @@ export async function listKPITitle(query?: Record<string, any>) {
  */
 export function addKPITitle(data: Record<string, any>) {
   return request({
-    url: `/neData/kpi/title`,
+    url: `/ne/data/kpi/title`,
     method: 'POST',
     data: data,
   });
@@ -33,7 +50,7 @@ export function addKPITitle(data: Record<string, any>) {
  */
 export function updateKPITitle(data: Record<string, any>) {
   return request({
-    url: `/neData/kpi/title`,
+    url: `/ne/data/kpi/title`,
     method: 'PUT',
     data: data,
   });
@@ -45,7 +62,7 @@ export function updateKPITitle(data: Record<string, any>) {
  */
 export async function delKPITitle(id: string) {
   return request({
-    url: `/neData/kpi/title?id=${id}`,
+    url: `/ne/data/kpi/title?id=${id}`,
     method: 'DELETE',
   });
 }

src/api/neData/kpi.ts

@@ -0,0 +1,18 @@
+import { request } from '@/plugins/http-fetch';
+
+/**
+ * 查询黄金指标数据
+ * @param query 查询参数
+ * @returns object
+ */
+export async function listKPIData(query: Record<string, any>) {
+  const result = await request({
+    url: `/ne/data/kpi/data`,
+    method: 'GET',
+    params: query,
+    timeout: 60_000,
+  });
+
+  return result;
+}
+

src/api/neData/kpic-title.ts

@@ -5,9 +5,9 @@ import { request } from '@/plugins/http-fetch';
  * @param query 查询参数
  * @returns object
  */
-export async function listCustom(query?: Record<string, any>) {
+export async function listKPICTitle(query?: Record<string, any>) {
   return await request({
-    url: `/neData/kpic/title/list`,
+    url: `/ne/data/kpic/title/list`,
     method: 'GET',
     params: query,
   });
@@ -18,9 +18,9 @@ export async function listCustom(query?: Record<string, any>) {
  * @param data 网元对象
  * @returns object
  */
-export function addCustom(data: Record<string, any>) {
+export function addKPICTitle(data: Record<string, any>) {
   return request({
-    url: `/neData/kpic/title`,
+    url: `/ne/data/kpic/title`,
     method: 'POST',
     data: data,
   });
@@ -31,9 +31,9 @@ export function addCustom(data: Record<string, any>) {
  * @param data 网元对象
  * @returns object
  */
-export function updateCustom(data: Record<string, any>) {
+export function updateKPICTitle(data: Record<string, any>) {
   return request({
-    url: `/neData/kpic/title`,
+    url: `/ne/data/kpic/title`,
     method: 'PUT',
     data: data,
   });
@@ -43,9 +43,9 @@ export function updateCustom(data: Record<string, any>) {
  * 删除自定义指标
  * @returns object
  */
-export async function delCustom(data: Record<string, any>) {
+export async function delKPICTitle(data: Record<string, any>) {
   return request({
-    url: `/neData/kpic/title?id=${data.id}`,
+    url: `/ne/data/kpic/title?id=${data.id}`,
     method: 'DELETE',
   });
 }

src/api/neData/kpic.ts

@@ -1,14 +1,14 @@
 import { request } from '@/plugins/http-fetch';
 
 /**
- * 新 查询自定义指标数据
+ * 查询自定义指标数据
  * @param query 查询参数
  * @returns object
  */
-export async function listCustomData(query: Record<string, any>) {
+export async function listKPICData(query: Record<string, any>) {
   // 发起请求
   const result = await request({
-    url: `/neData/kpic/data`,
+    url: `/ne/data/kpic/data`,
     method: 'GET',
     params: query,
     timeout: 60_000,

src/api/neData/nb-state.ts

@@ -7,7 +7,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function listNBState(query: Record<string, any>) {
   return request({
-    url: '/neData/state/nb/list',
+    url: '/nf/state/nb/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -21,7 +21,7 @@ export function listNBState(query: Record<string, any>) {
  */
 export function exportNBState(query: Record<string, any>) {
   return request({
-    url: '/neData/state/nb/export',
+    url: '/nf/state/nb/export',
     method: 'GET',
     params: query,
     responseType: 'blob',

src/api/neDataNf/amf.ts

@@ -7,7 +7,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function listAMFDataUE(query: Record<string, any>) {
   return request({
-    url: '/neData/amf/ue/list',
+    url: '/nf/amf/ue/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -21,7 +21,7 @@ export function listAMFDataUE(query: Record<string, any>) {
  */
 export function delAMFDataUE(ueIds: string | number) {
   return request({
-    url: `/neData/amf/ue/${ueIds}`,
+    url: `/nf/amf/ue/${ueIds}`,
     method: 'DELETE',
     timeout: 60_000,
   });
@@ -34,7 +34,7 @@ export function delAMFDataUE(ueIds: string | number) {
  */
 export function exportAMFDataUE(query: Record<string, any>) {
   return request({
-    url: '/neData/amf/ue/export',
+    url: '/nf/amf/ue/export',
     method: 'GET',
     params: query,
     responseType: 'blob',
@@ -49,7 +49,7 @@ export function exportAMFDataUE(query: Record<string, any>) {
  */
 export function listAMFNblist(query: Record<string, any>) {
   return request({
-    url: '/neData/amf/nb/list',
+    url: '/nf/amf/nb/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -63,7 +63,7 @@ export function listAMFNblist(query: Record<string, any>) {
  */
 export function listAMFNbStatelist(query: Record<string, any>) {
   return request({
-    url: '/neData/amf/nb/addrs',
+    url: '/nf/amf/nb/addrs',
     method: 'GET',
     params: query,
     timeout: 60_000,

src/api/neDataNf/cbc.ts

@@ -7,7 +7,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function listCBC(query: Record<string, any>) {
   return request({
-    url: `/neData/cbc/message/list`,
+    url: `/nf/cbc/message/list`,
     method: 'GET',
     params: query,
     timeout: 30_000,
@@ -21,7 +21,7 @@ export function listCBC(query: Record<string, any>) {
  */
 export function addCBC(data: Record<string, any>) {
   return request({
-    url: `/neData/cbc/message?neId=${data.neId}`,
+    url: `/nf/cbc/message?neId=${data.neId}`,
     method: 'POST',
     data: data,
     timeout: 180_000,
@@ -30,7 +30,7 @@ export function addCBC(data: Record<string, any>) {
 
 export function updateCBCStatus(data: any) {
   return request({
-    url: `/neData/cbc/message/${data.id}/${data.status}?neId=${data.neId}`,
+    url: `/nf/cbc/message/${data.id}/${data.status}?neId=${data.neId}`,
     method: 'PUT',
     timeout: 180_000,
   });
@@ -38,7 +38,7 @@ export function updateCBCStatus(data: any) {
 
 export function updateCBC(data: any) {
   return request({
-    url: `/neData/cbc/message/${data.id}?neId=${data.neId}`,
+    url: `/nf/cbc/message/${data.id}?neId=${data.neId}`,
     method: 'PUT',
     data,
     timeout: 180_000,
@@ -52,7 +52,7 @@ export function updateCBC(data: any) {
  */
 export function delCBC(neId: string, id: string) {
   return request({
-    url: `/neData/cbc/message/${id}?neId=${neId}`,
+    url: `/nf/cbc/message/${id}?neId=${neId}`,
     method: 'DELETE',
     timeout: 180_000,
   });

src/api/neDataNf/ims.ts

@@ -7,7 +7,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function listIMSDataCDR(query: Record<string, any>) {
   return request({
-    url: '/neData/ims/cdr/list',
+    url: '/nf/ims/cdr/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -21,7 +21,7 @@ export function listIMSDataCDR(query: Record<string, any>) {
  */
 export function delIMSDataCDR(cdrIds: string | number) {
   return request({
-    url: `/neData/ims/cdr/${cdrIds}`,
+    url: `/nf/ims/cdr/${cdrIds}`,
     method: 'DELETE',
     timeout: 60_000,
   });
@@ -34,7 +34,7 @@ export function delIMSDataCDR(cdrIds: string | number) {
  */
 export function exportIMSDataCDR(query: Record<string, any>) {
   return request({
-    url: '/neData/ims/cdr/export',
+    url: '/nf/ims/cdr/export',
     method: 'GET',
     params: query,
     responseType: 'blob',
@@ -49,7 +49,7 @@ export function exportIMSDataCDR(query: Record<string, any>) {
  */
 export function listIMSSessionNum(coreUid: string, neUid: string) {
   return request({
-    url: '/neData/ims/session/num',
+    url: '/nf/ims/session/num',
     method: 'GET',
     params: { coreUid, neUid },
   });
@@ -62,7 +62,7 @@ export function listIMSSessionNum(coreUid: string, neUid: string) {
  */
 export function listIMSSessionList(query: Record<string, any>) {
   return request({
-    url: '/neData/ims/session/list',
+    url: '/nf/ims/session/list',
     method: 'GET',
     params: query,
   });

src/api/neDataNf/mme.ts

@@ -7,7 +7,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function listMMEDataUE(query: Record<string, any>) {
   return request({
-    url: '/neData/mme/ue/list',
+    url: '/nf/mme/ue/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -21,7 +21,7 @@ export function listMMEDataUE(query: Record<string, any>) {
  */
 export function delMMEDataUE(ueIds: string | number) {
   return request({
-    url: `/neData/mme/ue/${ueIds}`,
+    url: `/nf/mme/ue/${ueIds}`,
     method: 'DELETE',
     timeout: 60_000,
   });
@@ -34,7 +34,7 @@ export function delMMEDataUE(ueIds: string | number) {
  */
 export function exportMMEDataUE(query: Record<string, any>) {
   return request({
-    url: '/neData/mme/ue/export',
+    url: '/nf/mme/ue/export',
     method: 'GET',
     params: query,
     responseType: 'blob',
@@ -49,7 +49,7 @@ export function exportMMEDataUE(query: Record<string, any>) {
  */
 export function listMMENblist(query: Record<string, any>) {
   return request({
-    url: '/neData/mme/nb/list',
+    url: '/nf/mme/nb/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -63,7 +63,7 @@ export function listMMENblist(query: Record<string, any>) {
  */
 export function listMMENbStatelist(query: Record<string, any>) {
   return request({
-    url: '/neData/mme/nb/addrs',
+    url: '/nf/mme/nb/addrs',
     method: 'GET',
     params: query,
     timeout: 60_000,

src/api/neDataNf/n3iwf.ts

@@ -9,7 +9,7 @@ import { parseObjLineToHump } from '@/utils/parse-utils';
  */
 export function listN3IWFSubList(query: Record<string, any>) {
   return request({
-    url: '/neData/n3iwf/sub/list',
+    url: '/nf/n3iwf/sub/list',
     method: 'GET',
     params: query,
   });

src/api/neDataNf/nssf.ts

@@ -9,7 +9,7 @@ import { parseObjLineToHump } from '@/utils/parse-utils';
  */
 export function listNSSFSubList(query: Record<string, any>) {
   return request({
-    url: '/neData/nssf/sub/list',
+    url: '/nf/nssf/sub/list',
     method: 'GET',
     params: query,
   });
@@ -21,7 +21,7 @@ export function listNSSFSubList(query: Record<string, any>) {
  */
 export function listNSSFAmfList(query: Record<string, any>) {
   return request({
-    url: '/neData/nssf/amf/list',
+    url: '/nf/nssf/amf/list',
     method: 'GET',
     params: query,
   });

src/api/neDataNf/pcf.ts

@@ -7,7 +7,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function listPCFRule(query: Record<string, any>) {
   return request({
-    url: '/neData/pcf/rule/list',
+    url: '/nf/pcf/rule/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -21,7 +21,7 @@ export function listPCFRule(query: Record<string, any>) {
  */
 export function addPCFRule(data: Record<string, any>) {
   return request({
-    url: `/neData/pcf/rule`,
+    url: `/nf/pcf/rule`,
     method: 'POST',
     data,
   });
@@ -34,7 +34,7 @@ export function addPCFRule(data: Record<string, any>) {
  */
 export function editPCFRule(data: Record<string, any>) {
   return request({
-    url: `/neData/pcf/rule`,
+    url: `/nf/pcf/rule`,
     method: 'PUT',
     data,
   });
@@ -47,7 +47,7 @@ export function editPCFRule(data: Record<string, any>) {
  */
 export function delPCFRule(data: Record<string, any>) {
   return request({
-    url: `/neData/pcf/rule`,
+    url: `/nf/pcf/rule`,
     method: 'DELETE',
     params: data,
   });
@@ -60,7 +60,7 @@ export function delPCFRule(data: Record<string, any>) {
  */
 export function exportPCFRule(data: Record<string, any>) {
   return request({
-    url: '/neData/pcf/rule/export',
+    url: '/nf/pcf/rule/export',
     method: 'GET',
     params: data,
     responseType: 'blob',
@@ -75,7 +75,7 @@ export function exportPCFRule(data: Record<string, any>) {
  */
 export function importPCFRule(data: Record<string, any>) {
   return request({
-    url: '/neData/pcf/rule/import',
+    url: '/nf/pcf/rule/import',
     method: 'PUT',
     data,
   });

src/api/neDataNf/sgwc.ts

@@ -7,7 +7,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function listSGWCDataCDR(query: Record<string, any>) {
   return request({
-    url: '/neData/sgwc/cdr/list',
+    url: '/nf/sgwc/cdr/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -21,7 +21,7 @@ export function listSGWCDataCDR(query: Record<string, any>) {
  */
 export function delSGWCDataCDR(cdrIds: string | number) {
   return request({
-    url: `/neData/sgwc/cdr/${cdrIds}`,
+    url: `/nf/sgwc/cdr/${cdrIds}`,
     method: 'DELETE',
     timeout: 60_000,
   });
@@ -34,7 +34,7 @@ export function delSGWCDataCDR(cdrIds: string | number) {
  */
 export function exportSGWCDataCDR(query: Record<string, any>) {
   return request({
-    url: '/neData/sgwc/cdr/export',
+    url: '/nf/sgwc/cdr/export',
     method: 'GET',
     params: query,
     responseType: 'blob',

src/api/neDataNf/smf.ts

@@ -7,7 +7,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function listSMFDataCDR(query: Record<string, any>) {
   return request({
-    url: '/neData/smf/cdr/list',
+    url: '/nf/smf/cdr/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -21,7 +21,7 @@ export function listSMFDataCDR(query: Record<string, any>) {
  */
 export function delSMFDataCDR(cdrIds: string | number) {
   return request({
-    url: `/neData/smf/cdr/${cdrIds}`,
+    url: `/nf/smf/cdr/${cdrIds}`,
     method: 'DELETE',
     timeout: 60_000,
   });
@@ -34,7 +34,7 @@ export function delSMFDataCDR(cdrIds: string | number) {
  */
 export function exportSMFDataCDR(query: Record<string, any>) {
   return request({
-    url: '/neData/smf/cdr/export',
+    url: '/nf/smf/cdr/export',
     method: 'GET',
     params: query,
     responseType: 'blob',
@@ -49,7 +49,7 @@ export function exportSMFDataCDR(query: Record<string, any>) {
  */
 export function listSMFSubNum(coreUid: string, neUid: string) {
   return request({
-    url: '/neData/smf/sub/num',
+    url: '/nf/smf/sub/num',
     method: 'GET',
     params: { coreUid, neUid },
   });
@@ -62,7 +62,7 @@ export function listSMFSubNum(coreUid: string, neUid: string) {
  */
 export function listSMFSubList(query: Record<string, any>) {
   return request({
-    url: '/neData/smf/sub/list',
+    url: '/nf/smf/sub/list',
     method: 'GET',
     params: query,
   });

src/api/neDataNf/smsc.ts

@@ -7,7 +7,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function listSMSCDataCDR(query: Record<string, any>) {
   return request({
-    url: '/neData/smsc/cdr/list',
+    url: '/nf/smsc/cdr/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -21,7 +21,7 @@ export function listSMSCDataCDR(query: Record<string, any>) {
  */
 export function delSMSCDataCDR(cdrIds: string | number) {
   return request({
-    url: `/neData/smsc/cdr/${cdrIds}`,
+    url: `/nf/smsc/cdr/${cdrIds}`,
     method: 'DELETE',
     timeout: 60_000,
   });
@@ -34,7 +34,7 @@ export function delSMSCDataCDR(cdrIds: string | number) {
  */
 export function exportSMSCDataCDR(query: Record<string, any>) {
   return request({
-    url: '/neData/smsc/cdr/export',
+    url: '/nf/smsc/cdr/export',
     method: 'GET',
     params: query,
     responseType: 'blob',

src/api/neDataNf/udm_auth.ts

@@ -8,7 +8,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function resetUDMAuth(coreUid: string, neUid: string) {
   return request({
-    url: `/neData/udm/auth/reset`,
+    url: `/nf/udm/auth/reset`,
     method: 'PUT',
     params: { coreUid, neUid },
     timeout: 180_000,
@@ -22,7 +22,7 @@ export function resetUDMAuth(coreUid: string, neUid: string) {
  */
 export function listUDMAuth(query: Record<string, any>) {
   return request({
-    url: '/neData/udm/auth/list',
+    url: '/nf/udm/auth/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -37,7 +37,7 @@ export function listUDMAuth(query: Record<string, any>) {
  */
 export function getUDMAuth(query: Record<string, any>) {
   return request({
-    url: `/neData/udm/auth`,
+    url: `/nf/udm/auth`,
     method: 'GET',
     params: query,
   });
@@ -50,7 +50,7 @@ export function getUDMAuth(query: Record<string, any>) {
  */
 export function addUDMAuth(data: Record<string, any>) {
   return request({
-    url: `/neData/udm/auth`,
+    url: `/nf/udm/auth`,
     method: 'POST',
     params: { num: data.num },
     data: data,
@@ -65,7 +65,7 @@ export function addUDMAuth(data: Record<string, any>) {
  */
 export function updateUDMAuth(data: Record<string, any>) {
   return request({
-    url: `/neData/udm/auth`,
+    url: `/nf/udm/auth`,
     method: 'PUT',
     data: data,
     timeout: 180_000,
@@ -82,7 +82,7 @@ export function updateUDMAuth(data: Record<string, any>) {
  */
 export function delUDMAuth(query: Record<string, any>) {
   return request({
-    url: `/neData/udm/auth`,
+    url: `/nf/udm/auth`,
     method: 'DELETE',
     params: query,
     timeout: 180_000,
@@ -96,7 +96,7 @@ export function delUDMAuth(query: Record<string, any>) {
  */
 export function importUDMAuth(data: Record<string, any>) {
   return request({
-    url: `/neData/udm/auth/import`,
+    url: `/nf/udm/auth/import`,
     method: 'POST',
     data,
     timeout: 180_000,
@@ -110,7 +110,7 @@ export function importUDMAuth(data: Record<string, any>) {
  */
 export function exportUDMAuth(data: Record<string, any>) {
   return request({
-    url: '/neData/udm/auth/export',
+    url: '/nf/udm/auth/export',
     method: 'GET',
     params: data,
     responseType: 'blob',

src/api/neDataNf/udm_sub.ts

@@ -8,7 +8,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function resetUDMSub(coreUid: string, neUid: string) {
   return request({
-    url: `/neData/udm/sub/reset`,
+    url: `/nf/udm/sub/reset`,
     method: 'PUT',
     params: { coreUid, neUid },
     timeout: 180_000,
@@ -22,7 +22,7 @@ export function resetUDMSub(coreUid: string, neUid: string) {
  */
 export function listUDMSub(query: Record<string, any>) {
   return request({
-    url: '/neData/udm/sub/list',
+    url: '/nf/udm/sub/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -37,7 +37,7 @@ export function listUDMSub(query: Record<string, any>) {
  */
 export function getUDMSub(query: Record<string, any>) {
   return request({
-    url: `/neData/udm/sub`,
+    url: `/nf/udm/sub`,
     method: 'GET',
     params: query,
   });
@@ -50,7 +50,7 @@ export function getUDMSub(query: Record<string, any>) {
  */
 export function addUDMSub(data: Record<string, any>) {
   return request({
-    url: `/neData/udm/sub`,
+    url: `/nf/udm/sub`,
     method: 'POST',
     params: { num: data.num },
     data: data,
@@ -65,7 +65,7 @@ export function addUDMSub(data: Record<string, any>) {
  */
 export function updateUDMSub(data: Record<string, any>) {
   return request({
-    url: `/neData/udm/sub`,
+    url: `/nf/udm/sub`,
     method: 'PUT',
     data: data,
     timeout: 180_000,
@@ -79,7 +79,7 @@ export function updateUDMSub(data: Record<string, any>) {
  */
 export function delUDMSub(query: Record<string, any>) {
   return request({
-    url: `/neData/udm/sub`,
+    url: `/nf/udm/sub`,
     method: 'DELETE',
     params: query,
     timeout: 180_000,
@@ -93,7 +93,7 @@ export function delUDMSub(query: Record<string, any>) {
  */
 export function exportUDMSub(data: Record<string, any>) {
   return request({
-    url: '/neData/udm/sub/export',
+    url: '/nf/udm/sub/export',
     method: 'GET',
     params: data,
     responseType: 'blob',
@@ -108,7 +108,7 @@ export function exportUDMSub(data: Record<string, any>) {
  */
 export function importUDMSub(data: Record<string, any>) {
   return request({
-    url: `/neData/udm/sub/import`,
+    url: `/nf/udm/sub/import`,
     method: 'POST',
     data,
     timeout: 180_000,

src/api/neDataNf/udm_voip.ts

@@ -8,7 +8,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function resetUDMVoIP(coreUid: string, neUid: string) {
   return request({
-    url: `/neData/udm/voip/reset`,
+    url: `/nf/udm/voip/reset`,
     method: 'PUT',
     params: { coreUid, neUid },
     timeout: 180_000,
@@ -22,7 +22,7 @@ export function resetUDMVoIP(coreUid: string, neUid: string) {
  */
 export function listUDMVoIP(query: Record<string, any>) {
   return request({
-    url: '/neData/udm/voip/list',
+    url: '/nf/udm/voip/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -37,7 +37,7 @@ export function listUDMVoIP(query: Record<string, any>) {
  */
 export function getUDMVoIP(query: Record<string, any>) {
   return request({
-    url: `/neData/udm/voip`,
+    url: `/nf/udm/voip`,
     method: 'GET',
     params: query,
   });
@@ -50,7 +50,7 @@ export function getUDMVoIP(query: Record<string, any>) {
  */
 export function addUDMVoIP(data: Record<string, any>) {
   return request({
-    url: `/neData/udm/voip`,
+    url: `/nf/udm/voip`,
     method: 'POST',
     params: { num: data.num },
     data: data,
@@ -65,7 +65,7 @@ export function addUDMVoIP(data: Record<string, any>) {
  */
 export function delUDMVoIP(query: Record<string, any>) {
   return request({
-    url: `/neData/udm/voip`,
+    url: `/nf/udm/voip`,
     method: 'DELETE',
     params: query,
     timeout: 180_000,
@@ -79,7 +79,7 @@ export function delUDMVoIP(query: Record<string, any>) {
  */
 export function exportUDMVoIP(data: Record<string, any>) {
   return request({
-    url: '/neData/udm/voip/export',
+    url: '/nf/udm/voip/export',
     method: 'GET',
     params: data,
     responseType: 'blob',
@@ -94,7 +94,7 @@ export function exportUDMVoIP(data: Record<string, any>) {
  */
 export function importUDMVoIP(data: Record<string, any>) {
   return request({
-    url: `/neData/udm/voip/import`,
+    url: `/nf/udm/voip/import`,
     method: 'POST',
     data,
     timeout: 180_000,

src/api/neDataNf/udm_volte_ims.ts

@@ -8,7 +8,7 @@ import { request } from '@/plugins/http-fetch';
  */
 export function resetUDMVolteIMS(coreUid: string, neUid: string) {
   return request({
-    url: `/neData/udm/volte-ims/reset`,
+    url: `/nf/udm/volte-ims/reset`,
     method: 'PUT',
     params: { coreUid, neUid },
     timeout: 180_000,
@@ -22,7 +22,7 @@ export function resetUDMVolteIMS(coreUid: string, neUid: string) {
  */
 export function listUDMVolteIMS(query: Record<string, any>) {
   return request({
-    url: '/neData/udm/volte-ims/list',
+    url: '/nf/udm/volte-ims/list',
     method: 'GET',
     params: query,
     timeout: 60_000,
@@ -37,7 +37,7 @@ export function listUDMVolteIMS(query: Record<string, any>) {
  */
 export function getUDMVolteIMS(query: Record<string, any>) {
   return request({
-    url: `/neData/udm/volte-ims`,
+    url: `/nf/udm/volte-ims`,
     method: 'GET',
     params: query,
   });
@@ -50,7 +50,7 @@ export function getUDMVolteIMS(query: Record<string, any>) {
  */
 export function addUDMVolteIMS(data: Record<string, any>) {
   return request({
-    url: `/neData/udm/volte-ims`,
+    url: `/nf/udm/volte-ims`,
     method: 'POST',
     params: { num: data.num },
     data: data,
@@ -70,7 +70,7 @@ export function addUDMVolteIMS(data: Record<string, any>) {
  */
 export function delUDMVolteIMS(query: Record<string, any>) {
   return request({
-    url: `/neData/udm/volte-ims`,
+    url: `/nf/udm/volte-ims`,
     method: 'DELETE',
     params: query,
     timeout: 180_000,
@@ -84,7 +84,7 @@ export function delUDMVolteIMS(query: Record<string, any>) {
  */
 export function exportUDMVolteIMS(data: Record<string, any>) {
   return request({
-    url: '/neData/udm/volte-ims/export',
+    url: '/nf/udm/volte-ims/export',
     method: 'GET',
     params: data,
     responseType: 'blob',
@@ -99,7 +99,7 @@ export function exportUDMVolteIMS(data: Record<string, any>) {
  */
 export function importUDMVolteIMS(data: Record<string, any>) {
   return request({
-    url: `/neData/udm/volte-ims/import`,
+    url: `/nf/udm/volte-ims/import`,
     method: 'POST',
     data,
     timeout: 180_000,

src/api/perfManage/goldTarget.ts

@@ -1,35 +0,0 @@
-import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { request } from '@/plugins/http-fetch';
-import { parseObjLineToHump } from '@/utils/parse-utils';
-
-/**
- * 查询黄金指标数据
- * @param query 查询参数
- * @returns object
- */
-export async function listKPIData(query: Record<string, any>) {
-  const result = await request({
-    url: `/neData/kpi/data`,
-    method: 'GET',
-    params: query,
-    timeout: 60_000,
-  });
-
-  return result;
-}
-
-/**
- * 查询黄金指标数据kpi.id转换title
- * @param neType 网元类型
- * @returns object
- */
-export async function getKPITitle(neType: string) {
-  // 发起请求
-  const result = await request({
-    url: `/neData/kpi/title`,
-    method: 'GET',
-    params: { neType },
-  });
-  // 解析数据//
-  return result;
-}

src/i18n/locales/en-US.ts

@@ -2101,7 +2101,7 @@ export default {
         stepInstallDesc: "Installation of network element services to service terminals",
         stepInstallStepPrev: 'Confirm that you want to abandon the current change and return to the previous step?',
         stepInstallStepNext: 'Confirm that you want to proceed to the next step for network element license authorization?',
-        stepInstallText: 'Select Install',
+        stepInstallText: 'Install',
         stepInstallTip: 'Confirm the installation of the new version of the chosen Net Meta?',
         stepInstallModal: 'Network Element For Install',
         stepInstallNotNewVer: 'No new version found',
@@ -2109,9 +2109,9 @@ export default {
         stepInstallFail: 'Installation fails, check if the service terminal environment is available!',
         stepLicenseTitle: "Service License",
         stepLicenseDesc: "Obtaining a license activation code for authorization authentication",
-        stepLicenseReload: 'Select Refresh',
+        stepLicenseReload: 'Refresh',
         stepLicenseReloadTip: 'Confirm refreshing selected license information?',
-        stepLicenseDownCode: 'Select Download Activation Code',
+        stepLicenseDownCode: 'Download Activation Code',
         stepLicenseDownCodeTip: 'Confirmed to download the selected network element license activation code to a text file?',
         stepLicenseStepPrev: 'Confirm that you want to abandon the current change and return to the previous step?',
         stepLicenseStepNext: 'Confirmed to end the network element installation step?',

src/i18n/locales/zh-CN.ts

@@ -693,8 +693,8 @@ export default {
         reloadBatch: "刷新许可证状态",
         reloadBatchTip: "对当前列表网元进行许可证状态信息刷新吗？",
         updateTtile: "更新许可证",
-        downCodeTop: "确认要将许可激活码保存到文件吗？",
-        activationRequestCode: "许可激活码",
+        downCodeTop: "确认要将授权码保存到文件吗？",
+        activationRequestCode: "授权码",
         licensePath: "许可证文件",
         licensePathTip: "请上传许可证文件",
         upload: '上传',
@@ -792,7 +792,7 @@ export default {
         licenseEnd: '结束',
         licenseEndTip: "确认要结束安装吗？",
         licenseCheack: '等待网元验证',
-        licenseTip1: '1. 点击【许可证】可获取许可激活码，随后联系网元厂商进行激活',
+        licenseTip1: '1. 点击【许可证】可获取授权码，随后联系网元厂商进行激活',
         licenseTip2: '2. 点击【结束】将结束安装过程',
       },
     },
@@ -2101,18 +2101,18 @@ export default {
         stepInstallDesc: "将网元服务安装到服务终端",
         stepInstallStepPrev: '确认要放弃当前变更返回上一步吗？',
         stepInstallStepNext: '确认要下一步进行网元许可授权吗？',
-        stepInstallText: '选择安装',
+        stepInstallText: '安装',
         stepInstallTip: '确认安装选择的网元新版本吗？',
         stepInstallModal: '网元进行安装',
         stepInstallNotNewVer: '没有发现新版本',
         stepInstallDone: '安装完成，服务进入初始化',
         stepInstallFail: '安装失败，请检查服务终端环境是否可用！',
         stepLicenseTitle: "网元许可授权",
-        stepLicenseDesc: "获取网元许可激活码进行授权认证",
-        stepLicenseReload: '选择刷新许可证',
+        stepLicenseDesc: "获取网元授权码进行授权认证",
+        stepLicenseReload: '刷新',
         stepLicenseReloadTip: '确认刷新选择的许可证信息吗？',
-        stepLicenseDownCode: '选择下载网元许可激活码',
-        stepLicenseDownCodeTip: '确认下载选择的网元许可激活码到文本文件吗？',
+        stepLicenseDownCode: '下载授权码',
+        stepLicenseDownCodeTip: '确认下载选择的网元授权码到文本文件吗？',
         stepLicenseStepPrev: '确认要放弃当前变更返回上一步吗？',
         stepLicenseStepNext: '确认要结束网元安装步骤吗？',
         stepLicenseStepNext2: '请下载网元许可授权码文件保存，并联系网元厂商获取授权许可证',

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

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { onMounted, ref, watch } from 'vue';
-import { listKPIData } from '@/api/perfManage/goldTarget';
+import { listKPIData } from '@/api/neData/kpi';
 import * as echarts from 'echarts/core';
 import {
   TooltipComponent,

src/views/monitor/overview/index.vue

@@ -9,11 +9,11 @@ import NeResources from './components/NeResources/index.vue';
 import UserActivity from './components/UserActivity/index.vue';
 import AlarnTypeBar from './components/AlarnTypeBar/index.vue';
 import UPFFlow from './components/UPFFlow/index.vue';
-import { listUDMSub } from '@/api/neData/udm_sub';
-import { listIMSSessionNum } from '@/api/neData/ims';
-import { listAMFNblist } from '@/api/neData/amf';
-import { listMMENblist } from '@/api/neData/mme';
-import { listSMFSubNum } from '@/api/neData/smf';
+import { listUDMSub } from '@/api/neDataNf/udm_sub';
+import { listIMSSessionNum } from '@/api/neDataNf/ims';
+import { listAMFNblist } from '@/api/neDataNf/amf';
+import { listMMENblist } from '@/api/neDataNf/mme';
+import { listSMFSubNum } from '@/api/neDataNf/smf';
 import {
   graphNodeClickID,
   graphState,

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

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { onMounted, ref, watch } from 'vue';
-import { listKPIData } from '@/api/perfManage/goldTarget';
+import { listKPIData } from '@/api/neData/kpi';
 import * as echarts from 'echarts/core';
 import {
   TooltipComponent,

src/views/monitor/overview2/index.vue

@@ -10,12 +10,12 @@ import UserActivity from './components/UserActivity/index.vue';
 import IMSActivity from './components/IMSActivity/index.vue';
 import AlarnTypeBar from './components/AlarnTypeBar/index.vue';
 import UPFFlow from './components/UPFFlow/index.vue';
-import { listUDMSub } from '@/api/neData/udm_sub';
-import { listSMFSubNum } from '@/api/neData/smf';
-import { listIMSSessionNum } from '@/api/neData/ims';
+import { listUDMSub } from '@/api/neDataNf/udm_sub';
+import { listSMFSubNum } from '@/api/neDataNf/smf';
+import { listIMSSessionNum } from '@/api/neDataNf/ims';
 
-import { listAMFNblist } from '@/api/neData/amf';
-import { listMMENblist } from '@/api/neData/mme';
+import { listAMFNblist } from '@/api/neDataNf/amf';
+import { listMMENblist } from '@/api/neDataNf/mme';
 import { graphNodeClickID, graphState, notNeNodes } from './hooks/useTopology';
 import { upfNeUId, upfTotalFlow, upfTFActive } from './hooks/useUPFTotalFlow';
 import { useFullscreen } from '@vueuse/core';
@@ -25,8 +25,8 @@ 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 { listAMFNbStatelist } from '@/api/neData/amf';
-import { listMMENbStatelist } from '@/api/neData/mme';
+import { listAMFNbStatelist } from '@/api/neDataNf/amf';
+import { listMMENbStatelist } from '@/api/neDataNf/mme';
 import { eventNeUid } from './hooks/useUserActivity';
 import { currentCoreUid } from '@/hooks/useCoreUid';
 

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

@@ -13,7 +13,7 @@ import { parseDateToStr } from '@/utils/date-utils';
 import { ColumnsType } from 'ant-design-vue/es/table';
 const { t } = useI18n();
 const EditModal = defineAsyncComponent(
-  () => import('../../../ne/neSoftware/components/EditModal.vue')
+  () => import('@/views/ne/neSoftware/components/EditModal.vue')
 );
 
 /**表格字段列 */

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

@@ -7,7 +7,7 @@ import { codeNeLicense, stateNeLicense } from '@/api/ne/neLicense';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 const { t } = useI18n();
 const EditModal = defineAsyncComponent(
-  () => import('../../../ne/neLicense/components/EditModal.vue')
+  () => import('@/views/ne/neLicense/components/EditModal.vue')
 );
 
 /**对象信息信息状态类型 */

src/views/ne/neSoftware/components/UploadMoreFile.vue

@@ -194,7 +194,7 @@ function fnBeforeUploadFile(file: FileType) {
   }
   // 根据给定的软件名取版本号 amf-r2.2404.xx-ub22.deb
   let version = '';
-  const matches = fileName.match(/([0-9.]+[0-9x]+)/);
+  const matches = fileName.match(/([0-9.]+[0-9a-zA-Z]+)/);
   if (matches) {
     version = matches[0];
   } else {

src/views/ne/neVersion/index.vue

@@ -25,10 +25,10 @@ const { getDict } = useDictStore();
 
 // 异步加载组件
 const EditModal = defineAsyncComponent(
-  () => import('../neSoftware/components/EditModal.vue')
+  () => import('@/views/ne/neSoftware/components/EditModal.vue')
 );
 const UploadMoreFile = defineAsyncComponent(
-  () => import('../neSoftware/components/UploadMoreFile.vue')
+  () => import('@/views/ne/neSoftware/components/UploadMoreFile.vue')
 );
 
 /**字典数据-状态 */

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

@@ -12,7 +12,7 @@ import {
 } from '@/constants/result-constants';
 import useDictStore from '@/store/modules/dict';
 import useNeStore from '@/store/modules/ne';
-import { listAMFDataUE, delAMFDataUE, exportAMFDataUE } from '@/api/neData/amf';
+import { listAMFDataUE, delAMFDataUE, exportAMFDataUE } from '@/api/neDataNf/amf';
 import { parseDateToStr } from '@/utils/date-utils';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import dayjs, { Dayjs } from 'dayjs';

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

@@ -8,8 +8,8 @@ import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useNeStore from '@/store/modules/ne';
 import { useRoute } from 'vue-router';
-import { listAMFNblist } from '@/api/neData/amf';
-import { listMMENblist } from '@/api/neData/mme';
+import { listAMFNblist } from '@/api/neDataNf/amf';
+import { listMMENblist } from '@/api/neDataNf/mme';
 import { currentCoreUid } from '@/hooks/useCoreUid';
 const neStore = useNeStore();
 const route = useRoute();

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

@@ -20,13 +20,13 @@ import {
   delAMFNbState,
   editAMFNbState,
   listAMFNbStatelist,
-} from '@/api/neData/amf';
+} from '@/api/neDataNf/amf';
 import {
   addMMENbState,
   delMMENbState,
   editMMENbState,
   listMMENbStatelist,
-} from '@/api/neData/mme';
+} from '@/api/neDataNf/mme';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import saveAs from 'file-saver';
 import { readSheet, writeSheet } from '@/utils/execl-utils';

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { reactive, onMounted, ref, onBeforeUnmount, useTemplateRef } from 'vue';
 import { Graph, GraphData, Menu, Tooltip, Util } from '@antv/g6';
-import { listAMFNbStatelist } from '@/api/neData/amf';
+import { listAMFNbStatelist } from '@/api/neDataNf/amf';
 import { stateNeInfo } from '@/api/ne/neAction';
 import { parseBasePath } from '@/plugins/file-static-url';
 import { edgeLineAnimateState } from '@/views/monitor/topologyBuild/hooks/registerEdge';
@@ -11,7 +11,7 @@ import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { parseDateToStr } from '@/utils/date-utils';
 import { useFullscreen } from '@vueuse/core';
-import { listMMENbStatelist } from '@/api/neData/mme';
+import { listMMENbStatelist } from '@/api/neDataNf/mme';
 const { t } = useI18n();
 const neStore = useNeStore();
 

src/views/neData/cbc-cbe/index.vue

@@ -15,7 +15,7 @@ import {
   listCBC,
   updateCBCStatus,
   updateCBC,
-} from '@/api/neData/cbc';
+} from '@/api/neDataNf/cbc';
 import { parseDateToStr } from '@/utils/date-utils';
 const neStore = useNeStore();
 const { t } = useI18n();

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

@@ -16,7 +16,7 @@ import {
   delIMSDataCDR,
   exportIMSDataCDR,
   listIMSDataCDR,
-} from '@/api/neData/ims';
+} from '@/api/neDataNf/ims';
 import { parseDateToStr, parseDuration } from '@/utils/date-utils';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import saveAs from 'file-saver';

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

@@ -8,7 +8,7 @@ import { ColumnsType } from 'ant-design-vue/es/table';
 import useNeStore from '@/store/modules/ne';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { listIMSSessionList } from '@/api/neData/ims';
+import { listIMSSessionList } from '@/api/neDataNf/ims';
 import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const neStore = useNeStore();

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

@@ -13,7 +13,7 @@ import {
 } from '@/constants/result-constants';
 import useDictStore from '@/store/modules/dict';
 import useNeStore from '@/store/modules/ne';
-import { listMMEDataUE, delMMEDataUE, exportMMEDataUE } from '@/api/neData/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';

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

@@ -5,7 +5,7 @@ import { message } 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 { listN3IWFSubList } from '@/api/neData/n3iwf';
+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';

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

@@ -4,7 +4,7 @@ import { PageContainer } from 'antdv-pro-layout';
 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 { listNSSFAmfList } from '@/api/neData/nssf';
+import { listNSSFAmfList } from '@/api/neDataNf/nssf';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { currentCoreUid } from '@/hooks/useCoreUid';

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

@@ -4,7 +4,7 @@ import { PageContainer } from 'antdv-pro-layout';
 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 { listNSSFSubList } from '@/api/neData/nssf';
+import { listNSSFSubList } from '@/api/neDataNf/nssf';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { currentCoreUid } from '@/hooks/useCoreUid';

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

@@ -15,7 +15,7 @@ import {
   exportPCFRule,
   importPCFRule,
   listPCFRule,
-} from '@/api/neData/pcf';
+} from '@/api/neDataNf/pcf';
 import { getPCFRule } from '@/api/ne/neConfig';
 import { uploadFileToNE } from '@/api/tool/file';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';

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

@@ -15,7 +15,7 @@ import {
   delSGWCDataCDR,
   exportSGWCDataCDR,
   listSGWCDataCDR,
-} from '@/api/neData/sgwc';
+} from '@/api/neDataNf/sgwc';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import dayjs, { type Dayjs } from 'dayjs';
 import PQueue from 'p-queue';

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

@@ -28,7 +28,7 @@ import { reactive, onMounted, toRaw, onBeforeUnmount, ref } from 'vue';
 import { PageContainer } from 'antdv-pro-layout';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import useI18n from '@/hooks/useI18n';
-import { listSMFDataCDR } from '@/api/neData/smf';
+import { listSMFDataCDR } from '@/api/neDataNf/smf';
 import {
   RESULT_CODE_ERROR,
   RESULT_CODE_SUCCESS,

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

@@ -15,7 +15,7 @@ import {
   delSMFDataCDR,
   exportSMFDataCDR,
   listSMFDataCDR,
-} from '@/api/neData/smf';
+} from '@/api/neDataNf/smf';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import PQueue from 'p-queue';
 import saveAs from 'file-saver';

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

@@ -6,7 +6,7 @@ import { message } 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 { listSMFSubList } from '@/api/neData/smf';
+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';

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

@@ -16,7 +16,7 @@ import {
   delSMSCDataCDR,
   exportSMSCDataCDR,
   listSMSCDataCDR,
-} from '@/api/neData/smsc';
+} from '@/api/neDataNf/smsc';
 import { parseDateToStr } from '@/utils/date-utils';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import saveAs from 'file-saver';

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

@@ -21,7 +21,7 @@ import {
   importUDMAuth,
   resetUDMAuth,
   listUDMAuth,
-} from '@/api/neData/udm_auth';
+} from '@/api/neDataNf/udm_auth';
 import { uploadFile } from '@/api/tool/file';
 import { getNeViewFile } from '@/api/tool/neFile';
 import { currentCoreUid } from '@/hooks/useCoreUid';

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

@@ -21,7 +21,7 @@ import {
   listUDMSub,
   resetUDMSub,
   updateUDMSub,
-} from '@/api/neData/udm_sub';
+} from '@/api/neDataNf/udm_sub';
 import { uploadFile } from '@/api/tool/file';
 import { getNeViewFile } from '@/api/tool/neFile';
 import { currentCoreUid } from '@/hooks/useCoreUid';

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

@@ -19,7 +19,7 @@ import {
   importUDMVoIP,
   listUDMVoIP,
   resetUDMVoIP,
-} from '@/api/neData/udm_voip';
+} from '@/api/neDataNf/udm_voip';
 import useNeStore from '@/store/modules/ne';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';

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

@@ -25,7 +25,7 @@ import {
   importUDMVolteIMS,
   listUDMVolteIMS,
   resetUDMVolteIMS,
-} from '@/api/neData/udm_volte_ims';
+} from '@/api/neDataNf/udm_volte_ims';
 import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const neStore = useNeStore();

src/views/perfManage/kpi-title/index.vue

@@ -15,7 +15,7 @@ import {
   delKPITitle,
   listKPITitle,
   updateKPITitle,
-} from '@/api/perfManage/kpi-title';
+} from '@/api/neData/kpi-title';
 const { t } = useI18n();
 const { getDict } = useDictStore();
 const neStore = useNeStore();

src/views/perfManage/kpi/index.vue

@@ -33,7 +33,8 @@ import {
 } from '@/constants/result-constants';
 import useNeStore from '@/store/modules/ne';
 import useI18n from '@/hooks/useI18n';
-import { getKPITitle, listKPIData } from '@/api/perfManage/goldTarget';
+import { listKPIData } from '@/api/neData/kpi';
+import { getKPITitle } from '@/api/neData/kpi-title';
 import { parseDateToStr } from '@/utils/date-utils';
 import { writeSheet } from '@/utils/execl-utils';
 import saveAs from 'file-saver';

src/views/perfManage/kpiKeyTarget/index.vue

@@ -16,7 +16,8 @@ import {
   RESULT_CODE_SUCCESS,
 } from '@/constants/result-constants';
 import { SizeType } from 'ant-design-vue/es/config-provider';
-import { listKPIData, getKPITitle } from '@/api/perfManage/goldTarget';
+import { listKPIData } from '@/api/neData/kpi';
+import { getKPITitle } from '@/api/neData/kpi-title';
 import useI18n from '@/hooks/useI18n';
 import { parseDateToStr } from '@/utils/date-utils';
 import dayjs from 'dayjs';
@@ -587,8 +588,8 @@ function fnRealTimeSwitch(bool: boolean) {
 
     let subGroupIDArr: string[] = [];
     selectedNeTypes.value.forEach(type => {
-       const ne = neTypeOptions.find((v: any) => v.value === type);
-      subGroupIDArr.push(`${WS_GROUP_KPI}_${ne.coreUid}_${ne.neUid}`); 
+      const ne = neTypeOptions.find((v: any) => v.value === type);
+      subGroupIDArr.push(`${WS_GROUP_KPI}_${ne.coreUid}_${ne.neUid}`);
     });
     const options: OptionsType = {
       url: '/ws',

src/views/perfManage/kpiOverView/index.vue

@@ -9,7 +9,8 @@ import {
 } from 'echarts/components';
 import { LineChart } from 'echarts/charts';
 import { CanvasRenderer } from 'echarts/renderers';
-import { getKPITitle, listKPIData } from '@/api/perfManage/goldTarget';
+import { listKPIData } from '@/api/neData/kpi';
+import { getKPITitle } from '@/api/neData/kpi-title';
 import useI18n from '@/hooks/useI18n';
 import { message } from 'ant-design-vue';
 import {

src/views/perfManage/kpic-title/index.vue

@@ -10,12 +10,12 @@ import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useI18n from '@/hooks/useI18n';
 import useNeStore from '@/store/modules/ne';
 import {
-  addCustom,
-  delCustom,
-  listCustom,
-  updateCustom,
-} from '@/api/perfManage/customTarget';
-import { getKPITitle } from '@/api/perfManage/goldTarget';
+  addKPICTitle,
+  delKPICTitle,
+  listKPICTitle,
+  updateKPICTitle,
+} from '@/api/neData/kpic-title'; 
+import { getKPITitle } from '@/api/neData/kpi-title';
 import useDictStore from '@/store/modules/dict';
 const { t, currentLocale } = useI18n();
 const { getDict } = useDictStore();
@@ -171,7 +171,7 @@ function fnRecordDelete(row: Record<string, any>) {
     onOk() {
       const key = 'delThreshold';
       message.loading({ content: t('common.loading'), key });
-      delCustom(row).then(res => {
+      delKPICTitle(row).then(res => {
         if (res.code === RESULT_CODE_SUCCESS) {
           message.success({
             content: t('views.perfManage.customTarget.delCustom', {
@@ -200,7 +200,7 @@ function fnGetList(pageNum?: number) {
   if (pageNum) {
     queryParams.pageNum = pageNum;
   }
-  listCustom(toRaw(queryParams)).then(res => {
+  listKPICTitle(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       // 取消勾选
       if (tableState.selectedRowKeys.length > 0) {
@@ -404,7 +404,7 @@ function fnModalOk() {
       from.expression = result;
       //return false;
       modalState.confirmLoading = true;
-      const perfTask = from.id ? updateCustom(from) : addCustom(from);
+      const perfTask = from.id ? updateKPICTitle(from) : addKPICTitle(from);
       const hide = message.loading(t('common.loading'), 0);
       perfTask
         .then(res => {

src/views/perfManage/kpic/index.vue

@@ -36,8 +36,8 @@ import {
 } from '@/constants/result-constants';
 import useNeStore from '@/store/modules/ne';
 import useI18n from '@/hooks/useI18n';
-import { listCustom } from '@/api/perfManage/customTarget';
-import { listCustomData } from '@/api/perfManage/customData';
+import { listKPICTitle } from '@/api/neData/kpic-title';
+import { listKPICData } from '@/api/neData/kpic';
 import { parseDateToStr } from '@/utils/date-utils';
 import { writeSheet } from '@/utils/execl-utils';
 import saveAs from 'file-saver';
@@ -354,7 +354,7 @@ function fnGetListTitle() {
   if (!state.neType[0]) return false;
 
   // 获取表头文字
-  listCustom({ neType: state.neType[0], status: '1', pageNum: 1, pageSize: 50 })
+  listKPICTitle({ neType: state.neType[0], status: '1', pageNum: 1, pageSize: 50 })
     .then(res => {
       if (res.code === RESULT_CODE_SUCCESS) {
         if (res.data.rows.length === 0) {
@@ -436,7 +436,7 @@ function fnGetList() {
   queryParams.neUid = state.neType[1];
   queryParams.beginTime = queryRangePicker.value[0];
   queryParams.endTime = queryRangePicker.value[1];
-  listCustomData(toRaw(queryParams))
+  listKPICData(toRaw(queryParams))
     .then(res => {
       tableState.loading = false;
       if (res.code === RESULT_CODE_SUCCESS) {
@@ -948,7 +948,7 @@ watch(
 onMounted(() => {
   // 目前支持的 AMF AUSF MME MOCNGW NSSF SMF UDM UPF PCF
   // 获取网元网元列表
-  listCustom({ status: '1', pageNum: 1, pageSize: 200 }).then((res: any) => {
+  listKPICTitle({ status: '1', pageNum: 1, pageSize: 200 }).then((res: any) => {
     if (res.code === RESULT_CODE_SUCCESS) {
       if (!res.data.rows.length) {
         message.warning({

src/views/perfManage/overview-ims/index.vue

@@ -147,7 +147,7 @@ import { GridComponent } from 'echarts/components'
 import { CanvasRenderer } from 'echarts/renderers'
 import useNeStore from '@/store/modules/ne';
 import { WS } from '@/plugins/ws-websocket'
-import { listKPIData } from '@/api/perfManage/goldTarget'
+import { listKPIData } from '@/api/neData/kpi'
 import useI18n from '@/hooks/useI18n';
 import { WS_GROUP_KPI } from '@/constants/ne-constants'
 import { currentCoreUid } from '@/hooks/useCoreUid'

src/views/system/quick-start/components/NeInfoConfig.vue

@@ -73,12 +73,12 @@ let modalState: ModalStateType = reactive({
   from: {
     id: undefined,
     neType: '',
-    neId: '',
+    neUid: '',
+    coreUid: currentCoreUid(),
     neName: '',
-    ip: '',
+    ipAddr: '',
     port: 33030,
     pvFlag: 'PNF',
-    coreUid: currentCoreUid(),
     macAddr: '',
     dn: '-',
     vendorName: '-',
@@ -108,13 +108,13 @@ let tableColumns: any = [
   },
   {
     title: t('views.ne.common.neUid'),
-    dataIndex: 'neId',
+    dataIndex: 'neUid',
     align: 'left',
     width: 150,
   },
   {
     title: t('views.ne.common.ipAddr'),
-    dataIndex: 'ip',
+    dataIndex: 'ipAddr',
     align: 'left',
     width: 150,
   },
@@ -228,20 +228,19 @@ function fnNeTypeChange(v: any, data: any) {
 }
 
 //打开新增或修改界面
-function fnModalVisibleByEdit(record?: any) {
+function fnModalVisibleByEdit(record?: Record<string, any>) {
   if (!record) {
     //modalStateFrom.resetFields();
     modalState.title = t('views.ne.neInfo.addTitle');
-    const neId = `${new Date().getMilliseconds()}`.padStart(3, '0');
     modalState.from = {
       id: undefined,
-      neId: neId,
+      coreUid: currentCoreUid(),
+      neUid: '',
       neType: '',
-      neName: `New_${neId}`,
-      ip: '',
+      neName: '',
+      ipAddr: '',
       port: 33030,
       pvFlag: 'PNF',
-      rmUid: `4400HXNew${neId}`,
       macAddr: '',
       dn: '-',
       vendorName: '-',
@@ -301,8 +300,6 @@ function fnModalVisibleByEdit(record?: any) {
 function fnModalOk() {
   modalState.confirmLoading = true;
   const from = toRaw(modalState.from);
-  from.rmUid = `4400HX${from.neType}${from.neId}`; // 4400HX1AMF001
-  from.neName = `${from.neType}_${from.neId}`; // AMF_001
   const result = from.id ? updateNeInfo(from) : addNeInfo(from);
   const hide = message.loading(t('common.loading'), 0);
   result
@@ -330,14 +327,18 @@ function fnModalOk() {
  * 删除网元
  * @param data 当前选项的data
  */
-function fnDelete(data: any) {
+function fnDelete(row: Record<string, any>) {
   Modal.confirm({
     title: t('common.tipTitle'),
-    content: `${data.neName} ${t('views.ne.neInfo.delTip')}`,
+    content: `${row.neName} ${t('views.ne.neInfo.delTip')}`,
     onOk() {
       tableState.loading = true;
       const hide = message.loading(t('common.loading'), 0);
-      delNeInfo(data.id)
+      delNeInfo({
+        coreUid: row.coreUid,
+        neUid: row.neUid,
+        id: row.id,
+      })
         .then(res => {
           if (res.code === RESULT_CODE_SUCCESS) {
             message.success(t('common.operateOk'), 3);
@@ -486,7 +487,7 @@ function fnGetList() {
     if (res.code === RESULT_CODE_SUCCESS) {
       tabState.panes = [];
       res.data.forEach((item: any, index: any) => {
-        if (item.neType === 'OMC' || !Array.isArray(item.hosts)) return;
+        if (!Array.isArray(item.hosts)) return;
         item.key = index + 1;
         tabState.panes.push(item);
       });
@@ -665,27 +666,19 @@ onMounted(() => {
 
         <a-col :lg="12" :md="12" :xs="24">
           <a-form-item
-            :label="t('views.ne.common.neUid')"
-            name="neId"
+            :label="t('views.ne.common.neName')"
+            name="neName"
             :rules="{
               required: true,
-              message: t('views.ne.common.neUidPlease'),
+              message: t('views.ne.common.neNamePlease'),
             }"
           >
             <a-input
-              v-model:value="modalState.from.neId"
+              v-model:value="modalState.from.neName"
               allow-clear
               :placeholder="t('views.ne.common.neUidPlease')"
               :maxlength="24"
             >
-              <template #prefix>
-                <a-tooltip placement="topLeft">
-                  <template #title>
-                    {{ t('views.ne.common.neUidTip') }}
-                  </template>
-                  <InfoCircleOutlined style="opacity: 0.45; color: inherit" />
-                </a-tooltip>
-              </template>
             </a-input>
           </a-form-item>
         </a-col>
@@ -695,7 +688,7 @@ onMounted(() => {
         <a-col :lg="12" :md="12" :xs="24">
           <a-form-item
             :label="t('views.ne.common.ipAddr')"
-            name="ip"
+            name="ipAddr"
             :rules="[
               {
                 required: true,
@@ -706,7 +699,7 @@ onMounted(() => {
             ]"
           >
             <a-input
-              v-model:value="modalState.from.ip"
+              v-model:value="modalState.from.ipAddr"
               allow-clear
               :placeholder="t('views.ne.common.ipAddrPlease')"
               :maxlength="128"

src/views/system/quick-start/components/NeInfoConfigPara5G.vue

@@ -3,10 +3,11 @@ import { Modal, message } from 'ant-design-vue/es';
 import { onMounted, reactive, toRaw } from 'vue';
 import { fnToStepName } from '../hooks/useStep';
 import useI18n from '@/hooks/useI18n';
-import { listNeInfo, updateNeInfo } from '@/api/ne/neInfo';
+import { listAllNeInfo,  updateNeInfo } from '@/api/ne/neInfo';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import Para5GForm from '@/views/ne/neQuickSetup/components/Para5GForm.vue';
 import { getPara5GFilee, savePara5GFile } from '@/api/ne/neAction';
+import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 
 /**对象信息信息状态类型 */
@@ -50,7 +51,6 @@ function fnSave() {
   if (state.confirmLoading) return;
   state.confirmLoading = true;
   savePara5GFile({
-    fileType: 'yaml',
     content: toRaw(state.from),
     syncNe: [],
   })
@@ -75,9 +75,9 @@ function fnGetList() {
   state.loading = true;
   Promise.all([
     getPara5GFilee(),
-    listNeInfo({
-      pageNum: 1,
-      pageSize: 100,
+    listAllNeInfo({
+      coreUid: currentCoreUid(),
+      bandStatus: false,
     }),
   ]).then(resArr => {
     // 已保存的配置
@@ -86,63 +86,63 @@ function fnGetList() {
     }
     // 填充固定网元类型的ip
     if (resArr[1].code === RESULT_CODE_SUCCESS) {
-      const { rows } = resArr[1].data;
-      for (const item of rows) {
+      for (const item of resArr[1].data) {
+        const ipAddr = item.ipAddr;
         switch (item.neType) {
           case 'OMC':
-            state.from.sbi.omc_ip = item.ip;
+            state.from.sbi.omc_ip = ipAddr;
             Object.assign(state.omcInfo, item);
             break;
           case 'IMS':
-            state.from.sbi.ims_ip = item.ip;
-            // state.from.external.ims_sip_ip = item.ip;
+            state.from.sbi.ims_ip = ipAddr;
+            // state.from.external.ims_sip_ip = ipAddr;
             state.hasNE.ims = true;
             break;
           case 'AMF':
-            state.from.sbi.amf_ip = item.ip;
+            state.from.sbi.amf_ip = ipAddr;
             state.hasNE.amf = true;
             break;
           case 'AUSF':
-            state.from.sbi.ausf_ip = item.ip;
+            state.from.sbi.ausf_ip = ipAddr;
             break;
           case 'UDM':
-            state.from.sbi.udm_ip = item.ip;
+            state.from.sbi.udm_ip = ipAddr;
             state.from.sbi.db_ip = '0.0.0.0';
             break;
           case 'SMF':
-            state.from.sbi.smf_ip = item.ip;
+            state.from.sbi.smf_ip = ipAddr;
             break;
           case 'PCF':
-            state.from.sbi.pcf_ip = item.ip;
+            state.from.sbi.pcf_ip = ipAddr;
             break;
           case 'NSSF':
-            state.from.sbi.nssf_ip = item.ip;
+            state.from.sbi.nssf_ip = ipAddr;
             break;
           case 'NRF':
-            state.from.sbi.nrf_ip = item.ip;
+            state.from.sbi.nrf_ip = ipAddr;
             break;
           case 'UPF':
-            state.from.sbi.upf_ip = item.ip;
+            state.from.sbi.upf_ip = ipAddr;
             state.hasNE.upf = true;
             break;
           case 'LMF':
-            state.from.sbi.lmf_ip = item.ip;
+            state.from.sbi.lmf_ip = ipAddr;
             break;
           case 'NEF':
-            state.from.sbi.nef_ip = item.ip;
+            state.from.sbi.nef_ip = ipAddr;
             break;
           case 'MME':
-            state.from.sbi.mme_ip = item.ip;
-            if (item.ip.includes('.')) {
-              state.from.external.mmes11_ip = item.ip + '/24';
+            state.from.sbi.mme_ip = ipAddr;
+            if (ipAddr.includes('.')) {
+              state.from.external.mmes11_ip = ipAddr + '/24';
             }
             state.hasNE.mme = true;
             break;
           case 'N3IWF':
-            state.from.sbi.n3iwf_ip = item.ip;
+            state.from.sbi.n3iwf_ip = ipAddr;
             break;
           case 'SMSC':
-            state.from.sbi.smsc_ip = item.ip;
+            state.from.sbi.smsc_ip = ipAddr;
             break;
         }
       }

src/views/system/quick-start/components/NeInfoSoftwareInstall.vue

@@ -8,11 +8,12 @@ import useDictStore from '@/store/modules/dict';
 import { listNeVersion, operateNeVersion } from '@/api/ne/neVersion';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { NE_TYPE_LIST } from '@/constants/ne-constants';
+import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const { getDict } = useDictStore();
 
 const UploadMoreFile = defineAsyncComponent(
-  () => import('../../../ne/neSoftware/components/UploadMoreFile.vue')
+  () => import('@/views/ne/neSoftware/components/UploadMoreFile.vue')
 );
 
 /**字典数据-状态 */
@@ -28,7 +29,7 @@ let tableColumns = ref<TableColumnsType>([
   },
   {
     title: t('views.ne.common.neUid'),
-    dataIndex: 'neId',
+    dataIndex: 'neUid',
     align: 'left',
     width: 100,
   },
@@ -152,8 +153,9 @@ async function fnRecordInstall() {
   for (const row of selectRows) {
     if (row.newVersion === '-' || row.newVersion === '') {
       state.operateDataUpgrade.push({
+        coreUid: row.coreUid,
         neType: row.neType,
-        neId: row.neId,
+        neUid: row.neUid,
         status: 'fail',
         log: t('views.system.quickStart.stepInstallNotNewVer'),
       });
@@ -165,8 +167,9 @@ async function fnRecordInstall() {
       preinput = { pisCSCF: 'y', updateMFetc: 'No', updateMFshare: 'No' };
     }
     const installData = {
+      coreUid: row.coreUid,
       neType: row.neType,
-      neId: row.neId,
+      neUid: row.neUid,
       action: 'install',
       preinput: preinput,
     };
@@ -174,8 +177,9 @@ async function fnRecordInstall() {
     try {
       const res = await operateNeVersion(installData);
       const operateData = {
+        coreUid: row.coreUid,
         neType: row.neType,
-        neId: row.neId,
+        neUid: row.neUid,
         status: 'fail',
         log: t('common.operateErr'),
       };
@@ -200,11 +204,10 @@ async function fnRecordInstall() {
 function fnGetList() {
   state.loading = true;
   listNeVersion({
-    neType: undefined,
-    neId: '',
-    version: '',
+    coreUid: currentCoreUid(),
+    checkVersion: false,
     pageNum: 1,
-    pageSize: 20,
+    pageSize: 50,
   }).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       // 取消勾选
@@ -283,10 +286,6 @@ onMounted(() => {
 
     <div class="ne-oper">
       <a-space direction="horizontal" :size="18">
-        <a-button @click="fnStepPrev()">
-          {{ t('views.system.quickStart.stepPrev') }}
-        </a-button>
-
         <a-button
           type="dashed"
           :disabled="state.selectedRowKeys.length > 1"
@@ -308,6 +307,10 @@ onMounted(() => {
           {{ t('views.system.quickStart.stepInstallText') }}
         </a-button>
 
+        <a-button @click="fnStepPrev()">
+          {{ t('views.system.quickStart.stepPrev') }}
+        </a-button>
+
         <a-button type="primary" @click="fnStepNext('NeInfoSoftwareLicense')">
           {{ t('views.system.quickStart.stepNext') }}
         </a-button>
@@ -360,9 +363,9 @@ onMounted(() => {
       </a-alert>
     </p>
 
-    <p v-for="o in state.operateDataUpgrade" :key="o.neId">
+    <p v-for="o in state.operateDataUpgrade" :key="o.neUid">
       <a-alert
-        :message="`${o.neType}-${o.neId}`"
+        :message="`${o.neType}-${o.neUid}`"
         :description="o.log"
         :type="o.status === 'done' ? 'success' : 'error'"
         show-icon

src/views/system/quick-start/components/NeInfoSoftwareLicense.vue

@@ -11,10 +11,11 @@ import {
   stateNeLicense,
 } from '@/api/ne/neLicense';
 import saveAs from 'file-saver';
+import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const { getDict } = useDictStore();
 const UploadLicenseFile = defineAsyncComponent(
-  () => import('../../../ne/neLicense/components/UploadLicenseFile.vue')
+  () => import('@/views/ne/neLicense/components/UploadLicenseFile.vue')
 );
 
 /**字典数据-状态 */
@@ -30,7 +31,7 @@ let tableColumns = ref<TableColumnsType>([
   },
   {
     title: t('views.ne.common.neUid'),
-    dataIndex: 'neId',
+    dataIndex: 'neUid',
     align: 'left',
     width: 100,
   },
@@ -163,11 +164,13 @@ function fnRecordCode() {
         if (row.neType.toUpperCase() === 'OMC') {
           continue;
         }
-        const res = await codeNeLicense(row.neType, row.neId);
+        const res = await codeNeLicense(row.coreUid, row.neUid);
         if (res.code === RESULT_CODE_SUCCESS) {
           const activationRequestCode = res.data;
           row.activationRequestCode = activationRequestCode;
-          codeArr.push(`[${row.neType} ${row.neId}]: ${activationRequestCode}`);
+          codeArr.push(
+            `[${row.neType} ${row.neUid}]: ${activationRequestCode}`
+          );
         }
       }
 
@@ -188,11 +191,9 @@ function fnRecordCode() {
 function fnGetList() {
   state.loading = true;
   listNeLicense({
-    neType: undefined,
-    neId: '',
-    version: '',
+    coreUid: currentCoreUid(),
     pageNum: 1,
-    pageSize: 20,
+    pageSize: 50,
   }).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       // 取消勾选
@@ -286,19 +287,6 @@ onMounted(() => {
 
     <div class="ne-oper">
       <a-space direction="horizontal" :size="18">
-        <a-button @click="fnStepPrev()">
-          {{ t('views.system.quickStart.stepPrev') }}
-        </a-button>
-
-        <a-button
-          type="dashed"
-          :disabled="state.selectedRowKeys.length < 1"
-          @click.prevent="fnModalOpen"
-        >
-          <template #icon><UploadOutlined /></template>
-          {{ t('views.ne.neLicense.uploadFile') }}
-        </a-button>
-
         <a-button
           type="primary"
           ghost
@@ -321,6 +309,19 @@ onMounted(() => {
           {{ t('views.system.quickStart.stepLicenseDownCode') }}
         </a-button>
 
+        <a-button
+          type="dashed"
+          :disabled="state.selectedRowKeys.length <= 0"
+          @click.prevent="fnModalOpen"
+        >
+          <template #icon><UploadOutlined /></template>
+          {{ t('views.ne.neLicense.uploadFile') }}
+        </a-button>
+
+        <a-button @click="fnStepPrev()">
+          {{ t('views.system.quickStart.stepPrev') }}
+        </a-button>
+
         <a-button type="primary" @click="fnStepNext('Done')">
           {{ t('views.system.quickStart.stepLicenseEnd') }}
         </a-button>

src/views/system/quick-start/hooks/useStep.ts

@@ -31,7 +31,7 @@ export const stepState: StepStateType = reactive({
     },
     {
       title: '网元许可授权',
-      description: '获取网元许可激活码进行授权认证',
+      description: '获取网元授权码进行授权认证',
     },
   ],
   neStepsCurrent: -1,