diff --git a/apps/web-antd/src/adapter/vxe-table.ts b/apps/web-antd/src/adapter/vxe-table.ts index 0604cfbf4..d82acec20 100644 --- a/apps/web-antd/src/adapter/vxe-table.ts +++ b/apps/web-antd/src/adapter/vxe-table.ts @@ -21,7 +21,7 @@ setupVbenVxeTable({ columnConfig: { resizable: true, }, - minHeight: 320, + minHeight: 180, formConfig: { // 全局禁用vxe-table的表单配置,使用formOptions enabled: false, diff --git a/apps/web-antd/src/locales/langs/en-US/page.json b/apps/web-antd/src/locales/langs/en-US/page.json index b423e3ecd..986d05f43 100644 --- a/apps/web-antd/src/locales/langs/en-US/page.json +++ b/apps/web-antd/src/locales/langs/en-US/page.json @@ -35,18 +35,8 @@ "sysRole": "System Role", "sysUser": "System User" }, - "table": { - "created_time": "Create Time", - "id": "ID", - "mark": "Mark", - "operation": "Operation", - "updated_time": "Update time" - }, "monitor": { "redis": { - "desc": { - "title": "Basic Information" - }, "cards": { "commands": { "title": "Command Statistics" @@ -55,29 +45,66 @@ "title": "Memory Status" } }, - "stats": { - "title": { - "used_memory": "Used Memory" - } + "desc": { + "title": "Basic Information" }, "info": { - "title": "Basic Info", - "version": "Version", - "mode": "Mode", - "os": "OS", "arch": "Arch", - "uptime": "Uptime", "clients": "Connections", - "memory_human": "Allocated Memory", - "connections_received": "Connections Received", "commands_processed": "Commands Processed", - "rejected_connections": "Rejected Connections", + "connections_received": "Connections Received", "keys_command_stats": "Keys Stats", + "keys_num": "Keys Num", + "memory_human": "Allocated Memory", + "mode": "Mode", + "os": "OS", + "rejected_connections": "Rejected Connections", "role": "Role", + "title": "Basic Info", + "uptime": "Uptime", "used_cpu": "Used CPU", "used_cpu_children": "Used CPU Children", - "keys_num": "Keys Num" + "version": "Version" + }, + "stats": { + "title": { + "used_memory": "Used Memory" + } } + }, + "server": { + "cpu": { + "current_freq": "Current Freq", + "logical_num": "Logical Num", + "physical_num": "Physical Num", + "usage": "Usage" + }, + "disk": { + "device": "Device", + "dir": "Dir", + "free": "Free", + "title": "Disk", + "total": "Total", + "type": "Type", + "usage": "Usage", + "used": "Used" + }, + "memory": { + "free": "Free", + "title": "Memory", + "total": "Total", + "usage": "Usage", + "used": "Used" + }, + "service": "Service", + "system": "System" } + }, + "table": { + "created_time": "Created Time", + "id": "ID", + "mark": "Mark", + "operation": "Operation", + "updated_time": "Updated time" } } diff --git a/apps/web-antd/src/locales/langs/zh-CN/page.json b/apps/web-antd/src/locales/langs/zh-CN/page.json index 1ebcb019a..648d594c8 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/page.json +++ b/apps/web-antd/src/locales/langs/zh-CN/page.json @@ -35,18 +35,8 @@ "sysRole": "系统角色", "sysUser": "系统角色" }, - "table": { - "created_time": "创建时间", - "id": "序号", - "mark": "备注", - "operation": "操作", - "updated_time": "更新时间" - }, "monitor": { "redis": { - "desc": { - "title": "基本信息" - }, "cards": { "commands": { "title": "命令统计" @@ -55,29 +45,66 @@ "title": "内存情况" } }, - "stats": { - "title": { - "used_memory": "已使用内存" - } + "desc": { + "title": "基本信息" }, "info": { - "title": "基础信息", - "version": "版本", - "mode": "模式", - "os": "操作系统", "arch": "架构", - "uptime": "运行时间", "clients": "连接数", - "memory_human": "已分配内存", - "connections_received": "可接受连接数", "commands_processed": "已执行命令", - "rejected_connections": "已拒绝连接", + "connections_received": "可接受连接数", "keys_command_stats": "查询次数", + "keys_num": "Keys 数量", + "memory_human": "已分配内存", + "mode": "模式", + "os": "操作系统", + "rejected_connections": "已拒绝连接", "role": "角色", + "title": "基础信息", + "uptime": "运行时间", "used_cpu": "CPU 消耗", "used_cpu_children": "后台 CPU 占用", - "keys_num": "Keys 数量" + "version": "版本" + }, + "stats": { + "title": { + "used_memory": "已使用内存" + } } + }, + "server": { + "cpu": { + "current_freq": "当前频率", + "logical_num": "逻辑核心数", + "physical_num": "物理核心数", + "usage": "使用率" + }, + "disk": { + "device": "设备", + "dir": "路径", + "free": "空闲", + "title": "磁盘", + "total": "总计", + "type": "类型", + "usage": "使用率", + "used": "已使用" + }, + "memory": { + "free": "空闲", + "title": "内存", + "total": "总量", + "usage": "使用率", + "used": "已使用" + }, + "service": "服务", + "system": "系统" } + }, + "table": { + "created_time": "创建时间", + "id": "序号", + "mark": "备注", + "operation": "操作", + "updated_time": "更新时间" } } diff --git a/apps/web-antd/src/views/monitor/redis/index.vue b/apps/web-antd/src/views/monitor/redis/index.vue index c91c10d74..7696196fd 100644 --- a/apps/web-antd/src/views/monitor/redis/index.vue +++ b/apps/web-antd/src/views/monitor/redis/index.vue @@ -105,8 +105,8 @@ watch(redisInfo, (val) => {