From 2d4294e04923217732b7402fd7417dac27fe9d69 Mon Sep 17 00:00:00 2001
From: qiudan <1044775178@qq.com>
Date: Thu, 11 Apr 2024 13:35:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0dhcp4=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/general/network.vue | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/views/general/network.vue b/src/views/general/network.vue
index 86c383b..875f629 100644
--- a/src/views/general/network.vue
+++ b/src/views/general/network.vue
@@ -42,7 +42,15 @@
                         <span style="margin-left: 10px">接通</span>
                     </el-col>
                 </el-form-item> -->
-                <!-- <p class="title">IPV4</p> -->
+                <div style="margin-bottom: 24px;">
+                <p class="title">dhcp4</p>
+                <el-switch
+                  v-model="dhcp4"
+                  active-text="开"
+                  inactive-text="关">
+                </el-switch>
+              </div>
+                <div v-show="dhcp4">
                 <p class="title">静态地址</p>
                  <el-button type="primary" @click="addRowsTableData()" style="margin-bottom:10px" v-if="!disable">新增</el-button>
                 <el-table :data="sizeForm.tableData" border style="width: 95%">
@@ -51,7 +59,7 @@
                         <!-- <el-input v-model="scope.row.address" @change="changeVal(scope.row,scope.$index)"></el-input> -->
                         <el-form-item :prop="'tableData.'+ scope.$index + '.address'" :rules="rules.address" class="tableFormItem">
                                 <el-input v-model.trim="scope.row.address"
-                                   placeholder="例：172.1.1.16/24"  :disabled="scope.$index ==0 || disable"/>
+                                   placeholder="例：172.1.1.16/24"  :disabled="disable"/>
                             </el-form-item>
                       </template>
                     </el-table-column>
@@ -85,6 +93,7 @@
                         </template>
                   </el-table-column>
                 </el-table>
+              </div>
                 <!-- <p style="margin-top: 10px" class="title">DHCP</p>
                 <el-form-item label="启用：">
                     <el-col :span="2" style="diaplay: flex">
@@ -318,6 +327,7 @@ export default {
 }
 
         return {
+          dhcp4:false,
               columnLabel: '', //要增加的列名
       columnPropIndex: 0, //列属性自增
       columnData: [],//列标题数组
@@ -582,7 +592,7 @@ export default {
            var ner = {
             type:"netplanSet",
             ethName:sizeForm.name,
-            dhcp4: false,
+            dhcp4: this.dhcp4,
             addresses:tableDataN,//静态地址
             gateway4:sizeForm.gateway4,
             nameservers:tableDataDNSN,//DNS
@@ -744,6 +754,10 @@ export default {
          console.log("msg",msg)
         //  var optionsDataN = this.optionsData
         console.log(" msg.netstates[this.optionsData]",this.optionsData)
+        if(msg.netplan[this.optionsData]!=undefined){
+          this.dhcp4 = msg.netplan[this.optionsData].dhcp4||false
+        }
+        
         if(msg.netstates[this.optionsData]!=undefined){
             this.sizeForm.name = this.optionsData
              this.sizeForm.mtu = msg.netstates[this.optionsData].mtu