From 053517324dc77844e8a895139fb5358aec0ccbac Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 19 Nov 2024 10:23:43 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BD=91=E5=85=83?= =?UTF-8?q?=E6=A6=82=E8=A7=88=E6=95=B0=E6=8D=AE=E9=A5=BC=E5=9B=BE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/configManage/neOverview/index.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/views/configManage/neOverview/index.vue b/src/views/configManage/neOverview/index.vue index ab00250a..4e15e309 100644 --- a/src/views/configManage/neOverview/index.vue +++ b/src/views/configManage/neOverview/index.vue @@ -174,15 +174,13 @@ function fnGetList(one: boolean) { tableState.loading = false; var rightNum = 0; var errorNum = 0; - // if (res.length) nfInfo.serialNum = res[0].serialNum; - for (let i = 0; i < res.length; i++) { - if (res[i].status == '正常' || res[i].status == 'Normal') { + res.data.forEach((item: any) => { + if (item.serverState.online) { rightNum++; } else { errorNum++; } - } - + }); const optionData: any = { title: { text: '', From 6bd7a284580cd45cd84aca66b7ce5d45a55e4757 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 19 Nov 2024 10:24:32 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E7=9C=8B=E6=9D=BF=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B4=BB=E5=8A=A8=E5=90=8420=E6=9D=A1?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/overview/hooks/useWS.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/dashboard/overview/hooks/useWS.ts b/src/views/dashboard/overview/hooks/useWS.ts index 33936ada..df85c983 100644 --- a/src/views/dashboard/overview/hooks/useWS.ts +++ b/src/views/dashboard/overview/hooks/useWS.ts @@ -136,7 +136,7 @@ export default function useWS() { sortField: 'timestamp', sortOrder: 'desc', pageNum: 1, - pageSize: 5, + pageSize: 20, }, }); // MME_UE会话事件 @@ -149,7 +149,7 @@ export default function useWS() { sortField: 'timestamp', sortOrder: 'desc', pageNum: 1, - pageSize: 5, + pageSize: 20, }, }); // IMS_CDR会话事件 @@ -163,7 +163,7 @@ export default function useWS() { sortField: 'timestamp', sortOrder: 'desc', pageNum: 1, - pageSize: 5, + pageSize: 20, }, }); } From 49bd59c6394a75bf1dc15925fefabc46139b302e Mon Sep 17 00:00:00 2001 From: lai <371757574@qq.com> Date: Tue, 19 Nov 2024 11:28:49 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=9B=9E=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/perfManage/customTarget/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/perfManage/customTarget/index.vue b/src/views/perfManage/customTarget/index.vue index 00c4fe8c..fa79791f 100644 --- a/src/views/perfManage/customTarget/index.vue +++ b/src/views/perfManage/customTarget/index.vue @@ -385,7 +385,7 @@ function fnModalOk() { message.error(t('views.perfManage.customTarget.expressionNoIdTip'), 3); return false; } - + modalState.from.expression = result; const from = toRaw(modalState.from); //return false; modalState.confirmLoading = true; From 2c9807f9b8f8226640717ab441e4509bd3b624c8 Mon Sep 17 00:00:00 2001 From: lai <371757574@qq.com> Date: Tue, 19 Nov 2024 11:36:03 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=85=A8=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/perfManage/kpiCReport/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/perfManage/kpiCReport/index.vue b/src/views/perfManage/kpiCReport/index.vue index 030a203e..af85ca1d 100644 --- a/src/views/perfManage/kpiCReport/index.vue +++ b/src/views/perfManage/kpiCReport/index.vue @@ -199,7 +199,7 @@ type StateType = { let state: StateType = reactive({ neType: [], chartRealTime: false, - chartLegendSelectedFlag: false, + chartLegendSelectedFlag: true, }); // 存储每个指标的临时固定颜色 From 68e002776ced0bbc64882363aa37dc403400690c Mon Sep 17 00:00:00 2001 From: lai <371757574@qq.com> Date: Tue, 19 Nov 2024 14:09:37 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=95=B0=E6=8D=AE?= =?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/views/perfManage/goldTarget/index.vue | 2 +- src/views/perfManage/kpiCReport/index.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/perfManage/goldTarget/index.vue b/src/views/perfManage/goldTarget/index.vue index 63699eaf..76906d09 100644 --- a/src/views/perfManage/goldTarget/index.vue +++ b/src/views/perfManage/goldTarget/index.vue @@ -186,7 +186,7 @@ type StateType = { let state: StateType = reactive({ neType: [], chartRealTime: false, - chartLegendSelectedFlag: false, + chartLegendSelectedFlag: true, }); // 存储每个指标的临时固定颜色 diff --git a/src/views/perfManage/kpiCReport/index.vue b/src/views/perfManage/kpiCReport/index.vue index af85ca1d..1a5ca6dc 100644 --- a/src/views/perfManage/kpiCReport/index.vue +++ b/src/views/perfManage/kpiCReport/index.vue @@ -551,18 +551,18 @@ function fnRanderChartData() { } for (const item of orgData) { - chartDataXAxisData.push(item['timeGroup']); const keys = Object.keys(item); for (const y of chartDataYSeriesData) { for (const key of keys) { if (y.key === key) { y.data.push(+item[key]); + chartDataXAxisData.push(item['timeGroup']); } } } } - // console.log(queryParams.sortOrder, chartLegendSelected); - // console.log(chartDataXAxisData, chartDataYSeriesData); + ///console.log(queryParams.sortOrder, chartDataXAxisData); + console.log(chartDataXAxisData, chartDataYSeriesData); // 绘制图数据 kpiChart.value.setOption( From a85f87f3fca2d9e5278c077f472ea5ad2d6159e7 Mon Sep 17 00:00:00 2001 From: lai <371757574@qq.com> Date: Tue, 19 Nov 2024 14:23:16 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=B1=85=E4=B8=AD=E6=98=BE=E7=A4=BAtooltip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/perfManage/goldTarget/index.vue | 29 +++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/src/views/perfManage/goldTarget/index.vue b/src/views/perfManage/goldTarget/index.vue index 76906d09..3d6eee32 100644 --- a/src/views/perfManage/goldTarget/index.vue +++ b/src/views/perfManage/goldTarget/index.vue @@ -43,7 +43,7 @@ import { generateColorRGBA } from '@/utils/generate-utils'; import { OptionsType, WS } from '@/plugins/ws-websocket'; import { useRoute } from 'vue-router'; import { LineOutlined } from '@ant-design/icons-vue'; - const neInfoStore = useNeInfoStore(); +const neInfoStore = useNeInfoStore(); const route = useRoute(); const { t, currentLocale } = useI18n(); const ws = new WS(); @@ -411,12 +411,33 @@ function fnRanderChart() { if (!container) return; //若没有，则退出函数 kpiChart.value = markRaw(echarts.init(container, 'light')); //初始化Echarts图表实例，应用light主题，并赋值给kpiChart.value，markRaw是vue函数，用于标记对象为不可响应 - const option: EChartsOption = { + const option: any = { //定义图表的配置对象，tooltip的出发方式为axis tooltip: { trigger: 'axis', - position: function (pt: any) { - return [pt[0], '10%']; + position: function ( + point: number[], + size: { viewSize: number[]; contentSize: number[] } + ) { + const [x, y] = point; + const [viewWidth] = size.viewSize; + const [tooltipWidth, tooltipHeight] = size.contentSize; + + // 距离右侧的距离 + const rightSpace = viewWidth - x; + + // 计算垂直方向的居中位置 + // 将 tooltip 的中心点对齐到鼠标位置 + const verticalOffset = -tooltipHeight / 2; + + // 如果右侧空间不足以显示tooltip（假设需要20px的安全距离） + if (rightSpace < tooltipWidth + 20) { + // 向左显示，垂直居中 + return [x - tooltipWidth - 10, y + verticalOffset]; + } + + // 默认向右显示，垂直居中 + return [x + 10, y + verticalOffset]; }, }, xAxis: { From ebc46ff7d4f2028ac4991312ce3afd2f42a04ffe Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 19 Nov 2024 16:58:07 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E5=B7=A5=E5=85=B7ipfer=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E5=AE=A2=E6=88=B7=E7=AB=AFhost=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tool/iperf/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/tool/iperf/index.vue b/src/views/tool/iperf/index.vue index f9b0ee0d..486a6379 100644 --- a/src/views/tool/iperf/index.vue +++ b/src/views/tool/iperf/index.vue @@ -66,7 +66,7 @@ async function fnIPerf() { }); return; } - if (state.dataType === 'options' && state.data.host === '') { + if (state.dataType === 'options' && state.data.mode === 'client' && state.data.host === '') { message.warning({ content: 'Please fill in the Host', duration: 2,