Commit a06c733a authored by 徐一鸣's avatar 徐一鸣

分配信息确认fixed

parent 3a2e1c44
...@@ -668,7 +668,7 @@ width: 620px!important; ...@@ -668,7 +668,7 @@ width: 620px!important;
} }
.apaas_detail_container .main_contaner.locked_height { .apaas_detail_container .main_contaner.locked_height {
height: calc(100vh - 84px - 83px); height: calc(100vh - 84px - 83px);
min-height: 800px; min-height: 400px;
} }
.apaas_detail_container .detail_action { .apaas_detail_container .detail_action {
text-align: right; text-align: right;
......
...@@ -59,6 +59,25 @@ ...@@ -59,6 +59,25 @@
<span class="text_grey"> 内存:</span> <span class="text_grey"> 内存:</span>
<span v-text="(detail && detail['memory']) || '-'"></span> <span v-text="(detail && detail['memory']) || '-'"></span>
</p> </p>
<p class="info_text info_cell">
<span class="text_grey"> 容器组:</span>
<span v-text="(detail && detail['containers']) || '-'"></span>
</p>
<p class="info_text info_cell">
<span class="text_grey"> 数据盘:</span>
<span v-text="(detail && detail['disk']) || '-'"></span>
</p>
</div>
<div class="detail_list">
<p class="info_text">单个容器组规格:</p>
<p class="info_text info_cell">
<span class="text_grey">CPU:</span>
<span v-text="(detail && detail['one_cpu']) || '-'"></span>
</p>
<p class="info_text info_cell">
<span class="text_grey"> 内存:</span>
<span v-text="(detail && detail['one_memory']) || '-'"></span>
</p>
</div> </div>
<div class="detail_list"> <div class="detail_list">
<p class="info_text">申请时长:</p> <p class="info_text">申请时长:</p>
...@@ -110,7 +129,7 @@ export default { ...@@ -110,7 +129,7 @@ export default {
this.$http this.$http
.get("/apaas/service/v3/resource/apply/distributionDisplay", { .get("/apaas/service/v3/resource/apply/distributionDisplay", {
params: { params: {
apply_id: apply_id apply_id: apply_id,
}, },
}) })
.then(({ data }) => { .then(({ data }) => {
...@@ -119,8 +138,11 @@ export default { ...@@ -119,8 +138,11 @@ export default {
this.detail = { this.detail = {
...datas, ...datas,
cpu: `最高${datas.max_cpu}核,默认${datas.min_cpu}核`, cpu: `${datas.cpu}核`,
memory: `最高${datas.max_memory}GB,默认${datas.min_memory}GB`, memory: `${datas.memory}G`,
containers: `${datas.containers}个`,
one_cpu: `最高${datas.max_cpu}核,默认${datas.min_cpu}核`,
one_memory: `最高${datas.max_memory}GB,默认${datas.min_memory}GB`,
}; };
} else { } else {
this.$message({ this.$message({
...@@ -146,7 +168,7 @@ export default { ...@@ -146,7 +168,7 @@ export default {
params: { params: {
id: this.detail.id, id: this.detail.id,
user_id: this.detail.user_id, user_id: this.detail.user_id,
namespace: this.detail.namespace namespace: this.detail.namespace,
}, },
}) })
.then(({ data }) => { .then(({ data }) => {
......
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