diff --git a/src/api/trace/analysis.ts b/src/api/trace/analysis.ts deleted file mode 100644 index 1a4ccf11..00000000 --- a/src/api/trace/analysis.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { request } from '@/plugins/http-fetch'; - -/** - * 跟踪任务数据列表 - * @param query 查询参数 - * @returns object - */ -export async function listTraceData(query: Record) { - return request({ - url: '/trace/task/list', - method: 'GET', - params: query, - }); -} - -/** - * 信令数据解析HTML - * @param id 任务ID - * @returns - */ -export function getTraceRawInfo(id: Record) { - return request({ - url: `/api/rest/traceManagement/v1/decMessage/${id}`, - method: 'GET', - responseType: 'text', - }); -} diff --git a/src/api/trace/task.ts b/src/api/trace/task.ts index d30473e1..629b71ba 100644 --- a/src/api/trace/task.ts +++ b/src/api/trace/task.ts @@ -76,29 +76,31 @@ export function filePullTask(traceId: string) { method: 'GET', params: { traceId }, responseType: 'blob', - timeout: 60_000, + timeout: 180_000, }); } /** - * 获取网元跟踪接口列表 + * 跟踪任务数据列表 + * @param query 查询参数 * @returns object */ -export async function getNeTraceInterfaceAll() { - // 发起请求 - const result = await request({ - url: `/api/rest/databaseManagement/v1/elementType/omc_db/objectType/ne_info`, +export async function listTraceData(query: Record) { + return request({ + url: '/trace/data/list', + method: 'GET', + params: query, + }); +} + +/** + * 查询跟踪任务数据信息 + * @param id ID + * @returns object + */ +export async function getTraceData(id: string | number) { + return request({ + url: `/trace/data/${id}`, method: 'GET', - params: { - SQL: `SELECT ne_type,interface FROM trace_info GROUP BY ne_type,interface`, - }, }); - // 解析数据 - if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { - let data = result.data.data[0]; - return Object.assign(result, { - data: parseObjLineToHump(data['trace_info']), - }); - } - return result; } diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 6d2257f6..73f9aecb 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -16,7 +16,6 @@ export default { errorFields: 'Please fill in the required information in {num} correctly!', tablePaginationTotal: 'Total {total} items', noData: "No Data", - zebra:'Tabular zebra pattern', ok: 'Ok', cancel: 'Cancel', close: 'Close', @@ -1010,25 +1009,6 @@ export default { }, }, traceManage: { - analysis: { - imsi: 'IMSI', - imsiPlease: 'Please enter IMSI', - msisdn: 'MSISDN', - msisdnPlease: 'Please enter MSISDN', - trackTaskId: 'Task ID', - srcIp: 'Source IP Address', - dstIp: 'Destination IP Address', - signalType: 'Signaling Type', - msgDirect: 'Message Direction', - msgType: 'Message Type', - rowTime: 'Record Time', - signalData: 'Signaling Data', - signalDetail: 'Signaling Details', - noData: 'No information content', - taskTitle: 'Task {num}', - taskDownText: 'Download HTML', - taskDownTip: 'Confirm downloading the signaling details HTML file?', - }, pcap: { capArgPlease: 'Please enter tcpdump -i any support parameter', cmd: 'Command', @@ -1079,30 +1059,35 @@ export default { imsiTip: 'Mobile communication IMSI number', srcIp: 'Source IP Address', srcIpPlease: 'Please enter the IP address', - srcIpTip: 'Current sender IPv4 address', + srcIpTip: 'sending IPv4 address', dstIp: 'Destination IP Address', dstIpPlease: 'Please enter the IP address', - dstIpTip: 'IPv4 address of the receiving end of the other party', + dstIpTip: 'receiving end IPv4 address', interfaces: 'Signaling Interface', interfacesPlease: 'Please enter the signaling interface', - signalPort: 'Signal Port', - signalPortPlease: 'Please enter the signaling port', - signalPortTip: 'Port of the side corresponding to the destination IP address or source IP address', - rangePicker: 'Start/End Time', + rangePicker: 'Task Time', rangePickerPlease: 'Please select the start and end time of the task', remark: 'Remark', remarkPlease: 'Task description can be entered', addTask: 'Add Task', - editTask: 'Modify Task', viewTask: 'View Task', errorTaskInfo: 'Failed to obtain task information', delTaskTip: 'Are you sure to delete the data item with record ID {id} ?', stopTask: 'Successful cessation of tasks {id}', stopTaskTip: 'Confirm stopping the task with record ID {id} ?', - pcapView: "Tracking Data Analysis", - traceFile: "Tracking File", + pcapView: "Track Data Analysis", + traceFile: "Track File", errMsg: "Error Message", imsiORmsisdn: "imsi or msisdn is null, cannot start task", + dataView: "Track Data", + protocolOrInterface: "Protocol/Interface", + msgNe: 'Network Element', + msgEvent: 'Event', + msgType: 'Type', + msgDirect: 'Direction', + msgLen: 'Length', + rowTime: 'Time', + taskInfo: 'Task information', }, }, faultManage: { diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 37d5808e..1ff6ecb5 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -16,7 +16,6 @@ export default { errorFields: '请正确填写 {num} 处必填信息！', tablePaginationTotal: '总共 {total} 条', noData: "暂无数据", - zebra:'表格斑马纹', ok: '确定', cancel: '取消', close: '关闭', @@ -1010,25 +1009,6 @@ export default { }, }, traceManage: { - analysis: { - imsi: 'IMSI', - imsiPlease: '请输入IMSI', - msisdn: 'MSISDN', - msisdnPlease: '请输入MSISDN', - trackTaskId: '跟踪任务标记', - srcIp: '源IP地址', - dstIp: '目标IP地址', - signalType: '信令类型', - msgDirect: '消息元', - msgType: '消息类型', - rowTime: '记录时间', - signalData: '信令数据', - signalDetail: '信令详情', - noData: '无信息内容', - taskTitle: '任务 {num}', - taskDownText: '下载HTML', - taskDownTip: '确认下载信令详情HTML文件?', - }, pcap: { capArgPlease: '请输入tcpdump -i any支持参数', cmd: '命令', @@ -1079,21 +1059,17 @@ export default { imsiTip: '移动通信IMSI编号', srcIp: '源IP地址', srcIpPlease: '请输入源IP地址', - srcIpTip: '当前发送端IPv4地址', + srcIpTip: '发送端IPv4地址', dstIp: '目标IP地址', dstIpPlease: '请输入目标IP地址', - dstIpTip: '对方接收端IPv4地址', + dstIpTip: '接收端IPv4地址', interfaces: '信令接口', interfacesPlease: '请输入信令接口', - signalPort: '信令端口', - signalPortPlease: '请输入信令端口', - signalPortTip: '目标IP地址或源IP地址对应一方的端口', - rangePicker: '开始结束时间', + rangePicker: '任务时间', rangePickerPlease: '请选择任务时间开始结束时间', remark: '说明', remarkPlease: '可输入任务说明', addTask: '添加任务', - editTask: '修改任务', viewTask: '查看任务', errorTaskInfo: '获取任务信息失败', delTaskTip: '确认删除记录编号为 {id} 的数据项?', @@ -1103,6 +1079,15 @@ export default { traceFile: "跟踪文件", errMsg: "错误信息", imsiORmsisdn: "imsi 或 msisdn 是空值，不能开始任务", + dataView: "跟踪数据", + protocolOrInterface: "协议/接口", + msgNe: '消息网元', + msgEvent: '消息事件', + msgType: '消息类型', + msgDirect: '消息方向', + msgLen: '消息长度', + rowTime: '消息时间', + taskInfo: '任务信息', }, }, faultManage: { diff --git a/src/views/traceManage/task/analyze.vue b/src/views/traceManage/task/analyze.vue index 1cee75c4..16aae17c 100644 --- a/src/views/traceManage/task/analyze.vue +++ b/src/views/traceManage/task/analyze.vue @@ -1,35 +1,32 @@ @@ -154,8 +567,9 @@ onBeforeUnmount(() => { :loading="!state.initialized" :body-style="{ padding: '12px' }" > -
- + + -
- - {{ state.currentFilter }} - - Matched Frame: {{ state.totalFrames }} -
- - - - - - -
- - - - - - - - Filter - - - + + - - - + + + + + @@ -268,15 +658,15 @@ onBeforeUnmount(() => { @@ -289,24 +679,20 @@ onBeforeUnmount(() => { diff --git a/src/views/traceManage/task/index.vue b/src/views/traceManage/task/index.vue index 1be6f3e6..43ae3eda 100644 --- a/src/views/traceManage/task/index.vue +++ b/src/views/traceManage/task/index.vue @@ -20,7 +20,7 @@ import { updateTraceTask, } from '@/api/trace/task'; import useDictStore from '@/store/modules/dict'; -import { regExpIPv4, regExpPort } from '@/utils/regular-utils'; +import { regExpIPv4 } from '@/utils/regular-utils'; import dayjs, { Dayjs } from 'dayjs'; import { parseObjHumpToLine } from '@/utils/parse-utils'; const neInfoStore = useNeInfoStore(); @@ -33,8 +33,11 @@ const route = useRoute(); let dict: { /**跟踪类型 */ traceType: DictType[]; + /**跟踪接口 */ + traceInterfaces: DictType[]; } = reactive({ traceType: [], + traceInterfaces: [], }); /**网元类型_多neId */ @@ -98,40 +101,28 @@ let tableState: TabeStateType = reactive({ /**表格字段列 */ let tableColumns: ColumnsType = [ - { - title: t('views.ne.common.neType'), - dataIndex: 'neType', - align: 'left', - sorter: { - compare: (a, b) => 1, - multiple: 1, - }, - }, - { - title: t('views.ne.common.neId'), - dataIndex: 'neId', - align: 'left', - }, { title: t('views.traceManage.task.traceId'), dataIndex: 'traceId', align: 'left', + width: 150, }, { title: t('views.traceManage.task.trackType'), dataIndex: 'traceType', key: 'traceType', align: 'left', + width: 150, }, { title: t('views.traceManage.task.startTime'), dataIndex: 'startTime', align: 'left', + width: 200, customRender(opt) { if (!opt.value) return ''; return parseDateToStr(opt.value); }, - sorter: true, }, { title: t('views.traceManage.task.endTime'), @@ -141,6 +132,7 @@ let tableColumns: ColumnsType = [ if (!opt.value) return ''; return parseDateToStr(opt.value); }, + width: 200, }, { title: t('common.operate'), @@ -274,18 +266,15 @@ type ModalStateType = { /**标题 */ title: string; /**网元类型设备对象 */ - neType: string[]; + neType: any[] | undefined; /**网元类型设备对象接口 */ - neTypeInterface: Record[]; - /**网元类型设备对象接口选择 */ - neTypeInterfaceSelect: string[]; + neTypeInterface: string[]; /**任务开始结束时间 */ - timeRangePicker: [string, string]; + timeRangePicker: [Dayjs, Dayjs] | undefined; /**表单数据 */ from: { id?: string; - neType: string; - neId: string; + neList: string; // 网元列表 neType_neId 例如 UDM_001,AMF_001 /**1-Interface,2-Device,3-User */ traceType: string; startTime?: number; @@ -312,13 +301,11 @@ let modalState: ModalStateType = reactive({ title: '', neType: [], neTypeInterface: [], - neTypeInterfaceSelect: [], - timeRangePicker: ['', ''], + timeRangePicker: undefined, from: { id: undefined, - neType: '', - neId: '', - traceId: '', + neList: '', + traceId: undefined, traceType: '3', startTime: undefined, endTime: undefined, @@ -330,8 +317,8 @@ let modalState: ModalStateType = reactive({ dstIp: '', signalPort: undefined, /**3用户跟踪 */ - imsi: '', - msisdn: '', + imsi: undefined, + // msisdn: undefined, }, confirmLoading: false, }); @@ -346,7 +333,7 @@ const modalStateFrom = Form.useForm( message: t('views.traceManage.task.trackTypePlease'), }, ], - neId: [ + neList: [ { required: true, message: t('views.ne.common.neTypePlease'), @@ -393,43 +380,48 @@ const modalStateFrom = Form.useForm( message: t('views.traceManage.task.dstIpPlease'), }, ], - signalPort: [ - { - required: false, - pattern: regExpPort, - message: t('views.traceManage.task.signalPortPlease'), - }, - ], }) ); /**网元类型选择对应修改 */ -function fnNeChange(_: any, item: any) { - modalState.from.neType = item[1].neType; - modalState.from.neId = item[1].neId; - // 网元信令接口可选列表 - modalState.from.interfaces = ''; - modalState.neTypeInterfaceSelect = []; - fnSelectInterfaceInit(item[1].neType); -} - -/**跟踪类型选择对应修改 */ -function fnTraceTypeChange(v: any, _: any) { - // 网元信令接口可选列表 - if (v === '1' && modalState.from.neType) { - modalState.from.interfaces = ''; - modalState.neTypeInterfaceSelect = []; - fnSelectInterfaceInit(modalState.from.neType); +function fnNeChange(p: any, c: any) { + let neList: string[] = []; + for (let i = 0; i < p.length; i++) { + const v = p[i]; + if (v.length === 1) { + c[i][0].children.forEach((item: any) => { + neList.push(`${item.neType}_${item.neId}`); + }); + } else if (v.length === 2) { + neList.push(`${v[0]}_${v[1]}`); + } + } + if (neList.length > 0) { + modalState.from.neList = neList.join(','); + } else { + modalState.from.neList = ''; } } /**开始结束时间选择对应修改 */ function fnRangePickerChange(item: any, _: any) { - modalState.from.startTime = +item[0]; - modalState.from.endTime = +item[1]; + if (!item || item.length !== 2) { + modalState.from.startTime = undefined; + modalState.from.endTime = undefined; + return; + } + // 获取当前时间 + const now = dayjs(); + // 如果开始时间小于当前时间，则设置为当前时间 + const startTime = item[0].isBefore(now) ? now : item[0]; + const endTime = item[1].isBefore(now) ? now : item[1]; + modalState.timeRangePicker = [startTime, endTime]; + + modalState.from.startTime = startTime.valueOf(); + modalState.from.endTime = endTime.valueOf(); } function fnRangePickerDisabledDate(current: Dayjs) { - return current && current < dayjs().subtract(1, 'day').endOf('day'); + return current && current < dayjs().startOf('day'); } /**信令接口选择对应修改 */ @@ -437,19 +429,6 @@ function fnSelectInterface(s: any, _: any) { modalState.from.interfaces = s.join(','); } -/**信令接口选择初始 */ -function fnSelectInterfaceInit(neType: string) { - const interfaces = neInfoStore.traceInterfaceList; - modalState.neTypeInterface = interfaces - .filter(i => i.neType === neType) - .map(i => { - return { - value: i.interface, - label: i.interface, - }; - }); -} - /** * 对话框弹出显示为 新增或者修改 * @param noticeId 网元id, 不传为新增 @@ -467,20 +446,45 @@ function fnModalOpenByEdit(id?: string) { modalState.confirmLoading = false; hide(); if (res.code === RESULT_CODE_SUCCESS && res.data) { - modalState.neType = [res.data.neType, res.data.neId]; - modalState.timeRangePicker = [res.data.startTime, res.data.endTime]; - modalState.from = Object.assign(modalState.from, res.data); - // 接口 - if (res.data.traceType === 'Interface') { - if ( - res.data.interfaces.length > 4 && - res.data.interfaces.includes('[') - ) { - modalState.neTypeInterfaceSelect = JSON.parse(res.data.interfaces); + // 回显网元类型 + const neType: any[] = []; + const neList = res.data.neList.split(','); + const neListMap: any = {}; + for (const v of neList) { + const item: string[] = v.split('_'); + if (!neListMap[item[0]]) { + neListMap[item[0]] = []; } - fnSelectInterfaceInit(res.data.neType); + neListMap[item[0]].push(item[1]); } - modalState.title = t('views.traceManage.task.editTask'); + for (const op of neCascaderOptions.value) { + const arr = neListMap[op.value]; + if (!arr) { + continue; + } + const all = op.children.every((c: any) => { + return arr.includes(c.neId); + }); + if (all) { + neType.push([op.value]); + } else { + arr.forEach((v: string) => { + neType.push([op.value, v]); + }); + } + } + modalState.neType = neType; + // 回显时间 + modalState.timeRangePicker = [ + dayjs(res.data.startTime), + dayjs(res.data.endTime), + ]; + // 回显接口 + if (res.data.traceType === '1') { + modalState.neTypeInterface = res.data.interfaces.split(','); + } + modalState.from = Object.assign(modalState.from, res.data); + modalState.title = t('views.traceManage.task.viewTask'); modalState.openByEdit = true; } else { message.error(t('views.traceManage.task.errorTaskInfo'), 3); @@ -495,15 +499,15 @@ function fnModalOpenByEdit(id?: string) { */ function fnModalOk() { const from = toRaw(modalState.from); - let valids = ['traceType', 'neId', 'endTime']; + let valids = ['traceType', 'neList', 'endTime']; if (from.traceType === '1') { valids = valids.concat(['interfaces']); } if (from.traceType === '2') { - valids = valids.concat(['srcIp', 'dstIp', 'signalPort']); + valids = valids.concat(['srcIp', 'dstIp']); } if (from.traceType === '3') { - valids = valids.concat(['imsi', 'msisdn']); + valids = valids.concat(['imsi']); } modalStateFrom @@ -546,29 +550,31 @@ function fnModalCancel() { modalState.openByEdit = false; modalState.confirmLoading = false; modalStateFrom.resetFields(); - modalState.timeRangePicker = ['', '']; - modalState.neTypeInterfaceSelect = []; modalState.neType = []; modalState.neTypeInterface = []; + modalState.timeRangePicker = undefined; } -/**跳转PCAP文件详情页面 */ -function fnRecordPCAPView(row: Record) { +/**跳转内嵌详情页面 */ +function fnRecordView(traceId: any, type: 'analyze' | 'data') { router.push({ - path: `${route.path}${MENU_PATH_INLINE}/analyze`, - query: { - traceId: row.traceId, - }, + path: `${route.path}${MENU_PATH_INLINE}/${type}`, + query: { traceId }, }); } onMounted(() => { // 初始字典数据 - Promise.allSettled([getDict('trace_type')]).then(resArr => { - if (resArr[0].status === 'fulfilled') { - dict.traceType = resArr[0].value; + Promise.allSettled([getDict('trace_type'), getDict('trace_interfaces')]).then( + resArr => { + if (resArr[0].status === 'fulfilled') { + dict.traceType = resArr[0].value; + } + if (resArr[1].status === 'fulfilled') { + dict.traceInterfaces = resArr[1].value; + } } - }); + ); // 获取网元网元列表 useNeInfoStore() @@ -579,13 +585,13 @@ onMounted(() => { // 过滤不可用的网元 neCascaderOptions.value = neInfoStore.getNeSelectOtions.filter( (item: any) => { - return ['UDM'].includes(item.value); + return ['AMF', 'AUSF', 'SMF', 'UDM', 'PCF'].includes(item.value); } ); if (neCascaderOptions.value.length === 0) { message.warning({ content: t('common.noData'), - duration: 2, + duration: 3, }); return; } @@ -593,13 +599,11 @@ onMounted(() => { } else { message.warning({ content: t('common.noData'), - duration: 2, + duration: 3, }); } }) .finally(() => { - // 获取跟踪接口列表 - neInfoStore.fnNeTraceInterface(); // 获取列表数据 fnGetList(); }); @@ -765,21 +769,40 @@ onMounted(() => { - + -->