xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!34 修复CPU系统使用率、当前空闲率

Browse Source 
Merge pull request !34 from GitHubList/abp
This commit is contained in:
橙子
2024-08-31 10:47:28 +00:00
committed by Gitee
parent bfe0f346c8 8f10146d39
commit eadb5eb216
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/ComputerHelper.cs
View File

@@ -94,7 +94,7 @@ namespace Yi.Framework.Core.Helper
memoryMetrics.UsedRam = Math.Round(memoryMetrics.Used / 1024, 2) + "GB"; memoryMetrics.UsedRam = Math.Round(memoryMetrics.Used / 1024, 2) + "GB";
memoryMetrics.TotalRAM = Math.Round(memoryMetrics.Total / 1024, 2) + "GB"; memoryMetrics.TotalRAM = Math.Round(memoryMetrics.Total / 1024, 2) + "GB";
memoryMetrics.RAMRate = Math.Ceiling(100 * memoryMetrics.Used / memoryMetrics.Total).ToString() + "%"; memoryMetrics.RAMRate = Math.Ceiling(100 * memoryMetrics.Used / memoryMetrics.Total).ToString() + "%";
memoryMetrics.CPURate = Math.Ceiling(ParseToDouble(GetCPURate())) + "%"; memoryMetrics.CPURate = Math.Ceiling(ParseToDouble(GetCPURate()));
return memoryMetrics; return memoryMetrics;
} }
catch (Exception ex) catch (Exception ex)
@@ -239,7 +239,7 @@ namespace Yi.Framework.Core.Helper
/// <summary> /// <summary>
/// CPU使用率% /// CPU使用率%
/// </summary> /// </summary>
public string CPURate { get; set; } public double CPURate { get; set; }
/// <summary> /// <summary>
/// 总内存 GB /// 总内存 GB
/// </summary> /// </summary>

4
Yi.RuoYi.Vue3/src/views/monitor/server/index.vue
View File

@@ -23,11 +23,11 @@
</tr> </tr>
<tr> <tr>
<td class="el-table__cell is-leaf"><div class="cell">系统使用率</div></td> <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>
<tr> <tr>
<td class="el-table__cell is-leaf"><div class="cell">当前空闲率</div></td> <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> </tr>
</tbody> </tbody>
</table> </table>