Commit 8770d175 authored by 徐一鸣's avatar 徐一鸣

fixed:详情页不该展示审批通过后工作区域规格,只会展示当前工作区域规格(资源调整后的)

parent 2506f18a
...@@ -642,6 +642,20 @@ export default { ...@@ -642,6 +642,20 @@ export default {
this.tabShow = false; this.tabShow = false;
this.activeName = "0"; 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() { getCloudDetail() {
let query = { let query = {
...@@ -702,6 +716,7 @@ export default { ...@@ -702,6 +716,7 @@ export default {
); );
this.list_arr.splice(index, 1); this.list_arr.splice(index, 1);
} }
this.cloudDteail.containers = data.containers; this.cloudDteail.containers = data.containers;
this.cloudDteail.cpu = data.cpu; this.cloudDteail.cpu = data.cpu;
this.cloudDteail.disk = data.disk; this.cloudDteail.disk = data.disk;
...@@ -711,6 +726,7 @@ export default { ...@@ -711,6 +726,7 @@ export default {
this.cloudDteail.one_cpu_min = data.one_cpu_min; this.cloudDteail.one_cpu_min = data.one_cpu_min;
this.cloudDteail.one_memory_max = data.one_memory_max; this.cloudDteail.one_memory_max = data.one_memory_max;
this.cloudDteail.one_memory_min = data.one_memory_min; this.cloudDteail.one_memory_min = data.one_memory_min;
this.cloudDetailNew.adjust_containers = data.adjust_containers; this.cloudDetailNew.adjust_containers = data.adjust_containers;
this.cloudDetailNew.adjust_cpu = data.adjust_cpu; this.cloudDetailNew.adjust_cpu = data.adjust_cpu;
this.cloudDetailNew.adjust_disk = data.adjust_disk; this.cloudDetailNew.adjust_disk = data.adjust_disk;
...@@ -720,8 +736,10 @@ export default { ...@@ -720,8 +736,10 @@ export default {
this.cloudDetailNew.adjust_one_cpu_min = data.adjust_one_cpu_min; 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_max = data.adjust_one_memory_max;
this.cloudDetailNew.adjust_one_memory_min = data.adjust_one_memory_min; this.cloudDetailNew.adjust_one_memory_min = data.adjust_one_memory_min;
this.apploy_msg.first_level = data.first_level; this.apploy_msg.first_level = data.first_level;
this.apploy_msg.second_level = data.second_level; this.apploy_msg.second_level = data.second_level;
this.cloudData.namespace = data.namespace; this.cloudData.namespace = data.namespace;
this.cloudData.workplace = data.workplace; this.cloudData.workplace = data.workplace;
this.cloudData.user_name = data.user_name; this.cloudData.user_name = data.user_name;
...@@ -729,6 +747,7 @@ export default { ...@@ -729,6 +747,7 @@ export default {
this.cloudData.apply_time = data.apply_time; this.cloudData.apply_time = data.apply_time;
this.cloudData.system_name = data.system_name; this.cloudData.system_name = data.system_name;
} }
if (this.use_uid != "") { if (this.use_uid != "") {
this.getCloudApplication(); this.getCloudApplication();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment