From c2e17dd325c279898ef67deed66ac2b173048f70 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 4 Mar 2022 10:16:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20IPAM=20=E9=A1=B5=E9=9D=A2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/ipamBox.vue         |  6 +++---
 .../src/components/common/table/settings/ipamTable.vue | 10 +++++-----
 nezha-fronted/src/components/page/config/ipam.vue      | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/ipamBox.vue b/nezha-fronted/src/components/common/rightBox/ipamBox.vue
index 7310369cc..206c77a7a 100644
--- a/nezha-fronted/src/components/common/rightBox/ipamBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/ipamBox.vue
@@ -52,9 +52,6 @@
               </el-select>
             </el-form-item>
           </div>
-          <el-form-item :label="$t('overall.vlan')" prop="vlan">
-            <el-input maxlength="256" rows="4" show-word-limit placeholder="" v-model="editipam.vlan" size="small"></el-input>
-          </el-form-item>
           <el-form-item :label="$t('overall.dc')" prop="dc.name">
             <div class="right-box-form-content">
               <el-select id="prom-box-input-dc" v-model="editipam.dc" placeholder="" class="right-box__select" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside" size="small" value-key="id">
@@ -64,6 +61,9 @@
               </el-select>
             </div>
           </el-form-item>
+          <el-form-item :label="$t('overall.vlan')" prop="vlan">
+            <el-input maxlength="256" rows="4" show-word-limit placeholder="" v-model="editipam.vlan" size="small"></el-input>
+          </el-form-item>
           <el-form-item :label="$t('overall.remark')" prop="remark">
             <el-input maxlength="256" rows="4" show-word-limit type="textarea" placeholder="" v-model="editipam.remark" size="small" id="mib-box-input-remark"></el-input>
           </el-form-item>
diff --git a/nezha-fronted/src/components/common/table/settings/ipamTable.vue b/nezha-fronted/src/components/common/table/settings/ipamTable.vue
index 31b61da6d..29bcbeb2e 100644
--- a/nezha-fronted/src/components/common/table/settings/ipamTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/ipamTable.vue
@@ -111,17 +111,17 @@ export default {
           show: true,
           minWidth: 200,
           sortable: 'custom'
-        }, {
-          label: this.$t('overall.vlan'),
-          prop: 'vlan',
-          show: true,
-          width: 200
         }, {
           label: this.$t('overall.dc'),
           prop: 'dc',
           show: true,
           width: 200,
           sortable: 'custom'
+        }, {
+          label: this.$t('overall.vlan'),
+          prop: 'vlan',
+          show: true,
+          width: 200
         }, {
           label: this.$t('overall.remark'),
           prop: 'remark',
diff --git a/nezha-fronted/src/components/page/config/ipam.vue b/nezha-fronted/src/components/page/config/ipam.vue
index 60b892550..ee33addf5 100644
--- a/nezha-fronted/src/components/page/config/ipam.vue
+++ b/nezha-fronted/src/components/page/config/ipam.vue
@@ -119,16 +119,16 @@ export default {
             type: 'input',
             label: 'addr',
             disabled: false
-          }, {
-            name: this.$t('overall.vlan'),
-            type: 'input',
-            label: 'vlan',
-            disabled: false
           }, {
             name: this.$t('overall.dc'),
             type: 'dc',
             label: 'dcIds',
             disabled: false
+          }, {
+            name: this.$t('overall.vlan'),
+            type: 'input',
+            label: 'vlan',
+            disabled: false
           }
         ]
       }