From 8770d1758beca76ac5824e6cd3c5b665d1af51b3 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Mon, 27 Jul 2020 16:45:31 +0800
Subject: [PATCH] =?UTF-8?q?fixed=EF=BC=9A=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E4=B8=8D=E8=AF=A5=E5=B1=95=E7=A4=BA=E5=AE=A1=E6=89=B9=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=90=8E=E5=B7=A5=E4=BD=9C=E5=8C=BA=E5=9F=9F=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E5=8F=AA=E4=BC=9A=E5=B1=95=E7=A4=BA=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E5=B7=A5=E4=BD=9C=E5=8C=BA=E5=9F=9F=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=EF=BC=88=E8=B5=84=E6=BA=90=E8=B0=83=E6=95=B4=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwgl/cloud-detail.vue | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue
index 748c882..0b5313e 100644
--- a/src/pages/workbench/fwgl/cloud-detail.vue
+++ b/src/pages/workbench/fwgl/cloud-detail.vue
@@ -642,6 +642,20 @@ export default {
         this.tabShow = false;
         this.activeName = "0";
       }
+
+      /**
+       * 资源调整通过后，"工作区域申请规格"会同步"审批通过后工作区域规格"信息，届时需要隐藏掉"审批通过后工作区域规格"
+       * add by xuym
+       * */ 
+      if (this.apploy_msg.first_level == 1 && this.apploy_msg.second_level == 1) {
+          let index = this.list_arr.findIndex(
+            item => item.title == "审批通过后工作区域规格："
+          );
+          
+          if (index > -1) {
+            this.list_arr.splice(index, 1);
+          }
+      }
     },
     getCloudDetail() {
       let query = {
@@ -702,6 +716,7 @@ export default {
             );
             this.list_arr.splice(index, 1);
           }
+
           this.cloudDteail.containers = data.containers;
           this.cloudDteail.cpu = data.cpu;
           this.cloudDteail.disk = data.disk;
@@ -711,6 +726,7 @@ export default {
           this.cloudDteail.one_cpu_min = data.one_cpu_min;
           this.cloudDteail.one_memory_max = data.one_memory_max;
           this.cloudDteail.one_memory_min = data.one_memory_min;
+
           this.cloudDetailNew.adjust_containers = data.adjust_containers;
           this.cloudDetailNew.adjust_cpu = data.adjust_cpu;
           this.cloudDetailNew.adjust_disk = data.adjust_disk;
@@ -720,8 +736,10 @@ export default {
           this.cloudDetailNew.adjust_one_cpu_min = data.adjust_one_cpu_min;
           this.cloudDetailNew.adjust_one_memory_max = data.adjust_one_memory_max;
           this.cloudDetailNew.adjust_one_memory_min = data.adjust_one_memory_min;
+
           this.apploy_msg.first_level = data.first_level;
           this.apploy_msg.second_level = data.second_level;
+
           this.cloudData.namespace = data.namespace;
           this.cloudData.workplace = data.workplace;
           this.cloudData.user_name = data.user_name;
@@ -729,6 +747,7 @@ export default {
           this.cloudData.apply_time = data.apply_time;
           this.cloudData.system_name = data.system_name;
         }
+
         if (this.use_uid != "") {
           this.getCloudApplication();
         }
-- 
2.26.0