From 5b4381c25749a5bcf0064fd04f4ffe04a194f956 Mon Sep 17 00:00:00 2001 From: rainv123 <2148537152@qq.com> Date: Fri, 12 Sep 2025 11:41:31 +0800 Subject: [PATCH] =?UTF-8?q?updata:=E6=99=BA=E6=8E=A7=E5=8F=B0=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E8=AF=AD=E8=A8=80=E5=88=87=E6=8D=A2?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E4=B8=AD=E8=8B=B1=E7=B9=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/DictDataDialog.vue | 2 +- .../src/components/ParamDialog.vue | 11 ++------ main/manager-web/src/i18n/en.js | 15 ++++++++++ main/manager-web/src/i18n/zh_CN.js | 15 ++++++++++ main/manager-web/src/i18n/zh_TW.js | 15 ++++++++++ .../src/views/DeviceManagement.vue | 2 +- .../src/views/ParamsManagement.vue | 28 +++++++++++-------- main/manager-web/src/views/register.vue | 20 ++++++------- 8 files changed, 75 insertions(+), 33 deletions(-) diff --git a/main/manager-web/src/components/DictDataDialog.vue b/main/manager-web/src/components/DictDataDialog.vue index 3731eeff..e98c2a39 100644 --- a/main/manager-web/src/components/DictDataDialog.vue +++ b/main/manager-web/src/components/DictDataDialog.vue @@ -13,7 +13,7 @@ diff --git a/main/manager-web/src/components/ParamDialog.vue b/main/manager-web/src/components/ParamDialog.vue index d72b3768..8980ec1a 100644 --- a/main/manager-web/src/components/ParamDialog.vue +++ b/main/manager-web/src/components/ParamDialog.vue @@ -107,16 +107,9 @@ export default { this.$refs.form.validate((valid) => { if (valid) { this.saving = true; // 开始加载 - this.$emit('submit', { - form: this.form, - done: () => { - this.saving = false; // 加载完成 - } - }); + this.$emit('submit', this.form); - setTimeout(() => { - this.saving = false; - }, 3000); + // 在父组件处理完成后,通过watch visible的变化来重置saving状态 } }); }, diff --git a/main/manager-web/src/i18n/en.js b/main/manager-web/src/i18n/en.js index 2c35bdf3..8b5e7ac0 100644 --- a/main/manager-web/src/i18n/en.js +++ b/main/manager-web/src/i18n/en.js @@ -198,6 +198,21 @@ export default { 'register.mobileRequired': 'Mobile number cannot be empty', 'register.passwordRequired': 'Password cannot be empty', 'register.confirmPasswordRequired': 'Confirm password cannot be empty', + 'register.goToLogin': 'Already have an account, go to login', + 'register.agreeTo': 'Registering means you agree to the', + 'register.userAgreement': 'User Agreement', + 'register.and': 'and', + 'register.privacyPolicy': 'Privacy Policy', + 'register.sendCaptcha': 'Get Verification Code', + 'register.notAllowRegister': 'User registration is not allowed currently', + 'register.captchaLoadFailed': 'Verification code loading failed, click to refresh', + 'register.inputCorrectMobile': 'Please enter correct mobile number', + 'register.inputCaptcha': 'Please enter captcha', + 'register.captchaSendSuccess': 'Verification code sent successfully', + 'register.captchaSendFailed': 'Failed to send verification code', + 'register.registerSuccess': 'Registration successful!', + 'register.registerFailed': 'Registration failed', + 'register.passwordsNotMatch': 'The two passwords do not match', // Retrieve password page text 'retrievePassword.title': 'Reset Password', diff --git a/main/manager-web/src/i18n/zh_CN.js b/main/manager-web/src/i18n/zh_CN.js index 1f5e7b31..15382204 100644 --- a/main/manager-web/src/i18n/zh_CN.js +++ b/main/manager-web/src/i18n/zh_CN.js @@ -198,6 +198,21 @@ export default { 'register.mobileRequired': '手机号不能为空', 'register.passwordRequired': '密码不能为空', 'register.confirmPasswordRequired': '确认密码不能为空', + 'register.goToLogin': '已有账号,去登录', + 'register.agreeTo': '注册即同意', + 'register.userAgreement': '《用户协议》', + 'register.and': '和', + 'register.privacyPolicy': '《隐私政策》', + 'register.sendCaptcha': '获取验证码', + 'register.notAllowRegister': '当前不允许普通用户注册', + 'register.captchaLoadFailed': '验证码加载失败,点击刷新', + 'register.inputCorrectMobile': '请输入正确的手机号码', + 'register.inputCaptcha': '请输入图形验证码', + 'register.captchaSendSuccess': '验证码发送成功', + 'register.captchaSendFailed': '验证码发送失败', + 'register.registerSuccess': '注册成功!', + 'register.registerFailed': '注册失败', + 'register.passwordsNotMatch': '两次输入的密码不一致', // 忘记密码页面文本 'retrievePassword.title': '重置密码', diff --git a/main/manager-web/src/i18n/zh_TW.js b/main/manager-web/src/i18n/zh_TW.js index 6f1e345c..7e17d35c 100644 --- a/main/manager-web/src/i18n/zh_TW.js +++ b/main/manager-web/src/i18n/zh_TW.js @@ -198,6 +198,21 @@ export default { 'register.mobileRequired': '手機號不能為空', 'register.passwordRequired': '密碼不能為空', 'register.confirmPasswordRequired': '確認密碼不能為空', + 'register.goToLogin': '已有賬號,去登錄', + 'register.agreeTo': '註冊即同意', + 'register.userAgreement': '《用戶協議》', + 'register.and': '和', + 'register.privacyPolicy': '《隱私政策》', + 'register.sendCaptcha': '獲取驗證碼', + 'register.notAllowRegister': '當前不允許普通用戶註冊', + 'register.captchaLoadFailed': '驗證碼加載失敗,點擊刷新', + 'register.inputCorrectMobile': '請輸入正確的手機號碼', + 'register.inputCaptcha': '請輸入圖形驗證碼', + 'register.captchaSendSuccess': '驗證碼發送成功', + 'register.captchaSendFailed': '驗證碼發送失敗', + 'register.registerSuccess': '註冊成功!', + 'register.registerFailed': '註冊失敗', + 'register.passwordsNotMatch': '兩次輸入的密碼不一致', // 忘记密码页面文本 'retrievePassword.title': '重置密碼', diff --git a/main/manager-web/src/views/DeviceManagement.vue b/main/manager-web/src/views/DeviceManagement.vue index 670bca8d..5247c87b 100644 --- a/main/manager-web/src/views/DeviceManagement.vue +++ b/main/manager-web/src/views/DeviceManagement.vue @@ -74,7 +74,7 @@
- {{ isCurrentPageAllSelected ? $t('device.deselectAll') : $t('device.selectAll') }} + {{ isCurrentPageAllSelected ? $t('common.deselectAll') : $t('common.selectAll') }} {{ $t('device.bindWithCode') }} diff --git a/main/manager-web/src/views/ParamsManagement.vue b/main/manager-web/src/views/ParamsManagement.vue index fa55e110..f501fdc7 100644 --- a/main/manager-web/src/views/ParamsManagement.vue +++ b/main/manager-web/src/views/ParamsManagement.vue @@ -116,8 +116,9 @@ export default { paramForm: { id: null, paramCode: "", - paramValue: "", - remark: "" + paramValue: "", + valueType: "string", + remark: "" }, }; }, @@ -165,6 +166,7 @@ export default { if (data.code === 0) { this.paramsList = data.data.list.map(item => ({ ...item, + valueType: item.valueType || "string", selected: false, showValue: false })); @@ -191,21 +193,23 @@ export default { showAddDialog() { this.dialogTitle = this.$t('paramManagement.addParam'); this.paramForm = { - id: null, - paramCode: "", - paramValue: "", - remark: "" - }; + id: null, + paramCode: "", + paramValue: "", + valueType: "string", // 默认值 + remark: "" + }; this.dialogVisible = true; }, editParam(row) { this.dialogTitle = this.$t('paramManagement.editParam'); this.paramForm = { - id: row.id, - paramCode: row.paramCode, - paramValue: row.paramValue, - remark: row.remark - }; + id: row.id, + paramCode: row.paramCode, + paramValue: row.paramValue, + valueType: row.valueType || "string", // 确保有值 + remark: row.remark + }; this.dialogVisible = true; }, handleSubmit(form) { diff --git a/main/manager-web/src/views/register.vue b/main/manager-web/src/views/register.vue index 043cead7..873cc9a6 100644 --- a/main/manager-web/src/views/register.vue +++ b/main/manager-web/src/views/register.vue @@ -162,7 +162,7 @@ export default { mounted() { this.$store.dispatch('fetchPubConfig').then(() => { if (!this.allowUserRegister) { - showDanger('当前不允许普通用户注册'); + showDanger(this.$t('register.notAllowRegister')); setTimeout(() => { goToPage('/login'); }, 1500); @@ -181,7 +181,7 @@ export default { } else { console.error('验证码加载异常:', error); - showDanger('验证码加载失败,点击刷新'); + showDanger(this.$t('register.captchaLoadFailed')); } }); }, @@ -198,12 +198,12 @@ export default { // 发送手机验证码 sendMobileCaptcha() { if (!validateMobile(this.form.mobile, this.form.areaCode)) { - showDanger('请输入正确的手机号码'); + showDanger(this.$t('register.inputCorrectMobile')); return; } // 验证图形验证码 - if (!this.validateInput(this.form.captcha, '请输入图形验证码')) { + if (!this.validateInput(this.form.captcha, this.$t('register.inputCaptcha'))) { this.fetchCaptcha(); return; } @@ -231,9 +231,9 @@ export default { captcha: this.form.captcha, captchaId: this.form.captchaId }, (res) => { - showSuccess('验证码发送成功'); + showSuccess(this.$t('register.captchaSendSuccess')); }, (err) => { - showDanger(err.data.msg || '验证码发送失败'); + showDanger(err.data.msg || this.$t('register.captchaSendFailed')); this.countdown = 0; this.fetchCaptcha(); }); @@ -244,7 +244,7 @@ export default { if (this.enableMobileRegister) { // 手机号注册验证 if (!validateMobile(this.form.mobile, this.form.areaCode)) { - showDanger('请输入正确的手机号码'); + showDanger(this.$t('register.inputCorrectMobile')); return; } if (!this.form.mobileCaptcha) { @@ -263,7 +263,7 @@ export default { return; } if (this.form.password !== this.form.confirmPassword) { - showDanger('两次输入的密码不一致') + showDanger(this.$t('register.passwordsNotMatch')) return } // 验证验证码 @@ -276,10 +276,10 @@ export default { } Api.user.register(this.form, ({ data }) => { - showSuccess('注册成功!') + showSuccess(this.$t('register.registerSuccess')) goToPage('/login') }, (err) => { - showDanger(err.data.msg || '注册失败') + showDanger(err.data.msg || this.$t('register.registerFailed')) if (err.data != null && err.data.msg != null && err.data.msg.indexOf('图形验证码') > -1) { this.fetchCaptcha() }