修改国际化配置

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',
+    lblWidthSearch: '80px',
-    lblWidthDialog: '100px',
+    lblWidthDialog: '143px',
 
     //-------------------------------------------------------------
     //---子页面---

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: '双货位分组编码',
+    placeholderGroupCodingNo: '请输入双货位分组编码',
-    // placeholdergroupCodingName: '双货位分组编码（1、2...）',
+    placeholderGroupCodingName: '请输入双货位分组编码（1、2...）',
-    // placeholdercargoSpaceLogo: '双货位标识（0外1内）',
+    placeholderCargoSpaceLogo: '请输入双货位标识（0外1内）',
-    // placeholderthisCargoAreaId: '仓库区域编码',
+    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: '请选择任务组名',

ruoyi-ui/src/views/monitor/cache/list.vue

@@ -50,7 +50,7 @@
             <!-- 操作 -->
             <el-table-column
               :label="this.$t('Monitor_CacheList.operation')"
-              width="60"
+              width="90"
               align="center"
               class-name="small-padding fixed-width"
             >
@@ -93,7 +93,7 @@
             <!-- 序号 -->
             <el-table-column
               :label="this.$t('Monitor_CacheList.Id')"
-              width="60"
+              width="80"
               type="index"
             ></el-table-column>
             <!-- 缓存键名 -->
@@ -107,7 +107,7 @@
             <!-- 操作 -->
             <el-table-column
               :label="this.$t('Monitor_CacheList.operation')"
-              width="60"
+              width="90"
               align="center"
               class-name="small-padding fixed-width"
             >

ruoyi-ui/src/views/monitor/job/index.vue

@@ -305,7 +305,7 @@
         <!-- 任务分组： -->
         <el-form-item :label="$t('Monitor_ScheduledTask.jobGroup')">{{ jobGroupFormat(form) }}</el-form-item>
         <!-- 创建时间： -->
-        <el-form-item :label="$t('Monitor_ScheduledTask.jobGroup' + ':')">{{ form.createTime }}</el-form-item>
+        <el-form-item :label="$t('Monitor_ScheduledTask.createTime')">{{ form.createTime }}</el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- cron表达式： -->
@@ -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')
       })
     },
     /** 提交按钮 */

ruoyi-ui/src/views/monitor/online/index.vue

@@ -62,7 +62,7 @@
         </template>
       </el-table-column>
       <!-- 操作 -->
-      <el-table-column :label="$t('monitor_Online.btnForceLogout')" align="center" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('monitor_Online.operation')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <!-- 【强制退出】按钮 -->
           <el-button

ruoyi-ui/src/views/system/dept/index.vue

@@ -111,8 +111,8 @@
     </el-table>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :width="$t('systemManagement_DeptManagement.windowWidthDialog')" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" :label-width="$t('systemManagement_DeptManagement.lblWidthDialog')">
         <el-row>
           <!-- 上级部门 -->
           <el-col :span="24" v-if="form.parentId !== 0">
