From a06c733a848164e0cd36a3b1fe1f2182788fe3a4 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Sat, 25 Jul 2020 17:29:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=85=8D=E4=BF=A1=E6=81=AF=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/index.css              |  2 +-
 src/components/allot-info-confirm.vue | 30 +++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index c50840a..9e905b5 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 2de4b37..d40c6ed 100644
--- a/src/components/allot-info-confirm.vue
+++ b/src/components/allot-info-confirm.vue
@@ -59,6 +59,25 @@
                 <span class="text_grey"> 内存：</span>
                 <span v-text="(detail && detail['memory']) || '-'"></span>
               </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 class="detail_list">
               <p class="info_text">申请时长：</p>
@@ -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 }) => {
-- 
2.26.0