diff --git a/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/ComputerHelper.cs b/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/ComputerHelper.cs index 2c0acec4..c1f68058 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/ComputerHelper.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/ComputerHelper.cs @@ -94,7 +94,7 @@ namespace Yi.Framework.Core.Helper memoryMetrics.UsedRam = Math.Round(memoryMetrics.Used / 1024, 2) + "GB"; memoryMetrics.TotalRAM = Math.Round(memoryMetrics.Total / 1024, 2) + "GB"; memoryMetrics.RAMRate = Math.Ceiling(100 * memoryMetrics.Used / memoryMetrics.Total).ToString() + "%"; - memoryMetrics.CPURate = Math.Ceiling(ParseToDouble(GetCPURate())) + "%"; + memoryMetrics.CPURate = Math.Ceiling(ParseToDouble(GetCPURate())); return memoryMetrics; } catch (Exception ex) @@ -239,7 +239,7 @@ namespace Yi.Framework.Core.Helper /// /// CPU使用率% /// - public string CPURate { get; set; } + public double CPURate { get; set; } /// /// 总内存 GB /// diff --git a/Yi.RuoYi.Vue3/src/views/monitor/server/index.vue b/Yi.RuoYi.Vue3/src/views/monitor/server/index.vue index 91ccfc85..cd046d78 100644 --- a/Yi.RuoYi.Vue3/src/views/monitor/server/index.vue +++ b/Yi.RuoYi.Vue3/src/views/monitor/server/index.vue @@ -23,11 +23,11 @@
系统使用率
-
{{ Math.floor((server.cpu.used/server.cpu.total)*100)}}%
+
{{ server.cpu.cpuRate}}%
当前空闲率
-
{{ Math.floor((server.cpu.free/server.cpu.total)*100) }}%
+
{{ 100-server.cpu.cpuRate}}%