From 8cf8c8acd059969b9e79ad1c2f9f1921cc42d69c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 07 十一月 2023 11:38:19 +0800
Subject: [PATCH] 修复外链带端口出现的异常(I86J4B)
---
ruoyi-ui/src/views/monitor/cache/index.vue | 91 ++++++++++++++++++++-------------------------
1 files changed, 41 insertions(+), 50 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/cache/index.vue b/ruoyi-ui/src/views/monitor/cache/index.vue
index 98eed22..aacc7da 100644
--- a/ruoyi-ui/src/views/monitor/cache/index.vue
+++ b/ruoyi-ui/src/views/monitor/cache/index.vue
@@ -3,39 +3,39 @@
<el-row>
<el-col :span="24" class="card-box">
<el-card>
- <div slot="header"><span>基本信息</span></div>
+ <div slot="header"><span><i class="el-icon-monitor"></i> 基本信息</span></div>
<div class="el-table el-table--enable-row-hover el-table--medium">
<table cellspacing="0" style="width: 100%">
<tbody>
<tr>
- <td><div class="cell">Redis版本</div></td>
- <td><div class="cell" v-if="cache.info">{{ cache.info.redis_version }}</div></td>
- <td><div class="cell">运行模式</div></td>
- <td><div class="cell" v-if="cache.info">{{ cache.info.redis_mode == "standalone" ? "单机" : "集群" }}</div></td>
- <td><div class="cell">端口</div></td>
- <td><div class="cell" v-if="cache.info">{{ cache.info.tcp_port }}</div></td>
- <td><div class="cell">客户端数</div></td>
- <td><div class="cell" v-if="cache.info">{{ cache.info.connected_clients }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">Redis版本</div></td>
+ <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">运行模式</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">端口</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.tcp_port }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">客户端数</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.connected_clients }}</div></td>
</tr>
<tr>
- <td><div class="cell">运行时间(天)</div></td>
- <td><div class="cell" v-if="cache.info">{{ cache.info.uptime_in_days }}</div></td>
- <td><div class="cell">使用内存</div></td>
- <td><div class="cell" v-if="cache.info">{{ cache.info.used_memory_human }}</div></td>
- <td><div class="cell">使用CPU</div></td>
- <td><div class="cell" v-if="cache.info">{{ parseFloat(cache.info.used_cpu_user_children).toFixed(2) }}</div></td>
- <td><div class="cell">内存配置</div></td>
- <td><div class="cell" v-if="cache.info">{{ cache.info.maxmemory_human }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">运行时间(天)</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.uptime_in_days }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">使用内存</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.used_memory_human }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">使用CPU</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ parseFloat(cache.info.used_cpu_user_children).toFixed(2) }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">内存配置</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.maxmemory_human }}</div></td>
</tr>
<tr>
- <td><div class="cell">AOF是否开启</div></td>
- <td><div class="cell" v-if="cache.info">{{ cache.info.aof_enabled == "0" ? "否" : "是" }}</div></td>
- <td><div class="cell">RDB是否成功</div></td>
- <td><div class="cell" v-if="cache.info">{{ cache.info.rdb_last_bgsave_status }}</div></td>
- <td><div class="cell">Key数量</div></td>
- <td><div class="cell" v-if="cache.dbSize">{{ cache.dbSize }} </div></td>
- <td><div class="cell">网络入口/出口</div></td>
- <td><div class="cell" v-if="cache.info">{{ cache.info.instantaneous_input_kbps }}kps/{{cache.info.instantaneous_output_kbps}}kps</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">AOF是否开启</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">RDB是否成功</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.rdb_last_bgsave_status }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">Key数量</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.dbSize">{{ cache.dbSize }} </div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">网络入口/出口</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.instantaneous_input_kbps }}kps/{{cache.info.instantaneous_output_kbps}}kps</div></td>
</tr>
</tbody>
</table>
@@ -45,7 +45,7 @@
<el-col :span="12" class="card-box">
<el-card>
- <div slot="header"><span>命令统计</span></div>
+ <div slot="header"><span><i class="el-icon-pie-chart"></i> 命令统计</span></div>
<div class="el-table el-table--enable-row-hover el-table--medium">
<div ref="commandstats" style="height: 420px" />
</div>
@@ -54,9 +54,7 @@
<el-col :span="12" class="card-box">
<el-card>
- <div slot="header">
- <span>内存信息</span>
- </div>
+ <div slot="header"><span><i class="el-icon-odometer"></i> 内存信息</span></div>
<div class="el-table el-table--enable-row-hover el-table--medium">
<div ref="usedmemory" style="height: 420px" />
</div>
@@ -68,21 +66,19 @@
<script>
import { getCache } from "@/api/monitor/cache";
-import echarts from "echarts";
+import * as echarts from "echarts";
export default {
- name: "Server",
+ name: "Cache",
data() {
return {
- // 加载层信息
- loading: [],
// 统计命令信息
commandstats: null,
// 使用内存
usedmemory: null,
// cache信息
- cache: [],
- };
+ cache: []
+ }
},
created() {
this.getList();
@@ -93,7 +89,7 @@
getList() {
getCache().then((response) => {
this.cache = response.data;
- this.loading.close();
+ this.$modal.closeLoading();
this.commandstats = echarts.init(this.$refs.commandstats, "macarons");
this.commandstats.setOption({
@@ -111,8 +107,8 @@
data: response.data.commandStats,
animationEasing: "cubicInOut",
animationDuration: 1000,
- },
- ],
+ }
+ ]
});
this.usedmemory = echarts.init(this.$refs.usedmemory, "macarons");
this.usedmemory.setOption({
@@ -132,22 +128,17 @@
{
value: parseFloat(this.cache.info.used_memory_human),
name: "内存消耗",
- },
- ],
- },
- ],
+ }
+ ]
+ }
+ ]
});
});
},
// 打开加载层
openLoading() {
- this.loading = this.$loading({
- lock: true,
- text: "拼命读取中",
- spinner: "el-icon-loading",
- background: "rgba(0, 0, 0, 0.7)",
- });
- },
- },
+ this.$modal.loading("正在加载缓存监控数据，请稍候！");
+ }
+ }
};
</script>
--
Gitblit v1.9.2