diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue index 748c88252c04db9135a53b0e23d2b61b273a71bd..0b5313e75b0dbea5a1ec21ad90ae213db0f680b6 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(); }