From 43d76e599091dc6b79b51f89c79514b50e33ea35 Mon Sep 17 00:00:00 2001
From: fuzui <73400@163.com>
Date: 星期四, 16 十二月 2021 02:18:48 +0800
Subject: [PATCH] fix: cron组件中周回显bug
---
ruoyi-ui/src/views/monitor/cache/index.vue | 65 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 35 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/cache/index.vue b/ruoyi-ui/src/views/monitor/cache/index.vue
index c78a220..cafa28c 100644
--- a/ruoyi-ui/src/views/monitor/cache/index.vue
+++ b/ruoyi-ui/src/views/monitor/cache/index.vue
@@ -8,34 +8,34 @@
<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>
@@ -74,8 +74,6 @@
name: "Server",
data() {
return {
- // 加载层信息
- loading: [],
// 统计命令信息
commandstats: null,
// 使用内存
@@ -93,7 +91,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({
@@ -117,14 +115,16 @@
this.usedmemory = echarts.init(this.$refs.usedmemory, "macarons");
this.usedmemory.setOption({
tooltip: {
- formatter: "{b} <br/>{a} : {c}M",
+ formatter: "{b} <br/>{a} : " + this.cache.info.used_memory_human,
},
series: [
{
name: "峰值",
type: "gauge",
+ min: 0,
+ max: 1000,
detail: {
- formatter: "{value}M",
+ formatter: this.cache.info.used_memory_human,
},
data: [
{
@@ -139,12 +139,7 @@
},
// 打开加载层
openLoading() {
- this.loading = this.$loading({
- lock: true,
- text: "拼命读取中",
- spinner: "el-icon-loading",
- background: "rgba(0, 0, 0, 0.7)",
- });
+ this.$modal.loading("正在加载缓存监控数据，请稍候！");
},
},
};
--
Gitblit v1.9.2