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: '', 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, }, }); } 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; diff --git a/src/views/perfManage/goldTarget/index.vue b/src/views/perfManage/goldTarget/index.vue index 63699eaf..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(); @@ -186,7 +186,7 @@ type StateType = { let state: StateType = reactive({ neType: [], chartRealTime: false, - chartLegendSelectedFlag: false, + chartLegendSelectedFlag: true, }); // 存储每个指标的临时固定颜色 @@ -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: { diff --git a/src/views/perfManage/kpiCReport/index.vue b/src/views/perfManage/kpiCReport/index.vue index 030a203e..1a5ca6dc 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, }); // 存储每个指标的临时固定颜色 @@ -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( 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,