src/api/user.js

@@ -7,19 +7,9 @@ export const SaveUserAnswer = (data) => {
     `/wangguan?action=updatecache&mark=${data.mark}&user_id=${data.user_id}&mark_value=${data.mark_value}`,
   );
 };
-// export const GetUserAnswer = (data) => {
+export const GetUserAnswer = (data) => {
-//   return axios.get(
-//     `/wangguan?action=querycache&mark=${data.mark}&user_id=${data.user_id}`
-//   );
-// };
-
-//最新拿缓存请求接口
-export let GetUserAnswer = (data) => {
   return axios.get(
     `/wangguan?action=queryanswercache&mark=${data.mark}&user_id=${data.user_id}`
   );
 };
-<<<<<<< HEAD
-=======
 
->>>>>>> a1e871850258edf9c13570149a9249a1fd77a361

src/components/ChiClonewifi.vue

@@ -5,26 +5,16 @@
     <!-- <div v-click-outside="closeMenu"> -->
     <!-- <el-button type="info" plain @click="dialogVisible = true">斥侯MQTT云</el-button> -->
     <div v-show="dialogVisible" class="tree_menu">
-      <el-tree
+      <el-tree :data="datas" :props="defaultProps" @node-click="treeNodeClick" default-expand-all></el-tree>
-        :data="datas"
-        :props="defaultProps"
-        @node-click="treeNodeClick"
-        default-expand-all
-      ></el-tree>
       <!-- 树形控件右键组件 -->
     </div>
     <!-- </div> -->
     <div class="pas_params" v-show="add_passage" v-loading="loading">
       <div class="content">
         <div class="con_left">
-          <h3 class="mqtt" style="margin-top: 20px; color: white">标准 MQTT</h3>
+          <h3 class="mqtt" style="margin-top: 20px;color: white;">标准 MQTT</h3>
           <el-divider></el-divider>
-          <el-form
+          <el-form :model="formData" :label-position="labelPosition" :rules="rules" ref="ruleForm">
-            :model="formData"
-            :label-position="labelPosition"
-            :rules="rules"
-            ref="ruleForm"
-          >
             <el-row>
               <el-col :span="24">
                 <el-form-item>
@@ -34,42 +24,22 @@
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item
+                <el-form-item label="服务器IP:" :label-width="formLabelWidth" prop="mqtt_ip">
-                  label="服务器IP:"
-                  :label-width="formLabelWidth"
-                  prop="mqtt_ip"
-                >
                   <el-row>
                     <el-col :span="5">
-                      <el-input
+                      <el-input v-model="mqtt_ip1" style="width: 43px; height: 30px" maxlength="3"></el-input>
-                        v-model="mqtt_ip1"
-                        style="width: 43px; height: 30px"
-                        maxlength="3"
-                      ></el-input>
                     </el-col>
                     <el-col :span="1">. </el-col>
                     <el-col :span="5">
-                      <el-input
+                      <el-input v-model="mqtt_ip2" style="width: 43px; height: 30px" maxlength="3"></el-input>
-                        v-model="mqtt_ip2"
-                        style="width: 43px; height: 30px"
-                        maxlength="3"
-                      ></el-input>
                     </el-col>
                     <el-col :span="1">.</el-col>
                     <el-col :span="5">
-                      <el-input
+                      <el-input v-model="mqtt_ip3" style="width: 43px; height: 30px" maxlength="3"></el-input>
-                        v-model="mqtt_ip3"
-                        style="width: 43px; height: 30px"
-                        maxlength="3"
-                      ></el-input>
                     </el-col>
                     <el-col :span="1">.</el-col>
                     <el-col :span="5">
-                      <el-input
+                      <el-input v-model="mqtt_ip4" style="width: 43px; height: 30px" maxlength="3"></el-input>
-                        v-model="mqtt_ip4"
-                        style="width: 43px; height: 30px"
-                        maxlength="3"
-                      ></el-input>
                     </el-col>
                   </el-row>
                 </el-form-item>
@@ -77,62 +47,31 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item
+                <el-form-item label="网关SN:" :label-width="formLabelWidth" prop="mqtt_wgsn">
-                  label="网关SN:"
+                  <el-input v-model="formData.mqtt_wgsn" placeholder="" style="width: 200px; height: 30px"></el-input>
-                  :label-width="formLabelWidth"
-                  prop="mqtt_wgsn"
-                >
-                  <el-input
-                    v-model="formData.mqtt_wgsn"
-                    placeholder=""
-                    style="width: 200px; height: 30px"
-                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item
+                <el-form-item label="端口:" :label-width="formLabelWidth" prop="mqtt_port">
-                  label="端口:"
+                  <el-input v-model="formData.mqtt_port" placeholder="" style="width: 200px; height: 30px"></el-input>
-                  :label-width="formLabelWidth"
-                  prop="mqtt_port"
-                >
-                  <el-input
-                    v-model="formData.mqtt_port"
-                    placeholder=""
-                    style="width: 200px; height: 30px"
-                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item
+                <el-form-item label="Keep Alive(s):" :label-width="formLabelWidth" prop="mqtt_keepalive">
-                  label="Keep Alive(s):"
+                  <el-input v-model="formData.mqtt_keepalive" placeholder=""
-                  :label-width="formLabelWidth"
+                    style="width: 200px; height: 30px"></el-input>
-                  prop="mqtt_keepalive"
-                >
-                  <el-input
-                    v-model="formData.mqtt_keepalive"
-                    placeholder=""
-                    style="width: 200px; height: 30px"
-                  ></el-input>
                   <div class="infos">2-60000</div>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item
+                <el-form-item label="实施数据发布主题:" :label-width="formLabelWidth" prop="mqtt_keepalive">
-                  label="实施数据发布主题:"
+                  <el-input v-model="formData.mqtt_sssjfbzt" placeholder="" style="width: 200px; height: 30px"></el-input>
-                  :label-width="formLabelWidth"
-                  prop="mqtt_keepalive"
-                >
-                  <el-input
-                    v-model="formData.mqtt_sssjfbzt"
-                    placeholder=""
-                    style="width: 200px; height: 30px"
-                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -158,22 +97,9 @@
                 <el-form-item>
                   <el-row>
                     <el-col :span="12">
-                      <el-form-item
+                      <el-form-item label="Qos(MQTT):" :label-width="formLabelWidth" prop="upload_week">
-                        label="Qos(MQTT):"
+                        <el-select v-model="formData.mqtt_qos" placeholder="请选择" style="width: 200px">
-                        :label-width="formLabelWidth"
+                          <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
-                        prop="upload_week"
-                      >
-                        <el-select
-                          v-model="formData.mqtt_qos"
-                          placeholder="请选择"
-                          style="width: 200px"
-                        >
-                          <el-option
-                            v-for="item in options1"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                          >
                           </el-option>
                         </el-select>
                       </el-form-item>
@@ -222,24 +148,16 @@
             <el-table-column property="mqtt_cjd_sbmc" label="设备名称">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.mqtt_cjd_sbmc" placeholder="">
-                  <el-option
+                  <el-option v-for="(option, index) in options2" :key="index" :label="option.label"
-                    v-for="(option, index) in options2"
+                    :value="option.value"></el-option>
-                    :key="index"
-                    :label="option.label"
-                    :value="option.value"
-                  ></el-option>
                 </el-select>
               </template>
             </el-table-column>
             <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
+                  <el-option v-for="(option, index) in options3" :key="index" :label="option.label"
-                    v-for="(option, index) in options3"
+                    :value="option.value"></el-option>
-                    :key="index"
-                    :label="option.label"
-                    :value="option.value"
-                  ></el-option>
                 </el-select>
               </template>
             </el-table-column>
@@ -250,14 +168,8 @@
     <!-- 添加按钮下显示出来的弹框信息 -->
     <div>
       <el-dialog title="选择点" :visible.sync="choose_point" width="30%">
-        <el-tree
+        <el-tree :data="points" show-checkbox node-key="id" :default-expanded-keys="[1, 2]"
-          :data="points"
+          :default-checked-keys="[3, 4, 5, 6]" :props="defaultProps">
-          show-checkbox
-          node-key="id"
-          :default-expanded-keys="[1, 2]"
-          :default-checked-keys="[3, 4, 5, 6]"
-          :props="defaultProps"
-        >
         </el-tree>
         <span slot="footer" class="dialog-footer">
           <el-button type="primary" @click="savePoint">保 存</el-button>
@@ -405,130 +317,99 @@ export default {
         {
           label: "无线区精雕1",
           value: "无线区精雕1",
-        },
+        }
-      ],
-      options3: [
-        {
-          value: "MachinePamHID909",
-          label: "MachinePamHID909",
-        },
-        {
-          value: "MachinePamHID910",
-          label: "MachinePamHID910",
-        },
-        {
-          value: "MachinePamHID911",
-          label: "MachinePamHID911",
-        },
-        {
-          value: "MachinePamHID912",
-          label: "MachinePamHID912",
-        },
-        {
-          value: "MachinePamHID913",
-          label: "MachinePamHID913",
-        },
-        {
-          value: "MachinePamHID914",
-          label: "MachinePamHID914",
-        },
-        {
-          value: "MachinePamHID915",
-          label: "MachinePamHID915",
-        },
-        {
-          value: "MachinePamHID916",
-          label: "MachinePamHID916",
-        },
-        {
-          value: "MachinePamHID917",
-          label: "MachinePamHID917",
-        },
-        {
-          value: "MachinePamHID918",
-          label: "MachinePamHID918",
-        },
-        {
-          value: "MachinePamHID919",
-          label: "MachinePamHID919",
-        },
-        {
-          value: "MachinePamHID920",
-          label: "MachinePamHID920",
-        },
-        {
-          value: "MachinePamHID921",
-          label: "MachinePamHID921",
-        },
-        {
-          value: "MachinePamHID922",
-          label: "MachinePamHID922",
-        },
-        {
-          value: "MachinePamHID923",
-          label: "MachinePamHID923",
-        },
-        {
-          value: "MachinePamHID924",
-          label: "MachinePamHID924",
-        },
-        {
-          value: "MachinePamHID925",
-          label: "MachinePamHID925",
-        },
-        {
-          value: "MachinePamHID926",
-          label: "MachinePamHID926",
-        },
-        {
-          value: "MachinePamHID927",
-          label: "MachinePamHID927",
-        },
-        {
-          value: "MachinePamHID928",
-          label: "MachinePamHID928",
-        },
-        {
-          value: "MachinePamHID929",
-          label: "MachinePamHID929",
-        },
-        {
-          value: "MachinePamHID930",
-          label: "MachinePamHID930",
-        },
-        {
-          value: "MachinePamHID931",
-          label: "MachinePamHID931",
-        },
-        {
-          value: "MachinePamHID932",
-          label: "MachinePamHID932",
-        },
-        {
-          value: "MachinePamHID933",
-          label: "MachinePamHID933",
-        },
-        {
-          value: "MachinePamHID934",
-          label: "MachinePamHID934",
-        },
-        {
-          value: "MachinePamHID935",
-          label: "MachinePamHID935",
-        },
-        {
-          value: "MachinePamHID936",
-          label: "MachinePamHID936",
-        },
-        {
-          value: "MachinePamHID937",
-          label: "MachinePamHID937",
-        },
-        {
-          value: "MachinePamHID938",
-          label: "MachinePamHID938",
-        },
       ],
