diff --git a/agent/app/dto/dashboard.go b/agent/app/dto/dashboard.go index 5cfd7f150..9898ef679 100644 --- a/agent/app/dto/dashboard.go +++ b/agent/app/dto/dashboard.go @@ -3,6 +3,11 @@ package dto import "time" type DashboardBase struct { + WebsiteNumber int `json:"websiteNumber"` + DatabaseNumber int `json:"databaseNumber"` + CronjobNumber int `json:"cronjobNumber"` + AppInstalledNumber int `json:"appInstalledNumber"` + Hostname string `json:"hostname"` OS string `json:"os"` Platform string `json:"platform"` diff --git a/agent/app/service/dashboard.go b/agent/app/service/dashboard.go index db310858a..ed7c2d392 100644 --- a/agent/app/service/dashboard.go +++ b/agent/app/service/dashboard.go @@ -572,22 +572,30 @@ func loadOutboundIP() string { } func loadQuickJump(base *dto.DashboardBase) { + website, _ := websiteRepo.GetBy() + base.WebsiteNumber = len(website) + + postgresqlDbs, _ := postgresqlRepo.List() + mysqlDbs, _ := mysqlRepo.List() + base.DatabaseNumber = len(mysqlDbs) + len(postgresqlDbs) + + cronjobs, _ := cronjobRepo.List() + base.CronjobNumber = len(cronjobs) + + appInstall, _ := appInstallRepo.ListBy(context.Background()) + base.AppInstalledNumber = len(appInstall) + quicks := launcherRepo.ListQuickJump(false) for i := 0; i < len(quicks); i++ { switch quicks[i].Name { case "Website": - website, _ := websiteRepo.GetBy() - quicks[i].Detail = fmt.Sprintf("%d", len(website)) + quicks[i].Detail = fmt.Sprintf("%d", base.WebsiteNumber) case "Database": - postgresqlDbs, _ := postgresqlRepo.List() - mysqlDbs, _ := mysqlRepo.List() - quicks[i].Detail = fmt.Sprintf("%d", len(mysqlDbs)+len(postgresqlDbs)) + quicks[i].Detail = fmt.Sprintf("%d", base.DatabaseNumber) case "Cronjob": - cronjobs, _ := cronjobRepo.List() - quicks[i].Detail = fmt.Sprintf("%d", len(cronjobs)) + quicks[i].Detail = fmt.Sprintf("%d", base.CronjobNumber) case "AppInstalled": - appInstall, _ := appInstallRepo.ListBy(context.Background()) - quicks[i].Detail = fmt.Sprintf("%d", len(appInstall)) + quicks[i].Detail = fmt.Sprintf("%d", base.AppInstalledNumber) } var item dto.QuickJump _ = copier.Copy(&item, quicks[i]) diff --git a/frontend/src/views/cronjob/cronjob/operate/index.vue b/frontend/src/views/cronjob/cronjob/operate/index.vue index 185d0524e..22b601f86 100644 --- a/frontend/src/views/cronjob/cronjob/operate/index.vue +++ b/frontend/src/views/cronjob/cronjob/operate/index.vue @@ -247,11 +247,7 @@ : form.websiteList " > - + - + {{ item.name }} @@ -320,11 +312,7 @@ : form.dbNameList " > - +