diff --git a/.history/src/components/ChiDevicewifi_20231114024553.vue b/.history/src/components/ChiDevicewifi_20231114024553.vue new file mode 100644 index 0000000..5f5a2dc --- /dev/null +++ b/.history/src/components/ChiDevicewifi_20231114024553.vue @@ -0,0 +1,998 @@ + + + + + + diff --git a/.history/src/components/ChiDevicewifi_20231114024557.vue b/.history/src/components/ChiDevicewifi_20231114024557.vue new file mode 100644 index 0000000..5f5a2dc --- /dev/null +++ b/.history/src/components/ChiDevicewifi_20231114024557.vue @@ -0,0 +1,998 @@ + + + + + + diff --git a/.history/src/components/ChiDevicewifi_20231114024638.vue b/.history/src/components/ChiDevicewifi_20231114024638.vue new file mode 100644 index 0000000..5f5a2dc --- /dev/null +++ b/.history/src/components/ChiDevicewifi_20231114024638.vue @@ -0,0 +1,998 @@ + + + + + + diff --git a/.history/src/components/ChiGateway_20231031112813.vue b/.history/src/components/ChiGateway_20231031112813.vue index 435385c..afb2e4c 100644 --- a/.history/src/components/ChiGateway_20231031112813.vue +++ b/.history/src/components/ChiGateway_20231031112813.vue @@ -1,160 +1,184 @@ \ No newline at end of file + diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..28a4323 Binary files /dev/null and b/dist.zip differ diff --git a/src/components/AddPolicy.vue b/src/components/AddPolicy.vue index 5de54c1..7938599 100644 --- a/src/components/AddPolicy.vue +++ b/src/components/AddPolicy.vue @@ -21,7 +21,7 @@ - + @@ -138,12 +133,7 @@ v-model="ruleForm1.clgl_ckwk" placeholder="选择配置的外网网卡" > - + @@ -164,12 +154,7 @@ - - - + @@ -278,12 +263,12 @@ @@ -68,16 +98,24 @@ @@ -92,16 +130,40 @@
- + - - + + - - + + @@ -723,7 +785,6 @@ export default { this.diag_drive = true; }, async handleSelect() { - // console.log(JSON.parse(datas)); // let datas = { ...JSON.parse(datas), ...this.tableData[0] }; let res = await SaveUserAnswer({ diff --git a/src/components/ChiDevicewifi.vue b/src/components/ChiDevicewifi.vue index 1330609..5f5a2dc 100644 --- a/src/components/ChiDevicewifi.vue +++ b/src/components/ChiDevicewifi.vue @@ -225,7 +225,6 @@ export default { gateway: "", trees: [], formData: { - ippz_ssid: "", ippz_rzfs: "", ippz_jmfs: "", diff --git a/src/components/GatewayMaintenance.vue b/src/components/GatewayMaintenance.vue index 9528b57..af960e2 100644 --- a/src/components/GatewayMaintenance.vue +++ b/src/components/GatewayMaintenance.vue @@ -65,16 +65,12 @@ - - - + - + - - - - diff --git a/src/components/IpConfiguration.vue b/src/components/IpConfiguration.vue index 3978ebb..178aeb1 100644 --- a/src/components/IpConfiguration.vue +++ b/src/components/IpConfiguration.vue @@ -488,7 +488,7 @@ export default { ) { callback(new Error("请输入主DNS服务器地址")); } else if ( - !isValidPrimaryDNS( + !this.isValidDNSAddress( this.ippz_dns_zy1 + "." + this.ippz_dns_zy2 + @@ -503,6 +503,16 @@ export default { callback(); } }, + isValidDNSAddress(value) { + // IPv4地址的正则表达式 + const ipv4Regex = /^(\d{1,3}\.){3}\d{1,3}$/; + + // IPv6地址的正则表达式 + const ipv6Regex = /^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$/; + + // 检查是否是有效的IPv4或IPv6地址 + return ipv4Regex.test(value) || ipv6Regex.test(value); + }, //备用dns服务验证 validatePrimaryDNS1(rule, value, callback) { if ( @@ -517,7 +527,7 @@ export default { ) { callback(new Error("请输入备用DNS服务器地址")); } else if ( - !isValidPrimaryDNS( + !this.isValidDNSAddress( this.ippz_dns_by1 + "." + this.ippz_dns_by2 + @@ -578,6 +588,7 @@ export default { position: absolute; top: 22px; left: 100px; + font-size: 18px; color: red; } diff --git a/src/components/NetworkManagement.vue b/src/components/NetworkManagement.vue index 6aa6ac8..92422fa 100644 --- a/src/components/NetworkManagement.vue +++ b/src/components/NetworkManagement.vue @@ -236,6 +236,8 @@ export default { } else { this.$store.commit("setType", "GYWZ_wx"); } + alert(this.user_id, this.$store.state.type); + console.log(this.user_id, this.$store.state.type); this.GetUserAnswer(); }, methods: { diff --git a/src/components/ObjectManagement.vue b/src/components/ObjectManagement.vue index 55912bc..a6001b5 100644 --- a/src/components/ObjectManagement.vue +++ b/src/components/ObjectManagement.vue @@ -5,7 +5,7 @@ 新增对象 -

只能添加两条数据

+

只能添加两条数据

@@ -163,14 +163,16 @@ export default { }, created() { this.dialogVisible = true; - // let str = window.location.href.split("?")[1]; - // this.user_id = str.split("|")[0]; - // let type = str.split("|")[1]; - // if (type == 1) { - // this.$store.commit("setType", "GYWZ_yx"); - // } else { - // this.$store.commit("setType", "GYWZ_wx"); - // } + let str = window.location.href.split("?")[1]; + this.user_id = str.split("|")[0]; + let type = str.split("|")[1]; + if (type == 1) { + this.$store.commit("setType", "GYWZ_yx"); + } else { + this.$store.commit("setType", "GYWZ_wx"); + } + alert(this.user_id, this.$store.state.type); + console.log(this.user_id, this.$store.state.type); this.GetUserAnswer(); }, methods: { @@ -388,6 +390,7 @@ export default { p { margin-left: 20px; color: red; + margin-bottom: 10px; } } .el-col-1 { diff --git a/src/components/PolicyManagement.vue b/src/components/PolicyManagement.vue index 81d9b36..fa11469 100644 --- a/src/components/PolicyManagement.vue +++ b/src/components/PolicyManagement.vue @@ -41,9 +41,9 @@ --> - \ No newline at end of file +