From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
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.3