diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index 85517a1..294efb3 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -576,6 +576,7 @@ const local: any = { }, addDict: 'Add Dictionary', editDict: 'Edit Dictionary', + dictDataTitle:'Dictionary Data', dictData:{ dictType: "Dictionary name", dictCode: "Data Code", @@ -620,8 +621,10 @@ const local: any = { title:"Log Management", }, task:{ + title:'Task Management', taskId:'ID', taskName:'Name', + logTitle:'Task Log', group:'Group', invoke:'Invoke', cron:'Cron', diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index 22f3e17..a2a3f4e 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -576,6 +576,7 @@ const local:any = { }, addDict: '新增字典', editDict: '编辑字典', + dictDataTitle:'字典数据', dictData:{ dictType: "字典名称", dictCode: "数据代码", @@ -620,8 +621,10 @@ const local:any = { title:"日志管理", }, task:{ + title:'任务管理', taskId:'编号', taskName:'任务名称', + logTitle:'任务日志', group:'任务组名', invoke:'调用目标', cron:'cron表达式', diff --git a/src/service/api/auth.ts b/src/service/api/auth.ts index 6e26534..abaf9ca 100644 --- a/src/service/api/auth.ts +++ b/src/service/api/auth.ts @@ -413,6 +413,14 @@ export function deletePortal(siteId: string, portalId: string) { +/** 首页邮箱重置密码 */ +export function fetcodeReset(data:any) { + return request({ + url: '/system/user/profile/forgotPwd', + method: 'put', + data + }); +} diff --git a/src/typings/auto-imports.d.ts b/src/typings/auto-imports.d.ts index 1fc578c..6642315 100644 --- a/src/typings/auto-imports.d.ts +++ b/src/typings/auto-imports.d.ts @@ -153,6 +153,7 @@ declare global { const fetchTerminalList: typeof import('../service/api/auth')['fetchTerminalList'] const fetchWlanGroups: typeof import('../service/api/auth')['fetchWlanGroups'] const fetchWlanSsidList: typeof import('../service/api/auth')['fetchWlanSsidList'] + const fetcodeReset: typeof import('../service/api/auth')['fetcodeReset'] const filterAuthRoutesByRoles: typeof import('../store/modules/route/shared')['filterAuthRoutesByRoles'] const filterTabsById: typeof import('../store/modules/tab/shared')['filterTabsById'] const filterTabsByIds: typeof import('../store/modules/tab/shared')['filterTabsByIds'] diff --git a/src/views/_builtin/login/modules/reset-pwd.vue b/src/views/_builtin/login/modules/reset-pwd.vue index bf03805..cb8aa1d 100644 --- a/src/views/_builtin/login/modules/reset-pwd.vue +++ b/src/views/_builtin/login/modules/reset-pwd.vue @@ -36,15 +36,26 @@ const rules = computed(() => { //phone: formRules.phone, email:formRules.email, code:formRules.code, - password: formRules.pwd, + password: formRules.userPwd, confirmPassword: createConfirmPwdRule(model.password) }; }); async function handleSubmit() { - await validate(); - // request to reset password + // await validate(); + // // request to reset password + // $message?.success(t('page.login.common.validateSuccess')); + await validate();//验证表单内容 + const { error } = await fetcodeReset({ + email: model.email, + code: model.code, + password: model.password + }); +if(!error){ $message?.success(t('page.login.common.validateSuccess')); + toggleLoginModule('pwd-login'); +} + } diff --git a/src/views/manage/dict/dictData/index.vue b/src/views/manage/dict/dictData/index.vue index 9f3c6cd..a68f213 100644 --- a/src/views/manage/dict/dictData/index.vue +++ b/src/views/manage/dict/dictData/index.vue @@ -486,7 +486,7 @@ onMounted(() => { -