From 9da44bb452378bbbebfa0384923a4099e3f781be Mon Sep 17 00:00:00 2001
From: wenc000 <450292408@qq.com>
Date: Mon, 10 Aug 2020 22:15:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7=E7=AB=AF?=
=?UTF-8?q?=E7=9A=84=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../templates/client/get-client-info.html | 86 +++++++++++++++++--
1 file changed, 79 insertions(+), 7 deletions(-)
diff --git a/cloud-central-control/src/main/resources/templates/client/get-client-info.html b/cloud-central-control/src/main/resources/templates/client/get-client-info.html
index 8d12964..42e0d4c 100644
--- a/cloud-central-control/src/main/resources/templates/client/get-client-info.html
+++ b/cloud-central-control/src/main/resources/templates/client/get-client-info.html
@@ -137,7 +137,19 @@
text: 'CPU使用情况（%）'
},
tooltip: {
- trigger: 'axis'
+ trigger: 'axis',
+ formatter: function(params, ticket, callback) {
+ var result = '';
+ for(var i = 0, item; item = params[i++];) {
+ if(result.length == 0) {
+ result += (item.name + '
');
+ } else {
+ result += '
';
+ }
+ result += (item.marker + item.seriesName + ': '+ item.data +'%');
+ }
+ return result;
+ }
},
legend: {
data: ['系统使用率', '用户使用率', '空闲率', '等待率']
@@ -151,10 +163,22 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: xDataTimeArray
+ splitLine: {
+ show: true,
+ lineStyle: {
+ type: 'dotted',
+ }
+ },
+ data: xDataTimeArray,
},
yAxis: {
- type: 'value'
+ type: 'value',
+ splitLine: {
+ show: true,
+ lineStyle: {
+ type: 'dotted',
+ }
+ },
},
series: [
{
@@ -198,7 +222,19 @@
text: '内存使用情况（GB）'
},
tooltip: {
- trigger: 'axis'
+ trigger: 'axis',
+ formatter: function(params, ticket, callback) {
+ var result = '';
+ for(var i = 0, item; item = params[i++];) {
+ if(result.length == 0) {
+ result += (item.name + '
');
+ } else {
+ result += '
';
+ }
+ result += (item.marker + item.seriesName + ': '+ item.data +'GB');
+ }
+ return result;
+ }
},
legend: {
data: ['总量', '使用量', '空闲量']
@@ -212,10 +248,22 @@
xAxis: {
type: 'category',
boundaryGap: false,
+ splitLine: {
+ show: true,
+ lineStyle: {
+ type: 'dotted',
+ }
+ },
data: xDataTimeArray
},
yAxis: {
- type: 'value'
+ type: 'value',
+ splitLine: {
+ show: true,
+ lineStyle: {
+ type: 'dotted',
+ }
+ },
},
series: [
{
@@ -254,7 +302,19 @@
text: 'JVM使用情况（MB）'
},
tooltip: {
- trigger: 'axis'
+ trigger: 'axis',
+ formatter: function(params, ticket, callback) {
+ var result = '';
+ for(var i = 0, item; item = params[i++];) {
+ if(result.length == 0) {
+ result += (item.name + '
');
+ } else {
+ result += '
';
+ }
+ result += (item.marker + item.seriesName + ': '+ item.data +'MB');
+ }
+ return result;
+ }
},
legend: {
data: ['初始值', '最大值', '使用值']
@@ -268,10 +328,22 @@
xAxis: {
type: 'category',
boundaryGap: false,
+ splitLine: {
+ show: true,
+ lineStyle: {
+ type: 'dotted',
+ }
+ },
data: xDataTimeArray
},
yAxis: {
- type: 'value'
+ type: 'value',
+ splitLine: {
+ show: true,
+ lineStyle: {
+ type: 'dotted',
+ }
+ },
},
series: [
{