diff --git a/internal/web/actions/default/servers/server/boards/index.go b/internal/web/actions/default/servers/server/boards/index.go
index 814d8c46..166ca07c 100644
--- a/internal/web/actions/default/servers/server/boards/index.go
+++ b/internal/web/actions/default/servers/server/boards/index.go
@@ -1,7 +1,9 @@
package boards
import (
+ "fmt"
teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+ "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
@@ -120,6 +122,22 @@ func (this *IndexAction) RunPost(params struct {
this.Data["topDomainStats"] = statMaps
}
+ // 地区排行
+ {
+ var countryMaps = []maps.Map{}
+ for _, stat := range resp.TopCountryStats {
+ countryMaps = append(countryMaps, maps.Map{
+ "name": stat.CountryName,
+ "bytes": stat.Bytes,
+ "formattedBytes": numberutils.FormatBytes(stat.Bytes),
+ "countRequests": stat.CountRequests,
+ "countAttackRequests": stat.CountAttackRequests,
+ "percent": fmt.Sprintf("%.2f", stat.Percent),
+ })
+ }
+ this.Data["topCountryStats"] = countryMaps
+ }
+
// 指标
{
var chartMaps = []maps.Map{}
@@ -157,5 +175,6 @@ func (this *IndexAction) RunPost(params struct {
}
this.Data["metricCharts"] = chartMaps
}
+
this.Success()
}
diff --git a/web/views/@default/servers/server/boards/index.css b/web/views/@default/servers/server/boards/index.css
index e8e45463..183dfd57 100644
--- a/web/views/@default/servers/server/boards/index.css
+++ b/web/views/@default/servers/server/boards/index.css
@@ -25,6 +25,12 @@
.chart-box {
height: 14em;
}
+.traffic-map-box {
+ height: 16em;
+}
+.traffic-map-box div::-webkit-scrollbar {
+ width: 4px;
+}
h4 span {
font-size: 0.8em;
color: grey;
diff --git a/web/views/@default/servers/server/boards/index.css.map b/web/views/@default/servers/server/boards/index.css.map
index 1f562066..ef4f8b70 100644
--- a/web/views/@default/servers/server/boards/index.css.map
+++ b/web/views/@default/servers/server/boards/index.css.map
@@ -1 +1 @@
-{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;EACC,0BAAA;EACA,2BAAA;;AAFD,KAIC;EACC,kBAAA;EACA,4BAAA;;AANF,KAIC,QAIC,IAAG;EACF,iBAAA;;AATH,KAIC,QAIC,IAAG,MAGF;EACC,cAAA;EACA,mBAAA;;AAbJ,KAkBC,QAAO;EACN,eAAA;;AAnBF,KAsBC,GACC;EACC,aAAA;;AAxBH,KA4BC,QAAO,MACN;EACC,eAAA;;AAKH;EACC,YAAA;;AAGD,EACC;EACC,gBAAA;EACA,WAAA","file":"index.css"}
\ No newline at end of file
+{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;EACC,0BAAA;EACA,2BAAA;;AAFD,KAIC;EACC,kBAAA;EACA,4BAAA;;AANF,KAIC,QAIC,IAAG;EACF,iBAAA;;AATH,KAIC,QAIC,IAAG,MAGF;EACC,cAAA;EACA,mBAAA;;AAbJ,KAkBC,QAAO;EACN,eAAA;;AAnBF,KAsBC,GACC;EACC,aAAA;;AAxBH,KA4BC,QAAO,MACN;EACC,eAAA;;AAKH;EACC,YAAA;;AAGD;EACC,YAAA;;AADD,gBAGC,IAAG;EACF,UAAA;;AAIF,EACC;EACC,gBAAA;EACA,WAAA","file":"index.css"}
\ No newline at end of file
diff --git a/web/views/@default/servers/server/boards/index.html b/web/views/@default/servers/server/boards/index.html
index ed6fbb3d..ff74c152 100644
--- a/web/views/@default/servers/server/boards/index.html
+++ b/web/views/@default/servers/server/boards/index.html
@@ -1,5 +1,11 @@
{$layout}
-{$template "/echarts"}
+
+{$var "header"}
+
+
+
+
+{$end}
服务列表
@@ -18,6 +24,12 @@
+
+
+
+
+
+