diff --git a/internal/web/actions/default/clusters/logs/index.go b/internal/web/actions/default/clusters/logs/index.go index 7d6801de..872661c4 100644 --- a/internal/web/actions/default/clusters/logs/index.go +++ b/internal/web/actions/default/clusters/logs/index.go @@ -120,6 +120,8 @@ func (this *IndexAction) RunGet(params struct { return } + var firstUnreadNodeMap maps.Map = nil + var logs = []maps.Map{} for _, log := range logsResp.NodeLogs { // 节点信息 @@ -132,6 +134,13 @@ func (this *IndexAction) RunGet(params struct { continue } + if params.Type == "unread" && firstUnreadNodeMap == nil { + firstUnreadNodeMap = maps.Map{ + "id": node.Id, + "name": node.Name, + } + } + // 服务信息 var serverMap = maps.Map{"id": 0} if log.ServerId > 0 { @@ -174,5 +183,7 @@ func (this *IndexAction) RunGet(params struct { } this.Data["logs"] = logs + this.Data["firstUnreadNode"] = firstUnreadNodeMap + this.Show() } diff --git a/internal/web/actions/default/clusters/logs/readLogs.go b/internal/web/actions/default/clusters/logs/readLogs.go index c1fcf023..21b081bb 100644 --- a/internal/web/actions/default/clusters/logs/readLogs.go +++ b/internal/web/actions/default/clusters/logs/readLogs.go @@ -5,6 +5,7 @@ package logs import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) @@ -14,9 +15,13 @@ type ReadLogsAction struct { func (this *ReadLogsAction) RunPost(params struct { LogIds []int64 + + NodeId int64 }) { _, err := this.RPC().NodeLogRPC().UpdateNodeLogsRead(this.AdminContext(), &pb.UpdateNodeLogsReadRequest{ NodeLogIds: params.LogIds, + NodeId: params.NodeId, + Role: nodeconfigs.NodeRoleNode, }) if err != nil { this.ErrorPage(err) diff --git a/web/views/@default/clusters/logs/index.html b/web/views/@default/clusters/logs/index.html index d4e89cd3..9d488ae7 100644 --- a/web/views/@default/clusters/logs/index.html +++ b/web/views/@default/clusters/logs/index.html @@ -52,6 +52,7 @@ [本页已读] [全部已读] + ["{{firstUnreadNode.name}}"已读] diff --git a/web/views/@default/clusters/logs/index.js b/web/views/@default/clusters/logs/index.js index efcc8ba0..8e9ab17f 100644 --- a/web/views/@default/clusters/logs/index.js +++ b/web/views/@default/clusters/logs/index.js @@ -27,6 +27,16 @@ Tea.context(function () { }) } + this.updateNodeRead = function (nodeId) { + this.$post(".readLogs") + .params({ + nodeId: nodeId + }) + .success(function () { + teaweb.reload() + }) + } + this.updateAllRead = function () { this.$post(".readAllLogs") .params({})