diff --git a/src/App.vue b/src/App.vue index bbb6d70..5a9563b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -26,6 +26,7 @@ export default { }, created() { // this.queryallanswer(); + console.log(this.$annswerObj, "变化没用"); }, methods: { // 请求正确答案 diff --git a/src/answerObj.js b/src/answerObj.js new file mode 100644 index 0000000..8626966 --- /dev/null +++ b/src/answerObj.js @@ -0,0 +1,5 @@ +export let answer = { + kqwk: "", + wkgzfs: "", + wkms: "", +}; diff --git a/src/components/AddPolicy.vue b/src/components/AddPolicy.vue index 7f16d3c..752b1fb 100644 --- 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("新增失败"); } }, //删除命令 diff --git a/src/components/GatewayConfiguration.vue b/src/components/GatewayConfiguration.vue index c360aef..4949eca 100644 --- a/src/components/GatewayConfiguration.vue +++ b/src/components/GatewayConfiguration.vue @@ -1,6 +1,6 @@ - + @@ -81,7 +81,7 @@ - + { if (valid) { if (this.wgpz.length < 4) { - this.wgpz.push(this.ruleForm); localStorage.setItem("wgpz", JSON.stringify(this.wgpz)); this.SaveUserAnswer(); this.flag = false; @@ -219,7 +219,6 @@ export default { return false; } } else { - console.log("error submit!!"); return false; } }); @@ -236,6 +235,13 @@ export default { }, //多选删除 deleteSelectedRows() { + if (this.multipleSelection.length == 0) { + this.$message({ + message: "请先选择数据", + type: "warning", + }); + return false; + } this.wgpz = this.wgpz.filter( (row) => !this.multipleSelection.includes(row) ); @@ -267,12 +273,15 @@ export default { mark_value: JSON.stringify(this.wgpz), }); if (data.state) { + this.wgpz.push(this.ruleForm); this.$message({ message: "操作成功", type: "success", }); + this.flag = true; } else { this.$message.error("操作失败"); + return; } }, }, @@ -301,4 +310,7 @@ export default { } } } +.el-table { + height: 400px; +} diff --git a/src/components/GatewayMaintenance.vue b/src/components/GatewayMaintenance.vue index 06b9310..4a2ad40 100644 --- a/src/components/GatewayMaintenance.vue +++ b/src/components/GatewayMaintenance.vue @@ -39,6 +39,7 @@ title="网关维护" :visible.sync="dialogVisible" :append-to-body="true" + width="90%" >
@@ -222,7 +223,7 @@ export default { ruleForm: { sswg: "", csname: "", - sfyxbz: "", + // sfyxbz: "", sdz: "", cskey: "", xsws: "", @@ -236,9 +237,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: "请选择一个选项" }, @@ -277,9 +278,8 @@ export default { this.$refs["ruleForm"].validate((valid) => { if (valid) { if (this.tableData.length < 4) { - this.tableData.push(this.ruleForm); - localStorage.setItem("wgwh", JSON.stringify(this.tableData)); this.SaveUserAnswer(); + localStorage.setItem("wgwh", JSON.stringify(this.tableData)); this.flag = false; } else { this.$message({ @@ -333,6 +333,7 @@ export default { mark_value: JSON.stringify(this.tableData), }); if (data.state) { + this.tableData.push(this.ruleForm); this.$message({ message: "操作成功", type: "success", @@ -373,4 +374,7 @@ export default { } } } +.el-table { + height: 400px; +} diff --git a/src/components/IpConfiguration.vue b/src/components/IpConfiguration.vue index 833c173..b728162 100644 --- a/src/components/IpConfiguration.vue +++ b/src/components/IpConfiguration.vue @@ -158,7 +158,7 @@
- 保存 + 保存 取 消 @@ -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; diff --git a/src/components/NetworkConfiguration.vue b/src/components/NetworkConfiguration.vue index b92f17c..e2240d9 100644 --- a/src/components/NetworkConfiguration.vue +++ b/src/components/NetworkConfiguration.vue @@ -47,8 +47,9 @@ - 保存 + 保存 取 消 +
@@ -67,6 +68,11 @@ export default { wkgzfs: "LAN口", wkms: "n", }, + // $answerObj: { + // kqwk: "", + // wkgzfs: "", + // wkms: "", + // }, rules: { kqwk: [{ required: true, trigger: "change", message: "必填项" }], wkgzfs: [{ required: true, trigger: "change", message: "必填项" }], @@ -75,6 +81,9 @@ export default { }; }, created() { + // this.$answerObj.kqwk = "你好"; + + // console.log(this.$answerObj); let that = this; window.getParameter = that; this.GetUserAnswer(); @@ -83,6 +92,9 @@ export default { getParameter(data) { this.user_id = data; }, + change() { + console.log(this.$answerObj); + }, async saveDatas() { let datas = JSON.parse(sessionStorage.getItem("CKFWQ_wx")); let res = await SaveUserAnswer({ @@ -106,7 +118,7 @@ export default { this.$message.error("保存失败"); } }, - //拿缓存 + // 拿缓存 async GetUserAnswer() { let res = await GetUserAnswer({ mark: "CKFWQ_wx", @@ -120,6 +132,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; + } + }); + }, }, }; diff --git a/src/components/ObjectManagement.vue b/src/components/ObjectManagement.vue index b33f269..d21d126 100644 --- a/src/components/ObjectManagement.vue +++ b/src/components/ObjectManagement.vue @@ -1,6 +1,5 @@