From 534f10b8a71f885289b90446b15dc7a175d4e28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Thu, 1 Jul 2021 10:39:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E6=95=B0=E6=8D=AE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8D=A0=E6=AF=94=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/servers/metrics/stats.go | 8 ++++++++
 web/views/@default/servers/metrics/stats.html         | 2 ++
 web/views/@default/servers/metrics/update.html        | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/internal/web/actions/default/servers/metrics/stats.go b/internal/web/actions/default/servers/metrics/stats.go
index d6c4c89f..b042c494 100644
--- a/internal/web/actions/default/servers/metrics/stats.go
+++ b/internal/web/actions/default/servers/metrics/stats.go
@@ -3,6 +3,7 @@
 package metrics
 
 import (
+	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
@@ -49,6 +50,12 @@ func (this *StatsAction) RunGet(params struct {
 	}
 	var statMaps = []maps.Map{}
 	for _, stat := range statsResp.MetricStats {
+		// 占比
+		var ratio float32
+		if stat.SumTotal > 0 {
+			ratio = stat.Value * 100 / stat.SumTotal
+		}
+
 		statMaps = append(statMaps, maps.Map{
 			"id":      stat.Id,
 			"time":    serverconfigs.HumanMetricTime(item.PeriodUnit, stat.Time),
@@ -57,6 +64,7 @@ func (this *StatsAction) RunGet(params struct {
 			"cluster": maps.Map{"id": stat.NodeCluster.Id, "name": stat.NodeCluster.Name},
 			"node":    maps.Map{"id": stat.Node.Id, "name": stat.Node.Name},
 			"server":  maps.Map{"id": stat.Server.Id, "name": stat.Server.Name},
+			"ratio":   fmt.Sprintf("%.2f", ratio),
 		})
 	}
 	this.Data["stats"] = statMaps
diff --git a/web/views/@default/servers/metrics/stats.html b/web/views/@default/servers/metrics/stats.html
index d01e5016..b1f57e54 100644
--- a/web/views/@default/servers/metrics/stats.html
+++ b/web/views/@default/servers/metrics/stats.html
@@ -8,6 +8,7 @@
         <tr>
             <th>指标对象</th>
             <th>指标值</th>
+            <th>占比</th>
             <th>时间</th>
             <th>集群</th>
             <th>节点</th>
@@ -17,6 +18,7 @@
     <tr v-for="stat in stats">
         <td>{{stat.keys}}</td>
         <td>{{stat.value}}</td>
+        <td>{{stat.ratio}}%</td>
         <td>{{stat.time}}</td>
         <td>{{stat.cluster.name}}</td>
         <td>{{stat.node.name}}</td>
diff --git a/web/views/@default/servers/metrics/update.html b/web/views/@default/servers/metrics/update.html
index 4723c138..e7905150 100644
--- a/web/views/@default/servers/metrics/update.html
+++ b/web/views/@default/servers/metrics/update.html
@@ -1,7 +1,7 @@
 {$layout "layout"}
 {$template "item_menu"}
 
-<warning-message>修改统计对象、统计周期、统计数值等参数后，将重新记录数据。</warning-message>
+<warning-message>修改统计对象、统计周期、统计数值等任一参数时，将重新记录数据。</warning-message>
 
 <form class="ui form" data-tea-action="$" data-tea-success="success">
     <csrf-token></csrf-token>