From 3095bc9773fe50646faa282c77d8961d2cdfc7a7 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Fri, 19 May 2023 11:11:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E8=8A=82=E7=82=B9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=A7=9F=E6=9C=9F=E3=80=81=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E4=B8=BA=E5=A4=87=E7=94=A8=E8=8A=82=E7=82=B9=E7=AD=89=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/clusters/cluster/nodes.go | 2 ++
 internal/web/actions/default/clusters/nodes.go         | 6 ++++--
 web/views/@default/clusters/cluster/nodes.html         | 5 +++++
 web/views/@default/clusters/nodes.html                 | 8 +++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/internal/web/actions/default/clusters/cluster/nodes.go b/internal/web/actions/default/clusters/cluster/nodes.go
index 76994c8e..91a61f46 100644
--- a/internal/web/actions/default/clusters/cluster/nodes.go
+++ b/internal/web/actions/default/clusters/cluster/nodes.go
@@ -209,6 +209,8 @@ func (this *NodesAction) RunGet(params struct {
 			"isInstalled": node.IsInstalled,
 			"isOn":        node.IsOn,
 			"isUp":        node.IsUp,
+			"isBackup":    node.IsBackupForCluster || node.IsBackupForGroup,
+			"offlineDay":  node.OfflineDay,
 			"installStatus": maps.Map{
 				"isRunning":  node.InstallStatus.IsRunning,
 				"isFinished": node.InstallStatus.IsFinished,
diff --git a/internal/web/actions/default/clusters/nodes.go b/internal/web/actions/default/clusters/nodes.go
index 09edfbcc..1cd20379 100644
--- a/internal/web/actions/default/clusters/nodes.go
+++ b/internal/web/actions/default/clusters/nodes.go
@@ -211,6 +211,8 @@ func (this *NodesAction) RunGet(params struct {
 			"isInstalled": node.IsInstalled,
 			"isOn":        node.IsOn,
 			"isUp":        node.IsUp,
+			"isBackup":    node.IsBackupForCluster || node.IsBackupForGroup,
+			"offlineDay":  node.OfflineDay,
 			"installStatus": maps.Map{
 				"isRunning":  node.InstallStatus.IsRunning,
 				"isFinished": node.InstallStatus.IsFinished,
@@ -222,9 +224,9 @@ func (this *NodesAction) RunGet(params struct {
 				"updatedAt":        status.UpdatedAt,
 				"hostname":         status.Hostname,
 				"cpuUsage":         status.CPUUsage,
-				"cpuUsageText":     numberutils.FormatFloat2(status.CPUUsage * 100) + "%",
+				"cpuUsageText":     numberutils.FormatFloat2(status.CPUUsage*100) + "%",
 				"memUsage":         status.MemoryUsage,
-				"memUsageText":     numberutils.FormatFloat2(status.MemoryUsage * 100) + "%",
+				"memUsageText":     numberutils.FormatFloat2(status.MemoryUsage*100) + "%",
 				"trafficInBytes":   status.TrafficInBytes,
 				"trafficOutBytes":  status.TrafficOutBytes,
 				"load1m":           numberutils.PadFloatZero(numberutils.FormatFloat2(status.Load1m), 2),
diff --git a/web/views/@default/clusters/cluster/nodes.html b/web/views/@default/clusters/cluster/nodes.html
index 0a84bd45..6ec9282f 100644
--- a/web/views/@default/clusters/cluster/nodes.html
+++ b/web/views/@default/clusters/cluster/nodes.html
@@ -76,6 +76,11 @@
 	<tr v-for="(node, nodeIndex) in nodes">
         <td class="node-name-td"><a :href="'/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + node.id">{{node.name}}<sup v-if="node.level > 1"><span class="blue"> &nbsp;L{{node.level}}</span></sup></a>
 
+            <a :href="'/clusters/cluster/node/settings/schedule?clusterId=' + node.cluster.id + '&nodeId=' + node.id">
+                <sup v-if="node.isBackup"><span class="blue"> &nbsp;备用</span></sup>
+                <sup v-if="node.offlineDay != null && node.offlineDay.length > 0"><span class="blue"> &nbsp;到{{node.offlineDay.substring(0, 4)}}-{{node.offlineDay.substring(4, 6)}}-{{node.offlineDay.substring(6, 8)}}</span></sup>
+            </a>
+
             <a :href="'/clusters/cluster/node/update?clusterId=' + clusterId + '&nodeId=' + node.id" title="设置"><i class="icon setting grey"></i></a>
 
             <div v-if="node.region != null">
diff --git a/web/views/@default/clusters/nodes.html b/web/views/@default/clusters/nodes.html
index 4a6de9bb..c2e3f4e5 100644
--- a/web/views/@default/clusters/nodes.html
+++ b/web/views/@default/clusters/nodes.html
@@ -68,7 +68,13 @@
     </tr>
     </thead>
     <tr v-for="(node, nodeIndex) in nodes">
-        <td class="node-name-td"><a :href="'/clusters/cluster/node?clusterId=' + node.cluster.id + '&nodeId=' + node.id">{{node.name}}<sup v-if="node.level > 1"><span class="blue"> &nbsp;L{{node.level}}</span></sup></a>
+        <td class="node-name-td"><a :href="'/clusters/cluster/node?clusterId=' + node.cluster.id + '&nodeId=' + node.id">{{node.name}}
+                <sup v-if="node.level > 1"><span class="blue"> &nbsp;L{{node.level}}</span></sup>
+            </a>
+            <a :href="'/clusters/cluster/node/settings/schedule?clusterId=' + node.cluster.id + '&nodeId=' + node.id">
+                <sup v-if="node.isBackup"><span class="blue"> &nbsp;备用</span></sup>
+            <sup v-if="node.offlineDay != null && node.offlineDay.length > 0"><span class="blue"> &nbsp;到{{node.offlineDay.substring(0, 4)}}-{{node.offlineDay.substring(4, 6)}}-{{node.offlineDay.substring(6, 8)}}</span></sup>
+            </a>
 
             <a :href="'/clusters/cluster/node/update?clusterId=' + node.cluster.id + '&nodeId=' + node.id" title="设置"><i class="icon setting grey"></i></a>