@@ -292,10 +292,10 @@ export default {
username: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
- password: [
+ pin: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
- priv_password: [
+ priv_pin: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
max_repetitions: [
@@ -448,7 +448,7 @@ export default {
params.configs = JSON.stringify(params.configs)
if (this.authType === 2 && !this.editModule.configs.bearer_token) {
this.$message.error("'token' is required")
- } else if (this.authType === 1 && !(this.editModule.configs.basic_auth.username && this.editModule.configs.basic_auth.password)) {
+ } else if (this.authType === 1 && !(this.editModule.configs.basic_auth.username && this.editModule.configs.basic_auth.pin)) {
this.$message.error("'username' and 'password' is required")
} else {
this.authType = 0
@@ -588,7 +588,7 @@ export default {
this.editModule.configs.bearer_token = ''
this.editModule.configs.basic_auth = {
username: '',
- password: ''
+ pin: ''
}
},
copyValue () {
@@ -696,7 +696,7 @@ export default {
if (params.basic_auth && !params.basic_auth.username) {
delete params.basic_auth
}
- if (params.basic_auth && !params.basic_auth.password) {
+ if (params.basic_auth && !params.basic_auth.pin) {
delete params.basic_auth
}
if (params.param && !Object.keys(params.param).length) {
diff --git a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue
index 9e63fc8a5..d33ce182b 100644
--- a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue
@@ -61,7 +61,7 @@ export default {
securityLevel: '',
authProtocol: '',
privProtocol: '',
- privPassword: ''
+ privPin: ''
},
configs: [
{
@@ -92,7 +92,7 @@ export default {
securityLevel: '',
authProtocol: '',
privProtocol: '',
- privPassword: ''
+ privPin: ''
},
configs: [
{
@@ -117,7 +117,7 @@ export default {
securityLevel: '',
authProtocol: '',
privProtocol: '',
- privPassword: ''
+ privPin: ''
},
configs: [
{
@@ -240,7 +240,7 @@ export default {
securityLevel: '',
authProtocol: '',
privProtocol: '',
- privPassword: ''
+ privPin: ''
}
}
configs.forEach(item => {
@@ -269,7 +269,7 @@ export default {
securityLevel: '',
authProtocol: '',
privProtocol: '',
- privPassword: ''
+ privPin: ''
},
configs: [
{
diff --git a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
index f120f3439..83314b802 100644
--- a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
+++ b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
@@ -71,7 +71,7 @@
{{$t('login.pin')}}
-
+
@@ -101,10 +101,10 @@
- {{$t('project.module.privPassword')}}
+ {{$t('project.module.privPin')}}
-
+
diff --git a/nezha-fronted/src/components/common/rightBox/userBox.vue b/nezha-fronted/src/components/common/rightBox/userBox.vue
index b63e4ee23..289a5b5e3 100644
--- a/nezha-fronted/src/components/common/rightBox/userBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/userBox.vue
@@ -26,11 +26,11 @@
+ show-word-limit size="small" type="password" @blur="pinBlur">
-
-
-
+
+
@@ -109,11 +109,11 @@ export default {
}
},
data () {
- const validatePassword = (rule, value, callback) => { // 确认密码的二次校验
+ const validatepin = (rule, value, callback) => { // 确认密码的二次校验
if (value === '' && this.editUser.pin) {
- callback(new Error(this.$t('config.account.inputConfirmPwd')))
+ callback(new Error(this.$t('config.account.inputConfirmPin')))
} else if (value !== this.editUser.pin) {
- callback(new Error(this.$t('config.account.confirmPwdErr')))
+ callback(new Error(this.$t('config.account.confirmPinErr')))
} else {
callback()
}
@@ -128,7 +128,7 @@ export default {
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
pinChange: [
- { validator: validatePassword, trigger: 'blur' },
+ { validator: validatepin, trigger: 'blur' },
{ required: true, message: '', trigger: 'blur' }
],
roleIds: [
@@ -143,7 +143,7 @@ export default {
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
pinChange: [
- { validator: validatePassword, trigger: 'blur' }
+ { validator: validatepin, trigger: 'blur' }
],
roleIds: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -228,9 +228,9 @@ export default {
})
},
/* 密码失去焦点 检验确认密码 */
- passwordBlur () {
+ pinBlur () {
if (this.editUser.pin && this.editUser.pinChange) {
- this.$refs.accountForm.validateField('passwordChange')
+ this.$refs.accountForm.validateField('pinChange')
}
},
getScripts () {
diff --git a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
index 858b2a7f9..da5de2fb2 100644
--- a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
@@ -53,7 +53,7 @@
- {{$t('config.terminallog.password')}}
+ {{$t('config.terminallog.pin')}}
{{$t('config.terminallog.key')}}
{{scope.row[item.prop]}}
diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue
index 04d254184..7cf111205 100644
--- a/nezha-fronted/src/components/layout/header.vue
+++ b/nezha-fronted/src/components/layout/header.vue
@@ -49,7 +49,7 @@
-
+
@@ -75,7 +75,7 @@
-
+
@@ -83,11 +83,11 @@
import bus from '../../libs/bus'
import dcBox from '../common/rightBox/dcBox' // dc弹框
import { mapActions } from 'vuex'
-import changePwd from '../page/config/changePwd'
+import changePin from '../page/config/changePin'
export default {
name: 'Header',
components: {
- 'change-password': changePwd,
+ 'change-password': changePin,
'dc-box': dcBox
},
data () {
@@ -203,7 +203,7 @@ export default {
permission: 'header_add_rule'
}
],
- showChangePwd: false
+ showChangePin: false
}
},
methods: {
@@ -258,10 +258,10 @@ export default {
community: 'public',
username: '',
security_level: 'noAuthNoPriv', // noAuthNoPriv/authNoPriv/authPriv
- password: '',
+ pin: '',
auth_protocol: 'MD5', // MD5/SHA
priv_protocol: 'DES', // DES/AES
- priv_password: '',
+ priv_pin: '',
context_name: ''
}
} else if (item.type == 3) {
@@ -403,11 +403,11 @@ export default {
window.location.reload()
})
},
- showPwdDialog () {
- this.showChangePwd = true
+ showPinDialog () {
+ this.showChangePin = true
},
dialogClosed () {
- this.showChangePwd = false
+ this.showChangePin = false
},
cancel () {
this.jumpTo(this.$route.path.slice(1, this.$route.path.length))
diff --git a/nezha-fronted/src/components/page/asset/accountConfig.vue b/nezha-fronted/src/components/page/asset/accountConfig.vue
index 24ed820e4..2af5d7de7 100644
--- a/nezha-fronted/src/components/page/asset/accountConfig.vue
+++ b/nezha-fronted/src/components/page/asset/accountConfig.vue
@@ -11,13 +11,13 @@