Merge branch 'master' of http://git.umayle.com:2023/chengdandan/InternetCompetition

src/components/ChiWireld.vue

@@ -11,11 +11,25 @@
       <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-form-item
-                  <el-select v-model="formData.ippz_wllx" placeholder="静态IP" style="width: 200px">
+                  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>
@@ -23,7 +37,11 @@
             </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>
@@ -69,7 +87,11 @@
             </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>
@@ -185,7 +207,7 @@ export default {
     let that = this;
     window.getParameter = that.getParameter;
   },
-  mounted() { },
+  mounted() {},
 
   methods: {
     getParameter(data) {
@@ -262,8 +284,9 @@ export default {
       });
       this.loading = false;
       console.log(data);
-      if (data.data && data.state) {
+      if (data.data !== null && data.state) {
         var obj = JSON.parse(data.data.mark_value);
+        console.log(obj);
         this.formData.ippz_wllx = obj.ippz_wllx;
         if (obj.ippz_ip) {
           this.ippz_ip1 = obj.ippz_ip.split(".")[0];