diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 94a563f6..5a6b28d4 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -691,40 +691,40 @@ export default { spaceUsage:'Space usage (%)' }, job: { - jobName: "JobName", - jobNamePlease: 'Please enter the task name correctly, limited to 2-20 characters', - jobGroup: "JobGroup", - invokeTarget: "invoke target", - invokeTargetPlease: 'Please enter the call target correctly, limited to 2-20 characters.', + jobName: "Job Name", + jobNamePlease: 'Please enter the task name correctly, limited to 2-50 characters', + jobGroup: "Job Group", + invokeTarget: "Invoke target", + invokeTargetPlease: 'Please enter the call target correctly, limited to 2-50 characters.', invokeTargetTip: "Parameter description: support for preset incoming parameters, serialized processing parameters in the processor", cronExpression: "cron expressions", cronExpressionPlease: 'Please enter or generate a cron execution expression', cronExpressionTip: "Example of an expression:0/20 * * * * ?", cronExpressionTip1: "Illustrative example: Execute tasks every 20 seconds", cronExpressionNew: "Generating Expressions", - status: "statuses", + status: "Status", status0: "disable", status1: "opens", status00: "pause", status01: "normalcy", - statusChange: "Are you sure you want the {text} {num} task?", + statusChange: "Are you sure you want the {text} {num} job?", saveLog: "Recording log", - tipRowErr: "Errors in the recording of tasks", - viewInfoErr: "Failed to get task information", - viewJob: "Task information", - addJob: "Add Tasks", - editJob: "Modify tasks", + tipRowErr: "Errors in the recording of jobs", + viewInfoErr: "Failed to get job information", + viewJob: "Job Info", + addJob: "Add Job", + editJob: "Modify Job", runOne: "execute once", - runOneTip: "Are you sure you want to perform a [{num}] task right away?", + runOneTip: "Are you sure you want to perform a [{num}] job right away?", runOneOk: "{num} Executed successfully", - delTip: "Are you sure you want to delete task number [{num}]?", + delTip: "Are you sure you want to delete job number [{num}]?", delOk: "Deleted successfully", - resetTip: "Sure you want to reset and refresh the scheduling task?", + resetTip: "Sure you want to reset and refresh the scheduling job?", resetOk: "Reset Successful", exportTip: "Confirm exporting xlsx table files based on search criteria?", exportOk: "Completed export", resetQueue: "Reset Queue", - jobLog: "Task log", + jobLog: "Job log", createTime: "CreateTime", targetParams: "TargetParams", targetParamsPlease: 'Call target incoming parameters, only support json strings', @@ -737,6 +737,26 @@ export default { concurrent1: "allowed", remark: "Remarks", }, + jobLog: { + jobName: "Job Name", + jobGroup: "Job Group", + invokeTarget: "Invoke target", + status: "Status", + status0: "failures", + status1: "normalcy", + createTime: "CreateTime", + costTime: "CostTime", + viewLog: "Scheduling log Info", + delTip: "Are you sure you want to delete the scheduling log entry with the number [{num}]?", + delOk: "Deleted successfully", + clearText: "Clear", + clearTip: "Confirm that all dispatch log data items are cleared?", + clearOk: "Cleared successfully", + exportTip: "Confirm exporting xlsx table files based on search criteria?", + exportOk: "Export completed", + jobMsg: "Job Messages", + targetParams: "TargetParams", + }, }, system:{ user: { diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 544b453b..dc7a7be2 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -692,10 +692,10 @@ export default { }, job: { jobName: "任务名称", - jobNamePlease: '请正确输入任务名称,限2-20个字符', + jobNamePlease: '请正确输入任务名称,限2-50个字符', jobGroup: "任务组名", invokeTarget: "调用目标", - invokeTargetPlease: '请正确输入调用目标,限2-20个字符', + invokeTargetPlease: '请正确输入调用目标,限2-50个字符', invokeTargetTip: "参数说明:支持预设传入参数,在处理器中进行序列化处理参数", cronExpression: "cron表达式", cronExpressionPlease: '请输入或生成cron执行表达式', @@ -737,6 +737,26 @@ export default { concurrent1: "允许", remark: "备注说明", }, + jobLog: { + jobName: "任务名称", + jobGroup: "任务组名", + invokeTarget: "调用目标", + status: "执行状态", + status0: "失败", + status1: "正常", + createTime: "记录时间", + costTime: "消耗时间", + viewLog: "调度日志信息", + delTip: "确认删除调度日志编号为 【{num}】 的数据项吗?", + delOk: "删除成功", + clearText: "清空", + clearTip: "确认清空所有调度日志数据项吗?", + clearOk: "清空成功", + exportTip: "确认根据搜索条件导出xlsx表格文件吗?", + exportOk: "已完成导出", + jobMsg: "日志信息", + targetParams: "传入参数", + }, }, system:{ user:{ diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue index 012f89b0..f86d2946 100644 --- a/src/views/monitor/job/index.vue +++ b/src/views/monitor/job/index.vue @@ -235,7 +235,7 @@ const modalStateFrom = Form.useForm( { required: true, min: 2, - max: 20, + max: 50, message: t('views.monitor.job.jobNamePlease'), }, ], @@ -243,7 +243,7 @@ const modalStateFrom = Form.useForm( { required: true, min: 2, - max: 20, + max: 50, message: t('views.monitor.job.invokeTargetPlease'), }, ], diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue index 39db2d02..2b15215a 100644 --- a/src/views/monitor/job/log.vue +++ b/src/views/monitor/job/log.vue @@ -116,34 +116,34 @@ let tableState: TabeStateType = reactive({ /**表格字段列 */ let tableColumns: ColumnsType = [ { - title: '日志编号', + title: t('common.rowId'), dataIndex: 'jobLogId', align: 'center', }, { - title: '任务名称', + title: t('views.monitor.jobLog.jobName'), dataIndex: 'jobName', align: 'center', }, { - title: '任务组名', + title: t('views.monitor.jobLog.jobGroup'), dataIndex: 'jobGroup', key: 'jobGroup', align: 'center', }, { - title: '调用目标', + title: t('views.monitor.jobLog.invokeTarget'), dataIndex: 'invokeTarget', align: 'center', }, { - title: '执行状态', + title: t('views.monitor.jobLog.status'), dataIndex: 'status', key: 'status', align: 'center', }, { - title: '记录时间', + title: t('views.monitor.jobLog.createTime'), dataIndex: 'createTime', align: 'center', customRender(opt) { @@ -152,7 +152,7 @@ let tableColumns: ColumnsType = [ }, }, { - title: '消耗时间', + title: t('views.monitor.jobLog.costTime'), dataIndex: 'costTime', key: 'costTime', align: 'center', @@ -161,7 +161,7 @@ let tableColumns: ColumnsType = [ }, }, { - title: '操作', + title: t('common.operate'), key: 'jobLogId', align: 'center', }, @@ -185,7 +185,8 @@ let tablePagination = reactive({ showSizeChanger: true, /**数据总数 */ total: 0, - showTotal: (total: number) => `总共 ${total} 条`, + showTotal: (total: number) => + t('common.tablePaginationTotal', { total: total }), onChange: (page: number, pageSize: number) => { tablePagination.current = page; tablePagination.pageSize = pageSize; @@ -242,7 +243,7 @@ let modalState: ModalStateType = reactive({ */ function fnModalVisibleByVive(row: Record) { modalState.from = Object.assign(modalState.from, row); - modalState.title = '调度日志信息'; + modalState.title = t('views.monitor.jobLog.viewLog'); modalState.visibleByView = true; } @@ -260,14 +261,14 @@ function fnRecordDelete() { const ids = tableState.selectedRowKeys.join(','); Modal.confirm({ title: t('common.tipTitle'), - content: `确认删除调度日志编号为 【${ids}】 的数据项吗?`, + content: t('views.monitor.jobLog.delTip', { num: ids }), onOk() { const key = 'delJobLog'; message.loading({ content: t('common.loading'), key }); delJobLog(ids).then(res => { if (res.code === RESULT_CODE_SUCCESS) { message.success({ - content: `删除成功`, + content: t('views.monitor.jobLog.delOk'), key, duration: 2, }); @@ -288,14 +289,14 @@ function fnRecordDelete() { function fnCleanList() { Modal.confirm({ title: t('common.tipTitle'), - content: `确认清空所有调度日志数据项吗?`, + content: t('views.monitor.jobLog.clearTip'), onOk() { const key = 'cleanJobLog'; message.loading({ content: t('common.loading'), key }); cleanJobLog().then(res => { if (res.code === RESULT_CODE_SUCCESS) { message.success({ - content: `清空成功`, + content: t('views.monitor.jobLog.clearOk'), key, duration: 2, }); @@ -316,14 +317,14 @@ function fnCleanList() { function fnExportList() { Modal.confirm({ title: t('common.tipTitle'), - content: `确认根据搜索条件导出xlsx表格文件吗?`, + content: t('views.monitor.jobLog.exportTip'), onOk() { const key = 'exportJobLog'; message.loading({ content: t('common.loading'), key }); exportJobLog(toRaw(queryParams)).then(res => { if (res.code === RESULT_CODE_SUCCESS) { message.success({ - content: `已完成导出`, + content: t('views.monitor.jobLog.exportOk'), key, duration: 2, }); @@ -415,45 +416,56 @@ onMounted(() => { - + - + - + - + @@ -463,11 +475,11 @@ onMounted(() => { - 搜索 + {{ t('common.search') }} - 重置 + {{ t('common.reset') }} @@ -482,7 +494,7 @@ onMounted(() => { - 关闭 + {{ t('common.close') }} { v-perms:has="['monitor:job:remove']" > - 删除 + {{ t('common.deleteText') }} { v-perms:has="['monitor:job:remove']" > - 清空 + {{ t('views.monitor.jobLog.clearText') }} { v-perms:has="['monitor:job:export']" > - 导出 + {{ t('common.export') }} @@ -518,31 +530,31 @@ onMounted(() => { @@ -585,20 +603,24 @@ onMounted(() => {