From e74515fc43ad7db91a8b3a85005245b3528fe371 Mon Sep 17 00:00:00 2001
From: unknown <1535852499@qq.com>
Date: Thu, 9 Nov 2023 15:43:39 +0800
Subject: [PATCH] zyh 11-9:16:00

---
 src/components/ChiClone.vue          |  10 +--
 src/components/ChiGate.vue           |   9 +-
 src/components/ChiGateway.vue        |  18 ++--
 src/components/ChiGatewifi.vue       |  18 ++--
 src/components/ChiWireld.vue         |  37 ++------
 src/components/CloneView.vue         |  16 ++--
 src/components/CloneWifi.vue         |  36 +++++---
 src/components/CollectionView.vue    |  32 +++----
 src/components/CollectionWifi.vue    |  32 +++----
 src/components/DataAcquire.vue       |  10 ++-
 src/components/DataAcquisition.vue   |  29 +++---
 src/components/DataView.vue          | 128 ++++++++++++++-------------
 src/components/DeviceWirle.vue       |  20 +++--
 src/components/GateWay.vue           | 101 +++++----------------
 src/components/IpConfiguration.vue   |  66 ++++++--------
 src/components/PortConfiguration.vue |   2 +-
 src/components/SerialPort.vue        |  52 ++++++-----
 src/views/ChWirelessGatewayIP.vue    |  12 ++-
 18 files changed, 288 insertions(+), 340 deletions(-)

