This commit is contained in:
qingjiao 2024-12-18 11:50:04 +08:00
parent 6c5aee2ee8
commit e6f6e85127
4 changed files with 30 additions and 11 deletions

View File

@ -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',

View File

@ -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: '保存',

View File

@ -167,7 +167,7 @@
}}</el-radio>
</el-form-item>
<el-form-item :label="$t('table.WAN_IP_AddressIP')">
<el-input v-model="formONVIFData.wanIP" />
<el-input v-model="formONVIFData.wanDomainName" />
</el-form-item>
<el-form-item :label="$t('table.WAN_Port')">
<el-input v-model="formONVIFData.wanOnvifPort" type="number" :min="0" :max="65535"/>
@ -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
}

View File

@ -58,6 +58,9 @@
<el-form-item :label="$t('table.DNS2')">
<el-input v-model="formData.dns1" disabled />
</el-form-item>
<el-form-item :label="$t('table.WAN_IP_AddressIP')">
<el-input v-model="formData.wanInfo" disabled />
</el-form-item>
<!-- <el-form-item :label="$t('table.aiVol')" class="volformbox">
<el-slider v-model="formData.aiVol" :step="1" :max="10" disabled />
<span class="volspan">{{ formData.aiVol }}</span>
@ -109,6 +112,9 @@ export default {
playStatus: '',//
dns0: '',// dns1
dns1: '',// dns2
wanDomainName: '',// Wan
wanIP: '',// wan IP
wanInfo: '',// wan
}
}
},
@ -124,6 +130,13 @@ export default {
this.formData.aoVol = parseInt(res.data.aoVol) || 0
this.formData.dns0 = res.data.dns0 || ''
this.formData.dns1 = res.data.dns1 || ''
this.formData.wanIP = res.data.wanIP || ''
if(res.data.wanDomainName !== undefined){
this.formData.wanDomainName = res.data.wanDomainName || ''
console.log('AAA', res)
}
this.formData.wanInfo = `${this.formData.wanDomainName} (${this.formData.wanIP})`
} else {
this.$message.error(res.message)
}