diff --git a/src/components/charts/line.js b/src/components/charts/line.js index ecf87ec..491713f 100644 --- a/src/components/charts/line.js +++ b/src/components/charts/line.js @@ -36,10 +36,29 @@ export default ( }, formatter: (params) => { const time = dayjs(parseInt(params[0].axisValue, 10)).format('YYYY.MM.DD HH:mm'); - let res = `${time}
`; - params.forEach((i) => { - res += `${i.marker} ${i.seriesName}: ${i.value[1]}ms
`; - }); + let res = `

${time}

`; + if (params.length < 10) { + params.forEach((i) => { + res += `${i.marker} ${i.seriesName}: ${i.value[1]}ms
`; + }); + } else { + res += ''; + let trEnd = false; + params.forEach((i, index) => { + if (index % 2 === 0) { + res += ''; + } + res += ``; + if (index % 2 === 1) { + res += ''; + trEnd = true; + } + }); + if (!trEnd) { + res += ''; + } + res += '
${i.marker} ${i.seriesName}: ${i.value[1]}ms
'; + } return res; }, backgroundColor: mode === 'dark' ? 'rgba(0, 0, 0, 0.7)' : 'rgba(255, 255, 255, 0.7)', diff --git a/src/views/components/server-detail/server-monitor.vue b/src/views/components/server-detail/server-monitor.vue index ba22511..3aa610d 100644 --- a/src/views/components/server-detail/server-monitor.vue +++ b/src/views/components/server-detail/server-monitor.vue @@ -166,10 +166,8 @@ const showCates = ref({}); const monitorData = ref([]); -const accpetShowTime = computed(() => { - const now = store.state.serverTime || Date.now(); - return now - (minute.value * 60 * 1000); -}); +const now = ref(Date.now()); +const accpetShowTime = computed(() => now.value - (minute.value * 60 * 1000)); const minuteActiveArrowStyle = computed(() => { const index = minutes.findIndex((i) => i.value === minute.value); @@ -308,6 +306,7 @@ function switchRefresh() { } function toggleMinute(value) { + now.value = store.state.serverTime || Date.now(); minute.value = value; } @@ -328,6 +327,7 @@ async function loadMonitor() { }).catch((err) => { console.error(err); }); + now.value = store.state.serverTime || Date.now(); } let loadMonitorTimer = null;