From bf073f3ae6cad333ad0e960e402b65a420604e79 Mon Sep 17 00:00:00 2001 From: lsymicc Date: Wed, 11 Jun 2025 17:35:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/lang/en.js | 64 +++++++- ruoyi-ui/src/lang/zh.js | 60 +++++++ ruoyi-ui/src/views/monitor/job/log.vue | 114 ++++++++----- ruoyi-ui/src/views/system/dict/data.vue | 151 ++++++++++++------ ruoyi-ui/src/views/system/notice/index.vue | 1 + ruoyi-ui/src/views/system/user/authRole.vue | 5 +- ruoyi-ui/src/views/system/user/index.vue | 2 +- .../views/system/user/profile/userAvatar.vue | 1 + 8 files changed, 301 insertions(+), 97 deletions(-) diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 640499a..a3ce721 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -1042,7 +1042,7 @@ export default { SystemMonitor_CacheMonitor: 'CacheMonitor', //缓存列表 SystemMonitor_CacheList: 'CacheList', - + //********************KPI分析******************** KPIAnalysis: 'KPI Analysis', // 入库分析 @@ -1364,7 +1364,7 @@ export default { //基本资料---用户信息 male:'Male', female:'Female', - + //基本资料---修改密码 oldPassword:'Old Password', newPassword:'New Password', @@ -1762,6 +1762,7 @@ export default { btnExport: 'Export', btnSubmit: 'Submit', btnCancel: 'Cancel', + btnClose: 'Close', btnExpandOrCollapse: 'Expand/Collapse', btnRefreshCache: 'Refresh Cache', @@ -1780,6 +1781,38 @@ export default { checkDictNameIsNull: 'DictName cannot be Null', checkDictTypeIsNull: 'DictType cannot be Null', + //-------------------------------------------------------------- + // 子页面data + dictCode:'DictCode', + dictLabel:'DictLabel', + dictValue:'DictValue', + dictSort:'DictSort', + + placeholderDictLabel:'Enter DictLabel', + placeholderDictValue:'Enter DictValue', + placeholderCssClass:'Enter Css Class', + + cssClass:'CssClass', + listClass:'ListClass', + + optionDefault:'Default', + optionPrimary:'Primary', + optionSuccess:'Success', + optionInfo:'Info', + optionWarning:'Warning', + optionDanger:'Danger', + + heckDictLabelIsNull: 'DictLabel cannot be Null', + heckDictValueIsNull: 'DictValue cannot be Null', + heckDictSortIsNull: 'DictSort cannot be Null', + + addDictItem: 'Add Dictionary Data', + editDictItem: 'Edit Dictionary Data', + + //---handleDelete--- + textDeleteDictCodeConfirm1: 'Are you sure you want to delete the data item with dictCode "', + textDeleteDictCodeConfirm2: '"?', + }, // ***************系统管理：参数设置************* @@ -2114,6 +2147,9 @@ export default { btnCancel: 'Cancel', btnMore: 'More', btnLog: 'Log', + btnDetails: 'Details', + btnClose: 'Close', + btnClear: 'Clear', btnGenerateExpression: 'GenerateExpression', //---------------更多-------------- @@ -2180,6 +2216,30 @@ export default { //--------------其他-------------- lblWidthSearch: '68px', lblWidthDialog: '100px', + + //------------------------------------------------------------- + //---子页面--- + execTime: 'ExecTime', + jobLogId: 'JobLogId', + jobMessage: 'JobMessage', + exceptionInfo: 'ExceptionInfo', + + placeholderDateStart: 'DateStart', + placeholderDateEnd: 'DateEnd', + placeholderStatus: 'Select Status', + + jobLogTitle: 'Job Log', + + optionNormal: 'Normal', + optionFail: 'Fail', + + //---函数：handleDelete--- + textDeleteJobLogConfirm1: 'Are you sure you want to delete the data item with jobLog number "', + textDeleteJobLogConfirm2: '"?', + + //---函数：handleClean--- + textClearJobLogConfirm: 'Are you sure you want to clear all jobLogs?', + }, // ***************系统监控：服务监控*************** diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index f6b131e..9fd184f 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -1757,6 +1757,7 @@ export default { btnExport: '导出', btnSubmit: '确定', btnCancel: '取消', + btnClose: '关闭', btnExpandOrCollapse: '展开/折叠', btnRefreshCache: '刷新缓存', @@ -1775,6 +1776,38 @@ export default { checkDictNameIsNull: '字典名称不能为空', checkDictTypeIsNull: '字典类型不能为空', + //-------------------------------------------------------------- + // 子页面data + dictCode:'字典编码', + dictLabel:'字典标签', + dictValue:'字典键值', + dictSort:'字典排序', + + placeholderDictLabel:'请输入字典标签', + placeholderDictValue:'请输入数据键值', + placeholderCssClass:'请输入样式属性', + + cssClass:'样式属性', + listClass:'回显样式', + + optionDefault:'默认', + optionPrimary:'主要', + optionSuccess:'成功', + optionInfo:'信息', + optionWarning:'警告', + optionDanger:'危险', + + heckDictLabelIsNull: '数据标签不能为空', + heckDictValueIsNull: '数据键值不能为空', + heckDictSortIsNull: '数据顺序不能为空', + + addDictItem: '新增字典数据', + editDictItem: '修改字典数据', + + //---handleDelete--- + textDeleteDictCodeConfirm1: '是否确认删除字典编码为"', + textDeleteDictCodeConfirm2: '"的数据项？', + }, // ***************系统管理：参数设置************* @@ -2107,6 +2140,9 @@ export default { btnCancel: '取消', btnMore: '更多', btnLog: '日志', + btnDetails: '详情', + btnClose: '关闭', + btnClear: '清空', btnGenerateExpression: '生成表达式', btnExceOnce: '执行一次', @@ -2172,6 +2208,30 @@ export default { //--------------其他-------------- lblWidthSearch: '68px', lblWidthDialog: '100px', + + //------------------------------------------------------------- + //---子页面--- + execTime: '执行时间', + jobLogId: '日志编号', + jobMessage: '日志信息', + exceptionInfo: '异常信息：', + + placeholderDateStart: '开始时间', + placeholderDateEnd: '结束时间', + placeholderStatus: '请选择状态', + + jobLogTitle: '调度日志', + + optionNormal: '正常', + optionFail: '失败', + + //---函数：handleDelete--- + textDeleteJobLogConfirm1: '是否确认删除定时日志编号为"', + textDeleteJobLogConfirm2: '"的数据项？', + + //---函数：handleClean--- + textClearJobLogConfirm: '是否确认清空所有调度日志数据项？', + }, // ***************系统监控：服务监控*************** diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue index 22d4e31..a746cf0 100644 --- a/ruoyi-ui/src/views/monitor/job/log.vue +++ b/ruoyi-ui/src/views/monitor/job/log.vue @@ -1,19 +1,21 @@