diff --git a/.history/src/components/IpConfiguration_20231108084214.vue b/.history/src/components/IpConfiguration_20231108084214.vue
new file mode 100644
index 0000000..e46c178
--- /dev/null
+++ b/.history/src/components/IpConfiguration_20231108084214.vue
@@ -0,0 +1,425 @@
+<!-- ip设置页面 -->
+<template>
+  <div>
+<<<<<<< HEAD
+    <!-- <el-button @click="dialogVisible = true">ip配置</el-button> -->
+    <el-dialog title="IP配置" :visible.sync="dialogVisible" width="30%" v-loading="loading">
+=======
+    <el-dialog title="IP配置" :visible.sync="dialogVisible" width="30%">
+>>>>>>> dac0d6880da10f1d9538048eaf4e8becfc504f97
+      <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-row>
+            <el-col :span="24">
+              <el-form-item label="IP获取方式" prop="ippz_ip_hqfs">
+                <el-select v-model="ruleForm.ippz_ip_hqfs" style="width: 200px">
+                  <el-option label="Static IP" value="Static IP"></el-option>
+                  <el-option label="DHCP" value="DHCP"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <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-option label="自动获取" value="自动获取"></el-option>
+                  <el-option label="手动设定" value="手动设定"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="本机IP" prop="ippz_ip">
+                <el-row>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_ip1"></el-input>
+                  </el-col>
+                  <el-col :span="1">. </el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_ip2"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_ip3"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_ip4"></el-input>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="子网掩码" prop="ippz_zwym">
+                <el-row>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_zwym1"></el-input>
+                  </el-col>
+                  <el-col :span="1">. </el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_zwym2"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_zwym3"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_zwym4"></el-input>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="网关地址" prop="ippz_mrwg">
+                <el-row>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_mrwg1"></el-input>
+                  </el-col>
+                  <el-col :span="1">. </el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_mrwg2"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_mrwg3"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_mrwg4"></el-input>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="主DNS服务器" prop="ippz_dns_zy">
+                <el-row>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_zy1"></el-input>
+                  </el-col>
+                  <el-col :span="1">. </el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_zy2"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_zy3"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_zy4"></el-input>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备用DNS服务器" prop="ippz_dns_by">
+                <el-row>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_by1"></el-input>
+                  </el-col>
+                  <el-col :span="1">. </el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_by2"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_by3"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_by4"></el-input>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="saveAll">保存</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { SaveUserAnswer, GetUserAnswer } from "@/api/user";
+import { isValidPrimaryDNS } from "../validate";
+import { Loading } from "element-ui";
+export default {
+  data() {
+    return {
+      loading:false,
+      ippz_ip1: "192",
+      ippz_ip2: "168",
+      ippz_ip3: "1",
+      ippz_ip4: "1",
+      ippz_zwym1: "255",
+      ippz_zwym2: "255",
+      ippz_zwym3: "255",
+      ippz_zwym4: "0",
+      ippz_mrwg1: "",
+      ippz_mrwg2: "",
+      ippz_mrwg3: "",
+      ippz_mrwg4: "",
+      ippz_dns_zy1: "",
+      ippz_dns_zy2: "",
+      ippz_dns_zy3: "",
+      ippz_dns_zy4: "",
+      ippz_dns_by1: "",
+      ippz_dns_by2: "",
+      ippz_dns_by3: "",
+      ippz_dns_by4: "",
+      dialogVisible: true,
+      labelPosition: "left",
+      ruleForm: {
+        ippz_ip_hqfs: "Static IP",
+        ippz_dns_hqfs: "自动获取",
+        ippz_ip: "",
+        ippz_zwym: "",
+        ippz_mrwg: "",
+        ippz_dns_zy: "",
+        ippz_dns_by: "",
+      },
+      rules: {
+        ippz_ip_hqfs: [
+          { required: true, message: "请输入活动名称", trigger: "blur" },
+        ],
+        ippz_dns_hqfs: [
+          { required: true, message: "请输入活动名称", trigger: "blur" },
+        ],
+        ippz_ip: [
+          {
+            required: true,
+            validator: this.validateIpAddress,
+            trigger: "blur",
+            message: "请输入有效的IP地址",
+          },
+        ],
+        ippz_zwym: [
+          {
+            required: true,
+            validator: this.validateSubnetMask,
+            trigger: "blur",
+            message: "请输入有效的子网掩码",
+          },
+        ],
+        ippz_mrwg: [
+          {
+            required: true,
+            validator: this.validateGateway,
+            trigger: "blur",
+            message: "请输入有效的网关地址",
+          },
+        ],
+        ippz_dns_zy: [
+          {
+            required: true,
+            validator: this.validatePrimaryDNS,
+            trigger: "blur",
+            message: "请输入有效的主DNS服务器地址",
+          },
+        ],
+        ippz_dns_by: [
+          {
+            required: true,
+            validator: this.validatePrimaryDNS,
+            trigger: "blur",
+            message: "请输入有效的备用DNS服务器地址",
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    // 封装合并输入框的数据
+    Merge(value, value1, value2, value3, value4) {
+      value = value1 + "." + value2 + "." + value3 + "." + value4;
+      return value;
+    },
+    SliceData(value) {
+      let res = value.split(".");
+      // console.log(res);
+      return res;
+    },
+    // 保存数据,发送请求
+    async saveAll() {
+      this.dialogVisible = false;
+      this.ruleForm.ippz_ip = this.Merge(
+        this.ruleForm.ippz_ip,
+        this.ippz_ip1,
+        this.ippz_ip2,
+        this.ippz_ip3,
+        this.ippz_ip4
+      );
+      this.ruleForm.ippz_zwym = this.Merge(
+        this.ruleForm.ippz_zwym,
+        this.ippz_zwym1,
+        this.ippz_zwym2,
+        this.ippz_zwym3,
+        this.ippz_zwym4
+      );
+      this.ruleForm.ippz_mrwg = this.Merge(
+        this.ruleForm.ippz_mrwg,
+        this.ippz_mrwg1,
+        this.ippz_mrwg2,
+        this.ippz_mrwg3,
+        this.ippz_mrwg4
+      );
+      this.ruleForm.ippz_dns_zy = this.Merge(
+        this.ruleForm.ippz_dns_zy,
+        this.ippz_dns_zy1,
+        this.ippz_dns_zy2,
+        this.ippz_dns_zy3,
+        this.ippz_dns_zy4
+      );
+      this.ruleForm.ippz_dns_by = this.Merge(
+        this.ruleForm.ippz_dns_by,
+        this.ippz_dns_by1,
+        this.ippz_dns_by2,
+        this.ippz_dns_by3,
+        this.ippz_dns_by4
+      );
+      let datas = sessionStorage.getItem("CKFWQ_yx");
+      datas = { ...JSON.parse(datas), ...this.ruleForm }
+      let res = await SaveUserAnswer({
+        mark: "CKFWQ_yx",
+        user_id: "USER202307301109254198",
+        mark_value: JSON.stringify(datas),
+      });
+      console.log(res);
+      sessionStorage.setItem("CKFWQ_yx", JSON.stringify(datas));
+    },
+    async GetUserAnswer() {
+      let answers = await GetUserAnswer({
+        mark: "CKFWQ_yx",
+        user_id: "USER202307301109254198"
+      })
+      console.log(answers);
+      let obj = JSON.parse(answers.data.data.mark_value);
+      console.log(obj);
+    },
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          alert("submit!");
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    },
+    //ip地址验证
+    validateIpAddress(rule, value, callback) {
+      if (value === "") {
+        callback(new Error("请输入IP地址"));
+      } else if (
+        !/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(
+          value
+        )
+      ) {
+        callback(new Error("请输入有效的IP地址"));
+      } else {
+        callback();
+      }
+    },
+    //子网掩码验证
+    validateSubnetMask(rule, value, callback) {
+      if (value === "") {
+        callback(new Error("请输入子网掩码"));
+      } else if (
+        !/^(\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])$/.test(
+          value
+        )
+      ) {
+        callback(new Error("请输入有效的子网掩码"));
+      } else {
+        callback();
+      }
+    },
+    //网关地址验证
+    validateGateway(rule, value, callback) {
+      if (value === "") {
+        callback(new Error("请输入网关地址"));
+      } else if (!/^(\d{1,3}\.){3}\d{1,3}$/.test(value)) {
+        callback(new Error("请输入有效的网关地址"));
+      } else {
+        callback();
+      }
+    },
+    //dns服务验证
+    validatePrimaryDNS(rule, value, callback) {
+      if (value === "") {
+        callback(new Error("请输入主DNS服务器地址"));
+      } else if (!isValidPrimaryDNS(value)) {
+        callback(new Error("请输入有效的主DNS服务器地址"));
+      } else {
+        callback();
+      }
+    },
+  },
+  created(){
+    this.Loading=true;
+    this.GetUserAnswer();
+    this.Loading=false;
+  },
+};
+</script>
+<style scoped lang="less">
+/deep/ .ip_setting {
+  .el-input__inner {
+    height: 30px;
+    text-align: center;
+    padding: 0;
+  }
+
+  .el-row {
+    display: flex;
+    align-items: flex-end;
+
+    .el-col-1 {
+      padding: 0px 2px;
+      color: black;
+      text-align: left;
+      line-height: 32px;
+      height: 20px;
+    }
+
+    .el-col-5 {
+      width: 43px;
+      height: 30px;
+    }
+
+    .el-col-24 {
+      padding-right: 152px;
+    }
+  }
+}
+
+.el-dialog {
+  position: relative;
+}
+
+.txt {
+  position: absolute;
+  top: 22px;
+  left: 100px;
+  color: red;
+}
+</style>
diff --git a/.history/src/components/IpConfiguration_20231108084220.vue b/.history/src/components/IpConfiguration_20231108084220.vue
new file mode 100644
index 0000000..054d58a
--- /dev/null
+++ b/.history/src/components/IpConfiguration_20231108084220.vue
@@ -0,0 +1,421 @@
+<!-- ip设置页面 -->
+<template>
+  <div>
+    <!-- <el-button @click="dialogVisible = true">ip配置</el-button> -->
+    <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-row>
+            <el-col :span="24">
+              <el-form-item label="IP获取方式" prop="ippz_ip_hqfs">
+                <el-select v-model="ruleForm.ippz_ip_hqfs" style="width: 200px">
+                  <el-option label="Static IP" value="Static IP"></el-option>
+                  <el-option label="DHCP" value="DHCP"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <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-option label="自动获取" value="自动获取"></el-option>
+                  <el-option label="手动设定" value="手动设定"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="本机IP" prop="ippz_ip">
+                <el-row>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_ip1"></el-input>
+                  </el-col>
+                  <el-col :span="1">. </el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_ip2"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_ip3"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_ip4"></el-input>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="子网掩码" prop="ippz_zwym">
+                <el-row>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_zwym1"></el-input>
+                  </el-col>
+                  <el-col :span="1">. </el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_zwym2"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_zwym3"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_zwym4"></el-input>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="网关地址" prop="ippz_mrwg">
+                <el-row>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_mrwg1"></el-input>
+                  </el-col>
+                  <el-col :span="1">. </el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_mrwg2"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_mrwg3"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_mrwg4"></el-input>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="主DNS服务器" prop="ippz_dns_zy">
+                <el-row>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_zy1"></el-input>
+                  </el-col>
+                  <el-col :span="1">. </el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_zy2"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_zy3"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_zy4"></el-input>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备用DNS服务器" prop="ippz_dns_by">
+                <el-row>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_by1"></el-input>
+                  </el-col>
+                  <el-col :span="1">. </el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_by2"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_by3"></el-input>
+                  </el-col>
+                  <el-col :span="1">.</el-col>
+                  <el-col :span="5">
+                    <el-input v-model="ippz_dns_by4"></el-input>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="saveAll">保存</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { SaveUserAnswer, GetUserAnswer } from "@/api/user";
+import { isValidPrimaryDNS } from "../validate";
+import { Loading } from "element-ui";
+export default {
+  data() {
+    return {
+      loading:false,
+      ippz_ip1: "192",
+      ippz_ip2: "168",
+      ippz_ip3: "1",
+      ippz_ip4: "1",
+      ippz_zwym1: "255",
+      ippz_zwym2: "255",
+      ippz_zwym3: "255",
+      ippz_zwym4: "0",
+      ippz_mrwg1: "",
+      ippz_mrwg2: "",
+      ippz_mrwg3: "",
+      ippz_mrwg4: "",
+      ippz_dns_zy1: "",
+      ippz_dns_zy2: "",
+      ippz_dns_zy3: "",
+      ippz_dns_zy4: "",
+      ippz_dns_by1: "",
+      ippz_dns_by2: "",
+      ippz_dns_by3: "",
+      ippz_dns_by4: "",
+      dialogVisible: true,
+      labelPosition: "left",
+      ruleForm: {
+        ippz_ip_hqfs: "Static IP",
+        ippz_dns_hqfs: "自动获取",
+        ippz_ip: "",
+        ippz_zwym: "",
+        ippz_mrwg: "",
+        ippz_dns_zy: "",
+        ippz_dns_by: "",
+      },
+      rules: {
+        ippz_ip_hqfs: [
+          { required: true, message: "请输入活动名称", trigger: "blur" },
+        ],
+        ippz_dns_hqfs: [
+          { required: true, message: "请输入活动名称", trigger: "blur" },
+        ],
+        ippz_ip: [
+          {
+            required: true,
+            validator: this.validateIpAddress,
+            trigger: "blur",
+            message: "请输入有效的IP地址",
+          },
+        ],
+        ippz_zwym: [
+          {
+            required: true,
+            validator: this.validateSubnetMask,
+            trigger: "blur",
+            message: "请输入有效的子网掩码",
+          },
+        ],
+        ippz_mrwg: [
+          {
+            required: true,
+            validator: this.validateGateway,
+            trigger: "blur",
+            message: "请输入有效的网关地址",
+          },
+        ],
+        ippz_dns_zy: [
+          {
+            required: true,
+            validator: this.validatePrimaryDNS,
+            trigger: "blur",
+            message: "请输入有效的主DNS服务器地址",
+          },
+        ],
+        ippz_dns_by: [
+          {
+            required: true,
+            validator: this.validatePrimaryDNS,
+            trigger: "blur",
+            message: "请输入有效的备用DNS服务器地址",
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    // 封装合并输入框的数据
+    Merge(value, value1, value2, value3, value4) {
+      value = value1 + "." + value2 + "." + value3 + "." + value4;
+      return value;
+    },
+    SliceData(value) {
+      let res = value.split(".");
+      // console.log(res);
+      return res;
+    },
+    // 保存数据,发送请求
+    async saveAll() {
+      this.dialogVisible = false;
+      this.ruleForm.ippz_ip = this.Merge(
+        this.ruleForm.ippz_ip,
+        this.ippz_ip1,
+        this.ippz_ip2,
+        this.ippz_ip3,
+        this.ippz_ip4
+      );
+      this.ruleForm.ippz_zwym = this.Merge(
+        this.ruleForm.ippz_zwym,
+        this.ippz_zwym1,
+        this.ippz_zwym2,
+        this.ippz_zwym3,
+        this.ippz_zwym4
+      );
+      this.ruleForm.ippz_mrwg = this.Merge(
+        this.ruleForm.ippz_mrwg,
+        this.ippz_mrwg1,
+        this.ippz_mrwg2,
+        this.ippz_mrwg3,
+        this.ippz_mrwg4
+      );
+      this.ruleForm.ippz_dns_zy = this.Merge(
+        this.ruleForm.ippz_dns_zy,
+        this.ippz_dns_zy1,
+        this.ippz_dns_zy2,
+        this.ippz_dns_zy3,
+        this.ippz_dns_zy4
+      );
+      this.ruleForm.ippz_dns_by = this.Merge(
+        this.ruleForm.ippz_dns_by,
+        this.ippz_dns_by1,
+        this.ippz_dns_by2,
+        this.ippz_dns_by3,
+        this.ippz_dns_by4
+      );
+      let datas = sessionStorage.getItem("CKFWQ_yx");
+      datas = { ...JSON.parse(datas), ...this.ruleForm }
+      let res = await SaveUserAnswer({
+        mark: "CKFWQ_yx",
+        user_id: "USER202307301109254198",
+        mark_value: JSON.stringify(datas),
+      });
+      console.log(res);
+      sessionStorage.setItem("CKFWQ_yx", JSON.stringify(datas));
+    },
+    async GetUserAnswer() {
+      let answers = await GetUserAnswer({
+        mark: "CKFWQ_yx",
+        user_id: "USER202307301109254198"
+      })
+      console.log(answers);
+      let obj = JSON.parse(answers.data.data.mark_value);
+      console.log(obj);
+    },
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          alert("submit!");
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    },
+    //ip地址验证
+    validateIpAddress(rule, value, callback) {
+      if (value === "") {
+        callback(new Error("请输入IP地址"));
+      } else if (
+        !/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(
+          value
+        )
+      ) {
+        callback(new Error("请输入有效的IP地址"));
+      } else {
+        callback();
+      }
+    },
+    //子网掩码验证
+    validateSubnetMask(rule, value, callback) {
+      if (value === "") {
+        callback(new Error("请输入子网掩码"));
+      } else if (
+        !/^(\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])$/.test(
+          value
+        )
+      ) {
+        callback(new Error("请输入有效的子网掩码"));
+      } else {
+        callback();
+      }
+    },
+    //网关地址验证
+    validateGateway(rule, value, callback) {
+      if (value === "") {
+        callback(new Error("请输入网关地址"));
+      } else if (!/^(\d{1,3}\.){3}\d{1,3}$/.test(value)) {
+        callback(new Error("请输入有效的网关地址"));
+      } else {
+        callback();
+      }
+    },
+    //dns服务验证
+    validatePrimaryDNS(rule, value, callback) {
+      if (value === "") {
+        callback(new Error("请输入主DNS服务器地址"));
+      } else if (!isValidPrimaryDNS(value)) {
+        callback(new Error("请输入有效的主DNS服务器地址"));
+      } else {
+        callback();
+      }
+    },
+  },
+  created(){
+    this.Loading=true;
+    this.GetUserAnswer();
+    this.Loading=false;
+  },
+};
+</script>
+<style scoped lang="less">
+/deep/ .ip_setting {
+  .el-input__inner {
+    height: 30px;
+    text-align: center;
+    padding: 0;
+  }
+
+  .el-row {
+    display: flex;
+    align-items: flex-end;
+
+    .el-col-1 {
+      padding: 0px 2px;
+      color: black;
+      text-align: left;
+      line-height: 32px;
+      height: 20px;
+    }
+
+    .el-col-5 {
+      width: 43px;
+      height: 30px;
+    }
+
+    .el-col-24 {
+      padding-right: 152px;
+    }
+  }
+}
+
+.el-dialog {
+  position: relative;
+}
+
+.txt {
+  position: absolute;
+  top: 22px;
+  left: 100px;
+  color: red;
+}
+</style>
diff --git a/.history/src/components/netConfiguration_20231108084213.vue b/.history/src/components/netConfiguration_20231108084213.vue
new file mode 100644
index 0000000..e5bc71e
--- /dev/null
+++ b/.history/src/components/netConfiguration_20231108084213.vue
@@ -0,0 +1,207 @@
+<template>
+  <div>
+    <!-- <el-button @click="dialogVisible = true">串口及网络协议设置</el-button> -->
+    <el-dialog title="串口及网络协议设置" :visible.sync="dialogVisible" :before-close="handleClose">
+      <h3>串口参数设置</h3>
+      <el-divider></el-divider>
+      <div class="formOne">
+        <el-form :model="ruleForm" :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>
+              <el-option label="19200" value="19200"></el-option>
+              <el-option label="28800" value="28800"></el-option>
+              <el-option label="38400" value="38400"></el-option>
+              <el-option label="48000" value="48000"></el-option>
+              <el-option label="57600" value="57600"></el-option>
+              <el-option label="67200" value="67200"></el-option>
+              <el-option label="76800" value="76800"></el-option>
+              <el-option label="86400" value="86400"></el-option>
+              <el-option label="96000" value="96000"></el-option>
+              <el-option label="105600" value="105600"></el-option>
+              <el-option label="115200" value="115200"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="检验位:" prop="ckcssz_jyw">
+            <el-select v-model="ruleForm.ckcssz_jyw" placeholder="请选择检验位">
+              <el-option label="无校验（none）" value="无校验（none）"></el-option>
+              <el-option label="无校验（none）" value="无校验（none）"></el-option>
+              <el-option label="无校验（none）" value="无校验（none）"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="流控:" prop="ckcssz_lk">
+            <el-select v-model="ruleForm.ckcssz_lkms" placeholder="请选择流控">
+              <el-option label="关闭" value="关闭"></el-option>
+              <el-option label="硬件流控" value="硬件流控"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="自适应波特率(类RFC2117):" prop="ckcssz_zdybtl">
+            <el-select 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 :model="ruleForm" :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>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="停止位:" prop="ckcssz_tzw">
+            <el-select v-model="ruleForm.ckcssz_tzw" placeholder="请选择停止位">
+              <el-option label="1" value="1"></el-option>
+              <el-option label="2" value="2"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="485功能:" prop="ckcssz_485">
+            <el-select v-model="ruleForm.ckcssz_485" placeholder="请选择485功能">
+              <el-option label="开启" value="开启"></el-option>
+              <el-option label="关闭" value="关闭"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+      <h3>其他设置</h3>
+      <el-divider></el-divider>
+      <div class="formOne">
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="200px" class="demo-ruleForm"
+          :label-position="labelPosition">
+          <el-form-item label="串口自动成频:" prop="qtsz_ckzdcz">
+            <el-select v-model="ruleForm.qtsz_ckzdcz">
+              <el-option label="关闭" value="关闭"></el-option>
+              <el-option label="开启" value="开启"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="注册包类型:" prop="qtsz_zcblx">
+            <el-select v-model="ruleForm.qtsz_zcblx">
+              <el-option label="关闭" value="关闭"></el-option>
+              <el-option label="开启" value="开启"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="自定义心跳包:" prop="qtsz_zdyxtb">
+            <el-select v-model="ruleForm.qtsz_zdyxtb">
+              <el-option label="关闭" value="关闭"></el-option>
+              <el-option label="开启" value="开启"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="套接字分发功能:" prop="qtsz_tjzffgn">
+            <el-select v-model="ruleForm.qtsz_tjzffgn">
+              <el-option label="关闭" value="关闭"></el-option>
+              <el-option label="开启" value="开启"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <div>
+          <p>
+            注意：开启后，模块主动向服务器发送注册包，此功能用于辨识设备。
+            first:模块建议时发送注册包,every:每次发送数据时发送注册包
+          </p>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="saveDatas">保存</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { SaveUserAnswer, GetUserAnswer } from "@/api/user";
+import { Loading } from "element-ui";
+export default {
+  data() {
+    return {
+      dialogVisible: true,
+      labelPosition: "left",
+      ruleForm: {
+        ckcssz_btl: "9600",
+        ckcssz_jyw: "无校验（none）",
+        ckcssz_lk: "关闭",
+        ckcssz_zdybtl: "开启",
+        ckcssz_sjw: "8",
+        ckcssz_tzw: "1",
+        ckcssz_485: "关闭",
+        ckcssz_ckzdcz: "关闭",
+        ckcssz_zcblx: "关闭",
+        ckcssz_zdyxtb: "关闭",
+        ckcssz_tjzffgn: "关闭",
+      },
+      rules: {
+        ckcssz_btl: [{ required: true, trigger: "change" }],
+        ckcssz_jyw: [{ required: true, trigger: "change" }],
+        ckcssz_lk: [{ required: true, trigger: "change" }],
+        ckcssz_zdybtl: [{ required: true, trigger: "change" }],
+        ckcssz_sjw: [{ required: true, trigger: "change" }],
+        ckcssz_tzw: [{ required: true, trigger: "change" }],
+        ckcssz_485: [{ required: true, trigger: "change" }],
+        ckcssz_ckzdcz: [{ required: true, trigger: "change" }],
+        ckcssz_zcblx: [{ required: true, trigger: "change" }],
+        ckcssz_zdyxtb: [{ required: true, trigger: "change" }],
+        ckcssz_tjzffgn: [{ required: true, trigger: "change" }],
+      },
+    };
+  },
+  methods: {
+    async saveDatas() {
+      let datas = sessionStorage.getItem("CKFWQ_wx");
+      datas = { ...JSON.parse(datas), ...this.ruleForm };
+      let res = await SaveUserAnswer({
+        mark: "CKFWQ_wx",
+        user_id: "USER202307301109254198",
+        mark_value: JSON.stringify(datas),
+      });
+      console.log(res);
+      sessionStorage.setItem("CKFWQ_wx", JSON.stringify(datas));
+    },
+    async GetUserAnswer() {
+      let answers = await GetUserAnswer({
+        mark: "CKFWQ_wx",
+        user_id: "USER202307301109254198"
+      })
+      let obj = JSON.parse(answers.data.data.mark_value);
+      console.log(obj);
+      this.ruleForm.ckcssz_btl = obj.ckcssz_btl;
+      this.ruleForm.ckcssz_jyw = obj.ckcssz_jyw;
+      this.ruleForm.ckcssz_lk = obj.ckcssz_lk;
+      this.ruleForm.ckcssz_zdybtl = obj.ckcssz_zdybtl;
+      this.ruleForm.ckcssz_sjw = obj.ckcssz_sjw;
+      this.ruleForm.ckcssz_tzw = obj.ckcssz_tzw;
+      this.ruleForm.ckcssz_485 = obj.ckcssz_485;
+      this.ruleForm.ckcssz_ckzdcz = obj.ckcssz_ckzdcz;
+      this.ruleForm.ckcssz_zcblx = obj.ckcssz_zcblx;
+      this.ruleForm.ckcssz_zdyxtb = obj.ckcssz_zdyxtb;
+      this.ruleForm.ckcssz_tjzffgn = obj.ckcssz_tjzffgn;
+      // this.ruleForm
+      console.log(this.ruleForm,obj)
+    },
+  },
+  created() {
+    this.Loading = true;
+    this.GetUserAnswer();
+    this.Loading = false;
+  },
+};
+</script>
+<style scoped lang="less">
+.formOne {
+  display: flex;
+  justify-content: space-around;
+
+  div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    p {
+      width: 70%;
+    }
+  }
+}
+
+.demo-ruleForm {
+  width: 50%;
+}
+</style>
diff --git a/src/components/ChiGateway.vue b/src/components/ChiGateway.vue
index 02e1d2d..da89d70 100644
--- a/src/components/ChiGateway.vue
+++ b/src/components/ChiGateway.vue
@@ -1,190 +1,235 @@
 <!-- 斥候数据采集——有线网关配置 -->
 <template>
-    <div>
-        <!-- <el-button type="info" plain @click="getShow">斥候数据采集网关配置</el-button> -->
-        <div class="gateway" v-show="isShow">
-            <div class="title">
-                <p class="title_l">新建网关</p>
-                <i class="el-icon-close title_r" @click="isShow = false"></i>
-            </div>
-            <el-divider></el-divider>
-            <div class="content">
-                <el-form :model="formData" :label-position="labelPosition" :rules="rules" ref="ruleForm">
-                    <el-row>
-                        <el-col :span="24">
-                            <el-form-item label="网关名称:" :label-width="formLabelWidth" prop="wgpz_wgmc">
-                                <el-select v-model="formData.wgpz_wgmc" 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>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="24">
-                            <el-form-item label="网关ID:" :label-width="formLabelWidth" prop="wgpz_wgid">
-                                <el-select v-model="formData.wgpz_wgid" placeholder="请选择" style="width: 200px;">
-                                    <el-option v-for="item in options2" :key="item.value" :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <div class="footer">
-                        <el-button type="primary" @click="innerVisible = true">保 存</el-button>
-
-                        <el-button @click="isShow = false">取 消</el-button>
-                    </div>
-                </el-form>
-            </div>
-        </div>
-        <div>
-            <el-dialog title="系统提示" :visible.sync="innerVisible" append-to-body width="382px">
-                <p class="inner_content">请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关</p>
-                <div slot="footer" class="dialog-footer">
-                    <el-button type="primary" @click="saveGate">确定</el-button>
-                    <el-button @click="innerVisible = false">取 消</el-button>
-                </div>
-            </el-dialog>
-        </div>
+  <div>
+    <div class="gateway" v-show="isShow">
+      <div class="title">
+        <p class="title_l" style="color: #fff">新建网关</p>
+        <i class="el-icon-close title_r" @click="isShow = false"></i>
+      </div>
+      <el-divider></el-divider>
+      <div class="content">
+        <el-form
+          :model="formData"
+          :label-position="labelPosition"
+          :rules="rules"
+          ref="ruleForm"
+        >
+          <el-row>
+            <el-col :span="24">
+              <el-form-item
+                label="网关名称:"
+                :label-width="formLabelWidth"
+                prop="wgpz_wgmc"
+              >
+                <el-select
+                  v-model="formData.wgpz_wgmc"
+                  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>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item
+                label="网关ID:"
+                :label-width="formLabelWidth"
+                prop="wgpz_wgid"
+              >
+                <el-select
+                  v-model="formData.wgpz_wgid"
+                  placeholder="请选择"
+                  style="width: 200px"
+                >
+                  <el-option
+                    v-for="item in options2"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="footer">
+            <el-button type="primary" @click="innerVisible = true"
+              >保 存</el-button
+            >
+            <el-button @click="isShow = false">取 消</el-button>
+          </div>
+        </el-form>
+      </div>
     </div>
+    <div>
+      <el-dialog
+        title="系统提示"
+        :visible.sync="innerVisible"
+        append-to-body
+        width="382px"
+      >
+        <p class="inner_content">
+          请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关
+        </p>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="saveGate">确定</el-button>
+          <el-button @click="innerVisible = false">取 消</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
 </template>
 
 <script>
-import { SaveUserAnswer } from '@/api/user';
+import { SaveUserAnswer } from "@/api/user";
 export default {
-    name: 'TestChiGate',
+  name: "TestChiGate",
+  data() {
+    return {
+      options1: [
+        {
+          value: "有线区网关2",
+          label: "有线区网关2",
+        },
+        {
+          value: "无线区网关2",
+          label: "无线区网关2",
+        },
+      ],
+      options2: [
+        {
+          value: "LAN-BOX2",
+          label: "LAN-BOX2",
+        },
+        {
+          value: "WLAN-BOX2",
+          label: "WLAN-BOX2",
+        },
+      ],
+      formData: {
+        wgpz_wgmc: "有线区网关2",
+        wgpz_wgid: "LAN-BOX2",
+      },
+      innerVisible: false,
+      labelPosition: "left",
+      formLabelWidth: "96px",
+      count: 0,
+      isShow: true,
+      options: [
+        {
+          value: "选项1",
+          label: "测试1",
+        },
+        {
+          value: "选项2",
+          label: "测试2",
+        },
+        {
+          value: "选项3",
+          label: "测试3",
+        },
+        {
+          value: "选项4",
+          label: "测试4",
+        },
+        {
+          value: "选项5",
+          label: "测试5",
+        },
+      ],
+      rules: {
+        gateway_id: [
+          { required: true, message: "请输入网关ID", trigger: "blur" },
+        ],
+        gateway_name: [
+          { required: true, message: "请输入网关名称", trigger: "blur" },
+        ],
+      },
+    };
+  },
 
-    data() {
-        return {
-            options1: [{
-                value: "有线区网关2",
-                label: "有线区网关2"
-            }, {
-                value: "无线区网关2",
-                label: "无线区网关2"
-            }],
-            options2: [{
-                value: "LAN-BOX2",
-                label: "LAN-BOX2"
-            }, {
-                value: "WLAN-BOX2",
-                label: "WLAN-BOX2"
-            }],
-            formData: {
-                wgpz_wgmc: "有线区网关2",
-                wgpz_wgid: "LAN-BOX2",
-            },
-            innerVisible: false,
-            labelPosition: "left",
-            formLabelWidth: "96px",
-            count: 0,
-            isShow: true,
-            options: [{
-                value: '选项1',
-                label: '测试1'
-            }, {
-                value: '选项2',
-                label: '测试2'
-            }, {
-                value: '选项3',
-                label: '测试3'
-            }, {
-                value: '选项4',
-                label: '测试4'
-            }, {
-                value: '选项5',
-                label: '测试5'
-            }],
-            rules: {
-                gateway_id: [
-                    { required: true, message: '请输入网关ID', trigger: 'blur' },
-                ],
-                gateway_name: [
-                    { required: true, message: '请输入网关名称', trigger: 'blur' },
-                ],
-            },
-        };
-    },
-
-    mounted() {
-
-    },
-
-    methods: {
-        async saveGate() {
-            let datas = sessionStorage.getItem("answer2");
-            this.formData  = {...JSON.parse(datas),...this.formData};
-            let res = SaveUserAnswer({
-                mark: "CHGYWG_yx",
-                user_id: "USER202307301109254198",
-                mark_value: JSON.stringify(this.formData),
-            });
-            console.log(res);
-            sessionStorage.setItem("answer2",JSON.stringify(this.formData));
-            this.$router.push("/configuration");
-        }
+  mounted() {},
+
+  methods: {
+    async saveGate() {
+      let datas = sessionStorage.getItem("answer2");
+      this.formData = { ...JSON.parse(datas), ...this.formData };
+      let res = SaveUserAnswer({
+        mark: "CHGYWG_yx",
+        user_id: "USER202307301109254198",
+        mark_value: JSON.stringify(this.formData),
+      });
+      console.log(res);
+      sessionStorage.setItem("answer2", JSON.stringify(this.formData));
+      this.$router.push("/configuration");
     },
+  },
 };
 </script>
 
 <style lang="less" scoped>
 /deep/ .gateway {
-    position: absolute;
-    left: 694px;
-    top: 188px;
-    width: 382px;
-    height: 309px;
-    line-height: 20px;
-    // background-color: rgba(255, 255, 255, 1);
-    background: url(../assets/image/bg.png);
-    background-size: 100% 100%;
-    text-align: center;
-    border: 1px solid rgba(187, 187, 187, 1);
+  position: absolute;
+  left: 694px;
+  top: 188px;
+  width: 382px;
+  height: 309px;
+  line-height: 20px;
+  // background-color: rgba(255, 255, 255, 1);
+  background: url(../assets/image/bg.png);
+  background-size: 100% 100%;
+  text-align: center;
+  border: 1px solid rgba(187, 187, 187, 1);
 
-    .el-divider--horizontal {
-        margin: 8px 0;
+  .el-divider--horizontal {
+    margin: 8px 0;
+  }
+
+  .title {
+    margin: 13px 11px 0px 21px;
+    display: flex;
+    justify-content: space-between;
+
+    .title_l {
+      width: 72px;
+      height: 26px;
+      color: rgba(16, 16, 16, 1);
+      font-size: 18px;
+      text-align: left;
     }
 
-    .title {
-        margin: 13px 11px 0px 21px;
-        display: flex;
-        justify-content: space-between;
-
-        .title_l {
-            width: 72px;
-            height: 26px;
-            color: rgba(16, 16, 16, 1);
-            font-size: 18px;
-            text-align: left;
-        }
-
-        .title_r {
-            width: 24px;
-            height: 24px;
-            cursor: pointer;
-            color: rgba(111, 103, 103, 1);
-        }
+    .title_r {
+      width: 24px;
+      height: 24px;
+      cursor: pointer;
+      color: rgba(111, 103, 103, 1);
     }
+  }
 
-    .content {
-        margin-left: 50px;
-        margin-right: 50px;
+  .content {
+    margin-left: 50px;
+    margin-right: 50px;
 
-        .el-input__inner {
-            width: 200px;
-            height: 30px;
-        }
+    .el-input__inner {
+      width: 200px;
+      height: 30px;
     }
+  }
 
-    /deep/ .footer {
-        .el-button {
-            width: 80px;
-            height: 30px;
-            line-height: 0.5;
-        }
+  /deep/ .footer {
+    .el-button {
+      width: 80px;
+      height: 30px;
+      line-height: 0.5;
     }
+  }
 }
-</style>
\ No newline at end of file
+</style>