+      options3: [{
+        value: "MachinePamHID909",
+        label: "MachinePamHID909",
+      }, {
+        value: "MachinePamHID910",
+        label: "MachinePamHID910",
+      }, {
+        value: "MachinePamHID911",
+        label: "MachinePamHID911",
+      }, {
+        value: "MachinePamHID912",
+        label: "MachinePamHID912",
+      }, {
+        value: "MachinePamHID913",
+        label: "MachinePamHID913",
+      }, {
+        value: "MachinePamHID914",
+        label: "MachinePamHID914",
+      }, {
+        value: "MachinePamHID915",
+        label: "MachinePamHID915",
+      }, {
+        value: "MachinePamHID916",
+        label: "MachinePamHID916",
+      }, {
+        value: "MachinePamHID917",
+        label: "MachinePamHID917",
+      }, {
+        value: "MachinePamHID918",
+        label: "MachinePamHID918",
+      }, {
+        value: "MachinePamHID919",
+        label: "MachinePamHID919",
+      }, {
+        value: "MachinePamHID920",
+        label: "MachinePamHID920",
+      }, {
+        value: "MachinePamHID921",
+        label: "MachinePamHID921",
+      }, {
+        value: "MachinePamHID922",
+        label: "MachinePamHID922",
+      }, {
+        value: "MachinePamHID923",
+        label: "MachinePamHID923",
+      }, {
+        value: "MachinePamHID924",
+        label: "MachinePamHID924",
+      }, {
+        value: "MachinePamHID925",
+        label: "MachinePamHID925",
+      }, {
+        value: "MachinePamHID926",
+        label: "MachinePamHID926",
+      }, {
+        value: "MachinePamHID927",
+        label: "MachinePamHID927",
+      }, {
+        value: "MachinePamHID928",
+        label: "MachinePamHID928",
+      }, {
+        value: "MachinePamHID929",
+        label: "MachinePamHID929",
+      }, {
+        value: "MachinePamHID930",
+        label: "MachinePamHID930",
+      }, {
+        value: "MachinePamHID931",
+        label: "MachinePamHID931",
+      }, {
+        value: "MachinePamHID932",
+        label: "MachinePamHID932",
+      }, {
+        value: "MachinePamHID933",
+        label: "MachinePamHID933",
+      }, {
+        value: "MachinePamHID934",
+        label: "MachinePamHID934",
+      }, {
+        value: "MachinePamHID935",
+        label: "MachinePamHID935",
+      }, {
+        value: "MachinePamHID936",
+        label: "MachinePamHID936",
+      }, {
+        value: "MachinePamHID937",
+        label: "MachinePamHID937",
+      }, {
+        value: "MachinePamHID938",
+        label: "MachinePamHID938",
+      }],
       tableData: [
         {
           mqtt_cjd_sbmc: "无线区精雕1",
@@ -573,10 +454,10 @@ export default {
         this.choose_point = true;
       } else if (key == 1 && this.isAdd == true) {
         this.$message({
-          message: "添加失败,只能添加一条数据",
+          message: '添加失败,只能添加一条数据',
-          type: "error",
+          type: 'error'
         });
-        return false;
+        return false
       }
     },
     highlighter(code) {
@@ -590,8 +471,8 @@ export default {
       this.choose_point = false;
       this.isAdd = true;
       this.$message({
-        message: "添加成功",
+        message: '添加成功',
-        type: "success",
+        type: 'success'
       });
     },
     async handleSelect() {
@@ -608,20 +489,13 @@ export default {
     async saveClone() {
       var obj = {
         mqtt_qiyong: String(Number(this.formData.mqtt_qiyong)),
-        mqtt_ip:
+        mqtt_ip: this.mqtt_ip1 + "." + this.mqtt_ip2 + "." + this.mqtt_ip3 + "." + this.mqtt_ip4,
-          this.mqtt_ip1 +
-          "." +
-          this.mqtt_ip2 +
-          "." +
-          this.mqtt_ip3 +
-          "." +
-          this.mqtt_ip4,
         mqtt_wgsn: this.formData.mqtt_wgsn,
         mqtt_port: this.formData.mqtt_port,
         mqtt_keepalive: this.formData.mqtt_keepalive,
         mqtt_sssjfbzt: this.formData.mqtt_sssjfbzt,
         mqtt_qos: this.formData.mqtt_qos,
-      };
+      }
       // this.formData.mqtt_tls = String(Number(this.formData.mqtt_tls));
       // this.formData.mqtt_clearsession = String(Number(this.formData.mqtt_clearsession));
       let datas = sessionStorage.getItem("CHGYWG_wx");
@@ -633,8 +507,8 @@ export default {
       });
       if (res.status == 200) {
         this.$message({
-          message: "保存成功",
+          message: '保存成功',
-          type: "success",
+          type: 'success'
         });
       }
       console.log(res);
@@ -845,3 +719,4 @@ export default {
   }
 }
 </style>
+  

src/components/IpConfiguration.vue

@@ -1,22 +1,12 @@
 <!-- ip设置页面 -->
 <template>
   <div>
-    <el-dialog
+    <!-- <el-button @click="dialogVisible = true">ip配置</el-button> -->
-      title="IP配置"
+    <el-dialog title="IP配置" :visible.sync="dialogVisible" width="30%" v-loading="loading">
-      :visible.sync="dialogVisible"
-      width="30%"
-      v-loading="loading"
-    >
       <p class="txt">本页面涉及排错，请检查修改默认值</p>
       <div class="ip_setting">
-        <el-form
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="140px" class="demo-ruleForm"
-          :model="ruleForm"
+          :label-position="labelPosition">
-          :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 +20,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="DNS获取方式" prop="ippz_dns_hqfs">
-                <el-select
+                <el-select v-model="ruleForm.ippz_dns_hqfs" style="width: 200px">
-                  v-model="ruleForm.ippz_dns_hqfs"
-                  style="width: 200px"
-                >
                   <el-option label="自动获取" value="自动获取"></el-option>
                   <el-option label="手动设定" value="手动设定"></el-option>
                 </el-select>
@@ -171,7 +158,7 @@ import { Loading } from "element-ui";
 export default {
   data() {
     return {
-      loading: false,
+      loading:false,
       ippz_ip1: "192",
       ippz_ip2: "168",
       ippz_ip3: "1",
@@ -204,14 +191,18 @@ export default {
         ippz_dns_by: "",
       },
       rules: {
-        ippz_ip_hqfs: [{ required: true, message: "", trigger: "blur" }],
+        ippz_ip_hqfs: [
-        ippz_dns_hqfs: [{ required: true, message: "", trigger: "blur" }],
+          { required: true, message: "请输入活动名称", trigger: "blur" },
+        ],
+        ippz_dns_hqfs: [
+          { required: true, message: "请输入活动名称", trigger: "blur" },
+        ],
         ippz_ip: [
           {
             required: true,
             validator: this.validateIpAddress,
             trigger: "blur",
-            message: "",
+            message: "请输入有效的IP地址",
           },
         ],
         ippz_zwym: [
@@ -219,7 +210,7 @@ export default {
             required: true,
             validator: this.validateSubnetMask,
             trigger: "blur",
-            message: "",
+            message: "请输入有效的子网掩码",
           },
         ],
         ippz_mrwg: [
@@ -227,7 +218,7 @@ export default {
             required: true,
             validator: this.validateGateway,
             trigger: "blur",
-            message: "",
+            message: "请输入有效的网关地址",
           },
         ],
         ippz_dns_zy: [
@@ -235,7 +226,7 @@ export default {
             required: true,
             validator: this.validatePrimaryDNS,
             trigger: "blur",
-            message: "",
+            message: "请输入有效的主DNS服务器地址",
           },
         ],
         ippz_dns_by: [
@@ -243,7 +234,7 @@ export default {
             required: true,
             validator: this.validatePrimaryDNS,
             trigger: "blur",
-            message: "",
+            message: "请输入有效的备用DNS服务器地址",
           },
         ],
       },
@@ -299,58 +290,28 @@ export default {
         this.ippz_dns_by4
       );
       let datas = sessionStorage.getItem("CKFWQ_yx");
-      datas = { ...JSON.parse(datas), ...this.ruleForm };
+      datas = { ...JSON.parse(datas), ...this.ruleForm }
       let res = await SaveUserAnswer({
         mark: "CKFWQ_yx",
         user_id: "USER202307301114011710",
         mark_value: JSON.stringify(datas),
       });
       console.log(res);
-      if (res.status == 200) {
+      sessionStorage.setItem("CKFWQ_yx", JSON.stringify(datas));
-        sessionStorage.setItem("CKFWQ_yx", JSON.stringify(datas));
-        this.$message({
-          message: "保存成功",
-          type: "success",
-        });
-      } else {
-        this.$message.error("保存失败");
-      }
     },
     async GetUserAnswer() {
       let answers = await GetUserAnswer({
         mark: "CKFWQ_yx",
-        user_id: "USER202307301109254198",
+        user_id: "USER202307301114011710"
-      });
+      })
       console.log(answers);
-      if (answers.data.data) {
+      let obj = JSON.parse(answers.data.data.mark_value);
-        let obj = JSON.parse(answers.data.data.mark_value);
+      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];
-      }
     },
-    submitForm() {
+    submitForm(formName) {
-      this.$refs["ruleForm"].validate((valid) => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
+          alert("submit!");
         } else {
           console.log("error submit!!");
           return false;
@@ -409,10 +370,10 @@ export default {
       }
     },
   },
-  created() {
+  created(){
-    this.Loading = true;
+    this.Loading=true;
     this.GetUserAnswer();
-    this.Loading = false;
+    this.Loading=false;
   },
 };
 </script>

src/components/PortConfiguration.vue

@@ -2,25 +2,15 @@
   <div>
     <!-- <el-button @click="dialogVisible = true">端口配置</el-button> -->
     <div v-show="dialogVisible" class="tree_menu">
-      <el-tree
+      <el-tree :data="datas" :props="defaultProps" :default-expanded-keys="['keyOfNodeToExpand']"
-        :data="datas"
+        :default-checked-keys="['keyOfNodeToSelect']"></el-tree>
-        :props="defaultProps"
-        :default-expanded-keys="['keyOfNodeToExpand']"
-        :default-checked-keys="['keyOfNodeToSelect']"
-      ></el-tree>
       <!-- 树形控件右键组件 -->
     </div>
 
     <div class="port_content">
       <el-dialog title="端口配置" :visible.sync="dialogVisible" width="30%">
-        <el-form
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm"
-          :model="ruleForm"
+          :label-position="labelPosition">
-          :rules="rules"
-          ref="ruleForm"
-          label-width="150px"
-          class="demo-ruleForm"
-          :label-position="labelPosition"
-        >
           <el-form-item label="波特率(bps)" prop="dkpz_btl">
             <el-col :span="15">
               <el-select v-model="ruleForm.dkpz_btl">
@@ -49,10 +39,7 @@
           <el-form-item label="检验位" prop="dkpz_jyw">
             <el-col :span="15">
               <el-select v-model="ruleForm.dkpz_jyw">
-                <el-option
+                <el-option label="无校验(None)" value="无校验(None)"></el-option>
-                  label="无校验(None)"
-                  value="无校验(None)"
-                ></el-option>
                 <el-option label="奇校验" value="奇校验"></el-option>
                 <el-option label="偶校验" value="偶校验"></el-option>
               </el-select>
@@ -76,18 +63,12 @@
           </el-form-item>
           <el-form-item label="打包长度(bytes)" prop="dkpz_dbcd">
             <el-col :span="15">
-              <el-input
+              <el-input v-model="ruleForm.dkpz_dbcd" placeholder="0-1460"></el-input>
-                v-model="ruleForm.dkpz_dbcd"
-                placeholder="0-1460"
-              ></el-input>
             </el-col>
           </el-form-item>
           <el-form-item label="打包时间(ms)" prop="dkpz_dbsj">
             <el-col :span="15">
-              <el-input
+              <el-input v-model="ruleForm.dkpz_dbsj" placeholder="0-255"></el-input>
-                v-model="ruleForm.dkpz_dbsj"
-                placeholder="0-255"
-              ></el-input>
             </el-col>
           </el-form-item>
           <el-form-item label="同步波特率(RF2217)" prop="dkpz_tbbtl">
@@ -98,11 +79,7 @@
               </el-select>
             </el-col>
           </el-form-item>
-          <el-checkbox
+          <el-checkbox label="使能串口心跳包" name="type" v-model="ruleForm.dkpz_snckxtb"></el-checkbox>
-            label="使能串口心跳包"
-            name="type"
-            v-model="ruleForm.dkpz_snckxtb"
-          ></el-checkbox>
         </el-form>
         <span slot="footer" class="dialog-footer">
           <!-- <el-button type="primary" @click="submitForm('ruleForm'), (dialogVisible = false)">保存</el-button> -->
@@ -114,7 +91,7 @@
   </div>
 </template>
 <script>
-import { SaveUserAnswer, GetUserAnswer } from "@/api/user";
+import { SaveUserAnswer } from "@/api/user";
 import { isValidPrimaryDNS } from "../validate";
 export default {
   data() {
@@ -193,32 +170,11 @@ export default {
       },
     };
   },
-  created() {
-    this.GetUserAnswer();
-  },
   methods: {
-    async GetUserAnswer() {
-      let { data } = await GetUserAnswer({
-        mark: "CKFWQ_yx",
-        user_id: "USER202307301109254198",
-      });
-      if (data.data) {
-        let obj = JSON.parse(data.data.mark_value);
-        this.ruleForm.dkpz_btl = obj.dkpz_btl;
-        this.ruleForm.dkpz_sjw = obj.dkpz_sjw;
-        this.ruleForm.dkpz_jyw = obj.dkpz_jyw;
-        this.ruleForm.dkpz_tzw = obj.dkpz_tzw;
-        this.ruleForm.dkpz_lkms = obj.dkpz_lkms;
-        this.ruleForm.dkpz_dbcd = obj.dkpz_dbcd;
-        this.ruleForm.dkpz_dbsj = obj.dkpz_dbsj;
-        this.ruleForm.dkpz_tbbtl = obj.dkpz_tbbtl;
-        this.ruleForm.dkpz_snckxtb = Boolean(obj.dkpz_snckxtb);
-      }
-    },
     savePort() {
       this.ruleForm.dkpz_snckxtb = String(Number(this.ruleForm.dkpz_snckxtb));
-      let datas = localStorage.getItem("CKFWQ_yx");
+      let datas = localStorage.getItem("CKFWQ_yx")
-      datas = { ...JSON.parse(datas), ...this.ruleForm };
+      datas = { ...JSON.parse(datas), ...this.ruleForm }
       SaveUserAnswer({
         mark: "CKFWQ_yx",
         user_id: "USER202307301114011710",

src/components/Wireles.vue

@@ -2,14 +2,8 @@
   <div>
     <!-- <el-button @click="dialogVisible = true">无线设置</el-button> -->
     <el-dialog title="无线设置" :visible.sync="dialogVisible" width="30%">
-      <el-form
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm"
-        :model="ruleForm"
+        :label-position="labelPosition">
-        :rules="rules"
-        ref="ruleForm"
-        label-width="150px"
-        class="demo-ruleForm"
-        :label-position="labelPosition"
-      >
         <el-form-item label="工作模式:" prop="wxpz_gzms">
           <el-col :span="10">
             <el-select v-model="ruleForm.wxpz_gzms">
@@ -26,11 +20,11 @@
             </el-select>
           </el-col>
         </el-form-item>
-        <!-- <el-form-item label="MAC地址:" prop="wxpz_mac">
+        <el-form-item label="MAC地址:" prop="wxpz_mac">
           <el-col :span="10">
             <el-input v-model="ruleForm.wxpz_mac"> </el-input>
           </el-col>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="加密模式:" prop="wxpz_jmms">
           <el-col :span="10">
             <el-select v-model="ruleForm.wxpz_jmms">
@@ -73,7 +67,7 @@ export default {
       ruleForm: {
         wxpz_gzms: "STA模式",
         wxpz_wlmc: "无线区无限网",
-        // wxpz_mac: "",
+        wxpz_mac: "",
         wxpz_jmms: "WPA2PSK",
         wxpz_jmsf: "AES",
         wxpz_mm: "",
@@ -81,7 +75,7 @@ export default {
       rules: {
         wxpz_gzms: [{ required: true, trigger: "change", message: "必填" }],
         wxpz_wlmc: [{ required: true, trigger: "change", message: "必填" }],
-        // wxpz_mac: [{ trigger: "blur", message: "必填" }],
+        wxpz_mac: [{ trigger: "blur", message: "必填" }],
         wxpz_jmms: [{ required: true, trigger: "blur", message: "必填" }],
         wxpz_jmsf: [{ required: true, trigger: "blur", message: "必填" }],
         wxpz_mm: [{ required: true, trigger: "blur", message: "必填" }],
@@ -123,7 +117,7 @@ export default {
       console.log(obj);
       this.ruleForm.wxpz_gzms = obj.wxpz_gzms;
       this.ruleForm.wxpz_wlmc = obj.wxpz_wlmc;
-      // this.ruleForm.wxpz_mac = obj.wxpz_mac;
+      this.ruleForm.wxpz_mac = obj.wxpz_mac;
       this.ruleForm.wxpz_jmms = obj.wxpz_jmms;
       this.ruleForm.wxpz_jmsf = obj.wxpz_jmsf;
       this.ruleForm.wxpz_mm = obj.wxpz_mm;

src/components/netConfiguration.vue

@@ -1,21 +1,11 @@
 <template>
   <div>
-    <el-dialog
+    <el-dialog title="串口及网络协议设置" :visible.sync="dialogVisible" v-loading="loading">
-      title="串口及网络协议设置"
-      :visible.sync="dialogVisible"
-      v-loading="loading"
-    >
       <h3>串口参数设置</h3>
       <el-divider></el-divider>
       <div class="formOne">
-        <el-form
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm"
-          :model="ruleForm"
+          :label-position="labelPosition">
-          :rules="rules"
-          ref="ruleForm"
-          label-width="150px"
-          class="demo-ruleForm"
-          :label-position="labelPosition"
-        >
           <el-form-item label="波特率(bps):" prop="ckcssz_btl">
             <el-select v-model="ruleForm.ckcssz_btl" placeholder="请选择波特率">
               <el-option label="9600" value="9600"></el-option>
@@ -34,10 +24,7 @@
           </el-form-item>
           <el-form-item label="检验位:" prop="ckcssz_jyw">
             <el-select v-model="ruleForm.ckcssz_jyw" placeholder="请选择检验位">
-              <el-option
+              <el-option label="无校验（none）" value="无校验（none）"></el-option>
-                label="无校验（none）"
-                value="无校验（none）"
-              ></el-option>
               <el-option label="偶校验" value="偶校验"></el-option>
               <el-option label="奇校验" value="奇校验"></el-option>
             </el-select>
@@ -49,23 +36,14 @@
             </el-select>
           </el-form-item>
           <el-form-item label="自适应波特率(类RFC2117):" prop="ckcssz_zdybtl">
-            <el-select
+            <el-select v-model="ruleForm.ckcssz_zdybtl" placeholder="请选择自适应波特率">
-              v-model="ruleForm.ckcssz_zdybtl"
-              placeholder="请选择自适应波特率"
-            >
               <el-option label="开启" value="开启"></el-option>
               <el-option label="关闭" value="关闭"></el-option>
             </el-select>
           </el-form-item>
         </el-form>
-        <el-form
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm"
-          :model="ruleForm"
+          :label-position="labelPosition">
-          :rules="rules"
-          ref="ruleForm"
-          label-width="150px"
-          class="demo-ruleForm"
-          :label-position="labelPosition"
-        >
           <el-form-item label="数据位(bit):" prop="ckcssz_sjw">
             <el-select v-model="ruleForm.ckcssz_sjw" placeholder="请选择数据位">
               <el-option label="8" value="8"></el-option>
@@ -78,10 +56,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="485功能:" prop="ckcssz_485">
-            <el-select
+            <el-select v-model="ruleForm.ckcssz_485" placeholder="请选择485功能">
-              v-model="ruleForm.ckcssz_485"
-              placeholder="请选择485功能"
-            >
               <el-option label="开启" value="开启"></el-option>
               <el-option label="关闭" value="关闭"></el-option>
             </el-select>
@@ -91,14 +66,8 @@
       <h3>其他设置</h3>
       <el-divider></el-divider>
       <div class="formOne">
-        <el-form
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm1" label-width="200px" class="demo-ruleForm1"
-          :model="ruleForm"
+          :label-position="labelPosition">
-          :rules="rules"
-          ref="ruleForm1"
-          label-width="200px"
-          class="demo-ruleForm1"
-          :label-position="labelPosition"
-        >
           <el-form-item label="串口自动成频:" prop="qtsz_ckzdcz">
             <el-select v-model="ruleForm.qtsz_ckzdcz">
               <el-option label="关闭" value="关闭"></el-option>
@@ -208,19 +177,17 @@ export default {
       });
       let obj = JSON.parse(answers.data.data.mark_value);
       console.log(obj);
-      if (answers.data.data) {
+      this.ruleForm.ckcssz_btl = obj.ckcssz_btl;
-        this.ruleForm.ckcssz_btl = obj.ckcssz_btl;
+      this.ruleForm.ckcssz_jyw = obj.ckcssz_jyw;
-        this.ruleForm.ckcssz_jyw = obj.ckcssz_jyw;
+      this.ruleForm.ckcssz_lk = obj.ckcssz_lk;
-        this.ruleForm.ckcssz_lk = obj.ckcssz_lk;
+      this.ruleForm.ckcssz_zdybtl = obj.ckcssz_zdybtl;
-        this.ruleForm.ckcssz_zdybtl = obj.ckcssz_zdybtl;
+      this.ruleForm.ckcssz_sjw = obj.ckcssz_sjw;
-        this.ruleForm.ckcssz_sjw = obj.ckcssz_sjw;
+      this.ruleForm.ckcssz_tzw = obj.ckcssz_tzw;
-        this.ruleForm.ckcssz_tzw = obj.ckcssz_tzw;
+      this.ruleForm.ckcssz_485 = obj.ckcssz_485;
-        this.ruleForm.ckcssz_485 = obj.ckcssz_485;
+      this.ruleForm.qtsz_ckzdcz = obj.qtsz_ckzdcz;
-        this.ruleForm.qtsz_ckzdcz = obj.qtsz_ckzdcz;
+      this.ruleForm.qtsz_zcblx = obj.qtsz_zcblx;
-        this.ruleForm.qtsz_zcblx = obj.qtsz_zcblx;
+      this.ruleForm.qtsz_zdyxtb = obj.qtsz_zdyxtb;
-        this.ruleForm.qtsz_zdyxtb = obj.qtsz_zdyxtb;
+      this.ruleForm.qtsz_tjzffgn = obj.qtsz_tjzffgn;
-        this.ruleForm.qtsz_tjzffgn = obj.qtsz_tjzffgn;
-      }
       this.loading = false;
     },
   },

src/views/Index.vue

@@ -57,10 +57,7 @@ export default {
     ceshi
   },
   data() {
-    return {
+    return {};
-      tmDisplay: false,
-      rightMenu: {},
-    };
   },
   created() {
     localStorage.setItem(
@@ -161,31 +158,4 @@ export default {
   justify-content: space-around;
   align-items: flex-start;
 }
-
-.tree_menu {
-  position: fixed;
-  display: block;
-  z-index: 20000;
-  background-color: #fff;
-  padding: 5px 0;
-  border: 1px solid #ebeef5;
-  border-radius: 4px;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-
-  ul {
-    margin: 0;
-    padding: 0;
-  }
-  ul li {
-    list-style: none;
-    margin: 0;
-    padding: 0 15px;
-    font-size: 14px;
-    line-height: 30px;
-    cursor: pointer;
-  }
-  ul li:hover {
-    background-color: #ebeef5;
-  }
-}
 </style>