From 8f10146d39cf95dac9b68c83c4474d11d453530c Mon Sep 17 00:00:00 2001
From: GitHubList <GitHubList@Outlook.com>
Date: Wed, 28 Aug 2024 00:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DCPU=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=8E=87=E3=80=81=E5=BD=93=E5=89=8D=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B2=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/Yi.Framework.Core/Helper/ComputerHelper.cs      | 4 ++--
 Yi.RuoYi.Vue3/src/views/monitor/server/index.vue              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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
         /// <summary>
         /// CPU使用率%
         /// </summary>
-        public string CPURate { get; set; }
+        public double CPURate { get; set; }
         /// <summary>
         /// 总内存 GB
         /// </summary>
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 @@
                 </tr>
                 <tr>
                   <td class="el-table__cell is-leaf"><div class="cell">系统使用率</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.cpu">{{ Math.floor((server.cpu.used/server.cpu.total)*100)}}%</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.cpu">{{ server.cpu.cpuRate}}%</div></td>
                 </tr>
                 <tr>
                   <td class="el-table__cell is-leaf"><div class="cell">当前空闲率</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.cpu">{{ Math.floor((server.cpu.free/server.cpu.total)*100) }}%</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.cpu">{{ 100-server.cpu.cpuRate}}%</div></td>
                 </tr>
               </tbody>
             </table>