Merge remote-tracking branch 'origin/main'

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

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表达式',

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
+  });
+}
 
 
 

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']

src/views/_builtin/login/modules/reset-pwd.vue

@@ -36,15 +36,26 @@ const rules = computed<RuleRecord>(() => {
     //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');
+}
+
 }
 </script>
 

src/views/manage/dict/dictData/index.vue

@@ -486,7 +486,7 @@ onMounted(() => {
         </AForm>
       </ACard>
 
-      <ACard title="Dictionary Data" :bordered="false" :body-style="{ flex: 1, overflow: 'hidden' }"
+      <ACard :title="t('page.manage.dict.dictDataTitle')" :bordered="false" :body-style="{ flex: 1, overflow: 'hidden' }"
         class="flex-col-stretch sm:flex-1-hidden card-wrapper">
         <template #extra>
           <div class="flex flex-wrap justify-end gap-x-12px gap-y-8px lt-sm:(w-200px py-12px)">

src/views/manage/task/index.vue

@@ -228,7 +228,6 @@ async function fnRecordView(jobId: number) {
 
   });
 }
-
 /**
  * 对话框弹出确认执行函数
  * 进行表达规则校验
@@ -452,13 +451,13 @@ const handleReset = () => {
         <AForm :model="searchParams" :label-width="80">
           <ARow :gutter="[16, 16]" wrap>
             <ACol :lg="6" :md="12" :xs="24">
-              <AFormItem label="Name" name="jobName" class="m-0">
+              <AFormItem :label="t('page.manage.task.taskName')" name="jobName" class="m-0">
                 <AInput v-model:value="searchParams.jobName" />
               </AFormItem>
             </ACol>
 
             <ACol :lg="6" :md="12" :xs="24">
-              <AFormItem label="Group" name="jobGroup" class="m-0">
+              <AFormItem :label="t('page.manage.task.jobGroup')" name="jobGroup" class="m-0">
                 <a-select v-model:value="searchParams.jobGroup" default-value="DEFAULT"
                 :field-names="{ label: 'value', value: 'value' }"
                     :placeholder="t('common.selectPlease')" :options="dict.sysJobGroup" >
@@ -504,7 +503,7 @@ const handleReset = () => {
         </AForm>
       </ACard>
 
-      <ACard title="Task Management" :bordered="false" :body-style="{ flex: 1, overflow: 'hidden' }"
+      <ACard :title="t('page.manage.task.title')" :bordered="false" :body-style="{ flex: 1, overflow: 'hidden' }"
         class="flex-col-stretch sm:flex-1-hidden card-wrapper">
         <template #extra>
           <div class="flex flex-wrap justify-end gap-x-12px gap-y-8px lt-sm:(w-200px py-12px)">

src/views/manage/task/log/index.vue

@@ -305,13 +305,13 @@ onMounted(() => {
         <AForm :model="searchParams" :label-width="80">
           <ARow :gutter="[16, 16]" wrap>
             <ACol :lg="6" :md="12" :xs="24" v-if="jobId !== '0'">
-              <AFormItem label="Name" name="jobName" class="m-0">
+              <AFormItem :label="t('page.manage.task.taskName')" name="jobName" class="m-0">
                 <AInput v-model:value="searchParams.jobName" :disabled="jobId !== '0'" />
               </AFormItem>
             </ACol>
 
             <ACol :lg="6" :md="12" :xs="24">
-              <AFormItem label="Group" name="jobGroup" class="m-0">
+              <AFormItem :label="t('page.manage.task.jobGroup')" name="jobGroup" class="m-0">
                 <AInput v-model:value="searchParams.jobGroup" />
               </AFormItem>
             </ACol>
@@ -354,7 +354,7 @@ onMounted(() => {
         </AForm>
       </ACard>
 
-      <ACard title="Task Log" :bordered="false" :body-style="{ flex: 1, overflow: 'hidden' }"
+      <ACard :title="t('page.manage.task.logTitle')" :bordered="false" :body-style="{ flex: 1, overflow: 'hidden' }"
         class="flex-col-stretch sm:flex-1-hidden card-wrapper">
         <template #extra>
           <div class="flex flex-wrap justify-end gap-x-12px gap-y-8px lt-sm:(w-200px py-12px)">

src/views/manage/task/modules/task-operate-drawer.vue

@@ -76,7 +76,7 @@ const rules = {
   deptId: defaultRequiredRule,
   email: formRules.email,
   phonenumber: formRules.phone,
-  password: formRules.pwd,
+  password: formRules.userPwd,
   postIds: defaultRequiredRule,
   roleIds: defaultRequiredRule
 };