From d5e306fc0371ac78f147ed04599edd932e254552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=B6=E5=90=AF=E9=BE=99?= <shiqilong@beyondcent.com>
Date: Tue, 3 Sep 2024 18:47:31 +0800
Subject: [PATCH] fix: modify

---
 .../ctstack/page/bareMetal/addBareMetal.vue   | 32 +++++++++----------
 .../resource/ctstack/page/bareMetal/image.vue |  6 ++--
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/webs/cmp-web/src/views/resource/ctstack/page/bareMetal/addBareMetal.vue b/webs/cmp-web/src/views/resource/ctstack/page/bareMetal/addBareMetal.vue
index 990e477..5f8fb03 100644
--- a/webs/cmp-web/src/views/resource/ctstack/page/bareMetal/addBareMetal.vue
+++ b/webs/cmp-web/src/views/resource/ctstack/page/bareMetal/addBareMetal.vue
@@ -49,6 +49,22 @@
           </cb-form-item>
         </el-col>
         <images :add-data="addData" :vendor-id="vendorId"></images>
+        <el-col :span="24">
+          <cb-form-item label="本地磁盘：" v-if="systemVolumeLabel || dataVolumeLabel">
+            <div v-if="systemVolumeLabel">
+              {{ systemVolumeLabel }}
+              <el-select v-model="addData.systemVolumeRaidUuid" class="w m-l">
+                <el-option v-for="row in systemRaidList" :label="row.nameZh" :value="row.uuid" :key="row.uuid"></el-option>
+              </el-select>
+            </div>
+            <div v-if="dataVolumeLabel">
+              {{ dataVolumeLabel }}
+              <el-select v-model="addData.dataVolumeRaidUuid" class="w m-l">
+                <el-option v-for="row in dataRaidList" :label="row.nameZh" :value="row.uuid" :key="row.uuid"></el-option>
+              </el-select>
+            </div>
+          </cb-form-item>
+        </el-col>
         <el-col :span="24">
           <el-col :span="12">
             <cb-form-item label="所属VPC：" prop="vpcUuid" :rules="[required]">
@@ -107,22 +123,6 @@
             <el-input v-model="addData.remark"></el-input>
           </cb-form-item>
         </el-col>
-        <el-col :span="24">
-          <cb-form-item label="本地磁盘：" v-if="systemVolumeLabel || dataVolumeLabel">
-            <div v-if="systemVolumeLabel">
-              {{ systemVolumeLabel }}
-              <el-select v-model="addData.systemVolumeRaidUuid" class="w m-l">
-                <el-option v-for="row in systemRaidList" :label="row.nameZh" :value="row.uuid" :key="row.uuid"></el-option>
-              </el-select>
-            </div>
-            <div v-if="dataVolumeLabel">
-              {{ dataVolumeLabel }}
-              <el-select v-model="addData.dataVolumeRaidUuid" class="w m-l">
-                <el-option v-for="row in dataRaidList" :label="row.nameZh" :value="row.uuid" :key="row.uuid"></el-option>
-              </el-select>
-            </div>
-          </cb-form-item>
-        </el-col>
         <el-col :span="24" v-for="(item, index) in addData.diskDevices" :key="index">
           <cb-form-item :label="'数据盘' + (index + 1) + '：'">
             <el-col :span="6">
diff --git a/webs/cmp-web/src/views/resource/ctstack/page/bareMetal/image.vue b/webs/cmp-web/src/views/resource/ctstack/page/bareMetal/image.vue
index ae30f4a..0464f2b 100644
--- a/webs/cmp-web/src/views/resource/ctstack/page/bareMetal/image.vue
+++ b/webs/cmp-web/src/views/resource/ctstack/page/bareMetal/image.vue
@@ -5,7 +5,7 @@
         <el-radio disabled :label="item.value" :key="index" v-for="(item, index) in typeList" border> {{ item.name }}</el-radio>
       </el-radio-group>
       <el-select filterable v-model="addData.imageUuid" class="w-lg">
-        <el-option v-for="item in imageList" :key="item.imageUUID" :label="`${item.nameZh} ${item.version} ${item.os[0].bits}位`" :value="item.imageUUID"></el-option>
+        <el-option v-for="item in imageList" :key="item.imageUUID" :label="`${item.nameZh} ${item.version} ${item.os.bits}位`" :value="item.imageUUID"></el-option>
       </el-select>
     </el-form-item>
   </el-col>
@@ -57,7 +57,9 @@ export default {
       }).then(data => {
         if (data.success) {
           this.imageList = data.data
-          if (data.data.length) this.addData.imageUuid = data.data[0].imageUUID
+          this.$nextTick(() => {
+            if (data.data.length) this.addData.imageUuid = data.data[0].imageUUID
+          })
         }
       })
     }