diff --git a/src/lang/en.js b/src/lang/en.js
index ed05059..ad58f8c 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -43,15 +43,15 @@ export default {
upDateMsg: 'Firmware is being upgraded, please wait for a while。'
},
table: {
- DNS1:"Preferred DNS",
- DNS2:"Alternate DNS",
+ DNS1:"Preferred DNS Server",
+ DNS2:"Alternate DNS Server",
productName: 'Product Name',
productMode: 'Product Model',
serialNumber: 'Serial Number',
firmwareVercion: 'Firmware Version',
deviceID: 'Terminal ID',
deviceIP: 'Terminal IP',
- WAN_IP_AddressIP: 'DomainName',
+ WAN_IP_AddressIP: 'WAN DomainName',
WAN_Port: 'WAN Port',
WAN_RTSP_Port: 'WAN RTSP Port',
gatewal: 'Gateway',
@@ -71,6 +71,7 @@ export default {
isRight4: 'The IP address format is incorrect.',
isRight5: 'The public network port is out of range (1-65535).',
isRight6: 'The public network RTSP port is out of range (1-65535).',
+ isRight7: 'The public network domain name format is incorrect.',
open: 'Enable',
close: 'Disable',
save: 'Save',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 0d69654..61d4c76 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -39,15 +39,15 @@ export default {
upDateMsg: '固件正在升级,请稍等一段时间。',
},
table: {
- DNS1:"首选DNS",
- DNS2:"备用DNS",
+ DNS1:"首选DNS服务器",
+ DNS2:"备用DNS服务器",
productName: '产品名称',
productMode: '型号',
serialNumber: '序列号',
firmwareVercion: '固件版本',
deviceID: '终端 ID',
deviceIP: '终端 IP',
- WAN_IP_AddressIP: '域名',
+ WAN_IP_AddressIP: '公网域名',
WAN_Port: '公网端口号',
WAN_RTSP_Port: '公网RTSP端口号',
gatewal: '网关',
@@ -67,6 +67,7 @@ export default {
isRight4: 'IP地址格式不正确。',
isRight5: '公网端口号,超出范围(1-65535)。',
isRight6: '公网RTSP端口号,超出范围(1-65535)。',
+ isRight7: '公网域名格式错误。',
open: '启用',
close: '关闭',
save: '保存',
diff --git a/src/views/agreement/index.vue b/src/views/agreement/index.vue
index 289aa24..2e28732 100644
--- a/src/views/agreement/index.vue
+++ b/src/views/agreement/index.vue
@@ -167,7 +167,7 @@
}}
-
+
@@ -244,7 +244,8 @@ export default {
onvifAuth: '',
wanIP: '',
wanOnvifPort: '',
- wanRTSPPort: ''
+ wanRTSPPort: '',
+ wanDomainName: '',
},
sipPasswordType: 'password',
@@ -333,6 +334,7 @@ export default {
this.formONVIFData.wanIP = res.data.wanIP
this.formONVIFData.wanOnvifPort = res.data.wanOnvifPort
this.formONVIFData.wanRTSPPort = res.data.wanRTSPPort
+ this.formONVIFData.wanDomainName = res.data.wanDomainName
this.$forceUpdate()
} else {
@@ -345,6 +347,8 @@ export default {
const portRegex = /^(1\d{4}|[2-4]\d{4}|49999)$/
const portRegex2 = /^(?:[2-9]\d{0,3}|1\d{0,3}|9999)$/
const ipv4Regex = /^(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]?)$/
+ // const wanDName = /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\*\+,;=.]+$/
+ const wanDName = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
if (this.selectIndex === '2') {
param = {
...this.formUDPData
@@ -440,11 +444,11 @@ export default {
param = {
...this.formONVIFData
}
- if(this.formONVIFData.wanIP !== ''){
- if(!this.IPV4Single(this.formONVIFData.wanIP)){
+ if(this.formONVIFData.wanDomainName !== ''){
+ if(!wanDName.test(param.wanDomainName)){
this.$message({
type: 'warning',
- message: this.$i18n.t('table.isRight4')
+ message: this.$i18n.t('table.isRight7')
})
return
}
diff --git a/src/views/basicInfo/index.vue b/src/views/basicInfo/index.vue
index a173fd0..8544bfd 100644
--- a/src/views/basicInfo/index.vue
+++ b/src/views/basicInfo/index.vue
@@ -58,6 +58,9 @@
+
+
+