From e5a5ef6f9693e7e2f87eb7beb5c03f5d61bb6b7b Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 5 Jun 2024 17:00:24 +0800 Subject: [PATCH 01/75] =?UTF-8?q?style:=20=E5=A4=9A=E8=AF=AD=E8=A8=80-?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 2 +- src/i18n/locales/zh-CN.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index d938c68b..c50d8998 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -1763,7 +1763,7 @@ export default { className:'Department Name', classId:'Department Number', classSort:'Department Sorting', - status:'Position Status', + status:'Department Status', createTime:'Creation Time', highClass:'Higher Office', emailTip:'Please input the correct email address', diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 9ec66ef9..80586d9e 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -1763,7 +1763,7 @@ export default { className:'部门名称', classId:'部门编号', classSort:'部门排序', - status:'岗位状态', + status:'部门状态', createTime:'创建时间', highClass:'上级部门', emailTip:'请输入正确的邮箱地址', From be4fc896d75b327eec9d0d749ce13645fba75c2b Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 6 Jun 2024 11:51:49 +0800 Subject: [PATCH 02/75] =?UTF-8?q?style:=20=E7=BD=91=E5=85=83=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E5=8F=82=E6=95=B0EMS->OMC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neConfPara5G/components/Para5GForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ne/neConfPara5G/components/Para5GForm.vue b/src/views/ne/neConfPara5G/components/Para5GForm.vue index 7a3c2ab3..2bfadd64 100644 --- a/src/views/ne/neConfPara5G/components/Para5GForm.vue +++ b/src/views/ne/neConfPara5G/components/Para5GForm.vue @@ -213,7 +213,7 @@ onMounted(() => {}); Date: Thu, 6 Jun 2024 14:34:34 +0800 Subject: [PATCH 03/75] =?UTF-8?q?fix:=20=E5=BC=80=E7=AB=99=E7=B3=BB?= =?UTF-8?q?=E7=BB=9Flogo=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/quick-start/components/SystemConfig.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/quick-start/components/SystemConfig.vue b/src/views/system/quick-start/components/SystemConfig.vue index 1c420e64..c4151cb9 100644 --- a/src/views/system/quick-start/components/SystemConfig.vue +++ b/src/views/system/quick-start/components/SystemConfig.vue @@ -36,7 +36,7 @@ type StateType = { const state: StateType = reactive({ confirmLoading: false, filePath: '', - type: 'icon', + type: appStore.logoType, icon: getLogoURL('icon'), brand: getLogoURL('brand'), title: appStore.appName, From cb7fc418a585d9c243b699e3611e87aed12ce220 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 6 Jun 2024 15:13:45 +0800 Subject: [PATCH 04/75] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E7=89=88?= =?UTF-8?q?=E6=9C=ACOMC=E5=AE=89=E8=A3=85=E9=81=AE=E7=BD=A9=E5=92=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 3 ++- src/i18n/locales/zh-CN.ts | 3 ++- src/store/modules/locked.ts | 2 +- src/views/ne/neVersion/index.vue | 27 ++++++++++++++++++++++++--- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index c50d8998..c51ea671 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -739,8 +739,9 @@ export default { upgradeBatch: "Batch Upgrade", upgradeBatchTip: "Do you perform new version upgrades on checked records?", upgradeNotNewVer: 'No new version found', + upgradeOMCVer: 'Rejection of batch operation upgrades OMC', upgradeDone: 'Update complete, service being reloaded', - upgradeFail: 'The update failed, check if the service terminal environment is available!', + upgradeFail: 'The update fails, please check whether the software file exists and whether the service terminal environment is available!', upgradeModal: 'Network Element Version Updates', }, neLicense: { diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 80586d9e..fa66272e 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -739,8 +739,9 @@ export default { upgradeBatch: "批量更新", upgradeBatchTip: "对勾选的记录进行新版本升级吗？", upgradeNotNewVer: '没有发现新版本', + upgradeOMCVer: '拒绝批量操作升级OMC', upgradeDone: '更新完成，服务正在重载', - upgradeFail: '更新失败，请检查服务终端环境是否可用！', + upgradeFail: '更新失败，请检查软件文件是否存在且服务终端环境是否可用！', upgradeModal: '网元版本更新', }, neLicense: { diff --git a/src/store/modules/locked.ts b/src/store/modules/locked.ts index 977e0cb3..abf84193 100644 --- a/src/store/modules/locked.ts +++ b/src/store/modules/locked.ts @@ -50,7 +50,7 @@ const useLockedStore = defineStore('locked', { // 延迟5秒 setTimeout(() => { this.relaodWait(); - }, 2_000); + }, 5_000); } }, }, diff --git a/src/views/ne/neVersion/index.vue b/src/views/ne/neVersion/index.vue index d8295cee..d8cf53b8 100644 --- a/src/views/ne/neVersion/index.vue +++ b/src/views/ne/neVersion/index.vue @@ -1,7 +1,12 @@ + + + + From 8f8d056f45670d2894710678e22c76dba70000f0 Mon Sep 17 00:00:00 2001 From: lai <371757574@qq.com> Date: Thu, 6 Jun 2024 22:28:46 +0800 Subject: [PATCH 06/75] smf cdr --- src/api/neData/smf.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/api/neData/smf.ts diff --git a/src/api/neData/smf.ts b/src/api/neData/smf.ts new file mode 100644 index 00000000..d46069ca --- /dev/null +++ b/src/api/neData/smf.ts @@ -0,0 +1,14 @@ +import { request } from '@/plugins/http-fetch'; + +/** + * 查询SMF-CDR会话事件 + * @param query 查询参数 + * @returns object + */ +export function listIMSDataCDR(query: Record) { + return request({ + url: '/neData/smf/cdr/list', + method: 'get', + params: query, + }); +} From 233496e184e47be1b27f77c54189122e57340934 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 7 Jun 2024 19:50:02 +0800 Subject: [PATCH 07/75] =?UTF-8?q?feat:=20=E7=BD=91=E5=85=83=E6=95=B0?= =?UTF-8?q?=E6=8D=AECDR=E6=94=AF=E6=8C=81=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/neData/amf.ts | 28 +++++++--- src/api/neData/ims.ts | 28 +++++++--- src/i18n/locales/en-US.ts | 2 + src/i18n/locales/zh-CN.ts | 2 + src/views/dashboard/amfUE/index.vue | 74 ++++++++++++++++++++++++++- src/views/dashboard/imsCDR/index.vue | 76 +++++++++++++++++++++++++++- 6 files changed, 193 insertions(+), 17 deletions(-) diff --git a/src/api/neData/amf.ts b/src/api/neData/amf.ts index 97568b1d..2059e260 100644 --- a/src/api/neData/amf.ts +++ b/src/api/neData/amf.ts @@ -19,10 +19,24 @@ export function listAMFDataUE(query: Record) { * @returns object */ export function delAMFDataUE(ueIds: string | number) { - return request({ - url: `/neData/amf/ue/${ueIds}`, - method: 'delete', - timeout: 60_000, - }); - } - \ No newline at end of file + return request({ + url: `/neData/amf/ue/${ueIds}`, + method: 'delete', + timeout: 60_000, + }); +} + +/** + * AMF-UE会话列表导出 + * @param data 查询列表条件 + * @returns object + */ +export function exportAMFDataUE(data: Record) { + return request({ + url: '/neData/amf/ue/export', + method: 'post', + data, + responseType: 'blob', + timeout: 60_000, + }); +} diff --git a/src/api/neData/ims.ts b/src/api/neData/ims.ts index 9dea3073..1f1d67bc 100644 --- a/src/api/neData/ims.ts +++ b/src/api/neData/ims.ts @@ -19,10 +19,24 @@ export function listIMSDataCDR(query: Record) { * @returns object */ export function delIMSDataCDR(cdrIds: string | number) { - return request({ - url: `/neData/ims/cdr/${cdrIds}`, - method: 'delete', - timeout: 60_000, - }); - } - \ No newline at end of file + return request({ + url: `/neData/ims/cdr/${cdrIds}`, + method: 'delete', + timeout: 60_000, + }); +} + +/** + * IMS-CDR会话列表导出 + * @param data 查询列表条件 + * @returns object + */ +export function exportIMSDataCDR(data: Record) { + return request({ + url: '/neData/ims/cdr/export', + method: 'post', + data, + responseType: 'blob', + timeout: 60_000, + }); +} diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index c51ea671..ee5199c8 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -569,6 +569,7 @@ export default { called: "Called", result: "Result", delTip: "Confirm deletion of the data item numbered [{msg}]?", + exportTipIMS: "Do you confirm to export the current query conditions of the CDR data? (Maximum 10,000 items can be exported.)", }, ue: { eventType: "Event Type", @@ -582,6 +583,7 @@ export default { result: "Result", resultOk: "Successes", delTip: "Confirm deletion of the data item numbered [{msg}]?", + exportTipIMS: "Do you confirm to export the event data of the current query condition? (Maximum 10,000 items can be exported.)", }, }, ne: { diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index fa66272e..14f71e65 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -569,6 +569,7 @@ export default { called: "被叫", result: "结果", delTip: "确认删除编号为【{msg}】的数据项?", + exportTipIMS: "确认导出当前查询条件的话单数据吗？（导出最大支持一万条）", }, ue: { eventType: "事件类型", @@ -582,6 +583,7 @@ export default { result: "结果", resultOk: "成功", delTip: "确认删除编号为【{msg}】的数据项?", + exportTipIMS: "确认导出当前查询条件的事件数据吗？（导出最大支持一万条）", }, }, ne: { diff --git a/src/views/dashboard/amfUE/index.vue b/src/views/dashboard/amfUE/index.vue index 0a4f77aa..9d09de4d 100644 --- a/src/views/dashboard/amfUE/index.vue +++ b/src/views/dashboard/amfUE/index.vue @@ -11,8 +11,9 @@ import { RESULT_CODE_SUCCESS, } from '@/constants/result-constants'; import useDictStore from '@/store/modules/dict'; -import { listAMFDataUE, delAMFDataUE } from '@/api/neData/amf'; +import { listAMFDataUE, delAMFDataUE, exportAMFDataUE } from '@/api/neData/amf'; import { OptionsType, WS } from '@/plugins/ws-websocket'; +import saveAs from 'file-saver'; import PQueue from 'p-queue'; const { t } = useI18n(); const { getDict } = useDictStore(); @@ -33,6 +34,9 @@ let dict: { ueEventCmState: [], }); +/**开始结束时间 */ +let queryRangePicker = ref<[string, string]>(['', '']); + /**查询参数 */ let queryParams = reactive({ /**网元类型 */ @@ -42,6 +46,10 @@ let queryParams = reactive({ imsi: '', sortField: 'timestamp', sortOrder: 'desc', + /**开始时间 */ + startTime: '', + /**结束时间 */ + endTime: '', /**当前页数 */ pageNum: 1, /**每页条数 */ @@ -54,9 +62,12 @@ function fnQueryReset() { queryParams = Object.assign(queryParams, { eventType: 'auth-result', imsi: '', + startTime: '', + endTime: '', pageNum: 1, pageSize: 20, }); + queryRangePicker.value = ['', '']; tablePagination.current = 1; tablePagination.pageSize = 20; fnGetList(); @@ -241,6 +252,11 @@ function fnGetList(pageNum?: number) { if (pageNum) { queryParams.pageNum = pageNum; } + if (!queryRangePicker.value) { + queryRangePicker.value = ['', '']; + } + queryParams.startTime = queryRangePicker.value[0]; + queryParams.endTime = queryRangePicker.value[1]; listAMFDataUE(toRaw(queryParams)).then(res => { if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) { // 取消勾选 @@ -275,6 +291,39 @@ function fnGetList(pageNum?: number) { }); } +/**列表导出 */ +function fnExportList() { + if (modalState.confirmLoading) return; + Modal.confirm({ + title: t('common.tipTitle'), + content: t('views.dashboard.ue.exportTipAMF'), + onOk() { + const hide = message.loading(t('common.loading'), 0); + const querys = toRaw(queryParams); + querys.pageSize = 10000; + exportAMFDataUE(querys) + .then(res => { + if (res.code === RESULT_CODE_SUCCESS) { + message.success({ + content: t('common.operateOk'), + duration: 3, + }); + saveAs(res.data, `amf_ue_event_export_${Date.now()}.xlsx`); + } else { + message.error({ + content: `${res.msg}`, + duration: 3, + }); + } + }) + .finally(() => { + hide(); + modalState.confirmLoading = false; + }); + }, + }); +} + /**实时数据开关 */ const realTimeData = ref(false); @@ -399,7 +448,7 @@ onBeforeUnmount(() => { > - + { > + + + + + @@ -461,6 +526,11 @@ onBeforeUnmount(() => { {{ t('common.deleteText') }} + + + + {{ t('common.export') }} + diff --git a/src/views/dashboard/imsCDR/index.vue b/src/views/dashboard/imsCDR/index.vue index 57856434..796a487a 100644 --- a/src/views/dashboard/imsCDR/index.vue +++ b/src/views/dashboard/imsCDR/index.vue @@ -11,9 +11,14 @@ import { RESULT_CODE_SUCCESS, } from '@/constants/result-constants'; import useDictStore from '@/store/modules/dict'; -import { delIMSDataCDR, listIMSDataCDR } from '@/api/neData/ims'; +import { + delIMSDataCDR, + exportIMSDataCDR, + listIMSDataCDR, +} from '@/api/neData/ims'; import { parseDateToStr, parseDuration } from '@/utils/date-utils'; import { OptionsType, WS } from '@/plugins/ws-websocket'; +import saveAs from 'file-saver'; import PQueue from 'p-queue'; const { t } = useI18n(); const { getDict } = useDictStore(); @@ -31,6 +36,9 @@ let dict: { cdrCallType: [], }); +/**开始结束时间 */ +let queryRangePicker = ref<[string, string]>(['', '']); + /**查询参数 */ let queryParams = reactive({ /**网元类型 */ @@ -41,6 +49,10 @@ let queryParams = reactive({ calledParty: '', sortField: 'timestamp', sortOrder: 'desc', + /**开始时间 */ + startTime: '', + /**结束时间 */ + endTime: '', /**当前页数 */ pageNum: 1, /**每页条数 */ @@ -54,9 +66,12 @@ function fnQueryReset() { recordType: 'MOC', callerParty: '', calledParty: '', + startTime: '', + endTime: '', pageNum: 1, pageSize: 20, }); + queryRangePicker.value = ['', '']; tablePagination.current = 1; tablePagination.pageSize = 20; fnGetList(); @@ -279,6 +294,11 @@ function fnGetList(pageNum?: number) { if (pageNum) { queryParams.pageNum = pageNum; } + if (!queryRangePicker.value) { + queryRangePicker.value = ['', '']; + } + queryParams.startTime = queryRangePicker.value[0]; + queryParams.endTime = queryRangePicker.value[1]; listIMSDataCDR(toRaw(queryParams)).then(res => { if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) { // 取消勾选 @@ -313,6 +333,39 @@ function fnGetList(pageNum?: number) { }); } +/**列表导出 */ +function fnExportList() { + if (modalState.confirmLoading) return; + Modal.confirm({ + title: t('common.tipTitle'), + content: t('views.dashboard.cdr.exportTipIMS'), + onOk() { + const hide = message.loading(t('common.loading'), 0); + const querys = toRaw(queryParams); + querys.pageSize = 10000; + exportIMSDataCDR(querys) + .then(res => { + if (res.code === RESULT_CODE_SUCCESS) { + message.success({ + content: t('common.operateOk'), + duration: 3, + }); + saveAs(res.data, `ims_cdr_event_export_${Date.now()}.xlsx`); + } else { + message.error({ + content: `${res.msg}`, + duration: 3, + }); + } + }) + .finally(() => { + hide(); + modalState.confirmLoading = false; + }); + }, + }); +} + /**实时数据开关 */ const realTimeData = ref(false); @@ -455,6 +508,22 @@ onBeforeUnmount(() => { > + + + + + @@ -508,6 +577,11 @@ onBeforeUnmount(() => { {{ t('common.deleteText') }} + + + + {{ t('common.export') }} + From 04cbdc6b118e68fe993f9b0d0385057ef2974102 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 11 Jun 2024 10:26:46 +0800 Subject: [PATCH 08/75] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=A4=9A=E9=80=89=E5=88=A0=E9=99=A4id=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neInfo/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/ne/neInfo/index.vue b/src/views/ne/neInfo/index.vue index dd03b02c..e183f82d 100644 --- a/src/views/ne/neInfo/index.vue +++ b/src/views/ne/neInfo/index.vue @@ -243,6 +243,7 @@ function fnRecordDelete(id: string) { let msg = t('views.ne.neInfo.delTip'); if (id === '0') { msg = `${msg} ...${tableState.selectedRowKeys.length}`; + id = tableState.selectedRowKeys.join(','); } Modal.confirm({ From eadd4709eef3b53d0b6bd07dfabeac4c50e82f78 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 11 Jun 2024 10:28:16 +0800 Subject: [PATCH 09/75] =?UTF-8?q?fix:=20=E5=BC=80=E7=AB=99=E7=BD=91?= =?UTF-8?q?=E5=85=83=E4=BF=A1=E6=81=AF=E6=97=A0=E7=BB=88=E7=AB=AF=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=99=E6=96=B0=E5=BB=BA=E4=B8=AA=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=9A=84=E5=8D=A0=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/quick-start/components/NeInfoConfig.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/system/quick-start/components/NeInfoConfig.vue b/src/views/system/quick-start/components/NeInfoConfig.vue index d2a443e6..0dc273e2 100644 --- a/src/views/system/quick-start/components/NeInfoConfig.vue +++ b/src/views/system/quick-start/components/NeInfoConfig.vue @@ -313,16 +313,19 @@ function fnGetList() { listAllNeInfo({ bandHost: true, }).then(res => { - console.log(res); if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) { for (const item of res.data) { - if (item.neType === 'OMC') continue; + if (item.neType === 'OMC' || !Array.isArray(item.hosts)) continue; tabState.panes.push({ key: `${item.neType}@${item.neId}`, data: item, status: false, }); } + // 没有终端信息时，新建一个占位 + if (tabState.panes.length === 0) { + fnTabCreate(); + } // 选择首个 if (tabState.panes.length > 0) { tabState.activeKey = tabState.panes[0].key; From d88cec34dffd9320ba78251cd16027ae8ff8160f Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 11 Jun 2024 10:29:24 +0800 Subject: [PATCH 10/75] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7240611?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index bc2a1e8c..80792c6b 100644 --- a/.env.development +++ b/.env.development @@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS" VITE_APP_CODE = "CN EMS" # 应用版本 -VITE_APP_VERSION = "2.240530.1" +VITE_APP_VERSION = "2.240611.1" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/.env.production b/.env.production index bd9d43f4..dcbabe80 100644 --- a/.env.production +++ b/.env.production @@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS" VITE_APP_CODE = "CN EMS" # 应用版本 -VITE_APP_VERSION = "2.240530.1" +VITE_APP_VERSION = "2.240611.1" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" From 5133d09ec203842cf17671b8fd8fbf2f4994535a Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 11 Jun 2024 16:23:57 +0800 Subject: [PATCH 11/75] =?UTF-8?q?feat:=20SMF=20CDR=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E5=92=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E8=BF=9B=E8=A1=8C=E5=A4=9A=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/neData/smf.ts | 30 +- src/views/dashboard/smfCDR/index.vue | 692 +++++++++++++++++++-------- 2 files changed, 521 insertions(+), 201 deletions(-) diff --git a/src/api/neData/smf.ts b/src/api/neData/smf.ts index d46069ca..4139c3ed 100644 --- a/src/api/neData/smf.ts +++ b/src/api/neData/smf.ts @@ -5,10 +5,38 @@ import { request } from '@/plugins/http-fetch'; * @param query 查询参数 * @returns object */ -export function listIMSDataCDR(query: Record) { +export function listSMFDataCDR(query: Record) { return request({ url: '/neData/smf/cdr/list', method: 'get', params: query, }); } + +/** + * SMF-CDR会话删除 + * @param id 信息ID + * @returns object + */ +export function delSMFDataCDR(cdrIds: string | number) { + return request({ + url: `/neData/smf/cdr/${cdrIds}`, + method: 'delete', + timeout: 60_000, + }); +} + +/** + * SMF-CDR会话列表导出 + * @param data 查询列表条件 + * @returns object + */ +export function exportSMFDataCDR(data: Record) { + return request({ + url: '/neData/smf/cdr/export', + method: 'post', + data, + responseType: 'blob', + timeout: 60_000, + }); +} diff --git a/src/views/dashboard/smfCDR/index.vue b/src/views/dashboard/smfCDR/index.vue index 724f09c5..3bc66d03 100644 --- a/src/views/dashboard/smfCDR/index.vue +++ b/src/views/dashboard/smfCDR/index.vue @@ -1,40 +1,43 @@ + + + + From c9eb0240d85308128a0b827b294f6f87efe2d62e Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 12 Jun 2024 10:16:35 +0800 Subject: [PATCH 15/75] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9B=B4=E6=96=B0=E5=88=A0=E9=99=A4=E4=B8=8D=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E5=88=97=E8=A1=A8=EF=BC=8C=E8=BF=9B=E8=A1=8C=E5=8D=95?= =?UTF-8?q?=E4=B8=AA=E6=9B=B4=E6=96=B0=E5=B9=B6=E6=B8=85=E9=99=A4=E7=BD=91?= =?UTF-8?q?=E5=85=83=E5=88=97=E8=A1=A8=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neInfo/components/EditModal.vue | 6 +- src/views/ne/neInfo/index.vue | 136 +++++++++++-------- 2 files changed, 83 insertions(+), 59 deletions(-) diff --git a/src/views/ne/neInfo/components/EditModal.vue b/src/views/ne/neInfo/components/EditModal.vue index d2baf84a..0365d348 100644 --- a/src/views/ne/neInfo/components/EditModal.vue +++ b/src/views/ne/neInfo/components/EditModal.vue @@ -3,7 +3,6 @@ import { reactive, onMounted, toRaw, watch } from 'vue'; import { message, Form, Modal } from 'ant-design-vue/lib'; import useI18n from '@/hooks/useI18n'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; -import useNeInfoStore from '@/store/modules/neinfo'; import { NE_TYPE_LIST } from '@/constants/ne-constants'; import { regExpIPv4, regExpIPv6 } from '@/utils/regular-utils'; import { getNeInfo, addNeInfo, updateNeInfo } from '@/api/ne/neInfo'; @@ -250,9 +249,8 @@ function fnModalOk() { .then(res => { if (res.code === RESULT_CODE_SUCCESS) { message.success(t('common.operateOk'), 3); - // 刷新缓存的网元信息 - useNeInfoStore().fnRefreshNelist(); - emit('ok'); + // 返回无引用信息 + emit('ok', JSON.parse(JSON.stringify(from))); fnModalCancel(); } else { message.error({ diff --git a/src/views/ne/neInfo/index.vue b/src/views/ne/neInfo/index.vue index e183f82d..370b20d2 100644 --- a/src/views/ne/neInfo/index.vue +++ b/src/views/ne/neInfo/index.vue @@ -8,7 +8,7 @@ import { ColumnsType } from 'ant-design-vue/lib/table'; import useI18n from '@/hooks/useI18n'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import useNeInfoStore from '@/store/modules/neinfo'; -import { listNeInfo, delNeInfo } from '@/api/ne/neInfo'; +import { listNeInfo, delNeInfo, stateNeInfo } from '@/api/ne/neInfo'; import { NE_TYPE_LIST } from '@/constants/ne-constants'; import useDictStore from '@/store/modules/dict'; import useNeOptions from './hooks/useNeOptions'; @@ -70,7 +70,7 @@ type TabeStateType = { /**搜索栏 */ seached: boolean; /**记录数据 */ - data: object[]; + data: Record[]; /**勾选记录 */ selectedRowKeys: (string | number)[]; }; @@ -219,8 +219,20 @@ function fnModalVisibleByEdit(row?: Record) { * 对话框弹出确认执行函数 * 进行表达规则校验 */ -function fnModalEditOk() { - fnGetList(1); +function fnModalEditOk(from: Record) { + stateNeInfo(from.neType, from.neId) + .then(res => { + // 找到编辑更新的网元 + const item = tableState.data.find(s => s.id === from.id); + if (item && res.code === RESULT_CODE_SUCCESS) { + Object.assign(item.serverState, res.data); + const resouresUsage = parseResouresUsage(item.serverState); + Reflect.set(item, 'resoures', resouresUsage); + } + }) + .finally(() => { + useNeInfoStore().fnRefreshNelist(); + }); } /** @@ -256,7 +268,16 @@ function fnRecordDelete(id: string) { .then(res => { if (res.code === RESULT_CODE_SUCCESS) { message.success(t('common.operateOk'), 3); - fnGetList(1); + // 过滤掉删除的id + tableState.data = tableState.data.filter(item => { + if (id.indexOf(',')) { + return !tableState.selectedRowKeys.includes(item.id); + } else { + return item.id != id; + } + }); + // 刷新缓存 + useNeInfoStore().fnRefreshNelist(); } else { message.error({ content: `${res.msg}`, @@ -331,56 +352,8 @@ function fnGetList(pageNum?: number) { // 遍历处理资源情况数值 tableState.data = res.rows.map(item => { const neState = item.serverState; - let sysCpuUsage = 0; - let nfCpuUsage = 0; - if (neState.cpu) { - nfCpuUsage = neState.cpu.nfCpuUsage; - if (nfCpuUsage > 100) { - const nfCpu = +(neState.cpu.nfCpuUsage / 100); - if (nfCpu > 100) { - nfCpuUsage = 100; - } else { - nfCpuUsage = +nfCpu.toFixed(2); - } - } - - sysCpuUsage = neState.cpu.sysCpuUsage; - if (sysCpuUsage > 100) { - const sysCpu = +(neState.cpu.sysCpuUsage / 100); - if (sysCpu > 100) { - sysCpuUsage = 100; - } else { - sysCpuUsage = +sysCpu.toFixed(2); - } - } - } - - let sysMemUsage = 0; - if (neState.mem) { - let men = neState.mem.sysMemUsage; - if (men > 100) { - men = +(men / 100).toFixed(2); - } - sysMemUsage = men; - } - - let sysDiskUsage = 0; - if (neState.disk && Array.isArray(neState.disk.partitionInfo)) { - let disks: any[] = neState.disk.partitionInfo; - disks = disks.sort((a, b) => +b.used - +a.used); - if (disks.length > 0) { - const { total, used } = disks[0]; - sysDiskUsage = +((used / total) * 100).toFixed(2); - } - } - - Reflect.set(item, 'resoures', { - sysDiskUsage, - sysMemUsage, - sysCpuUsage, - nfCpuUsage, - }); - + const resouresUsage = parseResouresUsage(neState); + Reflect.set(item, 'resoures', resouresUsage); return item; }); } @@ -388,6 +361,59 @@ function fnGetList(pageNum?: number) { }); } +/**解析网元状态携带的资源利用率 */ +function parseResouresUsage(neState: Record) { + let sysCpuUsage = 0; + let nfCpuUsage = 0; + if (neState.cpu) { + nfCpuUsage = neState.cpu.nfCpuUsage; + if (nfCpuUsage > 100) { + const nfCpu = +(neState.cpu.nfCpuUsage / 100); + if (nfCpu > 100) { + nfCpuUsage = 100; + } else { + nfCpuUsage = +nfCpu.toFixed(2); + } + } + + sysCpuUsage = neState.cpu.sysCpuUsage; + if (sysCpuUsage > 100) { + const sysCpu = +(neState.cpu.sysCpuUsage / 100); + if (sysCpu > 100) { + sysCpuUsage = 100; + } else { + sysCpuUsage = +sysCpu.toFixed(2); + } + } + } + + let sysMemUsage = 0; + if (neState.mem) { + let men = neState.mem.sysMemUsage; + if (men > 100) { + men = +(men / 100).toFixed(2); + } + sysMemUsage = men; + } + + let sysDiskUsage = 0; + if (neState.disk && Array.isArray(neState.disk.partitionInfo)) { + let disks: any[] = neState.disk.partitionInfo; + disks = disks.sort((a, b) => +b.used - +a.used); + if (disks.length > 0) { + const { total, used } = disks[0]; + sysDiskUsage = +((used / total) * 100).toFixed(2); + } + } + + return { + sysDiskUsage, + sysMemUsage, + sysCpuUsage, + nfCpuUsage, + }; +} + onMounted(() => { // 初始字典数据 Promise.allSettled([getDict('ne_info_status')]).then(resArr => { From 375f236e320620efe01dc00cd7614fcfff692735 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 12 Jun 2024 14:35:07 +0800 Subject: [PATCH 16/75] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E9=94=81?= =?UTF-8?q?=E5=B1=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GlobalMask/index.vue | 138 ++++++++ src/components/LockScreen/index.vue | 230 ------------ src/constants/cache-keys-constants.ts | 7 +- src/i18n/locales/en-US.ts | 6 +- src/i18n/locales/zh-CN.ts | 4 +- src/layouts/BasicLayout.vue | 14 +- src/layouts/components/RightContent.vue | 61 +++- src/plugins/auth-token.ts | 7 +- src/store/modules/locked.ts | 59 ---- src/store/modules/mask.ts | 70 ++++ src/views/configManage/neManage/index.vue | 6 +- .../configManage/softwareManage/index.vue | 6 +- src/views/ne/neInfo/hooks/useNeOptions.ts | 6 +- src/views/ne/neVersion/index.vue | 6 +- .../setting/components/system-reset.vue | 10 +- src/views/tool/lockScreen/index.vue | 331 ++++++++---------- 16 files changed, 452 insertions(+), 509 deletions(-) create mode 100644 src/components/GlobalMask/index.vue delete mode 100644 src/components/LockScreen/index.vue delete mode 100644 src/store/modules/locked.ts create mode 100644 src/store/modules/mask.ts diff --git a/src/components/GlobalMask/index.vue b/src/components/GlobalMask/index.vue new file mode 100644 index 00000000..9948332d --- /dev/null +++ b/src/components/GlobalMask/index.vue @@ -0,0 +1,138 @@ + + + + + + diff --git a/src/components/LockScreen/index.vue b/src/components/LockScreen/index.vue deleted file mode 100644 index 078b01a5..00000000 --- a/src/components/LockScreen/index.vue +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - diff --git a/src/constants/cache-keys-constants.ts b/src/constants/cache-keys-constants.ts index e1e8393d..94e02304 100644 --- a/src/constants/cache-keys-constants.ts +++ b/src/constants/cache-keys-constants.ts @@ -10,8 +10,11 @@ export const CACHE_LOCAL_PRIMARY_COLOR = 'cache:local:primaryColor'; /**本地缓存-多语言 */ export const CACHE_LOCAL_I18N = 'cache:local:i18n'; -/**本地缓存-锁屏设置 */ -export const CACHE_LOCAL_LOCK = 'cache:local:Lock'; +/**本地缓存-遮罩设置 */ +export const CACHE_LOCAL_MASK = 'cache:local:mask'; + +/**本地缓存-锁屏密码 */ +export const CACHE_LOCAL_LOCK_PASSWD = 'cache:local:lock:passwd'; /**数据缓存表-表格排序 */ export const CACHE_DB_TABLE_DND = 'tbl_dnd'; diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 49ef62b8..3d249bca 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -130,7 +130,7 @@ export default { onlyAllow:'Only supports upload file formats', }, LockScreen: { - inputPlacePwd:'Please enter login password', + inputPlacePwd:'Please enter the lock screen password', validSucc:'Validation Passed', validError:'Validation Failure', backLogin:'Logout to Relogin', @@ -186,7 +186,9 @@ export default { }, rightContent: { lock: "Lock Screen", - lockTip: "Confirmed to perform a lock screen?", + lockTip: "Confirmation of the lock screen?", + lockPasswd: "Unlock Password", + lockPasswdTip: "No password can be set", helpDoc: "System User Documentation", fullscreen: "Full Screen", logout: "Logout", diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 486fdb67..96236c4e 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -130,7 +130,7 @@ export default { onlyAllow:'只支持上传文件格式', }, LockScreen: { - inputPlacePwd:'请输入登录密码', + inputPlacePwd:'请输入锁屏密码', validSucc:'校验通过', validError:'校验失败', backLogin:'退出并重新登录', @@ -187,6 +187,8 @@ export default { rightContent: { lock: "锁屏", lockTip: "确认要进行锁屏吗？", + lockPasswd: "解锁密码", + lockPasswdTip: "可不设置密码", helpDoc: "系统使用文档", fullscreen: "全屏显示", logout: "退出登录", diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index c35a736f..f6226867 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -8,6 +8,7 @@ import { } from 'antdv-pro-layout'; import RightContent from './components/RightContent.vue'; import Tabs from './components/Tabs.vue'; +import GlobalMask from '@/components/GlobalMask/index.vue'; import { scriptUrl } from '@/assets/js/icon_font_8d5l8fzk5b87iudi'; import { computed, reactive, watch, onMounted, onUnmounted } from 'vue'; import useLayoutStore from '@/store/modules/layout'; @@ -21,6 +22,7 @@ const { proConfig, waterMarkContent } = useLayoutStore(); import useI18n from '@/hooks/useI18n'; import { getServerTime } from '@/api'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; + import { parseDateToStr } from '@/utils/date-utils'; import { parseUrlPath } from '@/plugins/file-static-url'; const { t, currentLocale } = useI18n(); @@ -224,10 +226,10 @@ onUnmounted(() => { v-model:selectedKeys="layoutState.selectedKeys" v-model:openKeys="layoutState.openKeys" :menu-data="menuData" - :breadcrumb="{ routes: breadcrumb } as any" + :breadcrumb="{ routes: breadcrumb }" v-bind="proConfig" - :iconfont-url="scriptUrl" - :locale="(fnLocale as any)" + :iconfont-url="scriptUrl" + :locale="fnLocale" > diff --git a/src/layouts/components/RightContent.vue b/src/layouts/components/RightContent.vue index 59b70627..e9a25a7a 100644 --- a/src/layouts/components/RightContent.vue +++ b/src/layouts/components/RightContent.vue @@ -1,19 +1,20 @@ From be50fc9c5cfa189e6e4092bef2b2d0c8950863c6 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 12 Jun 2024 14:36:16 +0800 Subject: [PATCH 17/75] =?UTF-8?q?style:=20=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 2 +- src/store/modules/router.ts | 2 +- src/views/monitor/topology/graph.ts | 3 --- src/views/system/dept/index.vue | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 15d31680..3dd384e4 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -165,7 +165,7 @@ router.beforeEach(async (to, from, next) => { if (!appStore.loginBackground) { await appStore.fnSysConf(); } - + // 需要系统引导跳转 if (appStore.bootloader && to.path !== '/quick-start') { next({ name: 'QuickStart' }); diff --git a/src/store/modules/router.ts b/src/store/modules/router.ts index fa6e2658..d683a01f 100644 --- a/src/store/modules/router.ts +++ b/src/store/modules/router.ts @@ -1,5 +1,5 @@ import { defineStore } from 'pinia'; -import { +import type { RouteComponent, RouteLocationRaw, RouteMeta, diff --git a/src/views/monitor/topology/graph.ts b/src/views/monitor/topology/graph.ts index 22642f8a..8e526c79 100644 --- a/src/views/monitor/topology/graph.ts +++ b/src/views/monitor/topology/graph.ts @@ -1566,9 +1566,6 @@ export function randerGroph( collapseArray ); break; - case 'restart': - console.log('restart'); - break; case 'show': showItems(graph); break; diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 672d5c00..52c940a9 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -822,5 +822,4 @@ onMounted(() => { - + From a8e0f36562325940755910fa40228d36cf4f67e9 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 12 Jun 2024 14:42:16 +0800 Subject: [PATCH 18/75] =?UTF-8?q?fix:=20UDM=E7=AD=BE=E7=BA=A6=E6=95=B0?= =?UTF-8?q?=E6=8D=AETemplate=E8=BE=93=E5=85=A5=E9=95=BF=E5=BA=A616?= =?UTF-8?q?=E6=94=B9=E4=B8=BA50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/neUser/sub/index.vue | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue index 327eab9e..4d7d4e5c 100644 --- a/src/views/neUser/sub/index.vue +++ b/src/views/neUser/sub/index.vue @@ -1643,12 +1643,12 @@ onMounted(() => { diff --git a/src/views/ne/neHostCommand/index.vue b/src/views/ne/neHostCommand/index.vue index dd3abb3f..221b0742 100644 --- a/src/views/ne/neHostCommand/index.vue +++ b/src/views/ne/neHostCommand/index.vue @@ -497,8 +497,10 @@ onMounted(() => { - { /> - + diff --git a/src/views/ne/neInfo/components/BackConfModal.vue b/src/views/ne/neInfo/components/BackConfModal.vue index 361c1229..3d6615dd 100644 --- a/src/views/ne/neInfo/components/BackConfModal.vue +++ b/src/views/ne/neInfo/components/BackConfModal.vue @@ -244,8 +244,9 @@ defineExpose({ diff --git a/src/views/ne/neInfo/components/EditModal.vue b/src/views/ne/neInfo/components/EditModal.vue index 0365d348..ce7104d1 100644 --- a/src/views/ne/neInfo/components/EditModal.vue +++ b/src/views/ne/neInfo/components/EditModal.vue @@ -347,8 +347,10 @@ onMounted(() => { diff --git a/src/views/ne/neLicense/components/UploadLicenseFile.vue b/src/views/ne/neLicense/components/UploadLicenseFile.vue index 1dd5cf07..265efb80 100644 --- a/src/views/ne/neLicense/components/UploadLicenseFile.vue +++ b/src/views/ne/neLicense/components/UploadLicenseFile.vue @@ -185,8 +185,9 @@ onMounted(() => {}); diff --git a/src/views/ne/neSoftware/components/EditModal.vue b/src/views/ne/neSoftware/components/EditModal.vue index 8221bc81..f38b4165 100644 --- a/src/views/ne/neSoftware/components/EditModal.vue +++ b/src/views/ne/neSoftware/components/EditModal.vue @@ -344,8 +344,9 @@ onMounted(() => {}); diff --git a/src/views/ne/neSoftware/components/UploadMoreFile.vue b/src/views/ne/neSoftware/components/UploadMoreFile.vue index 93e7ee1b..eaebda82 100644 --- a/src/views/ne/neSoftware/components/UploadMoreFile.vue +++ b/src/views/ne/neSoftware/components/UploadMoreFile.vue @@ -348,8 +348,9 @@ onMounted(() => {}); - + diff --git a/src/views/ne/neVersion/index.vue b/src/views/ne/neVersion/index.vue index 9be1b73b..5458c6a2 100644 --- a/src/views/ne/neVersion/index.vue +++ b/src/views/ne/neVersion/index.vue @@ -657,8 +657,10 @@ onMounted(() => { > - {

- + diff --git a/src/views/neUser/auth/index.vue b/src/views/neUser/auth/index.vue index 7660c74b..8735da9a 100644 --- a/src/views/neUser/auth/index.vue +++ b/src/views/neUser/auth/index.vue @@ -998,8 +998,10 @@ onMounted(() => { - { - + - { - + - { - + { - { - + { - { - + - { - + - { - + { - { - + diff --git a/src/views/perfManage/customTarget/index.vue b/src/views/perfManage/customTarget/index.vue index f1db2900..2c5b78f3 100644 --- a/src/views/perfManage/customTarget/index.vue +++ b/src/views/perfManage/customTarget/index.vue @@ -295,7 +295,7 @@ function fnSelectPerformanceInit(value: any) { i => i.neType === value ); if (modalState.from.objectType) modalState.from.objectType = ''; - if(modalState.selectedPre.length > 0) modalState.selectedPre = []; + if (modalState.selectedPre.length > 0) modalState.selectedPre = []; modalState.from.expression = ''; const arrSet = new Set(); @@ -598,8 +598,10 @@ onMounted(() => { - { name="expression" v-bind="modalStateFrom.validateInfos.expression" > - + @@ -721,7 +723,7 @@ onMounted(() => { /> - + diff --git a/src/views/perfManage/perfReport/index.vue b/src/views/perfManage/perfReport/index.vue index aca5cddb..5d883b96 100644 --- a/src/views/perfManage/perfReport/index.vue +++ b/src/views/perfManage/perfReport/index.vue @@ -151,14 +151,18 @@ function fnTableSize({ key }: MenuInfo) { function fnGetList(pageNum?: number) { if (tableState.loading) return; tableState.loading = true; - if(pageNum){ + if (pageNum) { queryParams.pageNum = pageNum; } listTraceData(toRaw(queryParams)).then(res => { if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) { tablePagination.total = res.total; tableState.data = res.rows; - if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) { + if ( + tablePagination.total <= + (queryParams.pageNum - 1) * tablePagination.pageSize && + queryParams.pageNum !== 1 + ) { tableState.loading = false; fnGetList(queryParams.pageNum - 1); } @@ -470,8 +474,9 @@ onMounted(() => { - {
- + diff --git a/src/views/perfManage/perfSet/index.vue b/src/views/perfManage/perfSet/index.vue index 1ffb3721..5d883b96 100644 --- a/src/views/perfManage/perfSet/index.vue +++ b/src/views/perfManage/perfSet/index.vue @@ -158,7 +158,11 @@ function fnGetList(pageNum?: number) { if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) { tablePagination.total = res.total; tableState.data = res.rows; - if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) { + if ( + tablePagination.total <= + (queryParams.pageNum - 1) * tablePagination.pageSize && + queryParams.pageNum !== 1 + ) { tableState.loading = false; fnGetList(queryParams.pageNum - 1); } @@ -470,8 +474,9 @@ onMounted(() => { - {
- + diff --git a/src/views/perfManage/perfThreshold/index.vue b/src/views/perfManage/perfThreshold/index.vue index 1cb3354d..16ebd3b9 100644 --- a/src/views/perfManage/perfThreshold/index.vue +++ b/src/views/perfManage/perfThreshold/index.vue @@ -670,8 +670,10 @@ onMounted(() => { - { - + diff --git a/src/views/perfManage/taskManage/index.vue b/src/views/perfManage/taskManage/index.vue index 4ac5d575..2db44f35 100644 --- a/src/views/perfManage/taskManage/index.vue +++ b/src/views/perfManage/taskManage/index.vue @@ -880,8 +880,9 @@ onMounted(() => { - { t('common.close') }} - + - { /> - + diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue index 0ceb9b2e..1f124e99 100644 --- a/src/views/system/config/index.vue +++ b/src/views/system/config/index.vue @@ -449,7 +449,11 @@ function fnGetList(pageNum?: number) { } tablePagination.total = res.total; tableState.data = res.rows; - if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) { + if ( + tablePagination.total <= + (queryParams.pageNum - 1) * tablePagination.pageSize && + queryParams.pageNum !== 1 + ) { tableState.loading = false; fnGetList(queryParams.pageNum - 1); } @@ -698,8 +702,9 @@ onMounted(() => { - { {{ t('common.close') }} - + - { /> - + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 52c940a9..fda54046 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -602,8 +602,9 @@ onMounted(() => { - { t('common.cancel') }} - + - { - + diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue index 8959b006..7cb65d22 100644 --- a/src/views/system/dict/data.vue +++ b/src/views/system/dict/data.vue @@ -463,7 +463,11 @@ function fnGetList(pageNum?: number) { } tablePagination.total = res.total; tableState.data = res.rows; - if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) { + if ( + tablePagination.total <= + (queryParams.pageNum - 1) * tablePagination.pageSize && + queryParams.pageNum !== 1 + ) { tableState.loading = false; fnGetList(queryParams.pageNum - 1); } @@ -714,8 +718,9 @@ onMounted(() => { - { {{ t('common.close') }} - + - { /> - + diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 4f23a509..34ddef4b 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -452,7 +452,11 @@ function fnGetList(pageNum?: number) { } tablePagination.total = res.total; tableState.data = res.rows; - if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) { + if ( + tablePagination.total <= + (queryParams.pageNum - 1) * tablePagination.pageSize && + queryParams.pageNum !== 1 + ) { tableState.loading = false; fnGetList(queryParams.pageNum - 1); } @@ -718,8 +722,9 @@ onMounted(() => { - { t('common.cancel') }} - + - { /> - + diff --git a/src/views/system/log/operate/index.vue b/src/views/system/log/operate/index.vue index 3238b8b0..6712bbd0 100644 --- a/src/views/system/log/operate/index.vue +++ b/src/views/system/log/operate/index.vue @@ -606,8 +606,9 @@ onMounted(() => { - { {{ t('common.cancel') }} - + diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index b0515a8e..06f07173 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -717,8 +717,9 @@ onMounted(() => { - { t('common.cancel') }} - + - { /> - + diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index 69bd54be..9e824675 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -631,8 +631,9 @@ onMounted(() => { - { t('common.cancel') }} - + - { /> - + diff --git a/src/views/system/quick-start/components/NeInfoSoftwareInstall.vue b/src/views/system/quick-start/components/NeInfoSoftwareInstall.vue index bbce49d4..da463914 100644 --- a/src/views/system/quick-start/components/NeInfoSoftwareInstall.vue +++ b/src/views/system/quick-start/components/NeInfoSoftwareInstall.vue @@ -151,7 +151,7 @@ async function fnRecordInstall() { // 开始安装 let preinput = {}; if (row.neType.toUpperCase() === 'IMS') { - preinput = { pisCSCF: 'y', updateMFetc: 'No', updateMFshare: 'No' } + preinput = { pisCSCF: 'y', updateMFetc: 'No', updateMFshare: 'No' }; } const installData = { neType: row.neType, @@ -315,8 +315,9 @@ onMounted(() => { > - {

- +