@@ -343,14 +343,14 @@ export default {
           if (this.form.deptId != undefined) {
             updateDept(this.form).then(response => {
               // 提示：修改成功
-              this.$modal.msgSuccess($t('systemManagement_MenuManagement.editSuccessInfo'))
+              this.$modal.msgSuccess($t('systemManagement_DeptManagement.editSuccessInfo'))
               this.open = false
               this.getList()
             })
           } else {
             addDept(this.form).then(response => {
               // 提示：新增成功
-              this.$modal.msgSuccess($this.$t('systemManagement_MenuManagement.addSuccessInfo'))
+              this.$modal.msgSuccess($this.$t('systemManagement_DeptManagement.addSuccessInfo'))
               this.open = false
               this.getList()
             })

ruoyi-ui/src/views/system/dict/index.vue

@@ -135,19 +135,24 @@
           </router-link>
         </template>
       </el-table-column>
+      <!-- 状态 -->
       <el-table-column :label="$t('systemManagement_DictManagement.status')" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
         </template>
       </el-table-column>
+      <!-- 备注 -->
       <el-table-column :label="$t('systemManagement_DictManagement.remark')" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <!-- 创建时间 -->
       <el-table-column :label="$t('systemManagement_DictManagement.createTime')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <!-- 操作 -->
       <el-table-column :label="$t('systemManagement_DictManagement.operation')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <!-- 【编辑】按钮 -->
           <el-button
             size="mini"
             type="text"
@@ -155,6 +160,7 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dict:edit']"
           >{{ $t('systemManagement_DictManagement.btnEdit') }}</el-button>
+          <!-- 【删除】按钮 -->
           <el-button
             size="mini"
             type="text"
@@ -177,7 +183,7 @@
 
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <!-- 字典名称 -->
         <el-form-item :label="$t('systemManagement_DictManagement.dictName')" prop="dictName">
           <el-input v-model="form.dictName" :placeholder="$t('systemManagement_DictManagement.placeholderDictName')" />

ruoyi-ui/src/views/system/post/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="$t('systemManagement_PostManagement.lblWidthDialog')">
       <!-- 岗位编码 -->
       <el-form-item :label="$t('systemManagement_PostManagement.postCode')" prop="postCode">
         <el-input
           v-model="queryParams.postCode"
-          :placeholder="$t('systemManagement_PostManagement.placeholderpostCode')"
+          :placeholder="$t('systemManagement_PostManagement.placeholderPostCode')"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -14,14 +14,14 @@
       <el-form-item :label="$t('systemManagement_PostManagement.postName')" prop="postName">
         <el-input
           v-model="queryParams.postName"
-          :placeholder="$t('systemManagement_PostManagement.placeholderpostName')"
+          :placeholder="$t('systemManagement_PostManagement.placeholderPostName')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <!-- 岗位状态 -->
       <el-form-item :label="$t('systemManagement_PostManagement.status')" prop="status">
-        <el-select v-model="queryParams.status" :placeholder="$t('systemManagement_PostManagement.status')" clearable>
+        <el-select v-model="queryParams.status" :placeholder="$t('systemManagement_PostManagement.placeholderStatus')" clearable>
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
             :key="dict.value"
@@ -220,12 +220,15 @@ export default {
       // 表单校验
       rules: {
         postName: [
+          // 校验：岗位名称不能为空
           { required: true, message: this.$t('systemManagement_PostManagement.checkPostNameIsNull'), trigger: "blur" }
         ],
         postCode: [
+          // 校验：岗位编码不能为空
           { required: true, message: this.$t('systemManagement_PostManagement.checkPostCodeIsNull'), trigger: "blur" }
         ],
         postSort: [
+          // 校验：岗位顺序不能为空
           { required: true, message: this.$t('systemManagement_PostManagement.checkPostSortIsNull'), trigger: "blur" }
         ]
       }
@@ -281,6 +284,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
+      // 标题：新增岗位
       this.title = this.$t('systemManagement_PostManagement.addPostItem')
     },
     /** 修改按钮操作 */
@@ -290,6 +294,7 @@ export default {
       getPost(postId).then(response => {
         this.form = response.data
         this.open = true
+        // 标题：修改岗位
         this.title = this.$t('systemManagement_PostManagement.editPostItem')
       })
     },
@@ -299,12 +304,14 @@ export default {
         if (valid) {
           if (this.form.postId != undefined) {
             updatePost(this.form).then(response => {
+              // 修改成功
               this.$modal.msgSuccess(this.$t('systemManagement_PostManagement.editSuccessInfo'))
               this.open = false
               this.getList()
             })
           } else {
             addPost(this.form).then(response => {
+              // 新增成功
               this.$modal.msgSuccess(this.$t('systemManagement_PostManagement.addSuccessInfo'))
               this.open = false
               this.getList()
@@ -316,11 +323,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const postIds = row.postId || this.ids
+      // 提示信息：确定要删除岗位编号为【】的数据吗？
       const confirmText = this.$t('systemManagement_PostManagement.textDeleteConfirm1') + postIds + this.$t('systemManagement_PostManagement.textDeleteConfirm2')
       this.$modal.confirm(confirmText).then(() => {
         return delPost(postIds)
       }).then(() => {
         this.getList()
+        // 删除成功
         this.$modal.msgSuccess(this.$t('systemManagement_PostManagement.deleteSuccessInfo'))
       }).catch(() => {})
     },

ruoyi-ui/src/views/system/role/index.vue

@@ -245,7 +245,7 @@
 
     <!-- 分配角色数据权限对话框 -->
     <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
-      <el-form :model="form" label-width="80px">
+      <el-form :model="form" label-width="86px">
         <!-- 角色名称 -->
         <el-form-item :label="$t('systemManagement_RoleManagement.roleName')">
           <el-input v-model="form.roleName" :disabled="true" />