diff --git a/internal/web/actions/default/dashboard/index.go b/internal/web/actions/default/dashboard/index.go index 3b8187bb..e6ec58ae 100644 --- a/internal/web/actions/default/dashboard/index.go +++ b/internal/web/actions/default/dashboard/index.go @@ -55,13 +55,16 @@ func (this *IndexAction) RunPost(params struct{}) { this.Data["dashboard"] = maps.Map{ "defaultClusterId": resp.DefaultNodeClusterId, - "countServers": resp.CountServers, - "countNodeClusters": resp.CountNodeClusters, - "countNodes": resp.CountNodes, - "countUsers": resp.CountUsers, - "countAPINodes": resp.CountAPINodes, - "countDBNodes": resp.CountDBNodes, - "countUserNodes": resp.CountUserNodes, + "countServers": resp.CountServers, + "countNodeClusters": resp.CountNodeClusters, + "countNodes": resp.CountNodes, + "countOfflineNodes": resp.CountOfflineNodes, + "countUsers": resp.CountUsers, + "countAPINodes": resp.CountAPINodes, + "countOfflineAPINodes": resp.CountOfflineAPINodes, + "countDBNodes": resp.CountDBNodes, + "countUserNodes": resp.CountUserNodes, + "countOfflineUserNodes": resp.CountOfflineUserNodes, "canGoServers": configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeServer), "canGoNodes": configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeNode), diff --git a/internal/web/actions/default/settings/settingutils/advanced_helper.go b/internal/web/actions/default/settings/settingutils/advanced_helper.go index 65500b7c..6902afc0 100644 --- a/internal/web/actions/default/settings/settingutils/advanced_helper.go +++ b/internal/web/actions/default/settings/settingutils/advanced_helper.go @@ -33,7 +33,9 @@ func (this *AdvancedHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNex if configloaders.AllowModule(adminId, configloaders.AdminModuleCodeSetting) { tabbar.Add("数据库", "", "/settings/database", "", this.tab == "database") tabbar.Add("API节点", "", "/api", "", this.tab == "apiNodes") - tabbar.Add("用户节点", "", "/settings/userNodes", "", this.tab == "userNodes") + if teaconst.IsPlus { + tabbar.Add("用户节点", "", "/settings/userNodes", "", this.tab == "userNodes") + } tabbar.Add("日志数据库", "", "/db", "", this.tab == "dbNodes") if teaconst.IsPlus { tabbar.Add("监控节点", "", "/settings/monitorNodes", "", this.tab == "monitorNodes") diff --git a/internal/web/actions/default/settings/user-nodes/index.go b/internal/web/actions/default/settings/user-nodes/index.go index 6e4d620a..0ea2467f 100644 --- a/internal/web/actions/default/settings/user-nodes/index.go +++ b/internal/web/actions/default/settings/user-nodes/index.go @@ -3,6 +3,7 @@ package usernodes import ( "encoding/json" "fmt" + teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -20,6 +21,11 @@ func (this *IndexAction) Init() { } func (this *IndexAction) RunGet(params struct{}) { + if !teaconst.IsPlus { + this.RedirectURL("/") + return + } + countResp, err := this.RPC().UserNodeRPC().CountAllEnabledUserNodes(this.AdminContext(), &pb.CountAllEnabledUserNodesRequest{}) if err != nil { this.ErrorPage(err) diff --git a/web/views/@default/dashboard/boards/dns.html b/web/views/@default/dashboard/boards/dns.html index 84ba4459..40139985 100644 --- a/web/views/@default/dashboard/boards/dns.html +++ b/web/views/@default/dashboard/boards/dns.html @@ -18,7 +18,9 @@

节点

{{board.countNodes}} - {{board.countOfflineNodes}}离线 + + / {{board.countOfflineNodes}}离线 +
diff --git a/web/views/@default/dashboard/boards/index.html b/web/views/@default/dashboard/boards/index.html index 60a517af..55331528 100644 --- a/web/views/@default/dashboard/boards/index.html +++ b/web/views/@default/dashboard/boards/index.html @@ -59,17 +59,25 @@

边缘节点

-
{{dashboard.countNodes}}
+
+ {{dashboard.countNodes}}个 + / {{dashboard.countOfflineNodes}}离线{{dashboard.countOfflineNodes}}离线 +

API节点

-
{{dashboard.countAPINodes}}
+
+ {{dashboard.countAPINodes}}个 + / {{dashboard.countOfflineAPINodes}}离线{{dashboard.countOfflineAPINodes}}离线 +

用户

-
{{dashboard.countUsers}}
+
{{dashboard.countUsers}}个 + / {{dashboard.countOfflineUserNodes}}节点离线{{dashboard.countOfflineUserNodes}}节点离线 +
diff --git a/web/views/@default/dashboard/boards/user.html b/web/views/@default/dashboard/boards/user.html index 99faf597..845accea 100644 --- a/web/views/@default/dashboard/boards/user.html +++ b/web/views/@default/dashboard/boards/user.html @@ -18,7 +18,9 @@

用户节点

{{board.countUserNodes}} - {{board.countOfflineUserNodes}}离线 + + / {{board.countOfflineUserNodes}}离线 +
diff --git a/web/views/@default/dashboard/index.html b/web/views/@default/dashboard/index.html index 5bd26583..f3f69800 100644 --- a/web/views/@default/dashboard/index.html +++ b/web/views/@default/dashboard/index.html @@ -33,17 +33,23 @@

边缘节点

-
{{dashboard.countNodes}}
+
{{dashboard.countNodes}}个 + / {{dashboard.countOfflineNodes}}离线{{dashboard.countOfflineNodes}}离线 +

API节点

-
{{dashboard.countAPINodes}}
+
{{dashboard.countAPINodes}}个 + / {{dashboard.countOfflineAPINodes}}离线{{dashboard.countOfflineAPINodes}}离线 +

用户

-
{{dashboard.countUsers}}
+
{{dashboard.countUsers}}个 + / {{dashboard.countOfflineUserNodes}}节点离线{{dashboard.countOfflineUserNodes}}节点离线 +