尝试将所有监控放在顶部

This commit is contained in:
Sun 2024-01-03 20:46:58 +08:00
parent 8dfec7e4b7
commit d3e3cf5d58
2 changed files with 11 additions and 3 deletions

View File

@ -8,6 +8,7 @@ import { bytesToSize } from '@/utils/cmn'
interface ProgressStyle { interface ProgressStyle {
color: string color: string
railColor: string railColor: string
height: number
} }
let timer: NodeJS.Timer let timer: NodeJS.Timer
@ -15,6 +16,7 @@ const systemMonitorData = ref<SystemMonitor.GetAllRes | null>(null)
const progressStyle = ref<ProgressStyle>({ const progressStyle = ref<ProgressStyle>({
color: 'white', color: 'white',
railColor: 'rgba(0, 0, 0, 0.5)', railColor: 'rgba(0, 0, 0, 0.5)',
height: 5,
}) })
const svgStyle = { const svgStyle = {
width: '25px', width: '25px',
@ -64,7 +66,7 @@ onUnmounted(() => {
</script> </script>
<template> <template>
<div class="w-full p-5 px-5 bg-[#2a2a2a6b] rounded-2xl system-monitor flex items-center px-2 text-white overflow-auto"> <div class="w-full p-5 px-5 bg-[#2a2a2a6b] system-monitor flex items-center px-2 text-white overflow-auto">
<!-- <div class="flex flex-col items-center justify-center "> <!-- <div class="flex flex-col items-center justify-center ">
<div> <div>
<NProgress type="dashboard" :percentage="correctionNumber(systemMonitorData?.cpuInfo.usages[0] || 0)" :stroke-width="15" style="width: 50px;"> <NProgress type="dashboard" :percentage="correctionNumber(systemMonitorData?.cpuInfo.usages[0] || 0)" :stroke-width="15" style="width: 50px;">
@ -94,6 +96,7 @@ onUnmounted(() => {
type="line" type="line"
:color="progressStyle.color" :color="progressStyle.color"
:rail-color="progressStyle.railColor" :rail-color="progressStyle.railColor"
:height="progressStyle.height"
:percentage="correctionNumber(systemMonitorData?.cpuInfo.usages[0] || 0)" :percentage="correctionNumber(systemMonitorData?.cpuInfo.usages[0] || 0)"
:show-indicator="false" :show-indicator="false"
:stroke-width="15" :stroke-width="15"
@ -119,6 +122,7 @@ onUnmounted(() => {
type="line" type="line"
:color="progressStyle.color" :color="progressStyle.color"
:rail-color="progressStyle.railColor" :rail-color="progressStyle.railColor"
:height="progressStyle.height"
:percentage="systemMonitorData?.memoryInfo.usedPercent" :percentage="systemMonitorData?.memoryInfo.usedPercent"
:show-indicator="false" :show-indicator="false"
:stroke-width="15" style="width: 150px;" :stroke-width="15" style="width: 150px;"
@ -158,6 +162,7 @@ onUnmounted(() => {
<NProgress <NProgress
:color="progressStyle.color" :color="progressStyle.color"
:rail-color="progressStyle.railColor" :rail-color="progressStyle.railColor"
:height="progressStyle.height"
type="line" type="line"
:percentage="item.usedPercent" :percentage="item.usedPercent"
:show-indicator="false" :show-indicator="false"

View File

@ -333,6 +333,9 @@ function handleAddItem(itemIconGroupId?: number) {
/> />
<div class="mask" :style="{ backgroundColor: `rgba(0,0,0,${panelState.panelConfig.backgroundMaskNumber})` }" /> <div class="mask" :style="{ backgroundColor: `rgba(0,0,0,${panelState.panelConfig.backgroundMaskNumber})` }" />
<div ref="scrollContainerRef" class="absolute w-full h-full overflow-auto"> <div ref="scrollContainerRef" class="absolute w-full h-full overflow-auto">
<div v-if="panelState.panelConfig.searchBoxShow" class="flex mx-auto ">
<SystemMonitor @itemSearch="itemFrontEndSearch" />
</div>
<div <div
class="p-2.5 mx-auto" class="p-2.5 mx-auto"
:style="{ :style="{
@ -363,9 +366,9 @@ function handleAddItem(itemIconGroupId?: number) {
<!-- 应用盒子 --> <!-- 应用盒子 -->
<div class="mt-[50px]" :style="{ marginLeft: `${panelState.panelConfig.marginX}px`, marginRight: `${panelState.panelConfig.marginX}px` }"> <div class="mt-[50px]" :style="{ marginLeft: `${panelState.panelConfig.marginX}px`, marginRight: `${panelState.panelConfig.marginX}px` }">
<div v-if="panelState.panelConfig.searchBoxShow" class="flex mt-[20px] mx-auto "> <!-- <div v-if="panelState.panelConfig.searchBoxShow" class="flex mt-[20px] mx-auto ">
<SystemMonitor @itemSearch="itemFrontEndSearch" /> <SystemMonitor @itemSearch="itemFrontEndSearch" />
</div> </div> -->
<!-- 组纵向排列 --> <!-- 组纵向排列 -->
<div <div