From cbdf37a057023b7bd56b8de72db228e2277e5d34 Mon Sep 17 00:00:00 2001 From: lsymicc Date: Thu, 19 Jun 2025 17:36:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/lang/en.js | 16 +++++++++++----- ruoyi-ui/src/lang/zh.js | 13 ++++++++----- ruoyi-ui/src/views/monitor/cache/index.vue | 6 +++--- ruoyi-ui/src/views/monitor/job/index.vue | 2 +- ruoyi-ui/src/views/monitor/online/index.vue | 2 ++ ruoyi-ui/src/views/system/role/index.vue | 2 +- ruoyi-ui/src/views/system/user/authRole.vue | 2 +- 7 files changed, 27 insertions(+), 16 deletions(-) diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index e9112b9..01301d6 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/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", diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 99f8d3c..2b90636 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/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: "网络入口/出口", diff --git a/ruoyi-ui/src/views/monitor/cache/index.vue b/ruoyi-ui/src/views/monitor/cache/index.vue index 1c9ca61..235b3e8 100644 --- a/ruoyi-ui/src/views/monitor/cache/index.vue +++ b/ruoyi-ui/src/views/monitor/cache/index.vue @@ -13,7 +13,7 @@
{{ cache.info.redis_version }}
{{ $t('Monitor_Cache.redisMode') }}
-
{{ cache.info.redis_mode == "standalone" ? "单机" : "集群" }}
+
{{ cache.info.redis_mode == "standalone" ? $t('Monitor_Cache.redisModeStandalone') : $t('Monitor_Cache.redisModeCluster') }}
{{ $t('Monitor_Cache.port') }}
{{ cache.info.tcp_port }}
@@ -37,8 +37,8 @@ -
{{ $t('Monitor_Cache.AOFIsOpen') }}
-
{{ cache.info.aof_enabled == "0" ? "否" : "是" }}
+
{{ $t('Monitor_Cache.AOFStatus') }}
+
{{ cache.info.aof_enabled == "0" ? $t('Monitor_Cache.Close') : $t('Monitor_Cache.Open') }}
{{ $t('Monitor_Cache.RDBIsEnable') }}
{{ cache.info.rdb_last_bgsave_status }}
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index 46d190e..e3348ef 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/ruoyi-ui/src/views/monitor/job/index.vue @@ -24,7 +24,7 @@ - + { + console.log(response) this.list = response.rows this.total = response.total this.loading = false diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue index 3cb1c5f..dcb6165 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -245,7 +245,7 @@ - + diff --git a/ruoyi-ui/src/views/system/user/authRole.vue b/ruoyi-ui/src/views/system/user/authRole.vue index 5f623c4..a2288db 100644 --- a/ruoyi-ui/src/views/system/user/authRole.vue +++ b/ruoyi-ui/src/views/system/user/authRole.vue @@ -21,7 +21,7 @@

{{ $t('systemManagement_UserManagement.roleInfo') }}

- +