diff --git a/.env.development b/.env.development index 91246911..97ce74ca 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.240516.1" +VITE_APP_VERSION = "2.240517.1" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/.env.production b/.env.production index 04cf4c35..fa1425ce 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.240516.1" +VITE_APP_VERSION = "2.240517.1" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/src/api/faultManage/actAlarm.ts b/src/api/faultManage/actAlarm.ts index c85f3733..7d96ac81 100644 --- a/src/api/faultManage/actAlarm.ts +++ b/src/api/faultManage/actAlarm.ts @@ -294,7 +294,7 @@ export async function exportAll(query: Record) { * @returns bolb */ export async function origGet() { - let totalSQL = `select count(*) as value,orig_severity as name from alarm group by orig_severity`; + let totalSQL = `select count(*) as value,orig_severity as name from alarm WHERE alarm_status='1' group by orig_severity`; // 发起请求 const result = await request({ @@ -329,8 +329,8 @@ export async function origGet() { * @returns object */ export async function top3Sel(filterFlag?: string) { - let filter = ` WHERE orig_severity='${filterFlag}'`; - if (!filterFlag) filter = ''; + let filter = ` WHERE alarm_status='1'and orig_severity='${filterFlag}'`; + if (!filterFlag) filter = "WHERE alarm_status='1'"; let top3SQL = `select count(*) as value,ne_type as name from alarm ${filter} group by ne_type ORDER BY value desc limit 0,3 `; diff --git a/src/views/dashboard/amfUE/index.vue b/src/views/dashboard/amfUE/index.vue index 03674474..0a4f77aa 100644 --- a/src/views/dashboard/amfUE/index.vue +++ b/src/views/dashboard/amfUE/index.vue @@ -39,6 +39,7 @@ let queryParams = reactive({ neType: 'AMF', neId: '001', eventType: 'auth-result', + imsi: '', sortField: 'timestamp', sortOrder: 'desc', /**当前页数 */ @@ -52,6 +53,7 @@ function fnQueryReset() { eventTypes.value = ['auth-result']; queryParams = Object.assign(queryParams, { eventType: 'auth-result', + imsi: '', pageNum: 1, pageSize: 20, }); @@ -105,7 +107,7 @@ let tableColumns: ColumnsType = [ title: 'IMSI', dataIndex: 'eventJSON', align: 'left', - width: 100, + width: 150, customRender(opt) { const eventJSON = opt.value; return eventJSON.imsi; @@ -116,20 +118,20 @@ let tableColumns: ColumnsType = [ dataIndex: 'eventType', key: 'eventType', align: 'left', - width: 100, + width: 150, }, { title: t('views.dashboard.ue.result'), dataIndex: 'eventJSON', key: 'result', align: 'left', - width: 100, + width: 150, }, { title: t('views.dashboard.ue.time'), dataIndex: 'eventJSON', key: 'time', - align: 'center', + align: 'left', width: 150, }, { @@ -383,20 +385,29 @@ onBeforeUnmount(() => { - + + + + + + diff --git a/src/views/dashboard/imsCDR/index.vue b/src/views/dashboard/imsCDR/index.vue index 621b645f..2696dd21 100644 --- a/src/views/dashboard/imsCDR/index.vue +++ b/src/views/dashboard/imsCDR/index.vue @@ -37,6 +37,8 @@ let queryParams = reactive({ neType: 'IMS', neId: '001', recordType: 'MOC', + callerParty: '', + calledParty: '', sortField: 'timestamp', sortOrder: 'desc', /**当前页数 */ @@ -50,6 +52,8 @@ function fnQueryReset() { recordTypes.value = ['MOC']; queryParams = Object.assign(queryParams, { recordType: 'MOC', + callerParty: '', + calledParty: '', pageNum: 1, pageSize: 20, }); @@ -411,14 +415,14 @@ onBeforeUnmount(() => { - + { > - + + + + + + + + + + + diff --git a/src/views/dashboard/overview/css/index.css b/src/views/dashboard/overview/css/index.css index fcb6d4c2..56a135e4 100644 --- a/src/views/dashboard/overview/css/index.css +++ b/src/views/dashboard/overview/css/index.css @@ -221,7 +221,7 @@ .upfFlowTotal .inner .chart { width: 100%; height: 100%; - margin-top: 1rem; + margin-top: 0.1rem; } .upfFlowTotal .inner .chart .data { display: flex; diff --git a/src/views/logManage/operation/index.vue b/src/views/logManage/operation/index.vue deleted file mode 100644 index 04cc9bf3..00000000 --- a/src/views/logManage/operation/index.vue +++ /dev/null @@ -1,358 +0,0 @@ - - - - - diff --git a/src/views/logManage/security/index.vue b/src/views/logManage/security/index.vue deleted file mode 100644 index baf25c89..00000000 --- a/src/views/logManage/security/index.vue +++ /dev/null @@ -1,337 +0,0 @@ - - - - - diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue index 868afdb9..eb3b7b29 100644 --- a/src/views/monitor/online/index.vue +++ b/src/views/monitor/online/index.vue @@ -66,11 +66,11 @@ let tableColumns: ColumnsType = [ dataIndex: 'ipaddr', align: 'center', }, - { - title: t('views.monitor.online.loginDes'), - dataIndex: 'loginLocation', - align: 'center', - }, + // { + // title: t('views.monitor.online.loginDes'), + // dataIndex: 'loginLocation', + // align: 'center', + // }, { title: t('views.monitor.online.os'), dataIndex: 'os', diff --git a/src/views/system/log/login/index.vue b/src/views/system/log/login/index.vue index ef5f19db..aaf15eee 100644 --- a/src/views/system/log/login/index.vue +++ b/src/views/system/log/login/index.vue @@ -112,12 +112,12 @@ let tableColumns: ColumnsType = [ align: 'left', width: 150, }, - { - title: t('views.system.log.login.loginLoc'), - dataIndex: 'loginLocation', - align: 'left', - width: 150, - }, + // { + // title: t('views.system.log.login.loginLoc'), + // dataIndex: 'loginLocation', + // align: 'left', + // width: 150, + // }, { title: t('views.system.log.login.os'), dataIndex: 'os', diff --git a/src/views/system/log/operate/index.vue b/src/views/system/log/operate/index.vue index d77c3da2..b56c835d 100644 --- a/src/views/system/log/operate/index.vue +++ b/src/views/system/log/operate/index.vue @@ -656,8 +656,7 @@ onMounted(() => { :label="t('views.system.log.operate.operUser')" name="operName" > - {{ modalState.from.operName }} / {{ modalState.from.operIp }} / - {{ modalState.from.operLocation }} + {{ modalState.from.operName }} / {{ modalState.from.operIp }}