diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 233c1580..6adf2c1d 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -517,7 +517,7 @@ export default { title: "Resource Summary", sysMem: "SYS Mem", sysCpu: "SYS CPU", - sysDisk: "SYS Disk", + sysDisk: "SYS Store", neCpu: "NE CPU", }, topology: { @@ -533,6 +533,7 @@ export default { called: "Called", result: "Result", time: "Time", + resultOK: "OK", }, }, }, diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index c70bce29..e59d6ced 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -517,7 +517,7 @@ export default { title: "资源情况", sysMem: "系统内存", sysCpu: "系统CPU", - sysDisk: "系统磁盘", + sysDisk: "系统存储", neCpu: "网元CPU", }, topology: { @@ -533,6 +533,7 @@ export default { called: "被叫", result: "结果", time: "时间", + resultOK: "成功", }, } }, diff --git a/src/views/dashboard/overview/components/AlarnTypeBar/index.vue b/src/views/dashboard/overview/components/AlarnTypeBar/index.vue index dfbecd73..c50867d5 100644 --- a/src/views/dashboard/overview/components/AlarnTypeBar/index.vue +++ b/src/views/dashboard/overview/components/AlarnTypeBar/index.vue @@ -120,33 +120,35 @@ function initPicture() { title: [ { text: '', + show: false, }, { text: t('views.dashboard.overview.alarmTypeBar.topTitle'), textStyle: { - color: '#63C0FA', + color: '#fff', fontSize: '14', fontFamily: 'PingFang', fontWeight: '400', }, top: '50%', - left: '6%', + left: '0%', }, ], tooltip: { trigger: 'item', + formatter: '{b}', }, grid: [ { - top: '55%', + top: '60%', left: '15%', right: '25%', - bottom: '3%', + bottom: '10%', }, ], legend: { orient: 'vertical', - left: '72%', + right: '2%', top: '10%', data: pieArr.map((item: any) => item.name), //label数组 textStyle: { @@ -154,7 +156,7 @@ function initPicture() { }, }, // 饼图设置 - color: ['#FFAE57', '#FF7853', '#EA5151', '#CC3F57', '#9A2555'], + // color: ['#FFAE57', '#FF7853', '#EA5151', '#CC3F57', '#9A2555'], // color: ['#FFAE57', '#FFA500', '#FFAE57', '#1E90FF', '#1E90FF'], //红橙黄蓝绿 为告警级别配色 以严重性依次往下! series: [ @@ -168,7 +170,7 @@ function initPicture() { labelLine: { show: false, }, - center: ['45%', '25%'], + center: ['35%', '25%'], data: pieArr.sort((a: any, b: any) => { return a.value - b.value; }), @@ -207,23 +209,11 @@ function initPicture() { }, // 柱子上方的数值 itemStyle: { borderRadius: [0, 20, 20, 0], // 圆角(左上、右上、右下、左下) - color: new echarts.graphic.LinearGradient( - 1, - 0, - 0, - 0, - [ - { - offset: 0, - color: '#51C5FD', - }, - { - offset: 1, - color: '#005BB1', - }, - ], - false - ), // 渐变 + color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [ + { offset: 0, color: '#f0f5ff' }, + { offset: 0.5, color: '#adc6ff' }, + { offset: 1, color: '#2f54eb' }, + ]), // 渐变 }, data: firstThreeItems.map((item: any) => item.value), }, diff --git a/src/views/dashboard/overview/components/NeResources/index.vue b/src/views/dashboard/overview/components/NeResources/index.vue index 0b3471a1..29db6913 100644 --- a/src/views/dashboard/overview/components/NeResources/index.vue +++ b/src/views/dashboard/overview/components/NeResources/index.vue @@ -29,7 +29,11 @@ const neResourcesChart = ref(null); // 类别 const category = ref([ { - name: t('views.dashboard.overview.resources.neCpu'), + name: t('views.dashboard.overview.resources.sysDisk'), + value: 1, + }, + { + name: t('views.dashboard.overview.resources.sysMem'), value: 1, }, { @@ -37,11 +41,7 @@ const category = ref([ value: 1, }, { - name: t('views.dashboard.overview.resources.sysDisk'), - value: 1, - }, - { - name: t('views.dashboard.overview.resources.sysMem'), + name: t('views.dashboard.overview.resources.neCpu'), value: 1, }, ]); @@ -245,7 +245,7 @@ function fnChangeData(data: any[], itemID: string) { // console.log(info.id); // console.log(info.neState.cpu.nfCpuUsage); // console.log(info.neState.cpu.sysCpuUsage); - // console.log(info.neState.mem.sysMemUsage); + // console.log(info.neState.mem); // console.log(info.neState.disk); let sysCpuUsage = 0; let nfCpuUsage = 0; @@ -290,10 +290,10 @@ function fnChangeData(data: any[], itemID: string) { } } - category.value[0].value = nfCpuUsage; - category.value[1].value = sysCpuUsage; - category.value[2].value = sysDiskUsage; - category.value[3].value = sysMemUsage; + category.value[0].value = sysDiskUsage; + category.value[1].value = sysMemUsage; + category.value[2].value = sysCpuUsage; + category.value[3].value = nfCpuUsage; neResourcesChart.value.setOption({ series: [ { diff --git a/src/views/dashboard/overview/components/Topology/index.vue b/src/views/dashboard/overview/components/Topology/index.vue index 1322291c..ae129588 100644 --- a/src/views/dashboard/overview/components/Topology/index.vue +++ b/src/views/dashboard/overview/components/Topology/index.vue @@ -21,7 +21,7 @@ const graphG6Dom = ref(undefined); /**图节点展示 */ const graphNodeTooltip = new Tooltip({ - offsetX: 10, + offsetX: 20, offsetY: 20, getContent(evt) { if (!evt) return t('views.monitor.topologyBuild.graphNotInfo'); diff --git a/src/views/dashboard/overview/components/UserActivity/index.vue b/src/views/dashboard/overview/components/UserActivity/index.vue index c9f29ae6..681d4f6d 100644 --- a/src/views/dashboard/overview/components/UserActivity/index.vue +++ b/src/views/dashboard/overview/components/UserActivity/index.vue @@ -15,13 +15,16 @@ let dict: { cdrCallType: DictType[]; /**UE 事件认证代码类型 */ ueAauthCode: DictType[]; - /**UE 事件认证代码类型 */ + /**UE 事件类型 */ ueEventType: DictType[]; + /**UE 事件CM状态 */ + ueEventCmState: DictType[]; } = reactive({ cdrSipCode: [], cdrCallType: [], ueAauthCode: [], ueEventType: [], + ueEventCmState: [], }); onMounted(() => { @@ -31,6 +34,7 @@ onMounted(() => { getDict('cdr_call_type'), getDict('ue_auth_code'), getDict('ue_event_type'), + getDict('ue_event_cm_state'), ]).then(resArr => { if (resArr[0].status === 'fulfilled') { dict.cdrSipCode = resArr[0].value; @@ -44,6 +48,9 @@ onMounted(() => { if (resArr[3].status === 'fulfilled') { dict.ueEventType = resArr[3].value; } + if (resArr[4].status === 'fulfilled') { + dict.ueEventCmState = resArr[4].value; + } }); }); @@ -84,9 +91,9 @@ onMounted(() => {
{{ t('views.dashboard.overview.userActivity.called') }}: - {{ - item.data.calledParty - }} + + {{ item.data.calledParty }} +
{{ t('views.dashboard.overview.userActivity.duration') }}: @@ -152,11 +159,13 @@ onMounted(() => {
{{ t('views.dashboard.overview.userActivity.result') }}: - {{ item.data.detachResult }} + {{ t('views.dashboard.overview.userActivity.resultOK') }}
{{ t('views.dashboard.overview.userActivity.result') }}: - {{ item.data.status }} + + +
diff --git a/src/views/dashboard/overview/css/index.css b/src/views/dashboard/overview/css/index.css index bbc66624..06ebcf7d 100644 --- a/src/views/dashboard/overview/css/index.css +++ b/src/views/dashboard/overview/css/index.css @@ -209,7 +209,7 @@ display: flex; flex-direction: column; justify-content: space-around; - height: 72%; + height: 60%; } .upfFlowTotal .inner .chart .data .item { display: flex; @@ -228,8 +228,8 @@ /* 资源情况 */ .resources { - min-height: 13.6rem; - height: 25.5%; + min-height: 18rem rem; + height: 33.5%; } .resources .inner .chart { width: 100%; @@ -239,8 +239,8 @@ /* 告警统计 */ .alarmType { - min-height: 22rem; - height: 54.5%; + min-height: 25rem; + height: 46.5%; } .alarmType .inner .chart { width: 100%; diff --git a/src/views/dashboard/overview/index.vue b/src/views/dashboard/overview/index.vue index e40b43f7..2d3659b7 100644 --- a/src/views/dashboard/overview/index.vue +++ b/src/views/dashboard/overview/index.vue @@ -83,7 +83,7 @@ function fnGetState() { }); } - stateTimeout.value = setTimeout(() => fnGetState(), 10_000); + stateTimeout.value = setTimeout(() => fnGetState(), 10_000); } /**初始数据函数 */ @@ -97,13 +97,13 @@ function InitData() { stateInterval.value = setInterval(() => { upfTFActive.value = upfTFActive.value >= 2 ? 0 : upfTFActive.value + 1; - // if (upfTFActive.value === 0) { - // upfTFSend(7); - // } else if (upfTFActive.value === 1) { - // upfTFSend(30); - // } else if (upfTFActive.value === 2) { - // upfTFSend(0); - // } + if (upfTFActive.value === 0) { + upfTFSend(7); + } else if (upfTFActive.value === 1) { + upfTFSend(30); + } else if (upfTFActive.value === 2) { + upfTFSend(0); + } }, 10_000); } @@ -161,8 +161,8 @@ onMounted(() => { }); onBeforeUnmount(() => { - // clearTimeout(stateTimeout.value); - //clearTimeout(stateInterval.value); + clearTimeout(stateTimeout.value); + clearTimeout(stateInterval.value); }); @@ -344,7 +344,18 @@ onBeforeUnmount(() => { - + +
+
+

+    + {{ t('views.dashboard.overview.alarmTypeBar.alarmSum') }} +

+
+ +
+
+
@@ -358,19 +369,6 @@ onBeforeUnmount(() => {
- - -
-
-

-    - {{ t('views.dashboard.overview.alarmTypeBar.alarmSum') }} -

-
- -
-
-