diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 0e20ed0..dd912e8 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -766,6 +766,25 @@ export default { NoticeManagement: 'NoticeManagement', //日志管理 LogManagement: 'LogManagement', + //操作日志 + LogManagement_OperationLog: 'OperationLog', + //登录日志 + LogManagement_LoginLog: 'LoginLog', + + //********************系统监控******************** + SystemMonitor: 'SystemMonitor', + // 在线用户 + SystemMonitor_Online: 'Online', + // 定时任务 + SystemMonitor_ScheduledTask: 'ScheduledTask', + // 数据监控 + SystemMonitor_DataMonitor: 'DataMonitor', + //服务监控 + SystemMonitor_ServiceMonitor: 'ServiceMonitor', + //缓存监控 + SystemMonitor_CacheMonitor: 'CacheMonitor', + //缓存列表 + SystemMonitor_CacheList: 'CacheList', // ****************盘点管理****************** inventoryManagement: 'inventoryManagement', @@ -1597,6 +1616,273 @@ export default { }, + // ***************系统管理：日志管理-操作日志************* + // ***************views/monitor/operlog************* + systemManagement_LogManagement_Operation:{ + //--------------数据表标题-------------- + operId: 'OperId', + title: 'Title', + businessType: 'BusinessType', + operName: 'OperName', + operIp: 'OperIp', + operLocation: 'OperLocation', + status: 'Status', + operTime: 'OperTime', + costTime: 'CostTime', + unitMillisecond: 'ms', + operation: 'Operation', + details: 'Details', + + //--------------当前页面交互框操作提示-------------- + placeholderOpenIp: 'Enter openId', + placeholderTitle: 'Enter title', + placeholderBusinessType: 'Select businessType', + placeholderOperName: 'Select operName', + placeholderStatus: 'Select status', + placeholderOperTime: 'OperationTime', + placeholderDateStart: 'DateStart', + placeholderDateEnd: 'DateEnd', + + //--------------二级窗口-------------- + //--------------标题-------------- + logDetails: 'logDetails', + + //--------------交互框标签-------------- + noticeContent:"Content", + loginInfo: 'Login Info', + requestInfo: 'Request Info', + requestUrl: 'Request Url', + requestMethod: 'Request Method', + method:'Method', + requestParam: 'Request Params', + responseParam: 'Response Param', + statusNormal: 'Success', + statusFail: 'Fail', + errorMsg:'Error Message', + + //--------------交互按钮-------------- + btnSearch: 'Search', + btnReset: 'Reset', + btnAdd: 'Add', + btnEdit: 'Edit', + btnDelete: 'Delete', + btnImport: 'Import', + btnExport: 'Export', + btnSubmit: 'Confirm', + btnCancel: 'Cancel', + btnClear: 'ClearAll', + btnDetails: 'Details', + + //--------------提示文本-------------- + + //---handleClean--- + textDeleteConfirm: 'Confirm that all operation log data entries are cleared?"', + + //--------------操作提示-------------- + addSuccessInfo: 'Add success', + editSuccessInfo: 'Edit success', + deleteSuccessInfo: 'Delete success', + clearSuccessInfo: 'Clear success', + + //--------------其他-------------- + lblWidthSearch: '80px', + lblWidthDialog: '150px', + + }, + + // ***************系统管理：日志管理-登录日志************* + // ***************views/monitor/logininfor************* + systemManagement_LogManagement_Login:{ + //--------------数据表标题-------------- + infoId: 'InfoId', + userName: 'UserName', + ipAddress: 'IPAddress', + loginLocation: 'LoginLocation', + operLocation: 'OperLocation', + browser: 'Browser', + os: 'OperationSystem', + status: 'Status', + loginTime: 'LoginTime', + message: 'Message', + + //--------------当前页面交互框操作提示-------------- + placeholderIpAddress: 'Enter IPAddress', + placeholderUserName: 'Enter UserName', + placeholderStatus: 'Select Status', + placeholderLoginTime: 'LoginTime', + placeholderDateStart: 'DateStart', + placeholderDateEnd: 'DateEnd', + + //--------------交互按钮-------------- + btnSearch: 'Search', + btnReset: 'Reset', + btnAdd: 'Add', + btnEdit: 'Edit', + btnDelete: 'Delete', + btnImport: 'Import', + btnExport: 'Export', + btnSubmit: 'Confirm', + btnCancel: 'Cancel', + btnClear: 'ClearAll', + btnDetails: 'Details', + btnUnlocked: 'Unlock', + + //--------------提示文本-------------- + + //---函数：handleDelete--- + textDeleteConfirm1: 'Are you sure you want to delete the data item with the infoId of "', + textDeleteConfirm2: '"?', + + //---函数：handleUnlock--- + textUnlockConfirm1: 'Are you sure you want to unlock the data item with the infoId of "', + textUnlockConfirm2: '"?', + + //---handleClean--- + textCleanConfirm: 'Are you sure to clear all login log data items?', + + //--------------操作提示-------------- + addSuccessInfo: 'Add success', + editSuccessInfo: 'Edit success', + deleteSuccessInfo: 'Delete success', + clearSuccessInfo: 'Clear success', + unlockSuccessInfo: 'Unlock success', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + + }, + + // ***************系统监控：在线用户************* + monitor_Online:{ + //--------------数据表标题-------------- + num: 'Id', + tokenId: 'TokenId', + userName: 'UserName', + deptName: 'DeptName', + ipAddress: 'Host IP', + loginLocation: 'LoginLocation', + browser: 'Browser', + os: 'Operating System', + loginTime: 'LoginTime', + message: 'Message', + + //--------------当前页面交互框操作提示-------------- + placeholderIpAddress: 'Enter Host IP', + placeholderUserName: 'Enter UserName', + + //--------------交互按钮-------------- + btnSearch: 'Search', + btnReset: 'Reset', + btnForceLogout: 'Force Logout', + + //--------------提示文本-------------- + //---函数：handleForceLogout--- + textForceLogoutConfirm1: 'Is the user with the username "', + textForceLogoutConfirm2: '"forcefully logged out?', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + }, + + // ***************系统监控：定时任务************* + Monitor_ScheduledTask:{ + //--------------数据表标题-------------- + jobId: 'JobId', + jobName: 'JobName', + jobGroup: 'JobGroup', + invokeTarget: 'InvokeTarget', + cronExpression: 'CronExpression', + status: 'Status', + operation: 'Operation', + + //--------------当前页面交互框操作提示-------------- + placeholderJobName: 'Enter JobName', + placeholderJobGroup: 'Select JobGroup', + + //---------------二级窗口操作提示------------------ + placeholderInvokeTarget: 'Enter InvokeTarget', + placeholderCronExpression: 'Enter CronExpression', + + //--------------交互按钮-------------- + btnSearch: 'Search', + btnReset: 'Reset', + btnAdd: 'Add', + btnEdit: 'Edit', + btnDelete: 'Delete', + btnImport: 'Import', + btnExport: 'Export', + btnSubmit: 'Confirm', + btnCancel: 'Cancel', + btnMore: 'More', + btnLog: 'Log', + btnGenerateExpression: 'GenerateExpression', + + //---------------更多-------------- + btnExceOnce: 'Execute Once', + btnJobDetails: 'Job Details', + btnJobLog: 'Job Log', + + //--------------提示文本-------------- + //---二级窗口标题--- + titleAddJob: 'Add Job', + titleEditJob: 'Edit Job', + + //---标签--- + nextValidTime:'Next Valid Time', + execStrategy:'Execution Strategy', + allowParallel:'Allow Parallel', + + //---二级窗口--- + textInvokeMethod: 'Invoke Method', + textInvokeMethodTip1: "Bean call example:ryTask.ryParams('ry')", + textInvokeMethodTip2: "Class call example:com.ruoyi.quartz.task.RyTask.ryParams('ry')", + textInvokeMethodTip3: "Parameter: string, boolean, long integer, floating point, integer", + + textJobStatusNormal: 'Normal', + textJobStatusPause: 'Pause', + + textDefaultStrategy: 'Default', + textExecStrategyTip1: 'Immediately', + textExecStrategyTip2: 'Once', + textExecStrategyTip3: 'Never', + + textIsParallelTip1: 'Enable', + textIsParallelTip2: 'Disable', + + //---函数：handleDelete--- + textEnable: 'Enable', + textDisable: 'Disable', + textChangeConfirm1: 'Are you sure you want to enable "', + textChangeConfirm2: '" job?', + textSuccess: 'Success', + + //---函数：handleRun--- + textExecConfirm1: 'Are you sure you want to perform a scheduling task numbered "', + textExecConfirm2: '" immediately?', + + //---函数：handleDelete--- + textDeleteConfirm1: 'Sure you want to delete the data item with timed task number "', + textDeleteConfirm2: '"?', + + //--------------操作提示-------------- + addSuccessInfo: 'Add success', + editSuccessInfo: 'Edit success', + deleteSuccessInfo: 'Delete success', + clearSuccessInfo: 'Clear success', + unlockSuccessInfo: 'Unlock success', + execSuccessInfo: 'Exec success', + + //--------------校验提示-------------- + checkJobNameIsNull: 'JobName cannot be null', + checkInvokeTargetIsNull: 'InvokeTarget cannot be null', + checkCronExpressionIsNull: 'CronExpression cannot be null', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + }, // ***************出库作业流水查询************* diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 74dbace..4a92c92 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -750,25 +750,47 @@ export default { outboundTaskManagement: '出库作业管理', //********************系统管理******************** - SystemManagement: '系统管理', - //用户管理 - UserManagement: '用户管理', - //角色管理 - RoleManagement: '角色管理', - //菜单管理 - MenuManagement: '菜单管理', - //部门管理 - DepartmentManagement: '部门管理', - //岗位管理 - PostManagement: '岗位管理', - //字典管理 - DictionaryManagement: '字典管理', - //参数管理 - ConfigManagement: '参数管理', - //通知公告 - NoticeManagement: '通知公告', - //日志管理 - LogManagement: '日志管理', + SystemManagement: '系统管理', + //用户管理 + UserManagement: '用户管理', + //角色管理 + RoleManagement: '角色管理', + //菜单管理 + MenuManagement: '菜单管理', + //部门管理 + DepartmentManagement: '部门管理', + //岗位管理 + PostManagement: '岗位管理', + //字典管理 + DictionaryManagement: '字典管理', + //参数管理 + ConfigManagement: '参数管理', + //通知公告 + NoticeManagement: '通知公告', + //日志管理 + LogManagement: '日志管理', + //操作日志 + LogManagement_OperationLog: '操作日志', + //登录日志 + LogManagement_LoginLog: '操作日志', + + //********************系统监控******************** + SystemMonitor: '系统监控', + // 在线用户 + SystemMonitor_Online: '在线用户', + // 定时任务 + SystemMonitor_ScheduledTask: '定时任务', + // 数据监控 + SystemMonitor_DataMonitor: '数据监控', + //服务监控 + SystemMonitor_ServiceMonitor: '服务监控', + //缓存监控 + SystemMonitor_CacheMonitor: '缓存监控', + //缓存列表 + SystemMonitor_CacheList: '缓存列表', + + + // ****************盘点管理****************** inventoryManagement: '盘点管理', @@ -1500,6 +1522,14 @@ export default { createTime: '创建时间', operation: '人工操作', + //--------------当前页面交互框操作提示-------------- + placeholderNoticeTitle: '请输入公告标题', + placeholderCreateBy: '请输入操作人员', + placeholderNoticeType: '选择公告类型', + placeholderCreateTime: '创建时间', + placeholderDateStart: '开始时间', + placeholderDateEnd: '结束时间', + //--------------二级窗口-------------- //--------------标题-------------- addNoticeItem: '新增公告', @@ -1508,17 +1538,9 @@ export default { //--------------交互框标签-------------- noticeContent:"公告内容", - //--------------当前页面交互框操作提示-------------- - placeholderNoticeTitle: '请输入公告标题', - placeholderCreateBy: '请输入操作人员', - placeholderNoticeType: '选择公告类型', - placeholderCreateTime: '创建时间', - placeholderDateStart: '开始时间', - placeholderDateEnd: '结束时间', - - //--------------二级窗口操作提示-------------- - placeholderRemark: '请输入内容', - placeholderNoticeContent: '请输入内容', + //--------------二级窗口操作提示-------------- + placeholderRemark: '请输入内容', + placeholderNoticeContent: '请输入内容', //--------------交互按钮-------------- btnSearch: '搜索', @@ -1555,6 +1577,273 @@ export default { }, + // ***************系统管理：日志管理-操作日志************* + // ***************views/monitor/operlog************* + systemManagement_LogManagement_Operation:{ + //--------------数据表标题-------------- + operId: '日志编号', + title: '系统模块', + businessType: '操作类型', + operName: '操作人员', + operIp: '操作地址', + operLocation: '操作地点', + status: '操作状态', + operTime: '操作日期', + costTime: '消耗时间', + unitMillisecond: '毫秒', + operation: '消耗时间', + details: '明细', + + //--------------当前页面交互框操作提示-------------- + placeholderOpenIp: '请输入日志编号', + placeholderTitle: '请输入系统模块', + placeholderBusinessType: '请选择公告类型', + placeholderOperName: '请选择操作人员', + placeholderStatus: '请选择操作状态', + placeholderOperTime: '操作日期', + placeholderDateStart: '开始时间', + placeholderDateEnd: '结束时间', + + //--------------二级窗口-------------- + //--------------标题-------------- + logDetails: '日志明细', + + //--------------交互框标签-------------- + noticeContent:"公告内容", + loginInfo: '登录信息', + requestInfo: '请求信息', + requestUrl: '请求地址', + requestMethod: '请求方式', + method:'方法', + requestParam: '请求参数', + responseParam: '响应参数', + statusNormal: '响应正常', + statusFail: '响应失败', + errorMsg:'异常信息', + + //--------------交互按钮-------------- + btnSearch: '搜索', + btnReset: '重置', + btnAdd: '新增', + btnEdit: '修改', + btnDelete: '删除', + btnImport: '导入', + btnExport: '导出', + btnSubmit: '确定', + btnCancel: '取消', + btnClear: '清空', + btnDetails: '明细', + + //--------------提示文本-------------- + + //---handleClean--- + textDeleteConfirm: '是否确认清空所有操作日志数据项？"', + + //--------------操作提示-------------- + addSuccessInfo: '新增成功', + editSuccessInfo: '编辑成功', + deleteSuccessInfo: '删除成功', + clearSuccessInfo: '清空成功', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + + }, + + // ***************系统管理：日志管理-登录日志************* + // ***************views/monitor/logininfor************* + systemManagement_LogManagement_Login:{ + //--------------数据表标题-------------- + infoId: '访问编号', + userName: '用户名称', + ipAddress: '登录地址', + loginLocation: '登录地点', + operLocation: '操作地点', + browser: '浏览器', + os: '操作系统', + status: '登录状态', + loginTime: '登录日期', + message: '操作信息', + + //--------------当前页面交互框操作提示-------------- + placeholderIpAddress: '请输入登录地址', + placeholderUserName: '请输入用户名称', + placeholderStatus: '请选择登录状态', + placeholderLoginTime: '登录时间', + placeholderDateStart: '开始时间', + placeholderDateEnd: '结束时间', + + //--------------交互按钮-------------- + btnSearch: '搜索', + btnReset: '重置', + btnAdd: '新增', + btnEdit: '修改', + btnDelete: '删除', + btnImport: '导入', + btnExport: '导出', + btnSubmit: '确定', + btnCancel: '取消', + btnClear: '清空', + btnDetails: '明细', + btnUnlocked: '解锁', + + //--------------提示文本-------------- + //---函数：handleDelete--- + textDeleteConfirm1: '是否确认删除访问编号为"', + textDeleteConfirm2: '"的数据项？', + + //---函数：handleUnlock--- + textUnlockConfirm1: '是否确认解锁访问编号为"', + textUnlockConfirm2: '"的数据项？', + + //---函数：handleClean--- + textCleanConfirm: '是否确认清空所有登录日志数据项？', + + //--------------操作提示-------------- + addSuccessInfo: '新增成功', + editSuccessInfo: '编辑成功', + deleteSuccessInfo: '删除成功', + clearSuccessInfo: '清空成功', + unlockSuccessInfo: '解锁成功', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + + }, + + // ***************系统监控：在线用户************* + monitor_Online:{ + //--------------数据表标题-------------- + num: '序号', + tokenId: '会话编号', + userName: '登录名称', + deptName: '部门名称', + ipAddress: '主机', + loginLocation: '登录地点', + browser: '浏览器', + os: '操作系统', + loginTime: '登录日期', + message: '操作信息', + + //--------------当前页面交互框操作提示-------------- + placeholderIpAddress: '请输入登录地址', + placeholderUserName: '请输入用户名称', + + //--------------交互按钮-------------- + btnSearch: '搜索', + btnReset: '重置', + btnForceLogout: '强制退出', + + //--------------提示文本-------------- + //---函数：handleForceLogout--- + textForceLogoutConfirm1: '是否强制退出用户名为"', + textForceLogoutConfirm2: '"的用户？', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + }, + + // ***************系统监控：定时任务************* + Monitor_ScheduledTask:{ + //--------------数据表标题-------------- + jobId: '任务编号', + jobName: '任务名称', + jobGroup: '任务组名', + invokeTarget: '调用目标字符串', + cronExpression: 'cron执行表达式', + status: '状态', + operation: '操作', + + //--------------当前页面交互框操作提示-------------- + placeholderJobName: '请输入任务名称', + placeholderJobGroup: '请选择任务组名', + + //---------------二级窗口操作提示------------------ + placeholderInvokeTarget: '请输入调用目标字符串', + placeholderCronExpression: '请输入Cron执行表达式', + + //--------------交互按钮-------------- + btnSearch: '搜索', + btnReset: '重置', + btnAdd: '新增', + btnEdit: '修改', + btnDelete: '删除', + btnImport: '导入', + btnExport: '导出', + btnSubmit: '确定', + btnCancel: '取消', + btnMore: '更多', + btnLog: '日志', + btnGenerateExpression: '生成表达式', + + btnExceOnce: '执行一次', + btnJobDetails: '任务详情', + btnJobLog: '调度日志', + + //--------------提示文本-------------- + //---二级窗口标题--- + titleAddJob: '添加任务', + titleEditJob: '修改任务', + + //---标签--- + nextValidTime:'下次执行时间', + execStrategy:'执行策略', + allowParallel:'是否并发', + + //---二级窗口--- + textInvokeMethod: '调用方法', + textInvokeMethodTip1: "Bean调用示例：ryTask.ryParams('ry')", + textInvokeMethodTip2: "Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')", + textInvokeMethodTip3: "参数说明：支持字符串，布尔类型，长整型，浮点型，整型", + + textJobStatusNormal: '正常', + textJobStatusPause: '暂停', + + textDefaultStrategy: '默认策略', + textExecStrategyTip1: '立即执行', + textExecStrategyTip2: '执行一次', + textExecStrategyTip3: '放弃执行', + + textIsParallelTip1: '允许', + textIsParallelTip2: '禁止', + + //---函数：handleStatusChange--- + textEnable: '启用', + textDisable: '停用', + textChangeConfirm1: '确认要"', + textChangeConfirm2: '"任务吗？', + textSuccess: '成功', + + //---函数：handleRun--- + textExecConfirm1: '确认要立即执行一次"', + textExecConfirm2: '"任务吗？', + + //---函数：handleDelete--- + textDeleteConfirm1: '是否确认删除定时任务编号为"', + textDeleteConfirm2: '"的数据项？', + + //--------------操作提示-------------- + addSuccessInfo: '新增成功', + editSuccessInfo: '编辑成功', + deleteSuccessInfo: '删除成功', + clearSuccessInfo: '清空成功', + unlockSuccessInfo: '解锁成功', + execSuccessInfo: '执行成功', + + //--------------校验提示-------------- + checkJobNameIsNull: '任务名称不能为空', + checkInvokeTargetIsNull: '调用目标字符串不能为空', + checkCronExpressionIsNull: 'cron执行表达式不能为空', + + //--------------其他-------------- + lblWidthSearch: '68px', + lblWidthDialog: '100px', + }, + + // ***************出库作业流水查询************* searchViewOutJobFlow: { diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index 783873f..7e66258 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/ruoyi-ui/src/views/monitor/job/index.vue @@ -1,16 +1,19 @@ @@ -337,13 +399,16 @@ export default { // 表单校验 rules: { jobName: [ - { required: true, message: "任务名称不能为空", trigger: "blur" } + // 任务名称不能为空 + { required: true, message: this.$t('Monitor_ScheduledTask.checkJobNameIsNull'), trigger: "blur" } ], invokeTarget: [ - { required: true, message: "调用目标字符串不能为空", trigger: "blur" } + // 调用目标字符串不能为空 + { required: true, message: this.$t('Monitor_ScheduledTask.checkInvokeTargetIsNull'), trigger: "blur" } ], cronExpression: [ - { required: true, message: "cron执行表达式不能为空", trigger: "blur" } + // cron执行表达式不能为空 + { required: true, message: this.$t('Monitor_ScheduledTask.checkCronExpressionIsNull'), trigger: "blur" } ] } } @@ -418,21 +483,26 @@ export default { }, // 任务状态修改 handleStatusChange(row) { - let text = row.status === "0" ? "启用" : "停用" - this.$modal.confirm('确认要"' + text + '""' + row.jobName + '"任务吗？').then(function() { + // 启用/停用 + let text = row.status === "0" ? this.$t('Monitor_ScheduledTask.textEnable') : this.$t('Monitor_ScheduledTask.textDisable') + // 提示信息：确认要"启用/停用" + "任务名称" + 任务吗？ + this.$modal.confirm(this.$t('Monitor_ScheduledTask.textChangeConfirm1') + text + '""' + row.jobName + this.$t('Monitor_ScheduledTask.textChangeConfirm2')).then(function() { return changeJobStatus(row.jobId, row.status) }).then(() => { - this.$modal.msgSuccess(text + "成功") + // 提示信息："启用/停用" + 成功 + this.$modal.msgSuccess(text + this.$t('Monitor_ScheduledTask.textSuccess')) }).catch(function() { row.status = row.status === "0" ? "1" : "0" }) }, /* 立即执行一次 */ handleRun(row) { - this.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗？').then(function() { + // 提示信息：确认要立即执行一次"{jobName}"任务吗？ + this.$modal.confirm(this.$t('Monitor_ScheduledTask.textExecConfirm1') + row.jobName + this.$t('Monitor_ScheduledTask.textExecConfirm2')).then(function() { return runJob(row.jobId, row.jobGroup) }).then(() => { - this.$modal.msgSuccess("执行成功") + // 提示信息：执行成功 + this.$modal.msgSuccess(this.$t('Monitor_ScheduledTask.execSuccessInfo')) }).catch(() => {}) }, /** 任务详细信息 */ @@ -460,7 +530,8 @@ export default { handleAdd() { this.reset() this.open = true - this.title = "添加任务" + // 标题：添加任务 + this.title = this.$t('Monitor_ScheduledTask.btnAddTitle') }, /** 修改按钮操作 */ handleUpdate(row) { @@ -469,7 +540,8 @@ export default { getJob(jobId).then(response => { this.form = response.data this.open = true - this.title = "修改任务" + // 标题：修改任务 + this.title = this.$t('Monitor_ScheduledTask.btnEditTitle') }) }, /** 提交按钮 */ @@ -478,13 +550,15 @@ export default { if (valid) { if (this.form.jobId != undefined) { updateJob(this.form).then(response => { - this.$modal.msgSuccess("修改成功") + // 提示信息：修改成功 + this.$modal.msgSuccess(this.$t('Monitor_ScheduledTask.editSuccessInfo')) this.open = false this.getList() }) } else { addJob(this.form).then(response => { - this.$modal.msgSuccess("新增成功") + // 提示信息：新增成功 + this.$modal.msgSuccess(this.$t('Monitor_ScheduledTask.addSuccessInfo')) this.open = false this.getList() }) @@ -495,11 +569,13 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const jobIds = row.jobId || this.ids - this.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项？').then(function() { + // 提示信息：是否确认删除入库作业流水编号为"' + jobIds + '"的数据项？ + this.$modal.confirm(this.$t('Monitor_ScheduledTask.textDeleteConfirm1') + jobIds + this.$t('Monitor_ScheduledTask.textDeleteConfirm1')).then(function() { return delJob(jobIds) }).then(() => { this.getList() - this.$modal.msgSuccess("删除成功") + // 提示信息：删除成功 + this.$modal.msgSuccess(this.$t('Monitor_ScheduledTask.deleteSuccessInfo')) }).catch(() => {}) }, /** 导出按钮操作 */ diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue index f16a3dc..4ea6dd7 100644 --- a/ruoyi-ui/src/views/monitor/logininfor/index.vue +++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue @@ -1,28 +1,31 @@