From 72863503f8147192a886f86255b34354807a90b1 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Sat, 25 Jul 2020 15:30:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E8=B5=84=E6=BA=90=E8=AF=A6=E6=83=85fi?=
 =?UTF-8?q?xed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwgl/cloud-detail.vue | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue
index 27db869..db2370a 100644
--- a/src/pages/workbench/fwgl/cloud-detail.vue
+++ b/src/pages/workbench/fwgl/cloud-detail.vue
@@ -105,10 +105,10 @@
                 </div>
               </div>
               <div class="params_block_item_in">
-                <span class="params_block_item_title">CPU：</span>
+                <span class="params_block_item_title">内存：</span>
                 <div class="params_block_item_val">
-                  <span class="val_has_2">最高&nbsp;{{ cloudDteail.one_memory_max }}核</span>
-                  <span class="val_has_2">默认&nbsp;{{ cloudDteail.one_memory_min }}核</span>
+                  <span class="val_has_2">最高&nbsp;{{ cloudDteail.one_memory_max }}G</span>
+                  <span class="val_has_2">默认&nbsp;{{ cloudDteail.one_memory_min }}G</span>
                 </div>
               </div>
             </div>
@@ -155,10 +155,10 @@
                 </div>
               </div>
               <div class="params_block_item_in">
-                <span class="params_block_item_title">CPU：</span>
+                <span class="params_block_item_title">内存：</span>
                 <div class="params_block_item_val">
-                  <span class="val_has_2">最高&nbsp;{{ cloudDetailNew.adjust_one_memory_max }}核</span>
-                  <span class="val_has_2">默认&nbsp;{{ cloudDetailNew.adjust_one_memory_min }}核</span>
+                  <span class="val_has_2">最高&nbsp;{{ cloudDetailNew.adjust_one_memory_max }}G</span>
+                  <span class="val_has_2">默认&nbsp;{{ cloudDetailNew.adjust_one_memory_min }}G</span>
                 </div>
               </div>
             </div>
@@ -306,7 +306,7 @@ export default {
         {
           title: "审批通过后工作区域规格：",
           type: "solt",
-          solt_name: "ApplyParams"
+          solt_name: "ApplyBeforeParams"
         },
         {
           title: "资源申请文件：",
@@ -715,11 +715,11 @@ export default {
           this.cloudDetailNew.adjust_cpu = data.adjust_cpu;
           this.cloudDetailNew.adjust_disk = data.adjust_disk;
           this.cloudDetailNew.adjust_memory = data.adjust_memory;
-          this.cloudDteail.adjust_duration_time = data.adjust_duration_time;
-          this.cloudDteail.adjust_one_cpu_max = data.adjust_one_cpu_max;
-          this.cloudDteail.adjust_one_cpu_min = data.adjust_one_cpu_min;
-          this.cloudDteail.adjust_one_memory_max = data.adjust_one_memory_max;
-          this.cloudDteail.adjust_one_memory_min = data.adjust_one_memory_min;
+          this.cloudDetailNew.adjust_duration_time = data.adjust_duration_time;
+          this.cloudDetailNew.adjust_one_cpu_max = data.adjust_one_cpu_max;
+          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;
-- 
2.26.0