github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 优化监控页空数据显示 (#1229)

pull/1232/head
ssongliu 2023-06-02 11:50:27 +08:00 committed by GitHub
parent 4f650cad9d
commit 488eb319a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
frontend/src/views/host/monitor/monitor/index.vue
View File

@ -220,7 +220,7 @@ const search = async (param: string) => {
} }
switch (item.param) { switch (item.param) {
case 'base': case 'base':
let baseDate = item.date.length === 0 ? loadEmptyDate() : item.date; let baseDate = item.date.length === 0 ? loadEmptyDate(timeRangeCpu.value) : item.date;
baseDate = baseDate.map(function (item: any) { baseDate = baseDate.map(function (item: any) {
return dateFormatWithoutYear(item); return dateFormatWithoutYear(item);
}); });
@ -282,7 +282,7 @@ const search = async (param: string) => {
initIOCharts(item); initIOCharts(item);
break; break;
case 'network': case 'network':
let networkDate = item.date.length === 0 ? loadEmptyDate() : item.date; let networkDate = item.date.length === 0 ? loadEmptyDate(timeRangeNetwork.value) : item.date;
networkDate = networkDate.map(function (item: any) { networkDate = networkDate.map(function (item: any) {
return dateFormatWithoutYear(item); return dateFormatWithoutYear(item);
}); });
@ -371,7 +371,7 @@ function initCharts(chartName: string, xDatas: any, yDatas: any, yTitle: string,
} }
function initLoadCharts(item: Monitor.MonitorData) { function initLoadCharts(item: Monitor.MonitorData) {
let itemLoadDate = item.date.length === 0 ? loadEmptyDate() : item.date; let itemLoadDate = item.date.length === 0 ? loadEmptyDate(timeRangeLoad.value) : item.date;
let loadDate = itemLoadDate.map(function (item: any) { let loadDate = itemLoadDate.map(function (item: any) {
return dateFormatWithoutYear(item); return dateFormatWithoutYear(item);
}); });
@ -508,7 +508,7 @@ function initLoadCharts(item: Monitor.MonitorData) {
} }
function initIOCharts(item: Monitor.MonitorData) { function initIOCharts(item: Monitor.MonitorData) {
let itemIODate = item.date.length === 0 ? loadEmptyDate() : item.date; let itemIODate = item.date?.length === 0 ? loadEmptyDate(timeRangeIO.value) : item.date;
let ioDate = itemIODate.map(function (item: any) { let ioDate = itemIODate.map(function (item: any) {
return dateFormatWithoutYear(item); return dateFormatWithoutYear(item);
}); });
@ -660,17 +660,16 @@ function initIOCharts(item: Monitor.MonitorData) {
lineChart.setOption(option, true); lineChart.setOption(option, true);
} }
function loadEmptyDate() { function loadEmptyDate(timeRange: any) {
let dateNow = new Date(); if (timeRange.length != 2) {
let date1 = new Date(dateNow.getTime() - 3600 * 1000 * 4); return;
let date2 = new Date(dateNow.getTime() - 3600 * 1000 * 3); }
let date3 = new Date(dateNow.getTime() - 3600 * 1000 * 2); let date1 = new Date(timeRange[0]);
let date4 = new Date(dateNow.getTime() - 3600 * 1000 * 1); let date2 = new Date(timeRange[1]);
let date5 = dateNow; return [date1, date2];
return [date1, date2, date3, date4, date5];
} }
function loadEmptyData() { function loadEmptyData() {
return [0, 0, 0, 0, 0]; return [0, 0];
} }
function changeChartSize() { function changeChartSize() {