diff --git a/src/assets/css/index.css b/src/assets/css/index.css index c50840a1f4e2d430159a44408bb9f559534780e7..9e905b589d37d785d7a9a4979d271a942844b60f 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -668,7 +668,7 @@ width: 620px!important; } .apaas_detail_container .main_contaner.locked_height { height: calc(100vh - 84px - 83px); - min-height: 800px; + min-height: 400px; } .apaas_detail_container .detail_action { text-align: right; diff --git a/src/components/allot-info-confirm.vue b/src/components/allot-info-confirm.vue index 2de4b37c9d0c4335e063b7e64521fab07e97522c..d40c6ed4d3d8dbc3150dd7b152543c0527c7c1b6 100644 --- a/src/components/allot-info-confirm.vue +++ b/src/components/allot-info-confirm.vue @@ -59,6 +59,25 @@ 内存:

+

+ 容器组: + +

+

+ 数据盘: + +

+ +
+

单个容器组规格:

+

+ CPU: + +

+

+ 内存: + +

申请时长:

@@ -110,7 +129,7 @@ export default { this.$http .get("/apaas/service/v3/resource/apply/distributionDisplay", { params: { - apply_id: apply_id + apply_id: apply_id, }, }) .then(({ data }) => { @@ -119,8 +138,11 @@ export default { this.detail = { ...datas, - cpu: `最高${datas.max_cpu}核,默认${datas.min_cpu}核`, - memory: `最高${datas.max_memory}GB,默认${datas.min_memory}GB`, + cpu: `${datas.cpu}核`, + 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 { this.$message({ @@ -146,7 +168,7 @@ export default { params: { id: this.detail.id, user_id: this.detail.user_id, - namespace: this.detail.namespace + namespace: this.detail.namespace, }, }) .then(({ data }) => {