From af0e0a110e7187bf008655f7510199a0c0b25ec4 Mon Sep 17 00:00:00 2001
From: Nymph2333 <498092988@qq.com>
Date: 星期一, 10 四月 2023 14:27:40 +0800
Subject: [PATCH] newInstance() 已弃用,使用clazz.getDeclaredConstructor().newInstance() This method propagates any exception thrown by the nullary constructor, including a checked exception. Use of this method effectively bypasses the compile-time exception checking that would otherwise be performed by the compiler. The Constructor.newInstance method avoids this problem by wrapping any exception thrown by the constructor in a (checked) InvocationTargetException. The call clazz.newInstance() can be replaced by clazz.getDeclaredConstructor().newInstance() The latter sequence of calls is inferred to be able to throw the additional exception types InvocationTargetException and NoSuchMethodException. Both of these exception types are subclasses of ReflectiveOperationException.
---
ruoyi-ui/src/views/monitor/server/index.vue | 150 ++++++++++++++++++++++++-------------------------
1 files changed, 74 insertions(+), 76 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/server/index.vue b/ruoyi-ui/src/views/monitor/server/index.vue
index 36c95e3..c1feada 100644
--- a/ruoyi-ui/src/views/monitor/server/index.vue
+++ b/ruoyi-ui/src/views/monitor/server/index.vue
@@ -3,31 +3,31 @@
<el-row>
<el-col :span="12" class="card-box">
<el-card>
- <div slot="header"><span>CPU</span></div>
+ <div slot="header"><span><i class="el-icon-cpu"></i> CPU</span></div>
<div class="el-table el-table--enable-row-hover el-table--medium">
<table cellspacing="0" style="width: 100%;">
<thead>
<tr>
- <th class="is-leaf"><div class="cell">属性</div></th>
- <th class="is-leaf"><div class="cell">值</div></th>
+ <th class="el-table__cell is-leaf"><div class="cell">属性</div></th>
+ <th class="el-table__cell is-leaf"><div class="cell">值</div></th>
</tr>
</thead>
<tbody>
<tr>
- <td><div class="cell">核心数</div></td>
- <td><div class="cell" v-if="server.cpu">{{ server.cpu.cpuNum }}</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="server.cpu">{{ server.cpu.cpuNum }}</div></td>
</tr>
<tr>
- <td><div class="cell">用户使用率</div></td>
- <td><div class="cell" v-if="server.cpu">{{ server.cpu.used }}%</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="server.cpu">{{ server.cpu.used }}%</div></td>
</tr>
<tr>
- <td><div class="cell">系统使用率</div></td>
- <td><div class="cell" v-if="server.cpu">{{ server.cpu.sys }}%</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="server.cpu">{{ server.cpu.sys }}%</div></td>
</tr>
<tr>
- <td><div class="cell">当前空闲率</div></td>
- <td><div class="cell" v-if="server.cpu">{{ server.cpu.free }}%</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="server.cpu">{{ server.cpu.free }}%</div></td>
</tr>
</tbody>
</table>
@@ -37,36 +37,36 @@
<el-col :span="12" class="card-box">
<el-card>
- <div slot="header"><span>内存</span></div>
+ <div slot="header"><span><i class="el-icon-tickets"></i> 内存</span></div>
<div class="el-table el-table--enable-row-hover el-table--medium">
<table cellspacing="0" style="width: 100%;">
<thead>
<tr>
- <th class="is-leaf"><div class="cell">属性</div></th>
- <th class="is-leaf"><div class="cell">内存</div></th>
- <th class="is-leaf"><div class="cell">JVM</div></th>
+ <th class="el-table__cell is-leaf"><div class="cell">属性</div></th>
+ <th class="el-table__cell is-leaf"><div class="cell">内存</div></th>
+ <th class="el-table__cell is-leaf"><div class="cell">JVM</div></th>
</tr>
</thead>
<tbody>
<tr>
- <td><div class="cell">总内存</div></td>
- <td><div class="cell" v-if="server.mem">{{ server.mem.total }}G</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.total }}M</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="server.mem">{{ server.mem.total }}G</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.total }}M</div></td>
</tr>
<tr>
- <td><div class="cell">已用内存</div></td>
- <td><div class="cell" v-if="server.mem">{{ server.mem.used}}G</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.used}}M</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="server.mem">{{ server.mem.used}}G</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.used}}M</div></td>
</tr>
<tr>
- <td><div class="cell">剩余内存</div></td>
- <td><div class="cell" v-if="server.mem">{{ server.mem.free }}G</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.free }}M</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="server.mem">{{ server.mem.free }}G</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.free }}M</div></td>
</tr>
<tr>
- <td><div class="cell">使用率</div></td>
- <td><div class="cell" v-if="server.mem" :class="{'text-danger': server.mem.usage > 80}">{{ server.mem.usage }}%</div></td>
- <td><div class="cell" v-if="server.jvm" :class="{'text-danger': server.jvm.usage > 80}">{{ server.jvm.usage }}%</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="server.mem" :class="{'text-danger': server.mem.usage > 80}">{{ server.mem.usage }}%</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm" :class="{'text-danger': server.jvm.usage > 80}">{{ server.jvm.usage }}%</div></td>
</tr>
</tbody>
</table>
@@ -77,22 +77,22 @@
<el-col :span="24" class="card-box">
<el-card>
<div slot="header">
- <span>服务器信息</span>
+ <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">服务器名称</div></td>
- <td><div class="cell" v-if="server.sys">{{ server.sys.computerName }}</div></td>
- <td><div class="cell">操作系统</div></td>
- <td><div class="cell" v-if="server.sys">{{ server.sys.osName }}</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="server.sys">{{ server.sys.computerName }}</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="server.sys">{{ server.sys.osName }}</div></td>
</tr>
<tr>
- <td><div class="cell">服务器IP</div></td>
- <td><div class="cell" v-if="server.sys">{{ server.sys.computerIp }}</div></td>
- <td><div class="cell">系统架构</div></td>
- <td><div class="cell" v-if="server.sys">{{ server.sys.osArch }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">服务器IP</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.computerIp }}</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="server.sys">{{ server.sys.osArch }}</div></td>
</tr>
</tbody>
</table>
@@ -103,30 +103,34 @@
<el-col :span="24" class="card-box">
<el-card>
<div slot="header">
- <span>Java虚拟机信息</span>
+ <span><i class="el-icon-coffee-cup"></i> Java虚拟机信息</span>
</div>
<div class="el-table el-table--enable-row-hover el-table--medium">
- <table cellspacing="0" style="width: 100%;">
+ <table cellspacing="0" style="width: 100%;table-layout:fixed;">
<tbody>
<tr>
- <td><div class="cell">Java名称</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.name }}</div></td>
- <td><div class="cell">Java版本</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.version }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">Java名称</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.name }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">Java版本</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.version }}</div></td>
</tr>
<tr>
- <td><div class="cell">启动时间</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.startTime }}</div></td>
- <td><div class="cell">运行时长</div></td>
- <td><div class="cell" v-if="server.jvm">{{ server.jvm.runTime }}</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="server.jvm">{{ server.jvm.startTime }}</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="server.jvm">{{ server.jvm.runTime }}</div></td>
</tr>
<tr>
- <td colspan="1"><div class="cell">安装路径</div></td>
- <td colspan="3"><div class="cell" v-if="server.jvm">{{ server.jvm.home }}</div></td>
+ <td colspan="1" class="el-table__cell is-leaf"><div class="cell">安装路径</div></td>
+ <td colspan="3" class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.home }}</div></td>
</tr>
<tr>
- <td colspan="1"><div class="cell">项目路径</div></td>
- <td colspan="3"><div class="cell" v-if="server.sys">{{ server.sys.userDir }}</div></td>
+ <td colspan="1" class="el-table__cell is-leaf"><div class="cell">项目路径</div></td>
+ <td colspan="3" class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.userDir }}</div></td>
+ </tr>
+ <tr>
+ <td colspan="1" class="el-table__cell is-leaf"><div class="cell">运行参数</div></td>
+ <td colspan="3" class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.inputArgs }}</div></td>
</tr>
</tbody>
</table>
@@ -137,30 +141,30 @@
<el-col :span="24" class="card-box">
<el-card>
<div slot="header">
- <span>磁盘状态</span>
+ <span><i class="el-icon-receiving"></i> 磁盘状态</span>
</div>
<div class="el-table el-table--enable-row-hover el-table--medium">
<table cellspacing="0" style="width: 100%;">
<thead>
<tr>
- <th class="is-leaf"><div class="cell">盘符路径</div></th>
- <th class="is-leaf"><div class="cell">文件系统</div></th>
- <th class="is-leaf"><div class="cell">盘符类型</div></th>
- <th class="is-leaf"><div class="cell">总大小</div></th>
- <th class="is-leaf"><div class="cell">可用大小</div></th>
- <th class="is-leaf"><div class="cell">已用大小</div></th>
- <th class="is-leaf"><div class="cell">已用百分比</div></th>
+ <th class="el-table__cell el-table__cell is-leaf"><div class="cell">盘符路径</div></th>
+ <th class="el-table__cell is-leaf"><div class="cell">文件系统</div></th>
+ <th class="el-table__cell is-leaf"><div class="cell">盘符类型</div></th>
+ <th class="el-table__cell is-leaf"><div class="cell">总大小</div></th>
+ <th class="el-table__cell is-leaf"><div class="cell">可用大小</div></th>
+ <th class="el-table__cell is-leaf"><div class="cell">已用大小</div></th>
+ <th class="el-table__cell is-leaf"><div class="cell">已用百分比</div></th>
</tr>
</thead>
<tbody v-if="server.sysFiles">
- <tr v-for="sysFile in server.sysFiles">
- <td><div class="cell">{{ sysFile.dirName }}</div></td>
- <td><div class="cell">{{ sysFile.sysTypeName }}</div></td>
- <td><div class="cell">{{ sysFile.typeName }}</div></td>
- <td><div class="cell">{{ sysFile.total }}</div></td>
- <td><div class="cell">{{ sysFile.free }}</div></td>
- <td><div class="cell">{{ sysFile.used }}</div></td>
- <td><div class="cell" :class="{'text-danger': sysFile.usage > 80}">{{ sysFile.usage }}%</div></td>
+ <tr v-for="(sysFile, index) in server.sysFiles" :key="index">
+ <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.dirName }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.sysTypeName }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.typeName }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.total }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.free }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.used }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" :class="{'text-danger': sysFile.usage > 80}">{{ sysFile.usage }}%</div></td>
</tr>
</tbody>
</table>
@@ -175,10 +179,9 @@
import { getServer } from "@/api/monitor/server";
export default {
+ name: "Server",
data() {
return {
- // 加载层信息
- loading: [],
// 服务器信息
server: []
};
@@ -192,18 +195,13 @@
getList() {
getServer().then(response => {
this.server = response.data;
- this.loading.close();
+ this.$modal.closeLoading();
});
},
// 打开加载层
openLoading() {
- this.loading = this.$loading({
- lock: true,
- text: "拼命读取中",
- spinner: "el-icon-loading",
- background: "rgba(0, 0, 0, 0.7)"
- });
+ this.$modal.loading("正在加载服务监控数据，请稍候！");
}
}
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.2