1

2023-11-10 11:30:19 +08:00 · 2023-11-10 11:30:19 +08:00 · 5afc5afdcb
parent 58f8287f33
commit 5afc5afdcb
9 changed files with 210 additions and 41 deletions
--- a/src/components/AddPolicy.vue
+++ b/src/components/AddPolicy.vue
@ -858,11 +858,17 @@ export default {
        cmdlist_dz: "",
      },
      rules2: {
-        cmdlist_ml: [{ required: true, trigger: "change" }],
-        cmdlist_sbid: [{ required: true, trigger: "change" }],
-        cmdlist_qsdz: [{ required: true, trigger: "change" }],
-        cmdlist_dzcd: [{ required: true, trigger: "change" }],
-        cmdlist_dz: [{ required: true, trigger: "change" }],
+        cmdlist_ml: [{ required: true, trigger: "change", message: "必填项" }],
+        cmdlist_sbid: [
+          { required: true, trigger: "change", message: "必填项" },
+        ],
+        cmdlist_qsdz: [
+          { required: true, trigger: "change", message: "必填项" },
+        ],
+        cmdlist_dzcd: [
+          { required: true, trigger: "change", message: "必填项" },
+        ],
+        cmdlist_dz: [{ required: true, trigger: "change", message: "必填项" }],
      },
      value: "",
      flag: false,
@ -1032,6 +1038,8 @@ export default {
          message: "新增成功",
          type: "success",
        });
+      } else {
+        this.$message.error("新增失败");
      }
    },
    //删除命令
--- a/src/components/GatewayConfiguration.vue
+++ b/src/components/GatewayConfiguration.vue
@ -271,8 +271,10 @@ export default {
          message: "操作成功",
          type: "success",
        });
+        this.flag = true;
      } else {
        this.$message.error("操作失败");
+        return;
      }
    },
  },
