From 59b0c799d1f413c774b9b97954f75bccd71f8a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=B6=E5=90=AF=E9=BE=99?= <shiqilong@beyondcent.com>
Date: Wed, 28 Aug 2024 22:59:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=B9=E6=80=A7IP=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=BB=91=E5=AE=9A=E4=BA=91=E4=B8=BB=E6=9C=BA?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E4=BA=91=E4=B8=BB=E6=9C=BA=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A82=E4=B8=AA=E7=BD=91=E5=8D=A1=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E4=B8=AD=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=8D=95=E7=8B=AC=E9=80=89=E6=8B=A9=E4=BA=91=E4=B8=BB=E6=9C=BA?=
 =?UTF-8?q?=E7=9A=84=E6=9F=90=E4=B8=80=E4=B8=AA=E7=BD=91=E5=8D=A1=EF=BC=8C?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=87=AA=E5=8A=A8=E9=80=89=E4=B8=AD=E4=BA=86?=
 =?UTF-8?q?=E8=AF=A5=E4=BA=91=E4=B8=BB=E6=9C=BA=E7=9A=842=E4=B8=AA?=
 =?UTF-8?q?=E7=BD=91=E5=8D=A1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/ctstack/page/floatIp/bind.vue      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/webs/cmp-web/src/views/resource/ctstack/page/floatIp/bind.vue b/webs/cmp-web/src/views/resource/ctstack/page/floatIp/bind.vue
index 77cfecd..34baf35 100644
--- a/webs/cmp-web/src/views/resource/ctstack/page/floatIp/bind.vue
+++ b/webs/cmp-web/src/views/resource/ctstack/page/floatIp/bind.vue
@@ -3,9 +3,9 @@
     <el-dialog title="绑定云主机" :visible.sync="addData.dialog" width="40%">
       <el-row>
         <cb-form label-width="90px" :model="addData.data" ref="data">
-          <cb-form-item label="云主机：" prop="instanceId" :rules="[required]" required-message="请选择云主机">
-            <el-select v-model="addData.data.instanceId" filterable>
-              <el-option v-for="(item, index) in vmList" :label="item.serverName + '(' + item.ipAddress + ')'" :value="item.instanceId" :key="index"></el-option>
+          <cb-form-item label="云主机：" prop="networkcardUuid" :rules="[required]" required-message="请选择云主机">
+            <el-select v-model="addData.data.networkcardUuid" filterable>
+              <el-option v-for="(item, index) in vmList" :label="item.serverName + '(' + item.ipAddress + ')'" :value="item.networkcardUuid" :key="index"></el-option>
             </el-select>
           </cb-form-item>
         </cb-form>
@@ -47,22 +47,27 @@ export default {
     ok() {
       this.$refs.data.validate(valid => {
         if (valid) {
+          let instanceId = ''
           let networkCardId = ''
           let fixedIpAddress = '',
             serverId
           let cell = null
           this.vmList.forEach(item => {
-            if (item.instanceId == this.addData.data.instanceId) {
+            if (item.networkcardUuid == this.addData.data.networkcardUuid) {
               cell = item
               networkCardId = item.id
+              instanceId = item.instanceId
               fixedIpAddress = item.ipAddress
             }
           })
           floatIpPorts({
             networkCardId,
             fixedIpAddress,
-            portUuid: cell.networkcardUuid,
-            ...this.addData.data
+            instanceId,
+            portUuid: this.addData.data.networkcardUuid,
+            id: this.addData.data.id,
+            regionId: this.addData.data.regionId,
+            vendorId: this.addData.data.vendorId
           }).then(data => {
             if (data.success) {
               this.$message({