diff --git a/frontend/src/layouts/BaseLayout.vue b/frontend/src/layouts/BaseLayout.vue index c26a3927..b09ac4dd 100644 --- a/frontend/src/layouts/BaseLayout.vue +++ b/frontend/src/layouts/BaseLayout.vue @@ -23,7 +23,7 @@ function getClientWidth() { } function collapse() { - return getClientWidth() < 768 + return getClientWidth() < 1280 } const lang = computed(() => { diff --git a/frontend/src/views/dashboard/DashBoard.vue b/frontend/src/views/dashboard/DashBoard.vue index 9d154dd4..c535270f 100644 --- a/frontend/src/views/dashboard/DashBoard.vue +++ b/frontend/src/views/dashboard/DashBoard.vue @@ -44,6 +44,11 @@ onMounted(() => { Object.assign(memory, r.memory) Object.assign(disk, r.disk) + // uptime + handle_uptime(r.host?.uptime) + // load_avg + Object.assign(loadavg, r.loadavg) + net.last_recv = r.network.init.bytesRecv net.last_sent = r.network.init.bytesSent r.cpu.user.forEach((u: Usage) => { @@ -71,6 +76,16 @@ onUnmounted(() => { websocket.close() }) +function handle_uptime(t: number) { + // uptime + let _uptime = Math.floor(t) + let uptime_days = Math.floor(_uptime / 86400) + _uptime -= uptime_days * 86400 + let uptime_hours = Math.floor(_uptime / 3600) + _uptime -= uptime_hours * 3600 + uptime.value = uptime_days + 'd ' + uptime_hours + 'h ' + Math.floor(_uptime / 60) + 'm' +} + function wsOnMessage(m: { data: any }) { const r = JSON.parse(m.data) @@ -96,12 +111,7 @@ function wsOnMessage(m: { data: any }) { disk_io.reads = r.disk.reads.y // uptime - let _uptime = Math.floor(r.uptime) - let uptime_days = Math.floor(_uptime / 86400) - _uptime -= uptime_days * 86400 - let uptime_hours = Math.floor(_uptime / 3600) - _uptime -= uptime_hours * 3600 - uptime.value = uptime_days + 'd ' + uptime_hours + 'h ' + Math.floor(_uptime / 60) + 'm' + handle_uptime(r.uptime) // loadavg Object.assign(loadavg, r.loadavg) @@ -142,19 +152,21 @@ function wsOnMessage(m: { data: any }) {
-