diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 026a771..70fecee 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -1795,7 +1795,7 @@ export default { //--------------提示文本-------------- //---二级窗口标题--- titleAddJob: 'Add Job', - titleEditJob: 'Edit Job', + titleEditJob: 'Edit Job', //---标签--- nextValidTime:'Next Valid Time', @@ -1853,6 +1853,107 @@ export default { lblWidthDialog: '100px', }, + // ***************系统监控：服务监控*************** + Monitor_Service:{ + property: 'Property', + value: 'Value', + memory: 'Memory', + + cpu_Infomation: 'CPU Information', + cpu_Cores: 'Cores', + cpu_UserUsage: 'User Usage', + cpu_SystemUsage: 'System Usage', + cpu_Idle: 'Idle', + + memory_Infomation: 'Memory Information', + memory_total: 'Total Memory', + memory_Used: 'Used Memory', + memory_Free: 'Free Memory', + memory_Usage: 'Usage', + + server_Information: 'Server Information', + server_Name: "Server Name", + server_Ip: "Server IP", + server_OS: "System OS", + server_OSArch: "System OS Arch", + + jvm_Information: 'JVM Information', + jvm_Name: "Java Name", + jvm_Version: "Java Version", + jvm_StartTime: "StartTime", + jvm_RunningTime: "RunTime", + jvm_InstallPath: "Install Path", + jvm_ProjectPath: "Project Path", + jvm_Arguments: "Arguments", + + disk_Information: 'Disk Information', + disk_Path: "Path", + disk_FileSystem: "File System", + disk_Type: "Type", + disk_TotalSize: "Total Size", + disk_AvailableSize: "Available Size", + disk_UsedSize: "Used Size", + disk_UsedPercent: "Used Percent", + + textLoading: "Loading...", + + }, + + // ***************系统监控：缓存监控*************** + Monitor_Cache:{ + basInfomation: 'Basic Information', + redisVersion: 'Redis Version', + redisMode: 'Redis Mode', + port: 'Port', + connectedClients: 'Connected Clients', + + runningTime: 'Running Time', + memoryUsed: 'Memory Used', + cpuUsed: 'CPU Used', + memorySize: 'Memory Size', + + AOFIsOpen: "AOF IsOpen", + RDBIsEnable: "RDB IsEnable", + keySize: "Key Size", + netInputAndOutput: "netInput/Output", + + commandStats: 'Command Stats', + memoryUsedInfo: "Memory Infomation", + + command: "Command", + peakValue: "Peak Value", + cacheMemoryUsed: "Cache Memory Used", + textLoading: "Loading...", + + }, + + // ***************系统监控：缓存列表*************** + Monitor_CacheList:{ + cacheList: 'Cache List', + Id: 'Id', + cacheName: 'Cache Name', + remark: 'Remark', + operation: 'Operation', + + keyList: 'Key List', + cacheKey: 'Cache Key', + + CacheInfo: "Cache Info", + cacheValue: "Cache Value", + + refreshCacheSuccessInfo: "Refresh Cache Success", + refreshKeySuccessInfo: "Refresh Key Success", + clearAllCacheSuccessInfo: "Clear All Cache Success", + + textSuccess:'] Success', + textClearCacheName:'Clear Cache Name[', + textClearCacheKey:'Clear Cache Key[', + + btnRefresh: 'Refresh', + btnClearAll: 'Clear', + + }, + // ***************出库作业流水查询************* searchViewOutJobFlow: { diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index ec55dfd..3423656 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -1880,25 +1880,102 @@ export default { // ***************系统监控：服务监控*************** Monitor_Service:{ - Property: '属性', - Value: '值', - RAM: '内存', + property: '属性', + value: '值', + memory: '内存', - cores: '核心数', - userUsageRate: '用户使用率', - systemUsageRate: '系统使用率', - idleRate: '当先空闲率', + cpu_Infomation: 'CPU', + cpu_Cores: '核心数', + cpu_UserUsage: '用户使用率', + cpu_SystemUsage: '系统使用率', + cpu_Idle: '当先空闲率', - swap: 'Swap', - os: 'OS', - host: 'Host', - name: 'Name', - version: 'Version', - arch: 'Arch', - time: 'Time', - ip: 'IP', - mac: 'MAC', - cpu_cores: 'CPU Cores', + memory_Infomation: '内存', + memory_total: '总内存', + memory_Used: '已用内存', + memory_Free: '剩余内存', + memory_Usage: '使用率', + + server_Information: '服务器信息', + server_Name: "服务器名称", + server_Ip: "服务器IP", + server_OS: "操作系统", + server_OSArch: "系统架构", + + jvm_Information: '服务器信息', + jvm_Name: "服务器名称", + jvm_Version: "服务器版本", + jvm_StartTime: "启动时间", + jvm_RunTime: "运行时长", + jvm_InstallPath: "安装路径", + jvm_ProjectPath: "项目路径", + jvm_Arguments: "运行参数", + + disk_Information: '磁盘信息', + disk_Path: "盘符路径", + disk_FileSystem: "文件系统", + disk_Type: "盘符类型", + disk_TotalSize: "总容量", + disk_AvailableSize: "可用容量", + disk_UsedSize: "已用容量", + disk_UsedPercent: "已用百分比", + + textLoading: "正在加载服务监控数据，请稍候！", + + }, + + // ***************系统监控：缓存监控*************** + Monitor_Cache:{ + basInfomation: '基本信息', + redisVersion: 'Redis版本', + redisMode: '运行模式', + port: '端口', + connectedClients: '客户端数', + + runningTime: '运行时间(天)', + memoryUsed: '使用内存', + cpuUsed: '使用CPU', + memorySize: '内存配置', + + AOFIsOpen: "AOF是否开启", + RDBIsEnable: "RDB是否成功", + keySize: "Key数量", + netInputAndOutput: "网络入口/出口", + + commandStats: '命令统计', + memoryUsedInfo: "内存信息", + + command: "命令", + peakValue: "峰值", + cacheMemoryUsed: "内存消耗", + textLoading: "正在加载缓存监控数据，请稍候！", + + }, + + // ***************系统监控：缓存列表*************** + Monitor_CacheList:{ + cacheList: '缓存列表', + Id: '序号', + cacheName: '缓存名称', + remark: '备注', + operation: '操作', + + keyList: '键名列表', + cacheKey: '缓存键名', + + CacheInfo: "缓存信息", + cacheValue: "缓存内容", + + refreshCacheSuccessInfo: "刷新缓存列表成功", + refreshKeySuccessInfo: "刷新键名列表成功", + clearAllCacheSuccessInfo: "清理全部缓存成功", + + textSuccess:']成功', + textClearCacheName:'清理缓存名称[', + textClearCacheKey:'清理缓存键名[', + + btnRefresh: '刷新', + btnClearAll: '清理全部', }, diff --git a/ruoyi-ui/src/views/monitor/cache/index.vue b/ruoyi-ui/src/views/monitor/cache/index.vue index f8b6648..1c9ca61 100644 --- a/ruoyi-ui/src/views/monitor/cache/index.vue +++ b/ruoyi-ui/src/views/monitor/cache/index.vue @@ -3,38 +3,50 @@ -
基本信息
+
{{ $t('Monitor_Cache.basInfomation') }}
- + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + @@ -45,7 +57,8 @@ -
命令统计
+ +
{{ $t('Monitor_Cache.commandStats') }}
@@ -54,7 +67,8 @@ -
内存信息
+ +
{{ $t('Monitor_Cache.memoryUsedInfo') }}
@@ -99,7 +113,8 @@ export default { }, series: [ { - name: "命令", + // 命令 + name: this.$t('Monitor_Cache.command'), type: "pie", roseType: "radius", radius: [15, 95], @@ -117,7 +132,8 @@ export default { }, series: [ { - name: "峰值", + // 峰值 + name: this.$t('Monitor_Cache.peakValue'), type: "gauge", min: 0, max: 1000, @@ -127,7 +143,8 @@ export default { data: [ { value: parseFloat(this.cache.info.used_memory_human), - name: "内存消耗", + // 内存消耗 + name: this.$t('Monitor_Cache.cacheMemoryUsed'), } ] } @@ -141,7 +158,8 @@ export default { }, // 打开加载层 openLoading() { - this.$modal.loading("正在加载缓存监控数据，请稍候！") + // 提示：正在加载缓存监控数据，请稍候 + this.$modal.loading(this.$t('Monitor_Cache.cacheMemoryUsed')) } } } diff --git a/ruoyi-ui/src/views/monitor/cache/list.vue b/ruoyi-ui/src/views/monitor/cache/list.vue index 9e0523e..c84d093 100644 --- a/ruoyi-ui/src/views/monitor/cache/list.vue +++ b/ruoyi-ui/src/views/monitor/cache/list.vue @@ -1,17 +1,21 @@
Redis版本
{{ $t('Monitor_Cache.redisVersion') }}
{{ cache.info.redis_version }}
运行模式
{{ $t('Monitor_Cache.redisMode') }}
{{ cache.info.redis_mode == "standalone" ? "单机" : "集群" }}
端口
{{ $t('Monitor_Cache.port') }}
{{ cache.info.tcp_port }}
客户端数
{{ $t('Monitor_Cache.connectedClients') }}
{{ cache.info.connected_clients }}
运行时间(天)
{{ $t('Monitor_Cache.runningTime') }}
{{ cache.info.uptime_in_days }}
使用内存
{{ $t('Monitor_Cache.memoryUsed') }}
{{ cache.info.used_memory_human }}
使用CPU
{{ $t('Monitor_Cache.cpuUsed') }}
{{ parseFloat(cache.info.used_cpu_user_children).toFixed(2) }}
内存配置
{{ $t('Monitor_Cache.memorySize') }}
{{ cache.info.maxmemory_human }}
AOF是否开启
{{ $t('Monitor_Cache.AOFIsOpen') }}
{{ cache.info.aof_enabled == "0" ? "否" : "是" }}
RDB是否成功
{{ $t('Monitor_Cache.RDBIsEnable') }}
{{ cache.info.rdb_last_bgsave_status }}
Key数量
{{ $t('Monitor_Cache.keySize') }}
{{ cache.dbSize }}
网络入口/出口
{{ $t('Monitor_Cache.netInputAndOutput') }}
{{ cache.info.instantaneous_input_kbps }}kps/{{cache.info.instantaneous_output_kbps}}kps