Merge remote-tracking branch 'origin/main' into practical-training

src/hooks/useTheme.ts

@@ -1,5 +1,5 @@
 import { onBeforeMount } from 'vue';
-import { ConfigProvider } from 'ant-design-vue/lib';
+import { ConfigProvider, message } from 'ant-design-vue/lib';
 import { CACHE_LOCAL_PRIMARY_COLOR } from '@/constants/cache-keys-constants';
 import { localGet, localSet } from '@/utils/cache-local-utils';
 
@@ -8,6 +8,7 @@ import { localGet, localSet } from '@/utils/cache-local-utils';
  */
 export const usePrimaryColor = () => {
   onBeforeMount(() => {
+    message.config({ top: '100px' }); // 全局配置消息距离顶部的位置
     changePrimaryColor(getLocalColor());
   });
 };

src/i18n/locales/en-US.ts

@@ -57,7 +57,7 @@ export default {
     updateTime: 'Update Time',
     remark: 'Remark',
     description: 'Description',
-    operate: 'Operation',
+    operate: 'More Action',
     operateOk: 'Operation Successful!',
     operateErr: 'Operation Failed!',
     copyText: "Copy",
@@ -1368,7 +1368,7 @@ export default {
         status0: "Failures",
         status1: "Active",
         createTime: "Time",
-        costTime: "Time Consumption",
+        costTime: "Time Lap",
         viewLog: "Scheduling log Info",
         delTip: "Are you sure you want to delete the scheduling log entry with the number [{num}]?",
         delOk: "Deleted Successfully",
@@ -1804,13 +1804,13 @@ export default {
         operate:{
           operId:'Log ID',
           moduleName:'Module Name',
-          workType:'Business Type',
+          workType:'Operation',
           operUser:'Operator',
           requestMe:'Request Method',
           host:'Request Host',
           operStatus:'Status',
           operDate:'Time',
-          useTime:'Time Consumption',
+          useTime:'Time Lap',
           logInfo:'Operation Log Information',
           delSure:'Are you sure to delete the data item with access number [{ids}]?',
           delAllSure:'Confirm to clear all login log data items?',

src/i18n/locales/zh-CN.ts

@@ -57,7 +57,7 @@ export default {
     updateTime: '更新时间',
     remark: '备注',
     description: '说明',
-    operate: '操作',
+    operate: '更多操作',
     operateOk: '操作成功！',
     operateErr: '操作失败！',
     copyText: "复制",
@@ -1804,7 +1804,7 @@ export default {
         operate:{
           operId:'日志编号',
           moduleName:'模块名称',
-          workType:'业务类型',
+          workType:'操作类型',
           operUser:'操作人员',
           requestMe:'请求方式',
           host:'请求主机',

src/views/login.vue

@@ -47,7 +47,7 @@ function fnFinish() {
     .fnLogin(toRaw(state.from))
     .then(res => {
       if (res.code === RESULT_CODE_SUCCESS) {
-        message.success(t('views.login.loginSuccess'), 3);
+        message.success(t('views.login.loginSuccess'), 1);
         /**登录后重定向页面 */
         const redirectPath = route.query?.redirect || '/index';
         router.push({ path: redirectPath as string });