From 79c7ef843fe23ff783f3130713a614485c0232cd Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Mon, 13 Jul 2020 10:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7=E4=BA=91?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwgl/fwglList.vue | 55 ++++++++++++++-------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue
index 6d347a6..4c5438f 100644
--- a/src/pages/workbench/fwgl/fwglList.vue
+++ b/src/pages/workbench/fwgl/fwglList.vue
@@ -1205,39 +1205,42 @@ export default {
           if (this.type == 2) {
             const cloud = data.data.cloud_resource_count;
 
-            if (this.level == 1) {
+            if (this.level != 2) {
               this.listTotal = data.total;
               this.listData = data.data.cloud_apply_list;
-              this.cloud_zuzhi = {
-                count_zy: cloud.count_zy,
-                dashboard_list: [
-                  {
-                    name: "CPU使用量",
-                    value: cloud.cpu_use,
-                    total: cloud.cpu_total,
-                    unit: "（核）",
-                  },
-                  {
-                    name: "内存使用量",
-                    value: cloud.memory_use,
-                    total: cloud.memory_total,
-                    unit: "（GB）",
-                  },
-                  /* {
+
+              if (this.level == 1) {
+                this.cloud_zuzhi = {
+                  count_zy: cloud.count_zy,
+                  dashboard_list: [
+                    {
+                      name: "CPU使用量",
+                      value: cloud.cpu_use,
+                      total: cloud.cpu_total,
+                      unit: "（核）",
+                    },
+                    {
+                      name: "内存使用量",
+                      value: cloud.memory_use,
+                      total: cloud.memory_total,
+                      unit: "（GB）",
+                    },
+                    /* {
                     name: "数据盘使用量",
                     value: cloud.disk_use,
                     total: cloud.disk_total,
                     unit: "（GB）",
                   }, */
-                  {
-                    name: "容器组使用量",
-                    value: cloud.containers_use,
-                    total: cloud.containers_total,
-                    unit: "（个）",
-                  },
-                ],
-              };
-            } else if (this.level == 2) {
+                    {
+                      name: "容器组使用量",
+                      value: cloud.containers_use,
+                      total: cloud.containers_total,
+                      unit: "（个）",
+                    },
+                  ],
+                };
+              }
+            } else {
               this.cloud_admin = {
                 dashboard_list: [
                   {
-- 
2.26.0