diff --git a/internal/web/actions/default/clusters/cluster/node/detail.go b/internal/web/actions/default/clusters/cluster/node/detail.go index 7ea65395..f0479c22 100644 --- a/internal/web/actions/default/clusters/cluster/node/detail.go +++ b/internal/web/actions/default/clusters/cluster/node/detail.go @@ -11,6 +11,7 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/maps" + timeutil "github.com/iwind/TeaGo/utils/time" "time" ) @@ -198,6 +199,8 @@ func (this *DetailAction) RunGet(params struct { // 运行状态 var status = &nodeconfigs.NodeStatus{} + this.Data["nodeDatetime"] = "" + this.Data["nodeTimeDiff"] = 0 if len(node.StatusJSON) > 0 { err = json.Unmarshal(node.StatusJSON, &status) if err != nil { @@ -205,6 +208,19 @@ func (this *DetailAction) RunGet(params struct { return } status.IsActive = status.IsActive && time.Now().Unix()-status.UpdatedAt <= 60 // N秒之内认为活跃 + + if status.Timestamp > 0 { + this.Data["nodeDatetime"] = timeutil.FormatTime("Y-m-d H:i:s", status.Timestamp) + if status.UpdatedAt > 0 { + var diff = status.UpdatedAt - status.Timestamp + if diff < 0 { + diff = -diff + } + this.Data["nodeTimeDiff"] = diff + } + } else if status.UpdatedAt > 0 { + this.Data["nodeDatetime"] = timeutil.FormatTime("Y-m-d H:i:s", status.UpdatedAt) + } } // 检查是否有新版本 diff --git a/web/views/@default/clusters/cluster/node/detail.html b/web/views/@default/clusters/cluster/node/detail.html index 8a07f84c..8bac8cfe 100644 --- a/web/views/@default/clusters/cluster/node/detail.html +++ b/web/views/@default/clusters/cluster/node/detail.html @@ -176,6 +176,7 @@ + CPU用量 @@ -204,6 +205,13 @@ v{{node.status.buildVersion}}   发现新版本v{{newVersion}} » + + + 上次更新时间 + + {{nodeDatetime}} +

当前节点时间与API节点时间相差 {{nodeTimeDiff}} 秒,请同步节点时间。

+