diff --git a/internal/web/actions/default/servers/index.go b/internal/web/actions/default/servers/index.go index b3a2a00e..e5e9bfe1 100644 --- a/internal/web/actions/default/servers/index.go +++ b/internal/web/actions/default/servers/index.go @@ -274,7 +274,9 @@ func (this *IndexAction) RunGet(params struct { this.ErrorPage(err) return } - server := serverResp.Server + + // 服务 + var server = serverResp.Server if server == nil { // 设置为已修复 _, err = this.RPC().NodeLogRPC().FixNodeLog(this.AdminContext(), &pb.FixNodeLogRequest{NodeLogId: errorLog.Id}) @@ -286,6 +288,24 @@ func (this *IndexAction) RunGet(params struct { continue } + // 节点 + nodeResp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: errorLog.NodeId}) + if err != nil { + this.ErrorPage(err) + return + } + var node = nodeResp.Node + if node == nil || node.NodeCluster == nil { + // 设置为已修复 + _, err = this.RPC().NodeLogRPC().FixNodeLog(this.AdminContext(), &pb.FixNodeLogRequest{NodeLogId: errorLog.Id}) + if err != nil { + this.ErrorPage(err) + return + } + + continue + } + errorLogMaps = append(errorLogMaps, maps.Map{ "id": errorLog.Id, "description": errorLog.Description, @@ -293,6 +313,9 @@ func (this *IndexAction) RunGet(params struct { "serverId": errorLog.ServerId, "level": errorLog.Level, "serverName": server.Name, + "nodeId": node.Id, + "nodeName": node.Name, + "clusterId": node.NodeCluster.Id, }) } this.Data["errorLogs"] = errorLogMaps diff --git a/web/views/@default/@layout_override.css b/web/views/@default/@layout_override.css index 1647a0f7..3e3bf680 100644 --- a/web/views/@default/@layout_override.css +++ b/web/views/@default/@layout_override.css @@ -39,4 +39,7 @@ textarea::-webkit-scrollbar { select.dropdown { height: auto !important; } +.message .icon.warning { + font-size: 2em!important; +} /*# sourceMappingURL=@layout_override.css.map */ \ No newline at end of file diff --git a/web/views/@default/@layout_override.css.map b/web/views/@default/@layout_override.css.map index 91bb244d..29a63336 100644 --- a/web/views/@default/@layout_override.css.map +++ b/web/views/@default/@layout_override.css.map @@ -1 +1 @@ -{"version":3,"sources":["@layout_override.less"],"names":[],"mappings":"AACA,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,QAAO;EACrG,oCAAA;;AAGD,GAAG,OAAO,SAAU,MAAK,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,QAAS,QAAO;EACzF,oCAAA;;AAGD,GAAG,MAAM;EACR,kCAAA;;AAID,IACC;EACC,2BAAA;;AAKF,KAAK;EACJ,sBAAA;;AAGD,KAAK,KAAK;EACT,yBAAA;;AAID,KACC,GAAE;AADH,KACY,GAAE;EACZ,6BAAA;EACA,0BAAA;EACA,2BAAA;;AAJF,KAOC,GAAE;EACD,WAAA;;AARF,KAWC,GAAE;EACD,UAAA;;AAZF,KAeC,GAAE;EACD,UAAA;;AAKF,QAAQ;EACP,qBAAA;;AAID,MAAM;EACL,uBAAA","file":"@layout_override.css"} \ No newline at end of file +{"version":3,"sources":["@layout_override.less"],"names":[],"mappings":"AACA,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,QAAO;EACrG,oCAAA;;AAGD,GAAG,OAAO,SAAU,MAAK,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,QAAS,QAAO;EACzF,oCAAA;;AAGD,GAAG,MAAM;EACR,kCAAA;;AAID,IACC;EACC,2BAAA;;AAKF,KAAK;EACJ,sBAAA;;AAGD,KAAK,KAAK;EACT,yBAAA;;AAID,KACC,GAAE;AADH,KACY,GAAE;EACZ,6BAAA;EACA,0BAAA;EACA,2BAAA;;AAJF,KAOC,GAAE;EACD,WAAA;;AARF,KAWC,GAAE;EACD,UAAA;;AAZF,KAeC,GAAE;EACD,UAAA;;AAKF,QAAQ;EACP,qBAAA;;AAID,MAAM;EACL,uBAAA;;AAID,QACC,MAAK;EACJ,wBAAA","file":"@layout_override.css"} \ No newline at end of file diff --git a/web/views/@default/@layout_override.less b/web/views/@default/@layout_override.less index da974cd3..7489a972 100644 --- a/web/views/@default/@layout_override.less +++ b/web/views/@default/@layout_override.less @@ -56,4 +56,11 @@ textarea::-webkit-scrollbar { // dropdown select.dropdown { height: auto !important; +} + +// message +.message { + .icon.warning { + font-size: 2em!important; + } } \ No newline at end of file diff --git a/web/views/@default/servers/index.css b/web/views/@default/servers/index.css index ea4520c6..4bc06a03 100644 --- a/web/views/@default/servers/index.css +++ b/web/views/@default/servers/index.css @@ -1,6 +1,6 @@ -.ui.message .icon { +.ui.message .icon.remove { position: absolute; right: 1em; - top: 1.8em; + top: 2.2em; } /*# 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 f082c7b1..6bf1fbbf 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;EACC,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","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 1a3f496f..7750b3be 100644 --- a/web/views/@default/servers/index.html +++ b/web/views/@default/servers/index.html @@ -8,12 +8,16 @@ 需要修复的错误