diff --git a/src/components/ChiClone.vue b/src/components/ChiClone.vue
index c13a579..e9c5808 100644
--- a/src/components/ChiClone.vue
+++ b/src/components/ChiClone.vue
@@ -199,7 +199,7 @@ export default {
     return {
       loading: false,
       formData: {
-        mqtt_qiyong: true,
+        mqtt_qiyong: false,
         mqtt_ip: "",
         mqtt_wgsn: "",
         mqtt_port: "",
@@ -496,7 +496,7 @@ export default {
       // this.formData.mqtt_tls = String(Number(this.formData.mqtt_tls));
       // this.formData.mqtt_clearsession = String(Number(this.formData.mqtt_clearsession));
       var obj = {
-        mqtt_qiyong: String(Number(this.formData.mqtt_qiyong)),
+        // mqtt_qiyong: String(Number(this.formData.mqtt_qiyong)),
         mqtt_ip: this.mqtt_ip1 + "." + this.mqtt_ip2 + "." + this.mqtt_ip3 + "." + this.mqtt_ip4,
         mqtt_wgsn: this.formData.mqtt_wgsn,
         mqtt_port: this.formData.mqtt_port,
@@ -532,9 +532,9 @@ export default {
       console.log(JSON.parse(data.data.mark_value));
       let obj = JSON.parse(data.data.mark_value);
       if (obj.mqtt_ip) {
-        this.formData.mqtt_qiyong = Boolean(Number(obj.mqtt_qiyong));
-        console.log(obj.mqtt_qiyong);
-        console.log(this.formData.mqtt_qiyong);
+        // this.formData.mqtt_qiyong = Boolean(Number(obj.mqtt_qiyong));
+        // console.log(obj.mqtt_qiyong);
+        // console.log(this.formData.mqtt_qiyong);
         this.mqtt_ip1 = obj.mqtt_ip.split(".")[0];
         this.mqtt_ip2 = obj.mqtt_ip.split(".")[1];
         this.mqtt_ip3 = obj.mqtt_ip.split(".")[2];
diff --git a/src/components/ChiGate.vue b/src/components/ChiGate.vue
index 831e8dc..428b7bc 100644
--- a/src/components/ChiGate.vue
+++ b/src/components/ChiGate.vue
@@ -1,8 +1,8 @@
 <!-- 斥候IP设置——无线网关页面 -->
 <template>
-  <div>
+  <div v-loading="loading">
     <!-- <el-button type="info" plain @click="getShow">斥候IP设置——无线网关</el-button> -->
-    <div class="gateway" v-show="isShow" v-loading="loading">
+    <div class="gateway" v-show="isShow">
       <div class="title">
         <p class="title_l">IP配置</p>
         <i class="el-icon-close title_r" @click="isShow = false"></i>
@@ -60,7 +60,7 @@ export default {
   name: "ChiGate",
   data() {
     return {
-      loading:false,
+      loading: false,
       formData: {
         ippz_ssid: "",
         ippz_rzfs: "开放式", //答案：WPA2-PSK
@@ -199,10 +199,11 @@ export default {
     }
 
     .title_r {
+      color: rgb(255, 255, 255);
       width: 24px;
       height: 24px;
       cursor: pointer;
-      color: rgba(111, 103, 103, 1);
+      // color: rgba(111, 103, 103, 1);
     }
   }
 
diff --git a/src/components/ChiGateway.vue b/src/components/ChiGateway.vue
index e6e25e3..a76c9a5 100644
--- a/src/components/ChiGateway.vue
+++ b/src/components/ChiGateway.vue
@@ -104,7 +104,7 @@ export default {
     async saveGate() {
       let datas = sessionStorage.getItem("CHGYWG_yx");
       this.formData = { ...JSON.parse(datas), ...this.formData };
-      let res = SaveUserAnswer({
+      let res = await SaveUserAnswer({
         mark: "CHGYWG_yx",
         user_id: "USER202307301114011710",
         mark_value: JSON.stringify(this.formData),
@@ -126,13 +126,16 @@ export default {
         user_id: "USER202307301114011710",
       });
       this.loading = false;
-      console.log(JSON.parse(data.data.mark_value));
-      let obj = JSON.parse(data.data.mark_value);
-      if (obj.wgpz_wgid) {
-        this.formData.wgpz_wgid = obj.wgpz_wgid;
-        this.formData.wgpz_wgmc = obj.wgpz_wgmc;
+      if (data.data && data.state) {
+        console.log(JSON.parse(data.data.mark_value));
+        let obj = JSON.parse(data.data.mark_value);
+        if (obj.wgpz_wgid) {
+          this.formData.wgpz_wgid = obj.wgpz_wgid;
+          this.formData.wgpz_wgmc = obj.wgpz_wgmc;
+        }
       }
     },
+
   },
 };
 </script>
@@ -172,7 +175,8 @@ export default {
       width: 24px;
       height: 24px;
       cursor: pointer;
-      color: rgba(111, 103, 103, 1);
+      // color: rgba(111, 103, 103, 1);
+      color: rgb(255, 255, 255);
     }
   }
 
diff --git a/src/components/ChiGatewifi.vue b/src/components/ChiGatewifi.vue
index 4a3ec54..2f39334 100644
--- a/src/components/ChiGatewifi.vue
+++ b/src/components/ChiGatewifi.vue
@@ -31,7 +31,7 @@
             </el-col>
           </el-row>
           <div class="footer">
-            <el-button type="primary" @click="innerVisible=true">保 存</el-button>
+            <el-button type="primary" @click="innerVisible = true">保 存</el-button>
 
             <el-button @click="isShow = false">取 消</el-button>
           </div>
@@ -53,13 +53,13 @@
 </template>
 
 <script>
-import { SaveUserAnswer,GetUserAnswer} from '@/api/user';
+import { SaveUserAnswer, GetUserAnswer } from '@/api/user';
 export default {
   name: "TestChiGate",
 
   data() {
     return {
-      loading:false,
+      loading: false,
       options1: [{
         value: "有线区网关2",
         label: "有线区网关2"
@@ -135,11 +135,13 @@ export default {
         user_id: "USER202307301114011710",
       });
       this.loading = false;
-      console.log(JSON.parse(data.data.mark_value));
-      let obj = JSON.parse(data.data.mark_value);
-      if (obj.wgpz_wgid) {
-        this.formData.wgpz_wgid = obj.wgpz_wgid;
-        this.formData.wgpz_wgmc = obj.wgpz_wgmc;
+      if (data.data && data.state) {
+        console.log(JSON.parse(data.data.mark_value));
+        let obj = JSON.parse(data.data.mark_value);
+        if (obj.wgpz_wgid) {
+          this.formData.wgpz_wgid = obj.wgpz_wgid;
+          this.formData.wgpz_wgmc = obj.wgpz_wgmc;
+        }
       }
     },
   },
diff --git a/src/components/ChiWireld.vue b/src/components/ChiWireld.vue
index a8dc221..141384d 100644
--- a/src/components/ChiWireld.vue
+++ b/src/components/ChiWireld.vue
@@ -11,25 +11,11 @@
       <el-divider></el-divider>
       <div class="content">
         <div class="lan">
-          <el-form
-            v-loading="loading"
-            :model="formData"
-            :label-position="labelPosition"
-            :rules="rules"
-            ref="ruleForm"
-          >
+          <el-form v-loading="loading" :model="formData" :label-position="labelPosition" :rules="rules" ref="ruleForm">
             <el-row>
               <el-col :span="24">
-                <el-form-item
-                  label="网络类型:"
-                  :label-width="formLabelWidth"
-                  prop="type"
-                >
-                  <el-select
-                    v-model="formData.ippz_wllx"
-                    placeholder="静态IP"
-                    style="width: 200px"
-                  >
+                <el-form-item label="网络类型:" :label-width="formLabelWidth" prop="type">
+                  <el-select v-model="formData.ippz_wllx" placeholder="静态IP" style="width: 200px">
                     <el-option label="静态IP" value="静态IP"></el-option>
                   </el-select>
                 </el-form-item>
@@ -37,11 +23,7 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item
-                  label="IP地址:"
-                  :label-width="formLabelWidth"
-                  prop="ip"
-                >
+                <el-form-item label="IP地址:" :label-width="formLabelWidth" prop="ip">
                   <el-row>
                     <el-col :span="5">
                       <el-input v-model="ippz_ip1"></el-input>
@@ -87,11 +69,7 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item
-                  label="网关:"
-                  :label-width="formLabelWidth"
-                  prop="ip"
-                >
+                <el-form-item label="网关:" :label-width="formLabelWidth" prop="ip">
                   <el-row>
                     <el-col :span="5">
                       <el-input v-model="ippz_mrwg1"></el-input>
@@ -204,7 +182,7 @@ export default {
   created() {
     this.GetUserAnswer();
   },
-  mounted() {},
+  mounted() { },
 
   methods: {
     Merge(value, value1, value2, value3, value4) {
@@ -346,7 +324,8 @@ export default {
       width: 24px;
       height: 24px;
       cursor: pointer;
-      color: rgba(111, 103, 103, 1);
+      // color: rgba(111, 103, 103, 1);
+      color: rgb(255, 255, 255);
     }
   }
 
diff --git a/src/components/CloneView.vue b/src/components/CloneView.vue
index b507e63..a424442 100644
--- a/src/components/CloneView.vue
+++ b/src/components/CloneView.vue
@@ -103,8 +103,12 @@
                         <el-row>
                             <el-col :span="12">
                                 <el-form-item label="上传模式:" :label-width="formLabelWidth" prop="mqtt_scms">
-                                    <el-input v-model="formData.mqtt_scms" placeholder=""
-                                        style="width: 200px;height:30px"></el-input>
+                                    <!-- <el-input v-model="formData.mqtt_scms" placeholder=""
+                                        style="width: 200px;height:30px"></el-input> -->
+                                    <el-select v-model="formData.mqtt_scms" placeholder="">
+                                        <el-option v-for="(option, index) in options2" :key="index" :label="option.label"
+                                            :value="option.value"></el-option>
+                                    </el-select>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
@@ -145,7 +149,7 @@
                         <el-table-column property="mqtt_cjd_sbmc" label="设备名称">
                             <template slot-scope="scope">
                                 <el-select v-model="scope.row.mqtt_cjd_sbmc" placeholder="">
-                                    <el-option v-for="(option, index) in options2" :key="index" :label="option.label"
+                                    <el-option v-for="(option, index) in options3" :key="index" :label="option.label"
                                         :value="option.value"></el-option>
                                 </el-select>
                             </template>
@@ -153,7 +157,7 @@
                         <el-table-column property="mqtt_cjd_tagid" label="TagID">
                             <template slot-scope="scope">
                                 <el-select v-model="scope.row.mqtt_cjd_tagid" placeholder="">
-                                    <el-option v-for="(option, index) in options3" :key="index" :label="option.label"
+                                    <el-option v-for="(option, index) in options4" :key="index" :label="option.label"
                                         :value="option.value"></el-option>
                                 </el-select>
                             </template>
@@ -302,7 +306,7 @@ export default {
                 label: 'label'
             },
             // 右边添加设备的字段
-            options2: [
+            options3: [
                 {
                     label: "有线区精雕1",
                     value: "有线区精雕1",
@@ -312,7 +316,7 @@ export default {
                     value: "无线区精雕1",
                 }
             ],
-            options3: [{
+            options4: [{
                 value: "MachinePamHID909",
                 label: "MachinePamHID909",
             }, {
diff --git a/src/components/CloneWifi.vue b/src/components/CloneWifi.vue
index d7caa7c..cf63c1f 100644
--- a/src/components/CloneWifi.vue
+++ b/src/components/CloneWifi.vue
@@ -103,8 +103,12 @@
                         <el-row>
                             <el-col :span="12">
                                 <el-form-item label="上传模式:" :label-width="formLabelWidth" prop="mqtt_scms">
-                                    <el-input v-model="formData.mqtt_scms" placeholder=""
-                                        style="width: 200px;height:30px"></el-input>
+                                    <!-- <el-input v-model="formData.mqtt_scms" placeholder=""
+                                        style="width: 200px;height:30px"></el-input> -->
+                                    <el-select v-model="formData.mqtt_scms" placeholder="">
+                                        <el-option v-for="(option, index) in options2" :key="index" :label="option.label"
+                                            :value="option.value"></el-option>
+                                    </el-select>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
@@ -146,7 +150,8 @@
                             <template slot-scope="scope">
                                 <el-select v-model="scope.row.mqtt_cjd_sbmc" placeholder="">
                                     <el-option v-for="(option, index) in options2" :key="index" :label="option.label"
-                                        :value="option.value"></el-option>
+                                        :value="option.value">
+                                    </el-option>
                                 </el-select>
                             </template>
                         </el-table-column>
@@ -301,7 +306,7 @@ export default {
                 label: 'label'
             },
             // 右边添加设备的字段
-            options2: [
+            options3: [
                 {
                     label: "有线区精雕1",
                     value: "有线区精雕1",
@@ -311,7 +316,7 @@ export default {
                     value: "无线区精雕1",
                 }
             ],
-            options3: [{
+            options4: [{
                 value: "MachinePamHID909",
                 label: "MachinePamHID909",
             }, {
@@ -411,25 +416,32 @@ export default {
             // 校验
             rules: {
                 mqtt_ip: [
-                    { required: true, message: '请输入服务器IP', trigger: 'blur' },
+                    { required: true, message: '', trigger: 'blur' },
+                    // { required: true, message: '请输入服务器IP', trigger: 'blur' },
                 ],
                 mqtt_port: [
-                    { required: true, message: '请输入端口', trigger: 'blur' },
+                    { required: true, message: '', trigger: 'blur' },
+                    // { required: true, message: '请输入端口', trigger: 'blur' },
                 ],
                 mqtt_wgsn: [
-                    { required: true, message: '请输入网关ID', trigger: 'blur' },
+                    { required: true, message: '', trigger: 'blur' },
+                    // { required: true, message: '请输入网关ID', trigger: 'blur' },
                 ],
                 mqtt_sssjfbzt: [
-                    { required: true, message: '请输入主题', trigger: 'blur' },
+                    { required: true, message: '', trigger: 'blur' },
+                    // { required: true, message: '请输入主题', trigger: 'blur' },
                 ],
                 mqtt_scms: [
-                    { required: true, message: '请输入上传模式', trigger: 'blur' },
+                    { required: true, message: '', trigger: 'blur' },
+                    // { required: true, message: '请输入上传模式', trigger: 'blur' },
                 ],
                 mqtt_sczq: [
-                    { required: true, message: '请输入上传周期', trigger: 'blur' },
+                    { required: true, message: '', trigger: 'blur' },
+                    // { required: true, message: '请输入上传周期', trigger: 'blur' },
                 ],
                 mqtt_sjgl: [
-                    { required: true, message: '请输入数据过滤', trigger: 'blur' },
+                    { required: true, message: '', trigger: 'blur' },
+                    // { required: true, message: '请输入数据过滤', trigger: 'blur' },
                 ],
             },
         };
diff --git a/src/components/CollectionView.vue b/src/components/CollectionView.vue
index 586714f..2341df6 100644
--- a/src/components/CollectionView.vue
+++ b/src/components/CollectionView.vue
@@ -87,13 +87,13 @@
 </template>
 
 <script>
-import { SaveUserAnswer,GetUserAnswer } from '@/api/user';
+import { SaveUserAnswer, GetUserAnswer } from '@/api/user';
 export default {
     name: 'DeviceView',
 
     data() {
         return {
-            loading:false,
+            loading: false,
             tableData: [{
                 cjdpz_tagid: 'MachinePamHID909',
                 cjdpz_mc: '急停状态',
@@ -497,23 +497,25 @@ export default {
                 mark: "DB-IotLite_yx",
                 user_id: "USER202307301114011710",
             })
-            console.log(answer);
-            let obj = JSON.parse(answer.data.data.mark_value);
-            console.log(obj);
-            this.tableData[0].cjdpz_tagid = obj.cjdpz_tagid;
-            this.tableData[0].cjdpz_mc = obj.cjdpz_mc;
-            this.tableData[0].cjdpz_sjq = obj.cjdpz_sjq;
-            this.tableData[0].cjdpz_jcqdz = obj.cjdpz_jcqdz;
-            this.tableData[0].cjdpz_cjsjlx = obj.cjdpz_cjsjlx;
-            this.tableData[0].cjdpz_zjx = obj.cjdpz_zjx;
-            this.tableData[0].cjdpz_dxsx = obj.cjdpz_dxsx;
-            this.tableData[0].cjdpz_beilv = obj.cjdpz_beilv;
+            if (answer.data.state && answer.data.data) {
+                console.log(answer);
+                let obj = JSON.parse(answer.data.data.mark_value);
+                console.log(obj);
+                this.tableData[0].cjdpz_tagid = obj.cjdpz_tagid;
+                this.tableData[0].cjdpz_mc = obj.cjdpz_mc;
+                this.tableData[0].cjdpz_sjq = obj.cjdpz_sjq;
+                this.tableData[0].cjdpz_jcqdz = obj.cjdpz_jcqdz;
+                this.tableData[0].cjdpz_cjsjlx = obj.cjdpz_cjsjlx;
+                this.tableData[0].cjdpz_zjx = obj.cjdpz_zjx;
+                this.tableData[0].cjdpz_dxsx = obj.cjdpz_dxsx;
+                this.tableData[0].cjdpz_beilv = obj.cjdpz_beilv;
+            }
         }
     },
     created() {
-        this.loading=true;
+        this.loading = true;
         this.GetUserAnswer();
-        this.loading=false
+        this.loading = false
     },
     directives: {
         'click-outside': {
diff --git a/src/components/CollectionWifi.vue b/src/components/CollectionWifi.vue
index 820ef94..9f0e0f4 100644
--- a/src/components/CollectionWifi.vue
+++ b/src/components/CollectionWifi.vue
@@ -87,7 +87,7 @@
 </template>
 
 <script>
-import { SaveUserAnswer,GetUserAnswer} from "@/api/user";
+import { SaveUserAnswer, GetUserAnswer } from "@/api/user";
 export default {
     name: 'DeviceView',
 
@@ -489,26 +489,28 @@ export default {
             this.dialogVisible = false;
         },
         async GetUserAnswer() {
-            this.loading=true;
+            this.loading = true;
             let answer = await GetUserAnswer({
                 mark: "DB-IotLite_wx",
                 user_id: "USER202307301114011710",
             })
-            this.loading=false;
-            console.log(answer);
-            let obj = JSON.parse(answer.data.data.mark_value);
-            console.log(obj);
-            this.tableData[0].cjdpz_tagid = obj.cjdpz_tagid;
-            this.tableData[0].cjdpz_mc = obj.cjdpz_mc;
-            this.tableData[0].cjdpz_sjq = obj.cjdpz_sjq;
-            this.tableData[0].cjdpz_jcqdz = obj.cjdpz_jcqdz;
-            this.tableData[0].cjdpz_cjsjlx = obj.cjdpz_cjsjlx;
-            this.tableData[0].cjdpz_zjx = obj.cjdpz_zjx;
-            this.tableData[0].cjdpz_dxsx = obj.cjdpz_dxsx;
-            this.tableData[0].cjdpz_beilv = obj.cjdpz_beilv;
+            this.loading = false;
+            if (answer.data.state && answer.data.data) {
+                console.log(answer);
+                let obj = JSON.parse(answer.data.data.mark_value);
+                console.log(obj);
+                this.tableData[0].cjdpz_tagid = obj.cjdpz_tagid;
+                this.tableData[0].cjdpz_mc = obj.cjdpz_mc;
+                this.tableData[0].cjdpz_sjq = obj.cjdpz_sjq;
+                this.tableData[0].cjdpz_jcqdz = obj.cjdpz_jcqdz;
+                this.tableData[0].cjdpz_cjsjlx = obj.cjdpz_cjsjlx;
+                this.tableData[0].cjdpz_zjx = obj.cjdpz_zjx;
+                this.tableData[0].cjdpz_dxsx = obj.cjdpz_dxsx;
+                this.tableData[0].cjdpz_beilv = obj.cjdpz_beilv;
+            }
         }
     },
-    mounted(){
+    mounted() {
         this.GetUserAnswer();
     },
     directives: {
diff --git a/src/components/DataAcquire.vue b/src/components/DataAcquire.vue
index 558586f..3a0c18a 100644
--- a/src/components/DataAcquire.vue
+++ b/src/components/DataAcquire.vue
@@ -162,10 +162,12 @@ export default {
       this.loading = false;
       console.log(res2);
       let res3 = JSON.parse(res2.data.data.mark_value);
-      this.formData.wgpz_wgid = res3.wgpz_wgid;
-      console.log(this.formData.wgpz_wgid);
-      this.formData.wgpz_wgmc = res3.wgpz_wgmc;
-      this.formData.wgpz_wglx = res3.wgpz_wglx;
+      if (res3.wgpz_wgid) {
+        this.formData.wgpz_wgid = res3.wgpz_wgid;
+        console.log(this.formData.wgpz_wgid);
+        this.formData.wgpz_wgmc = res3.wgpz_wgmc;
+        this.formData.wgpz_wglx = res3.wgpz_wglx;
+      }
     },
   },
   created() {
diff --git a/src/components/DataAcquisition.vue b/src/components/DataAcquisition.vue
index f1d14a1..e9d66d5 100644
--- a/src/components/DataAcquisition.vue
+++ b/src/components/DataAcquisition.vue
@@ -27,7 +27,7 @@
             请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关
           </p>
           <div slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="innerConfirm('formData')">确定</el-button>
+            <el-button type="primary" @click="innerConfirm()">确定</el-button>
             <el-button @click="innerVisible = false">取 消</el-button>
           </div>
         </el-dialog>
@@ -134,13 +134,13 @@ export default {
       this.outerVisible = false;
       this.innerVisible = false;
       let datas = sessionStorage.getItem("DB-IotLite_yx");
-      console.log(JSON.parse(datas));
-      this.formdata = { ...JSON.parse(datas), ...this.formdata };
-      console.log(this.formdata);
+      // console.log(JSON.parse(datas));
+      datas = { ...JSON.parse(datas), ...this.formData };
+      console.log(datas);
       let res = await SaveUserAnswer({
         mark: "DB-IotLite_yx",
         user_id: "USER202307301114011710",
-        mark_value: JSON.stringify(this.formdata),
+        mark_value: JSON.stringify(datas),
       });
       if (res.status == 200) {
         this.$message({
@@ -150,7 +150,7 @@ export default {
       }
       console.log(res);
       console.log(JSON.parse(res.data.data.mark_value));
-      sessionStorage.setItem("DB-IotLite_yx", JSON.stringify(this.formdata));
+      sessionStorage.setItem("DB-IotLite_yx", JSON.stringify(this.formData));
       this.$router.replace("/channelconfig");
     },
     async getUserAnswer() {
@@ -160,13 +160,16 @@ export default {
         user_id: "USER202307301114011710",
       });
       this.loading = false;
-      console.log(res2);
-      let res3 = JSON.parse(res2.data.data.mark_value);
-      if (res3.wgpz_wgid) {
-        this.formData.wgpz_wgid = res3.wgpz_wgid;
-        console.log(this.formData.wgpz_wgid);
-        this.formData.wgpz_wgmc = res3.wgpz_wgmc;
-        this.formData.wgpz_wglx = res3.wgpz_wglx;
+      if (res2.data.data && res2.data.state) {
+        console.log(res2);
+        console.log(res2.data.data.mark_value);
+        let res3 = JSON.parse(res2.data.data.mark_value);
+        if (res3.wgpz_wgid) {
+          this.formData.wgpz_wgid = res3.wgpz_wgid;
+          console.log(this.formData.wgpz_wgid);
+          this.formData.wgpz_wgmc = res3.wgpz_wgmc;
+          this.formData.wgpz_wglx = res3.wgpz_wglx;
+        }
       }
     },
   },
diff --git a/src/components/DataView.vue b/src/components/DataView.vue
index 76997f4..4f6407c 100644
--- a/src/components/DataView.vue
+++ b/src/components/DataView.vue
@@ -28,19 +28,19 @@
                   <el-form-item label="默认网关:" :label-width="formLabelWidth" prop="ippz_mrwg">
                     <el-row>
                       <el-col :span="5">
-                        <el-input v-model="ippz_mrwg1"></el-input>
+                        <el-input v-model="ippz_mrwg1" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">. </el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_mrwg2"></el-input>
+                        <el-input v-model="ippz_mrwg2" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_mrwg3"></el-input>
+                        <el-input v-model="ippz_mrwg3" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_mrwg4"></el-input>
+                        <el-input v-model="ippz_mrwg4" maxlength="3"></el-input>
                       </el-col>
                     </el-row>
                   </el-form-item>
@@ -51,19 +51,19 @@
                   <el-form-item label="子网掩码:" :label-width="formLabelWidth" prop="ippz_zwym">
                     <el-row>
                       <el-col :span="5">
-                        <el-input v-model="ippz_zwym1"></el-input>
+                        <el-input v-model="ippz_zwym1" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_zwym2"></el-input>
+                        <el-input v-model="ippz_zwym2" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_zwym3"></el-input>
+                        <el-input v-model="ippz_zwym3" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_zwym4"></el-input>
+                        <el-input v-model="ippz_zwym4" maxlength="3"></el-input>
                       </el-col>
                     </el-row>
                   </el-form-item>
@@ -72,19 +72,19 @@
                   <el-form-item label="IP地址:" :label-width="formLabelWidth" prop="ippz_ip">
                     <el-row>
                       <el-col :span="5">
-                        <el-input v-model="ippz_ip1"></el-input>
+                        <el-input v-model="ippz_ip1" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">. </el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_ip2"></el-input>
+                        <el-input v-model="ippz_ip2" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_ip3"></el-input>
+                        <el-input v-model="ippz_ip3" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_ip4"></el-input>
+                        <el-input v-model="ippz_ip4" maxlength="3"></el-input>
                       </el-col>
                     </el-row>
                   </el-form-item>
@@ -95,19 +95,19 @@
                   <el-form-item label="首选DNS:" :label-width="formLabelWidth" prop="ippz_dns_sx">
                     <el-row>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_sx1"></el-input>
+                        <el-input v-model="ippz_dns_sx1" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_sx2"></el-input>
+                        <el-input v-model="ippz_dns_sx2" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_sx3"></el-input>
+                        <el-input v-model="ippz_dns_sx3" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_sx4"></el-input>
+                        <el-input v-model="ippz_dns_sx4" maxlength="3"></el-input>
                       </el-col>
                     </el-row>
                   </el-form-item>
@@ -116,19 +116,19 @@
                   <el-form-item label="备选DNS:" :label-width="formLabelWidth" prop="ippz_dns_by">
                     <el-row>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_by1"></el-input>
+                        <el-input v-model="ippz_dns_by1" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">. </el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_by2"></el-input>
+                        <el-input v-model="ippz_dns_by2" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_by3"></el-input>
+                        <el-input v-model="ippz_dns_by3" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_by4"></el-input>
+                        <el-input v-model="ippz_dns_by4" maxlength="3"></el-input>
                       </el-col>
                     </el-row>
                   </el-form-item>
@@ -219,15 +219,15 @@
                       </el-col>
                       <el-col :span="1">. </el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_mrwg1" disabled></el-input>
+                        <el-input v-model="ippz_mrwg2" disabled></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_mrwg1" disabled></el-input>
+                        <el-input v-model="ippz_mrwg3" disabled></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_mrwg1" disabled></el-input>
+                        <el-input v-model="ippz_mrwg4" disabled></el-input>
                       </el-col>
                     </el-row>
                   </el-form-item>
@@ -236,19 +236,19 @@
                   <el-form-item label="首选DNS:" :label-width="formLabelWidth" prop="ippz_dns_sx">
                     <el-row>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_sx1"></el-input>
+                        <el-input v-model="ippz_dns_sx1" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_sx2"></el-input>
+                        <el-input v-model="ippz_dns_sx2" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_sx3"></el-input>
+                        <el-input v-model="ippz_dns_sx3" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_sx4"></el-input>
+                        <el-input v-model="ippz_dns_sx4" maxlength="3"></el-input>
                       </el-col>
                     </el-row>
                   </el-form-item>
@@ -259,19 +259,19 @@
                   <el-form-item label="备选DNS:" :label-width="formLabelWidth" prop="ippz_dns_by">
                     <el-row>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_by1"></el-input>
+                        <el-input v-model="ippz_dns_by1" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_by2"></el-input>
+                        <el-input v-model="ippz_dns_by2" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_by3"></el-input>
+                        <el-input v-model="ippz_dns_by3" maxlength="3"></el-input>
                       </el-col>
                       <el-col :span="1">.</el-col>
                       <el-col :span="5">
-                        <el-input v-model="ippz_dns_by4"></el-input>
+                        <el-input v-model="ippz_dns_by4" maxlength="3"></el-input>
                       </el-col>
                     </el-row>
                   </el-form-item>
@@ -476,38 +476,40 @@ export default {
       });
       this.loading = false;
       console.log(res2);
-      let res3 = JSON.parse(res2.data.data.mark_value);
-      console.log(res3);
-      this.ippz_wangkou = res3.ippz_wangkou;
-      this.ippz_mrwg = res3.ippz_mrwg;
-      this.ippz_ip = res3.ippz_ip;
-      this.ippz_zwym = res3.ippz_zwym;
-      this.ippz_dns_sx = res3.ippz_dns_sx;
-      this.ippz_dns_by = res3.ippz_dns_by;
-      this.ippz_mac = res3.ippz_mac;
-      this.ippz_wifi_ssid = res3.ippz_wifi_ssid;
-      this.ippz_wifi_mm = res3.ippz_wifi_mm;
-      if (res3.ippz_mrwg) {
-        this.ippz_mrwg1 = this.SliceData(this.ippz_mrwg)[0];
-        this.ippz_mrwg2 = this.SliceData(this.ippz_mrwg)[1];
-        this.ippz_mrwg3 = this.SliceData(this.ippz_mrwg)[2];
-        this.ippz_mrwg4 = this.SliceData(this.ippz_mrwg)[3];
-        this.ippz_ip1 = this.SliceData(this.ippz_ip)[0];
-        this.ippz_ip2 = this.SliceData(this.ippz_ip)[1];
-        this.ippz_ip3 = this.SliceData(this.ippz_ip)[2];
-        this.ippz_ip4 = this.SliceData(this.ippz_ip)[3];
-        this.ippz_zwym1 = this.SliceData(this.ippz_zwym)[0];
-        this.ippz_zwym2 = this.SliceData(this.ippz_zwym)[1];
-        this.ippz_zwym3 = this.SliceData(this.ippz_zwym)[2];
-        this.ippz_zwym4 = this.SliceData(this.ippz_zwym)[3];
-        this.ippz_dns_sx1 = this.SliceData(this.ippz_dns_sx)[0];
-        this.ippz_dns_sx2 = this.SliceData(this.ippz_dns_sx)[1];
-        this.ippz_dns_sx3 = this.SliceData(this.ippz_dns_sx)[2];
-        this.ippz_dns_sx4 = this.SliceData(this.ippz_dns_sx)[3];
-        this.ippz_dns_by1 = this.SliceData(this.ippz_dns_by)[0];
-        this.ippz_dns_by2 = this.SliceData(this.ippz_dns_by)[1];
-        this.ippz_dns_by3 = this.SliceData(this.ippz_dns_by)[2];
-        this.ippz_dns_by4 = this.SliceData(this.ippz_dns_by)[3];
+      if (res2.data.data && res2.data.state) {
+        let res3 = JSON.parse(res2.data.data.mark_value);
+        console.log(res3);
+        this.ippz_wangkou = res3.ippz_wangkou;
+        this.ippz_mrwg = res3.ippz_mrwg;
+        this.ippz_ip = res3.ippz_ip;
+        this.ippz_zwym = res3.ippz_zwym;
+        this.ippz_dns_sx = res3.ippz_dns_sx;
+        this.ippz_dns_by = res3.ippz_dns_by;
+        this.ippz_mac = res3.ippz_mac;
+        this.ippz_wifi_ssid = res3.ippz_wifi_ssid;
+        this.ippz_wifi_mm = res3.ippz_wifi_mm;
+        if (res3.ippz_mrwg) {
+          this.ippz_mrwg1 = this.SliceData(this.ippz_mrwg)[0];
+          this.ippz_mrwg2 = this.SliceData(this.ippz_mrwg)[1];
+          this.ippz_mrwg3 = this.SliceData(this.ippz_mrwg)[2];
+          this.ippz_mrwg4 = this.SliceData(this.ippz_mrwg)[3];
+          this.ippz_ip1 = this.SliceData(this.ippz_ip)[0];
+          this.ippz_ip2 = this.SliceData(this.ippz_ip)[1];
+          this.ippz_ip3 = this.SliceData(this.ippz_ip)[2];
+          this.ippz_ip4 = this.SliceData(this.ippz_ip)[3];
+          this.ippz_zwym1 = this.SliceData(this.ippz_zwym)[0];
+          this.ippz_zwym2 = this.SliceData(this.ippz_zwym)[1];
+          this.ippz_zwym3 = this.SliceData(this.ippz_zwym)[2];
+          this.ippz_zwym4 = this.SliceData(this.ippz_zwym)[3];
+          this.ippz_dns_sx1 = this.SliceData(this.ippz_dns_sx)[0];
+          this.ippz_dns_sx2 = this.SliceData(this.ippz_dns_sx)[1];
+          this.ippz_dns_sx3 = this.SliceData(this.ippz_dns_sx)[2];
+          this.ippz_dns_sx4 = this.SliceData(this.ippz_dns_sx)[3];
+          this.ippz_dns_by1 = this.SliceData(this.ippz_dns_by)[0];
+          this.ippz_dns_by2 = this.SliceData(this.ippz_dns_by)[1];
+          this.ippz_dns_by3 = this.SliceData(this.ippz_dns_by)[2];
+          this.ippz_dns_by4 = this.SliceData(this.ippz_dns_by)[3];
+        }
       }
     }
   },
diff --git a/src/components/DeviceWirle.vue b/src/components/DeviceWirle.vue
index a754108..98289fc 100644
--- a/src/components/DeviceWirle.vue
+++ b/src/components/DeviceWirle.vue
@@ -270,15 +270,17 @@ export default {
                 user_id: "USER202307301114011710",
             })
             this.loading = false;
-            console.log(answer);
-            let obj = JSON.parse(answer.data.data.mark_value);
-            console.log(obj);
-            if (obj.sbpz_sbid) {
-                this.formdata.sbpz_sbid = obj.sbpz_sbid;
-                this.formdata.sbpz_jdzxz = Boolean(Number(obj.sbpz_jdzxz));
-                this.formdata.sbpz_jysb = Boolean(Number(obj.sbpz_jysb));
-                this.formdata.sbpz_sbmc = obj.sbpz_sbmc;
-                this.formdata.sbpz_sbdz = obj.sbpz_sbdz;
+            if (answer.data.data && answer.data.state) {
+                // console.log(answer);
+                let obj = JSON.parse(answer.data.data.mark_value);
+                console.log(obj);
+                if (obj.sbpz_sbid) {
+                    this.formdata.sbpz_sbid = obj.sbpz_sbid;
+                    this.formdata.sbpz_jdzxz = Boolean(Number(obj.sbpz_jdzxz));
+                    this.formdata.sbpz_jysb = Boolean(Number(obj.sbpz_jysb));
+                    this.formdata.sbpz_sbmc = obj.sbpz_sbmc;
+                    this.formdata.sbpz_sbdz = obj.sbpz_sbdz;
+                }
             }
         },
     },
diff --git a/src/components/GateWay.vue b/src/components/GateWay.vue
index 33e16d9..f5dbf35 100644
--- a/src/components/GateWay.vue
+++ b/src/components/GateWay.vue
@@ -2,71 +2,37 @@
 <template>
   <div>
     <!-- <div> <el-button type="info" plain @click="dialogFormVisible = true">IP设置</el-button></div> -->
-    <el-dialog
-      title="IP设置"
-      :visible.sync="dialogFormVisible"
-      :append-to-body="true"
-      width="894px"
-      v-loading="loading"
-    >
+    <el-dialog title="IP设置" :visible.sync="dialogFormVisible" :append-to-body="true" width="894px" v-loading="loading">
       <div class="form_content">
-        <el-form
-          :model="formData"
-          :label-position="labelPosition"
-          label-width="80px"
-          :rules="rules_ippz_wirle"
-          ref="formData"
-        >
+        <el-form :model="formData" :label-position="labelPosition" label-width="80px" :rules="rules_ippz_wirle"
+          ref="formData">
           <div class="wired">
             <el-row>
               <el-col :span="12">
-                <el-form-item
-                  label="网口:"
-                  :label-width="formLabelWidth"
-                  prop="ippz_wangkou"
-                >
-                  <el-select
-                    v-model="formData.ippz_wangkou"
-                    style="width: 200px; height: 30px"
-                  >
+                <el-form-item label="网口:" :label-width="formLabelWidth" prop="ippz_wangkou">
+                  <el-select v-model="formData.ippz_wangkou" style="width: 200px; height: 30px">
                     <el-option label="ETH0" value="ETH0"></el-option>
                     <el-option label="ETH1" value="ETH1"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item
-                  label="默认网关:"
-                  :label-width="formLabelWidth"
-                  prop="ippz_mrwg"
-                >
+                <el-form-item label="默认网关:" :label-width="formLabelWidth" prop="ippz_mrwg">
                   <el-row>
-                    <el-col :span="5"
-                      ><el-input v-model="ippz_mrwg1" maxlength="3"></el-input
-                    ></el-col>
+                    <el-col :span="5"><el-input v-model="ippz_mrwg1" maxlength="3"></el-input></el-col>
                     <el-col :span="1">.</el-col>
-                    <el-col :span="5"
-                      ><el-input v-model="ippz_mrwg2" maxlength="3"></el-input
-                    ></el-col>
+                    <el-col :span="5"><el-input v-model="ippz_mrwg2" maxlength="3"></el-input></el-col>
                     <el-col :span="1">.</el-col>
-                    <el-col :span="5"
-                      ><el-input v-model="ippz_mrwg3" maxlength="3"></el-input
-                    ></el-col>
+                    <el-col :span="5"><el-input v-model="ippz_mrwg3" maxlength="3"></el-input></el-col>
                     <el-col :span="1">.</el-col>
-                    <el-col :span="5"
-                      ><el-input v-model="ippz_mrwg4" maxlength="3"></el-input
-                    ></el-col>
+                    <el-col :span="5"><el-input v-model="ippz_mrwg4" maxlength="3"></el-input></el-col>
                   </el-row>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item
-                  label="子网掩码:"
-                  :label-width="formLabelWidth"
-                  prop="ippz_zwym"
-                >
+                <el-form-item label="子网掩码:" :label-width="formLabelWidth" prop="ippz_zwym">
                   <el-row>
                     <el-col :span="5">
                       <el-input v-model="ippz_zwym1" maxlength="3"></el-input>
@@ -87,11 +53,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item
-                  label="IP地址:"
-                  :label-width="formLabelWidth"
-                  prop="ippz_ip"
-                >
+                <el-form-item label="IP地址:" :label-width="formLabelWidth" prop="ippz_ip">
                   <el-row>
                     <el-col :span="5">
                       <el-input v-model="ippz_ip1" maxlength="3"></el-input>
@@ -114,11 +76,7 @@
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item
-                  label="首选DNS:"
-                  :label-width="formLabelWidth"
-                  prop="ippz_dns_sx"
-                >
+                <el-form-item label="首选DNS:" :label-width="formLabelWidth" prop="ippz_dns_sx">
                   <el-row>
                     <el-col :span="5">
                       <el-input v-model="ippz_dns_sx1" maxlength="3"></el-input>
@@ -139,11 +97,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item
-                  label="备选DNS:"
-                  :label-width="formLabelWidth"
-                  prop="ippz_dns_by"
-                >
+                <el-form-item label="备选DNS:" :label-width="formLabelWidth" prop="ippz_dns_by">
                   <el-row>
                     <el-col :span="5">
                       <el-input v-model="ippz_dns_by1" maxlength="3"></el-input>
@@ -158,11 +112,7 @@
                     </el-col>
                     <el-col :span="1">.</el-col>
                     <el-col :span="5">
-                      <el-input
-                        v-model="ippz_dns_by4"
-                        maxlength="3"
-                        type="number"
-                      ></el-input>
+                      <el-input v-model="ippz_dns_by4" maxlength="3"></el-input>
                     </el-col>
                   </el-row>
                 </el-form-item>
@@ -170,20 +120,11 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item
-                  label="MAC地址:"
-                  :label-width="formLabelWidth"
-                  prop="ippz_mac"
-                >
+                <el-form-item label="MAC地址:" :label-width="formLabelWidth" prop="ippz_mac">
                   <el-row>
                     <el-col :span="24" class="mac">
-                      <el-input
-                        style="width: 200px; height: 30px"
-                        v-model="formData.ippz_mac"
-                      ></el-input
-                      ><el-button v-copy="ippz_mac" @click="CopyText"
-                        >复制</el-button
-                      >
+                      <el-input style="width: 200px; height: 30px" v-model="formData.ippz_mac"></el-input><el-button
+                        v-copy="formData.ippz_mac" @click="CopyText">复制</el-button>
                     </el-col>
                   </el-row>
                 </el-form-item>
@@ -358,10 +299,11 @@ export default {
         this.ippz_dns_by3,
         this.ippz_dns_by4
       );
+      console.log(this.formData);
       sessionStorage.setItem("DB-IotLite_yx", JSON.stringify(this.formData));
       let data = {
         mark: "DB-IotLite_yx",
-        user_id: "USER202307301109254198",
+        user_id: "USER202307301114011710",
         mark_value: JSON.stringify(this.formData),
       };
       let res1 = await SaveUserAnswer(data);
@@ -388,6 +330,7 @@ export default {
       this.loading = false;
       console.log(res2);
       if (res2.data.data && res2.data.state) {
+        console.log("391");
         let res3 = JSON.parse(res2.data.data.mark_value);
         console.log(res3);
         if (res3.ippz_wangkou) {
@@ -424,7 +367,7 @@ export default {
   created() {
     this.getUserAnswer();
   },
-  mounted() {},
+  mounted() { },
   directives: {
     copy: {
       bind(el, { value }) {
diff --git a/src/components/IpConfiguration.vue b/src/components/IpConfiguration.vue
index 4d4f135..1b57b6d 100644
--- a/src/components/IpConfiguration.vue
+++ b/src/components/IpConfiguration.vue
@@ -1,22 +1,11 @@
 <!-- ip设置页面 -->
 <template>
   <div>
-    <el-dialog
-      title="IP配置"
-      :visible.sync="dialogVisible"
-      width="30%"
-      v-loading="loading"
-    >
+    <el-dialog title="IP配置" :visible.sync="dialogVisible" width="30%" v-loading="loading">
       <p class="txt">本页面涉及排错，请检查修改默认值</p>
       <div class="ip_setting">
-        <el-form
-          :model="ruleForm"
-          :rules="rules"
-          ref="ruleForm"
-          label-width="140px"
-          class="demo-ruleForm"
-          :label-position="labelPosition"
-        >
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="140px" class="demo-ruleForm"
+          :label-position="labelPosition">
           <el-row>
             <el-col :span="24">
               <el-form-item label="IP获取方式" prop="ippz_ip_hqfs">
@@ -30,10 +19,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="DNS获取方式" prop="ippz_dns_hqfs">
-                <el-select
-                  v-model="ruleForm.ippz_dns_hqfs"
-                  style="width: 200px"
-                >
+                <el-select v-model="ruleForm.ippz_dns_hqfs" style="width: 200px">
                   <el-option label="自动获取" value="自动获取"></el-option>
                   <el-option label="手动设定" value="手动设定"></el-option>
                 </el-select>
@@ -319,7 +305,7 @@ export default {
     async GetUserAnswer() {
       let answers = await GetUserAnswer({
         mark: "CKFWQ_yx",
-        user_id: "USER202307301109254198",
+        user_id: "USER202307301114011710",
       });
       console.log(answers);
       if (answers.data.data && answers.data.state) {
@@ -327,26 +313,28 @@ export default {
         console.log(obj);
         this.ruleForm.ippz_ip_hqfs = obj.ippz_ip_hqfs;
         this.ruleForm.ippz_dns_hqfs = obj.ippz_dns_hqfs;
-        this.ippz_ip1 = obj.ippz_ip.split(".")[0];
-        this.ippz_ip2 = obj.ippz_ip.split(".")[1];
-        this.ippz_ip3 = obj.ippz_ip.split(".")[2];
-        this.ippz_ip4 = obj.ippz_ip.split(".")[3];
-        this.ippz_zwym1 = obj.ippz_zwym.split(".")[0];
-        this.ippz_zwym2 = obj.ippz_zwym.split(".")[1];
-        this.ippz_zwym3 = obj.ippz_zwym.split(".")[2];
-        this.ippz_zwym4 = obj.ippz_zwym.split(".")[3];
-        this.ippz_mrwg1 = obj.ippz_mrwg.split(".")[0];
-        this.ippz_mrwg2 = obj.ippz_mrwg.split(".")[1];
-        this.ippz_mrwg3 = obj.ippz_mrwg.split(".")[2];
-        this.ippz_mrwg4 = obj.ippz_mrwg.split(".")[3];
-        this.ippz_dns_zy1 = obj.ippz_dns_zy.split(".")[0];
-        this.ippz_dns_zy2 = obj.ippz_dns_zy.split(".")[1];
-        this.ippz_dns_zy3 = obj.ippz_dns_zy.split(".")[2];
-        this.ippz_dns_zy4 = obj.ippz_dns_zy.split(".")[3];
-        this.ippz_dns_by1 = obj.ippz_dns_by.split(".")[0];
-        this.ippz_dns_by2 = obj.ippz_dns_by.split(".")[1];
-        this.ippz_dns_by3 = obj.ippz_dns_by.split(".")[2];
-        this.ippz_dns_by4 = obj.ippz_dns_by.split(".")[3];
+        if (obj.ippz_ip) {
+          this.ippz_ip1 = obj.ippz_ip.split(".")[0];
+          this.ippz_ip2 = obj.ippz_ip.split(".")[1];
+          this.ippz_ip3 = obj.ippz_ip.split(".")[2];
+          this.ippz_ip4 = obj.ippz_ip.split(".")[3];
+          this.ippz_zwym1 = obj.ippz_zwym.split(".")[0];
+          this.ippz_zwym2 = obj.ippz_zwym.split(".")[1];
+          this.ippz_zwym3 = obj.ippz_zwym.split(".")[2];
+          this.ippz_zwym4 = obj.ippz_zwym.split(".")[3];
+          this.ippz_mrwg1 = obj.ippz_mrwg.split(".")[0];
+          this.ippz_mrwg2 = obj.ippz_mrwg.split(".")[1];
+          this.ippz_mrwg3 = obj.ippz_mrwg.split(".")[2];
+          this.ippz_mrwg4 = obj.ippz_mrwg.split(".")[3];
+          this.ippz_dns_zy1 = obj.ippz_dns_zy.split(".")[0];
+          this.ippz_dns_zy2 = obj.ippz_dns_zy.split(".")[1];
+          this.ippz_dns_zy3 = obj.ippz_dns_zy.split(".")[2];
+          this.ippz_dns_zy4 = obj.ippz_dns_zy.split(".")[3];
+          this.ippz_dns_by1 = obj.ippz_dns_by.split(".")[0];
+          this.ippz_dns_by2 = obj.ippz_dns_by.split(".")[1];
+          this.ippz_dns_by3 = obj.ippz_dns_by.split(".")[2];
+          this.ippz_dns_by4 = obj.ippz_dns_by.split(".")[3];
+        }
       }
     },
     submitForm() {
diff --git a/src/components/PortConfiguration.vue b/src/components/PortConfiguration.vue
index 9438dae..b369a2f 100644
--- a/src/components/PortConfiguration.vue
+++ b/src/components/PortConfiguration.vue
@@ -200,7 +200,7 @@ export default {
     async GetUserAnswer() {
       let { data } = await GetUserAnswer({
         mark: "CKFWQ_yx",
-        user_id: "USER202307301109254198",
+        user_id: "USER202307301114011710",
       });
       if (data.data) {
         let obj = JSON.parse(data.data.mark_value);
diff --git a/src/components/SerialPort.vue b/src/components/SerialPort.vue
index cc33eb0..59f6bdd 100644
--- a/src/components/SerialPort.vue
+++ b/src/components/SerialPort.vue
@@ -514,7 +514,7 @@ export default {
             is_retract: true,
             labelPosition: "left",
             formLabelWidth: "116px",
-            input1: 192,
+            input1: 10,
             add_passage: false,
             rightMenu: "",
             dialogVisible: true,
@@ -808,30 +808,34 @@ export default {
             })
             this.loading = false;
             console.log(answer);
-            let obj = JSON.parse(answer.data.data.mark_value);
-            console.log(obj);
-            this.formData.tdpz_tdmc = obj.tdpz_tdmc;
-            this.formData.tdpz_td = obj.tdpz_td;
-            this.formData.tdpz_qdmc = obj.tdpz_qdmc;
-            this.formData.tdpz_chuankou = obj.tdpz_chuankou;
-            this.formData.tdpz_btl = obj.tdpz_btl;
-            this.formData.tdpz_sjw = obj.tdpz_sjw;
-            this.formData.tdpz_tzw = obj.tdpz_tzw;
-            this.formData.tdpz_jojy = obj.tdpz_jojy;
-            this.formData.tdpz_050F = obj.tdpz_050F;
-            this.formData.tdpz_0610 = obj.tdpz_0610;
-            this.formData.tdpz_port = obj.tdpz_port;
-            this.formData.tdpz_cssj = obj.tdpz_cssj;
-            this.formData.tdpz_jgsj = obj.tdpz_jgsj;
-            this.formData.tdpz_lxsj = obj.tdpz_lxsj;
-            this.formData.tdpz_cfcs = obj.tdpz_cfcs;
-            if (obj.tdpz_dxzkb) {
-                this.tdpz_dxzkb1 = obj.tdpz_dxzkb.split(":")[0];
-                this.tdpz_dxzkb2 = obj.tdpz_dxzkb.split(":")[1];
-            }
-            this.formData.tdpz_watchtime = Boolean(Number(obj.tdpz_watchtime));
-            this.formData.tdpz_cjsylxdz = Boolean(Number(obj.tdpz_cjsylxdz));
+            console.log(answer.data);
+            if (answer.data.data != "null" && answer.data.state) {
+                // console.log(answer);
+                let obj = JSON.parse(answer.data.data.mark_value);
+                console.log(obj);
+                this.formData.tdpz_tdmc = obj.tdpz_tdmc;
+                this.formData.tdpz_td = obj.tdpz_td;
+                this.formData.tdpz_qdmc = obj.tdpz_qdmc;
+                this.formData.tdpz_chuankou = obj.tdpz_chuankou;
+                this.formData.tdpz_btl = obj.tdpz_btl;
+                this.formData.tdpz_sjw = obj.tdpz_sjw;
+                this.formData.tdpz_tzw = obj.tdpz_tzw;
+                this.formData.tdpz_jojy = obj.tdpz_jojy;
+                this.formData.tdpz_port = obj.tdpz_port;
+                this.formData.tdpz_cssj = obj.tdpz_cssj;
+                this.formData.tdpz_jgsj = obj.tdpz_jgsj;
+                this.formData.tdpz_lxsj = obj.tdpz_lxsj;
+                this.formData.tdpz_cfcs = obj.tdpz_cfcs;
+                if (obj.tdpz_dxzkb) {
+                    this.formData.tdpz_050F = obj.tdpz_050F;
+                    this.formData.tdpz_0610 = obj.tdpz_0610;
+                    this.tdpz_dxzkb1 = obj.tdpz_dxzkb.split(":")[0];
+                    this.tdpz_dxzkb2 = obj.tdpz_dxzkb.split(":")[1];
+                    this.formData.tdpz_watchtime = Boolean(Number(obj.tdpz_watchtime));
+                    this.formData.tdpz_cjsylxdz = Boolean(Number(obj.tdpz_cjsylxdz));
+                }
 
+            }
         }
     },
     mounted() {
diff --git a/src/views/ChWirelessGatewayIP.vue b/src/views/ChWirelessGatewayIP.vue
index b641f94..e73e598 100644
--- a/src/views/ChWirelessGatewayIP.vue
+++ b/src/views/ChWirelessGatewayIP.vue
@@ -11,25 +11,23 @@
 import ChiGate from '@/components/ChiGate.vue';
 export default {
   name: 'InternetCompetitionChWirelessGatewayIP',
-  components:{
+  components: {
     ChiGate
   },
   data() {
     return {
-      
+
     };
   },
 
   mounted() {
-    
+
   },
 
   methods: {
-    
+
   },
 };
 </script>
 
-<style lang="less" scoped>
-
-</style>
+<style lang="less" scoped></style>