Merge remote-tracking branch 'origin/main' into multi-tenant

2024-07-06 15:54:53 +08:00
parent ca8a4128fb 6102972373
commit f89ba87fef
18 changed files with 75 additions and 51 deletions
--- a/src/views/dashboard/overview/components/NeResources/index.vue
+++ b/src/views/dashboard/overview/components/NeResources/index.vue
@@ -277,6 +277,9 @@ function fnChangeData(data: any[], itemID: string) {
    if (men > 100) {
      men = +(men / 100).toFixed(2);
    }
+    if (men > 100) {
+      men = 100;
+    }
    sysMemUsage = men;
  }