--- a/src/components/GatewayMaintenance.vue
+++ b/src/components/GatewayMaintenance.vue
@ -222,7 +222,7 @@ export default {
      ruleForm: {
        sswg: "",
        csname: "",
-        sfyxbz: "",
+        // sfyxbz: "",
        sdz: "",
        cskey: "",
        xsws: "",
@ -236,9 +236,9 @@ export default {
        csname: [
          { required: true, trigger: "change", message: "请选择一个选项" },
        ],
-        sfyxbz: [
-          { required: true, trigger: "change", message: "请选择一个选项" },
-        ],
+        // sfyxbz: [
+        //   { required: true, trigger: "change", message: "请选择一个选项" },
+        // ],
        sdz: [{ required: true, trigger: "blur", message: "设定值是必填参数" }],
        cskey: [
          { required: true, trigger: "change", message: "请选择一个选项" },
--- a/src/components/IpConfiguration.vue
+++ b/src/components/IpConfiguration.vue
@ -158,7 +158,7 @@
        </el-form>
      </div>
      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveAll">保存</el-button>
+        <el-button type="primary" @click="submitForm">保存</el-button>
        <el-button @click="dialogVisible = false">取 消</el-button>
      </span>
    </el-dialog>
@ -171,6 +171,7 @@ export default {
  data() {
    return {
      loading: false,
+      //网关地址校验信息
      user_id: "",
      ippz_ip1: "192",
      ippz_ip2: "168",
@ -204,8 +205,12 @@ export default {
        ippz_dns_by: "",
      },
      rules: {
-        ippz_ip_hqfs: [{ required: true, message: "", trigger: "blur" }],
-        ippz_dns_hqfs: [{ required: true, message: "", trigger: "blur" }],
+        ippz_ip_hqfs: [
+          { required: true, message: "请选择一项", trigger: "blur" },
+        ],
+        ippz_dns_hqfs: [
+          { required: true, message: "请选择一项", trigger: "blur" },
+        ],
        ippz_ip: [
          {
            required: true,
@ -241,7 +246,7 @@ export default {
        ippz_dns_by: [
          {
            required: true,
-            validator: this.validatePrimaryDNS,
+            validator: this.validatePrimaryDNS1,
            trigger: "blur",
            message: "",
          },
@ -253,6 +258,7 @@ export default {
    let that = this;
    window.getParameter = that.getParameter;
  },
+
  methods: {
    getParameter(data) {
      this.user_id = data;
@ -361,6 +367,7 @@ export default {
    submitForm() {
      this.$refs["ruleForm"].validate((valid) => {
        if (valid) {
+          this.saveAll();
        } else {
          console.log("error submit!!");
          return false;
@ -372,11 +379,26 @@ export default {
    },
    //ip地址验证
    validateIpAddress(rule, value, callback) {
-      if (value === "") {
+      if (
+        this.ippz_ip1 +
+          "." +
+          this.ippz_ip2 +
+          "." +
+          this.ippz_ip3 +
+          "." +
+          this.ippz_ip4 ===
+        ""
+      ) {
        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
+        !/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
+          this.ippz_ip1 +
+            "." +
+            this.ippz_ip2 +
+            "." +
+            this.ippz_ip3 +
+            "." +
+            this.ippz_ip4
        )
      ) {
        callback(new Error("请输入有效的IP地址"));
@ -386,11 +408,26 @@ export default {
    },
    //子网掩码验证
    validateSubnetMask(rule, value, callback) {
-      if (value === "") {
+      if (
+        this.ippz_zwym1 +
+          "." +
+          this.ippz_zwym2 +
+          "." +
+          this.ippz_zwym3 +
+          "." +
+          this.ippz_zwym4 ===
+        ""
+      ) {
        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
+          this.ippz_zwym1 +
+            "." +
+            this.ippz_zwym2 +
+            "." +
+            this.ippz_zwym3 +
+            "." +
+            this.ippz_zwym4
        )
      ) {
        callback(new Error("请输入有效的子网掩码"));
@ -400,24 +437,91 @@ export default {
    },
    //网关地址验证
    validateGateway(rule, value, callback) {
-      if (value === "") {
+      if (
+        this.ippz_mrwg1 +
+          "." +
+          this.ippz_mrwg2 +
+          "." +
+          this.ippz_mrwg3 +
+          "." +
+          this.ippz_mrwg4 ===
+        ""
+      ) {
        callback(new Error("请输入网关地址"));
-      } else if (!/^(\d{1,3}\.){3}\d{1,3}$/.test(value)) {
+      } else if (
+        !/^(\d{1,3}\.){3}\d{1,3}$/.test(
+          this.ippz_mrwg1 +
+            "." +
+            this.ippz_mrwg2 +
+            "." +
+            this.ippz_mrwg3 +
+            "." +
+            this.ippz_mrwg4
+        )
+      ) {
        callback(new Error("请输入有效的网关地址"));
      } else {
        callback();
      }
    },
-    //dns服务验证
+    //主dns服务验证
    validatePrimaryDNS(rule, value, callback) {
-      if (value === "") {
+      if (
+        this.ippz_dns_zy1 +
+          "." +
+          this.ippz_dns_zy2 +
+          "." +
+          this.ippz_dns_zy3 +
+          "." +
+          this.ippz_dns_zy4 ===
+        ""
+      ) {
        callback(new Error("请输入主DNS服务器地址"));
-      } else if (!isValidPrimaryDNS(value)) {
+      } else if (
+        !isValidPrimaryDNS(
+          this.ippz_dns_zy1 +
+            "." +
+            this.ippz_dns_zy2 +
+            "." +
+            this.ippz_dns_zy3 +
+            "." +
+            this.ippz_dns_zy4
+        )
+      ) {
        callback(new Error("请输入有效的主DNS服务器地址"));
      } else {
        callback();
      }
    },
+    //备用dns服务验证
+    validatePrimaryDNS1(rule, value, callback) {
+      if (
+        this.ippz_dns_by1 +
+          "." +
+          this.ippz_dns_by2 +
+          "." +
+          this.ippz_dns_by3 +
+          "." +
+          this.ippz_dns_by4 ===
+        ""
+      ) {
+        callback(new Error("请输入备用DNS服务器地址"));
+      } else if (
+        !isValidPrimaryDNS(
+          this.ippz_dns_by1 +
+            "." +
+            this.ippz_dns_by2 +
+            "." +
+            this.ippz_dns_by3 +
+            "." +
+            this.ippz_dns_by4
+        )
+      ) {
+        callback(new Error("请输入有效的备用DNS服务器地址"));
+      } else {
+        callback();
+      }
+    },
  },
  created() {
    this.Loading = true;
--- a/src/components/NetworkConfiguration.vue
+++ b/src/components/NetworkConfiguration.vue
@ -47,7 +47,7 @@
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveDatas">保存</el-button>
+        <el-button type="primary" @click="submitForm">保存</el-button>
        <el-button @click="dialogVisible = false">取 消</el-button>
      </span>
    </el-dialog>
@ -120,6 +120,16 @@ export default {
        this.ruleForm.wkms = obj.wkms;
      }
    },
+    submitForm(formName) {
+      this.$refs["ruleForm"].validate((valid) => {
+        if (valid) {
+          this.saveDatas();
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
  },
 };
 </script>
--- a/src/components/ObjectManagement.vue
+++ b/src/components/ObjectManagement.vue
@ -1,6 +1,5 @@
 <template>
  <div>
-    <!-- <el-button @click="dialogVisible = true">对象管理</el-button> -->
    <el-dialog title="对象管理" :visible.sync="dialogVisible" width="50%">
      <div class="title">
        <el-button style="margin-bottom: 10px" @click="addObj"
@ -90,7 +89,7 @@
        </el-form>
      </div>
      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="SaveUserAnswer">保存</el-button>
+        <el-button type="primary" @click="submitForm">保存</el-button>
        <el-button @click="dialogVisible1 = false">取 消</el-button>
      </span>
    </el-dialog>
@ -122,7 +121,12 @@ export default {
        dxmc: [
          { required: true, trigger: "blur", message: "选择一个对象名称" },
        ],
-        ip: [{ required: true, message: "ip地址是必填项" }],
+        ip: [
+          {
+            required: true,
+            validator: this.validateIpAddress,
+          },
+        ],
      },
      json: {},
    };
@ -136,9 +140,33 @@ export default {
    getParameter(data) {
      this.user_id = data;
    },
+    //ip地址验证
+    validateIpAddress(rule, value, callback) {
+      if (this.ip1 + "." + this.ip2 + "." + this.ip3 + "." + this.ip4 === "") {
+        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(
+          this.ip1 + "." + this.ip2 + "." + this.ip3 + "." + this.ip4
+        )
+      ) {
+        callback(new Error("请输入有效的IP地址"));
+      } else {
+        callback();
+      }
+    },
+    submitForm(formName) {
+      this.$refs["ruleForm"].validate((valid) => {
+        if (valid) {
+          this.SaveUserAnswer();
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
    async SaveUserAnswer() {
      //拿本地存的数据
-      console.log(this.dxgl);
+      // console.log(this.dxgl);
      var json = JSON.parse(sessionStorage.getItem("GYWZ_yx"));
      this.dxgl.push({
        dx_name: this.ruleForm.dxmc,
@ -150,13 +178,12 @@ export default {
        user_id: `${this.user_id}`,
        mark_value: JSON.stringify({ ...json, ...{ dxgl: this.dxgl } }),
      });
-      console.log(data.data);
+      console.log(data.state);
      if (data.state) {
        this.$message({
          message: "保存成功",
          type: "success",
        });
-
        this.dialogVisible1 = false;
      } else {
        this.$message.error("保存失败");
@ -178,11 +205,11 @@ export default {
    async deleteRow(index, rows) {
      this.dxgl.splice(index, 1);
      var json = JSON.parse(sessionStorage.getItem("GYWZ_yx"));
-      let { data } = await SaveUserAnswer({
+      let { data } = await {
        mark: `${this.$store.state.type}`,
        user_id: `${this.user_id}`,
        mark_value: JSON.stringify({ ...json, ...{ dxgl: this.dxgl } }),
-      });
+      };
      console.log(data.data);
      if (data.state) {
        this.$message({
--- a/src/components/PortConfiguration.vue
+++ b/src/components/PortConfiguration.vue
@ -106,7 +106,7 @@
        </el-form>
        <span slot="footer" class="dialog-footer">
          <!-- <el-button type="primary" @click="submitForm('ruleForm'), (dialogVisible = false)">保存</el-button> -->
-          <el-button type="primary" @click="savePort">保 存</el-button>
+          <el-button type="primary" @click="submitForm">保 存</el-button>
          <el-button @click="dialogVisible = false">取 消</el-button>
        </span>
      </el-dialog>
@ -179,14 +179,12 @@ export default {
        dkpz_dbcd: [
          { required: true, message: "请输入打包长度", trigger: "blur" },
          // 自定义校验规则，这里限制最大长度为1000
-          { validator: this.validatePackagingLength, trigger: "blur" },
-          { type: "number", message: "打包长度必须为数字值", trigger: "blur" },
+          // { type: "number", message: "打包长度必须为数字值", trigger: "blur" },
        ],
        dkpz_tbbtl: [
          { required: true, message: "请输入打包时间", trigger: "blur" },
-          { type: "number", message: "打包时间必须为数字值", trigger: "blur" },
+          // { type: "number", message: "打包时间必须为数字值", trigger: "blur" },
          // 自定义校验规则，这里限制最大长度为1000
-          { validator: this.validatTime, trigger: "blur" },
        ],
        dkpz_tbbtl: [
          { required: true, message: "请选择同步波特率", trigger: "change" },
@ -235,9 +233,9 @@ export default {
      localStorage.setItem("CKFWQ_yx", JSON.stringify(datas));
    },
    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
+      this.$refs["ruleForm"].validate((valid) => {
        if (valid) {
-          // alert("submit!");
+          this.savePort();
        } else {
          console.log("error submit!!");
          return false;
--- a/src/components/Wireles.vue
+++ b/src/components/Wireles.vue
@ -57,7 +57,7 @@
      </el-form>

      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveDatas">保存</el-button>
+        <el-button type="primary" @click="submitForm">保存</el-button>
        <el-button @click="dialogVisible = false">取 消</el-button>
      </span>
    </el-dialog>
@ -136,6 +136,16 @@ export default {
        console.log(this.ruleForm, "取");
      }
    },
+    submitForm(formName) {
+      this.$refs["ruleForm"].validate((valid) => {
+        if (valid) {
+          this.saveDatas();
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
  },
 };
 </script>
--- a/src/components/netConfiguration.vue
+++ b/src/components/netConfiguration.vue
@ -132,7 +132,7 @@
        </div>
      </div>
      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveDatas">保存</el-button>
+        <el-button type="primary" @click="submitForm">保存</el-button>
        <el-button @click="dialogVisible = false">取 消</el-button>
      </span>
    </el-dialog>
@ -236,6 +236,16 @@ export default {
    getParameter(data) {
      alert(data);
    },
+    submitForm(formName) {
+      this.$refs["ruleForm"].validate((valid) => {
+        if (valid) {
+          this.saveDatas();
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
  },
  created() {
    this.GetUserAnswer();