From bcb079e9024dcfd0b480f334a621ccb4ed4dbaa3 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Tue, 30 Nov 2021 16:43:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8A=82=E7=82=B9=E6=97=A5?= =?UTF-8?q?=E5=BF=97=EF=BC=9A=E5=8F=AF=E4=BB=A5=E6=89=B9=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=9C=8D=E5=8A=A1=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=B8=BA=E5=B7=B2=E4=BF=AE=E5=A4=8D=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/actions/default/servers/fixLog.go | 4 ++-- internal/web/actions/default/servers/index.go | 6 ++--- web/views/@default/servers/index.css | 10 ++++++++ web/views/@default/servers/index.css.map | 2 +- web/views/@default/servers/index.html | 6 ++--- web/views/@default/servers/index.js | 23 ++++++++++++++++++- web/views/@default/servers/index.less | 13 +++++++++++ 7 files changed, 54 insertions(+), 10 deletions(-) diff --git a/internal/web/actions/default/servers/fixLog.go b/internal/web/actions/default/servers/fixLog.go index 3835536b..09d40379 100644 --- a/internal/web/actions/default/servers/fixLog.go +++ b/internal/web/actions/default/servers/fixLog.go @@ -12,9 +12,9 @@ type FixLogAction struct { } func (this *FixLogAction) RunPost(params struct { - LogId int64 + LogIds []int64 }) { - _, err := this.RPC().NodeLogRPC().FixNodeLog(this.AdminContext(), &pb.FixNodeLogRequest{NodeLogId: params.LogId}) + _, err := this.RPC().NodeLogRPC().FixNodeLogs(this.AdminContext(), &pb.FixNodeLogsRequest{NodeLogIds: params.LogIds}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/servers/index.go b/internal/web/actions/default/servers/index.go index e5e9bfe1..3b883139 100644 --- a/internal/web/actions/default/servers/index.go +++ b/internal/web/actions/default/servers/index.go @@ -258,7 +258,7 @@ func (this *IndexAction) RunGet(params struct { NodeId: 0, Role: nodeconfigs.NodeRoleNode, Offset: 0, - Size: 10, + Size: 20, Level: "", FixedState: int32(configutils.BoolStateNo), AllServers: true, @@ -279,7 +279,7 @@ func (this *IndexAction) RunGet(params struct { var server = serverResp.Server if server == nil { // 设置为已修复 - _, err = this.RPC().NodeLogRPC().FixNodeLog(this.AdminContext(), &pb.FixNodeLogRequest{NodeLogId: errorLog.Id}) + _, err = this.RPC().NodeLogRPC().FixNodeLogs(this.AdminContext(), &pb.FixNodeLogsRequest{NodeLogIds: []int64{errorLog.Id}}) if err != nil { this.ErrorPage(err) return @@ -297,7 +297,7 @@ func (this *IndexAction) RunGet(params struct { var node = nodeResp.Node if node == nil || node.NodeCluster == nil { // 设置为已修复 - _, err = this.RPC().NodeLogRPC().FixNodeLog(this.AdminContext(), &pb.FixNodeLogRequest{NodeLogId: errorLog.Id}) + _, err = this.RPC().NodeLogRPC().FixNodeLogs(this.AdminContext(), &pb.FixNodeLogsRequest{NodeLogIds: []int64{errorLog.Id}}) if err != nil { this.ErrorPage(err) return diff --git a/web/views/@default/servers/index.css b/web/views/@default/servers/index.css index 4bc06a03..178b01ed 100644 --- a/web/views/@default/servers/index.css +++ b/web/views/@default/servers/index.css @@ -3,4 +3,14 @@ right: 1em; top: 2.2em; } +.ui.message .content { + padding-right: 1em; +} +.node-logs-box { + max-height: 11.6em; + overflow-y: auto; +} +.node-logs-box::-webkit-scrollbar { + width: 4px; +} /*# sourceMappingURL=index.css.map */ \ No newline at end of file diff --git a/web/views/@default/servers/index.css.map b/web/views/@default/servers/index.css.map index 6bf1fbbf..99fa71de 100644 --- a/web/views/@default/servers/index.css.map +++ b/web/views/@default/servers/index.css.map @@ -1 +1 @@ -{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA,GAAG,QACF,MAAK;EACJ,kBAAA;EACA,UAAA;EACA,UAAA","file":"index.css"} \ No newline at end of file +{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA,GAAG,QACF,MAAK;EACJ,kBAAA;EACA,UAAA;EACA,UAAA;;AAJF,GAAG,QAOF;EACC,kBAAA;;AAIF;EACC,kBAAA;EACA,gBAAA;;AAGD,cAAc;EACb,UAAA","file":"index.css"} \ No newline at end of file diff --git a/web/views/@default/servers/index.html b/web/views/@default/servers/index.html index a0f332c9..5204ebad 100644 --- a/web/views/@default/servers/index.html +++ b/web/views/@default/servers/index.html @@ -5,10 +5,10 @@
- 需要修复的错误 + 需要修复的错误  
-
-
+
+
[{{log.createdTime}}] diff --git a/web/views/@default/servers/index.js b/web/views/@default/servers/index.js index 7849c92e..8810bb84 100644 --- a/web/views/@default/servers/index.js +++ b/web/views/@default/servers/index.js @@ -55,7 +55,28 @@ Tea.context(function () { teaweb.confirm("确定要关闭此错误提示吗？", function () { that.$post(".fixLog") .params({ - logId: logId + logIds: logId + }) + .success(function () { + teaweb.reload() + }) + }) + } + + this.fixPageLogs = function () { + let logIds = this.errorLogs.map(function (v) { + return v.id + }) + if (logIds.length == 0) { + teaweb.reload() + return + } + + let that = this + teaweb.confirm("确定要关闭此页错误提示吗？", function () { + that.$post(".fixLog") + .params({ + logIds: logIds }) .success(function () { teaweb.reload() diff --git a/web/views/@default/servers/index.less b/web/views/@default/servers/index.less index 3eb96418..5c74227a 100644 --- a/web/views/@default/servers/index.less +++ b/web/views/@default/servers/index.less @@ -4,4 +4,17 @@ right: 1em; top: 2.2em; } + + .content { + padding-right: 1em; + } +} + +.node-logs-box { + max-height: 11.6em; + overflow-y: auto; +} + +.node-logs-box::-webkit-scrollbar { + width: 4px; } \ No newline at end of file