国际化字段检查修改

ruoyi-ui/src/lang/en.js

@@ -1241,7 +1241,7 @@ export default {
   },
 
   //=====================基础信息:容器管理=====================
-  bas_ContainerManagement: { 
+  bas_ContainerManagement: {
     //--------------标题--------------
       addContainerItem: 'Add Container Item',
       editContainerItem: 'Edit Container Item',
@@ -1273,8 +1273,8 @@ export default {
       placeholderPortName: 'Select PortName',
       placeholderStatus: 'Select Status',
       placeholderProductTypeQuantity: 'Enter TypeQuantity',
-      placeholderCapacity: 'Capacity',
-      placeholderOperationMan: 'Operationer',
+      placeholderCapacity: 'Enter Capacity',
+      placeholderOperationMan: 'Enter Operationer',
 
       //--------------子页面输入提示--------------
       placeholderProductId: 'Enter ProductId',
@@ -1326,6 +1326,7 @@ export default {
   //=====================系统管理：用户管理=====================
   systemManagement_UserManagement: {
     //--------------数据表标题--------------
+    id: 'Id',
     userId: 'UserId',
     userName: 'UserName',
     password: 'Password',
@@ -1487,6 +1488,7 @@ export default {
     roleName: 'RoleName',
     roleKey: 'RoleKey',
     dataScope: 'DataScope',
+    warehouseDataScope: 'Warehouse',
     menuAccess: 'MenuAccess',
     roleSort: 'RoleSort',
     status: 'Status',
@@ -1509,7 +1511,7 @@ export default {
     placeholderEmail: 'Enter Email',
     placeholderPost: 'Select Post',
     placeholderGender: 'Select Gender',
-    selectWarehouse: 'Select Warehouse',
+    placeholderWarehouse: 'Select Warehouse',
 
     //--------------交互按钮--------------
     btnSearch: 'Search',
@@ -2394,6 +2396,8 @@ export default {
     basInfomation: 'Basic Information',
     redisVersion: 'Redis Version',
     redisMode: 'Redis Mode',
+    redisModeStandalone: 'Standalone',
+    redisModeCluster: 'Cluster',
     port: 'Port',
     connectedClients: 'Connected Clients',
 
@@ -2402,7 +2406,9 @@ export default {
     cpuUsed: 'CPU Used',
     memorySize: 'Memory Size',
 
-    AOFIsOpen: "AOF IsOpen",
+    AOFStatus: "AOF Status",
+    Open: "Open",
+    Close: "Close",
     RDBIsEnable: "RDB IsEnable",
     keySize: "Key Size",
     netInputAndOutput: "netInput/Output",

ruoyi-ui/src/lang/zh.js

@@ -1251,7 +1251,7 @@ export default {
   },
 
   //=====================基础信息:容器管理=====================
-  bas_ContainerManagement: { 
+  bas_ContainerManagement: {
     //--------------标题--------------
       addContainerItem: '添加容器管理',
       editContainerItem: '修改容器管理',
@@ -1336,6 +1336,7 @@ export default {
   //=====================系统管理:用户管理=====================
   systemManagement_UserManagement: {
     //--------------数据表标题--------------
+    id: '序号',
     userId: '用户编号',
     userName: '用户名称',
     password: '密码',
@@ -1520,7 +1521,7 @@ export default {
     placeholderEmail: '请输入邮箱',
     placeholderPost: '请选择岗位',
     placeholderGender: '请选择性别',
-    selectWarehouse: '请选择仓库',
+    placeholderWarehouse: '请选择仓库',
 
     //--------------交互按钮--------------
     btnSearch: '搜索',
@@ -2253,8 +2254,6 @@ export default {
       status: '状态',
       operation: '操作',
 
-      //--------------当前页面交互框操作提示--------------
-
       //--------------当前页面交互框操作提示--------------
       placeholderJobName: '请输入任务名称',
       placeholderJobGroup: '请选择任务组名',
@@ -2419,6 +2418,8 @@ export default {
     basInfomation: '基本信息',
     redisVersion: 'Redis版本',
     redisMode: '运行模式',
+    redisModeStandalone: '单机',
+    redisModeCluster: '集群',
     port: '端口',
     connectedClients: '客户端数',
 
@@ -2427,7 +2428,9 @@ export default {
     cpuUsed: '使用CPU',
     memorySize: '内存配置',
 
-    AOFIsOpen: "AOF是否开启",
+    AOFStatus: "AOF是否开启",
+    Open: "是",
+    Close: "否",
     RDBIsEnable: "RDB是否成功",
     keySize: "Key数量",
     netInputAndOutput: "网络入口/出口",

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

@@ -13,7 +13,7 @@
                   <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.redis_version }}</div></td>
                   <!-- 运行模式 -->
                   <td class="el-table__cell is-leaf"><div class="cell">{{ $t('Monitor_Cache.redisMode') }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.redis_mode == "standalone" ? "单机" : "集群" }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.redis_mode == "standalone" ? $t('Monitor_Cache.redisModeStandalone') : $t('Monitor_Cache.redisModeCluster') }}</div></td>
                   <!-- 端口 -->
                   <td class="el-table__cell is-leaf"><div class="cell">{{ $t('Monitor_Cache.port') }}</div></td>
                   <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.tcp_port }}</div></td>
@@ -37,8 +37,8 @@
                 </tr>
                 <tr>
                   <!-- AOF是否开启 -->
-                  <td class="el-table__cell is-leaf"><div class="cell">{{ $t('Monitor_Cache.AOFIsOpen') }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.aof_enabled == "0" ? "否" : "是" }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">{{ $t('Monitor_Cache.AOFStatus') }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.aof_enabled == "0" ? $t('Monitor_Cache.Close') : $t('Monitor_Cache.Open') }}</div></td>
                   <!-- RDB是否成功 -->
                   <td class="el-table__cell is-leaf"><div class="cell">{{ $t('Monitor_Cache.RDBIsEnable') }}</div></td>
                   <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.rdb_last_bgsave_status }}</div></td>

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

@@ -24,7 +24,7 @@
       </el-form-item>
       <!-- 任务状态 -->
       <el-form-item :label="$t('Monitor_ScheduledTask.status')" prop="status">
-        <el-select v-model="queryParams.status" :placeholder="$t('Monitor_ScheduledTask.status')" clearable>
+        <el-select v-model="queryParams.status" :placeholder="$t('Monitor_ScheduledTask.placeholderStatus')" clearable>
           <el-option
             v-for="dict in dict.type.sys_job_status"
             :key="dict.value"

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

@@ -110,7 +110,9 @@ export default {
     /** 查询在线用户列表 */
     getList() {
       this.loading = true
+      console.log('---------------------------------------')
       list(this.queryParams).then(response => {
+        console.log(response)
         this.list = response.rows
         this.total = response.total
         this.loading = false

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="86px">
+      <el-form :model="form" label-width="90px">
         <!-- 角色名称 -->
         <el-form-item :label="$t('systemManagement_RoleManagement.roleName')">
           <el-input v-model="form.roleName" :disabled="true" />

ruoyi-ui/src/views/system/user/authRole.vue

@@ -21,7 +21,7 @@
     <!-- 角色信息 -->
     <h4 class="form-header h4">{{ $t('systemManagement_UserManagement.roleInfo') }}</h4>
     <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
-      <el-table-column label="序号" type="index" align="center">
+      <el-table-column :label="$t('systemManagement_UserManagement.id')" type="index" align="center">
         <template slot-scope="scope">
           <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
         </template>