diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 58fd951..504d009 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -1619,6 +1619,7 @@ export default { status: 'Status', createTime: 'CreateTime', operation: 'Operation', + remark: 'Remark', //--------------交互框操作提示-------------- placeholderDeptName: 'Enter DeptName', @@ -1652,6 +1653,9 @@ export default { btnCancel: 'Cancel', btnExpandOrCollapse: 'Expand/Collapse', + lblWidthDialog: '120px', + windowWidthDialog: '700px', + //--------------提示文本-------------- //---handleDelete--- @@ -1710,6 +1714,8 @@ export default { btnCancel: 'Cancel', btnExpandOrCollapse: 'Expand/Collapse', + lblWidthDialog: '80px', + //--------------提示文本-------------- //---handleDelete--- @@ -1779,6 +1785,7 @@ export default { addSuccessInfo: 'Add success', editSuccessInfo: 'Edit success', deleteSuccessInfo: 'Delete success', + refreshSuccessInfo: 'Refresh Cache Success', //--------------校验提示-------------- checkDictNameIsNull: 'DictName cannot be Null', @@ -2099,6 +2106,7 @@ export default { os: 'Operating System', loginTime: 'LoginTime', message: 'Message', + operation: 'Operation', //--------------当前页面交互框操作提示-------------- placeholderIpAddress: 'Enter Host IP', @@ -2217,8 +2225,8 @@ export default { checkCronExpressionIsNull: 'CronExpression cannot be null', //--------------其他-------------- - lblWidthSearch: '68px', - lblWidthDialog: '100px', + lblWidthSearch: '80px', + lblWidthDialog: '143px', //------------------------------------------------------------- //---子页面--- diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index c159650..aad8357 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -1181,6 +1181,7 @@ export default { placeholderRoadwayId: '请输入巷道号', placeholderCargoAreaId: '请输入货区编码', placeholderCargoSpaceType: '请输入货位类型', + placeholderCargoSpaceTypeName: '请输入货位类型名称', placeholderCargoSpaceName: '请输入货位名称', placeholderPlatoon: '请输入排', placeholderColumn: '请输入列', @@ -1190,17 +1191,17 @@ export default { placeholderStatus: '请输入货位状态', placeholderCargoHeight: '请输入货位高度', placeholderIsDouble: '请输入是否双伸(Y/N)', - // placeholdergroupCodingNo: '双货位分组编码', - // placeholdergroupCodingName: '双货位分组编码(1、2...)', - // placeholdercargoSpaceLogo: '双货位标识(0外1内)', - // placeholderthisCargoAreaId: '仓库区域编码', + placeholderGroupCodingNo: '请输入双货位分组编码', + placeholderGroupCodingName: '请输入双货位分组编码(1、2...)', + placeholderCargoSpaceLogo: '请输入双货位标识(0外1内)', + placeholderThisCargoAreaId: '请输入仓库区域编码', //--------------交互按钮-------------- btnSearch: '搜索', btnReset: '重置', btnAdd: '新增', btnEdit: '修改', - btnDel: '删除', + btnDelete: '删除', btnExport: '导出', btnImport: '导入', btnSubmit: '提交', @@ -1395,7 +1396,7 @@ export default { dataScope: '权限范围', menuAccess: '菜单权限', roleSort: '显示顺序', - roleStatus: '角色状态', + status: '角色状态', createTime: '创建时间', operation: '操作', role: '角色', @@ -1631,6 +1632,7 @@ export default { status: '部门状态', createTime: '创建时间', operation: '操作', + remark: '备注', //--------------交互框操作提示-------------- placeholderDeptName: '请输入部门名称', @@ -1664,6 +1666,9 @@ export default { btnCancel: '取消', btnExpandOrCollapse: '展开/折叠', + lblWidthDialog: '80px', + windowWidthDialog: '600px', + //--------------提示文本-------------- //---handleDelete--- @@ -1695,7 +1700,7 @@ export default { status: '状态', createTime: '创建时间', operation: '操作', - Remark: '备注', + remark: '备注', //--------------交互框操作提示-------------- placeholderpostName: '请输入岗位名称', @@ -1722,6 +1727,8 @@ export default { btnCancel: '取消', btnExpandOrCollapse: '展开/折叠', + lblWidthDialog: '68px', + //--------------提示文本-------------- //---handleDelete--- @@ -1746,7 +1753,7 @@ export default { dictId: '字典编号', dictName: '字典名称', dictType: '字典类型', - status: 'Sta状态tus', + status: '状态', remark: '备注', createTime: '创建时间', operation: '人工操作', @@ -1790,6 +1797,7 @@ export default { addSuccessInfo: '新增成功', editSuccessInfo: '编辑成功', deleteSuccessInfo: '删除成功', + refreshSuccessInfo: '刷新缓存成功', //--------------校验提示-------------- checkDictNameIsNull: '字典名称不能为空', @@ -2108,6 +2116,7 @@ export default { os: '操作系统', loginTime: '登录日期', message: '操作信息', + operation: '操作', //--------------当前页面交互框操作提示-------------- placeholderIpAddress: '请输入登录地址', @@ -2139,6 +2148,8 @@ export default { status: '状态', operation: '操作', + //--------------当前页面交互框操作提示-------------- + //--------------当前页面交互框操作提示-------------- placeholderJobName: '请输入任务名称', placeholderJobGroup: '请选择任务组名', diff --git a/ruoyi-ui/src/views/monitor/cache/list.vue b/ruoyi-ui/src/views/monitor/cache/list.vue index c84d093..566e303 100644 --- a/ruoyi-ui/src/views/monitor/cache/list.vue +++ b/ruoyi-ui/src/views/monitor/cache/list.vue @@ -50,7 +50,7 @@ @@ -93,7 +93,7 @@ @@ -107,7 +107,7 @@ diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index 66526ee..46d190e 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/ruoyi-ui/src/views/monitor/job/index.vue @@ -305,7 +305,7 @@ {{ jobGroupFormat(form) }} - {{ form.createTime }} + {{ form.createTime }} @@ -531,7 +531,7 @@ export default { this.reset() this.open = true // 标题:添加任务 - this.title = this.$t('Monitor_ScheduledTask.btnAddTitle') + this.title = this.$t('Monitor_ScheduledTask.titleAddJob') }, /** 修改按钮操作 */ handleUpdate(row) { @@ -541,7 +541,7 @@ export default { this.form = response.data this.open = true // 标题:修改任务 - this.title = this.$t('Monitor_ScheduledTask.btnEditTitle') + this.title = this.$t('Monitor_ScheduledTask.titleEditJob') }) }, /** 提交按钮 */ diff --git a/ruoyi-ui/src/views/monitor/online/index.vue b/ruoyi-ui/src/views/monitor/online/index.vue index 70b630d..18f4129 100644 --- a/ruoyi-ui/src/views/monitor/online/index.vue +++ b/ruoyi-ui/src/views/monitor/online/index.vue @@ -62,7 +62,7 @@ - + + + + +