From 8e67d3487e1f0ed5cd8ee713621a0ab2d8bcc28d Mon Sep 17 00:00:00 2001 From: nap0o <144927971+nap0o@users.noreply.github.com> Date: Tue, 27 Feb 2024 07:42:56 -0500 Subject: [PATCH] =?UTF-8?q?angel-kanade=E6=A8=A1=E7=89=88=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=BB=E9=A2=98=E5=88=87=E6=8D=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20(#329)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/theme-angel-kanade/footer.html | 3 +- .../template/theme-angel-kanade/home.html | 201 +++++++++--------- .../template/theme-angel-kanade/menu.html | 9 + .../template/theme-angel-kanade/service.html | 12 +- resource/template/theme-default/header.html | 2 +- resource/template/theme-default/home.html | 1 - .../template/theme-server-status/home.html | 10 +- 7 files changed, 129 insertions(+), 109 deletions(-) diff --git a/resource/template/theme-angel-kanade/footer.html b/resource/template/theme-angel-kanade/footer.html index 99b2fe5..2884f19 100644 --- a/resource/template/theme-angel-kanade/footer.html +++ b/resource/template/theme-angel-kanade/footer.html @@ -1,4 +1,5 @@ {{define "theme-angel-kanade/footer"}} +
© {{.Conf.Site.Brand}} | @@ -13,12 +14,12 @@ + - {{end}} \ No newline at end of file diff --git a/resource/template/theme-angel-kanade/home.html b/resource/template/theme-angel-kanade/home.html index 56d8ce8..1e1380f 100644 --- a/resource/template/theme-angel-kanade/home.html +++ b/resource/template/theme-angel-kanade/home.html @@ -3,118 +3,116 @@ {{if ts .CustomCode}} {{.CustomCode|safe}} {{end}} {{template "theme-angel-kanade/menu" .}}
-
-
-
-
- - @#(group.Tag!==''?group.Tag:'{{tr "Default"}}')#@ -
-
-
-
-
-
- 国家  - @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@ - -
- {{tr "Platform"}}: @#server.Host.Platform#@-@#server.Host.PlatformVersion#@ - [@#server.Host.Virtualization#@:@#server.Host.Arch#@]
- CPU: @#server.Host.CPU#@
- {{tr "DiskUsed"}}: - @#formatByteSize(server.State.DiskUsed)#@/@#formatByteSize(server.Host.DiskTotal)#@
- {{tr "MemUsed"}}: - @#formatByteSize(server.State.MemUsed)#@/@#formatByteSize(server.Host.MemTotal)#@
- {{tr "SwapUsed"}}: - @#formatByteSize(server.State.SwapUsed)#@/@#formatByteSize(server.Host.SwapTotal)#@
- {{tr "NetTransfer"}}: @#formatByteSize(server.State.NetInTransfer)#@@#formatByteSize(server.State.NetOutTransfer)#@
- {{tr "Load"}}: @# toFixed2(server.State.Load1) #@/@# toFixed2(server.State.Load5) #@/@# - toFixed2(server.State.Load15) #@
- {{tr "ProcessCount"}}: @# server.State.ProcessCount #@
- {{tr "ConnCount"}}: TCP @# server.State.TcpConnCount #@ / UDP @# server.State.UdpConnCount #@
- {{tr "BootTime"}}: @# formatTimestamp(server.Host.BootTime) #@
- {{tr "LastActive"}}: @# new Date(server.LastActive).toLocaleString() #@
- {{tr "Version"}}: @#server.Host.Version#@
-
-
+
+
+
+ + @#(group.Tag!==''?group.Tag:'{{tr "Default"}}')#@ +
+
+
+
+
+
+ 国家  + @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@ + +
+ {{tr "Platform"}}: @#server.Host.Platform#@-@#server.Host.PlatformVersion#@ + [@#server.Host.Virtualization#@:@#server.Host.Arch#@]
+ CPU: @#server.Host.CPU#@
+ {{tr "DiskUsed"}}: + @#formatByteSize(server.State.DiskUsed)#@/@#formatByteSize(server.Host.DiskTotal)#@
+ {{tr "MemUsed"}}: + @#formatByteSize(server.State.MemUsed)#@/@#formatByteSize(server.Host.MemTotal)#@
+ {{tr "SwapUsed"}}: + @#formatByteSize(server.State.SwapUsed)#@/@#formatByteSize(server.Host.SwapTotal)#@
+ {{tr "NetTransfer"}}: @#formatByteSize(server.State.NetInTransfer)#@@#formatByteSize(server.State.NetOutTransfer)#@
+ {{tr "Load"}}: @# toFixed2(server.State.Load1) #@/@# toFixed2(server.State.Load5) #@/@# + toFixed2(server.State.Load15) #@
+ {{tr "ProcessCount"}}: @# server.State.ProcessCount #@
+ {{tr "ConnCount"}}: TCP @# server.State.TcpConnCount #@ / UDP @# server.State.UdpConnCount #@
+ {{tr "BootTime"}}: @# formatTimestamp(server.Host.BootTime) #@
+ {{tr "LastActive"}}: @# new Date(server.LastActive).toLocaleString() #@
+ {{tr "Version"}}: @#server.Host.Version#@
-
-
-
CPU
-
-
-
- @#formatPercent(server.live,server.State.CPU,100).percent#@% -
+
+
+
+
+
CPU
+
+
+
+ @#formatPercent(server.live,server.State.CPU,100).percent#@%
-
{{tr "MemUsed"}}
-
-
-
- @#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0)#@% -
+
+
{{tr "MemUsed"}}
+
+
+
+ @#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0)#@%
-
{{tr "SwapUsed"}}
-
-
-
- @#parseInt(server.State?server.State.SwapUsed/server.Host.SwapTotal*100:0)#@% -
+
+
{{tr "SwapUsed"}}
+
+
+
+ @#parseInt(server.State?server.State.SwapUsed/server.Host.SwapTotal*100:0)#@%
-
{{tr "NetSpeed"}}
-
- - @#formatByteSize(server.State.NetInSpeed)#@/s - - @#formatByteSize(server.State.NetOutSpeed)#@/s -
-
{{tr "NetTransfer"}}
-
- - @#formatByteSize(server.State.NetInTransfer)#@ -   - - @#formatByteSize(server.State.NetOutTransfer)#@ -
-
{{tr "DiskUsed"}}
-
-
-
- @#parseInt(server.State?server.State.DiskUsed/server.Host.DiskTotal*100:0)#@% -
+
+
{{tr "NetSpeed"}}
+
+ + @#formatByteSize(server.State.NetInSpeed)#@/s + + @#formatByteSize(server.State.NetOutSpeed)#@/s +
+
{{tr "NetTransfer"}}
+
+ + @#formatByteSize(server.State.NetInTransfer)#@ +   + + @#formatByteSize(server.State.NetOutTransfer)#@ +
+
{{tr "DiskUsed"}}
+
+
+
+ @#parseInt(server.State?server.State.DiskUsed/server.Host.DiskTotal*100:0)#@%
-
{{tr "Info"}}
-
- @#getCoreAndGHz(server.Host.CPU)#@ -   - @#getByteToGB(server.Host.MemTotal)#@ -   - @#getByteToGB(server.Host.DiskTotal)#@ -
-
{{tr "Uptime"}}
-
- @#secondToDate(server.State.Uptime)#@ -
+
+
{{tr "Info"}}
+
+ @#getCoreAndGHz(server.Host.CPU)#@ +   + @#getByteToGB(server.Host.MemTotal)#@ +   + @#getByteToGB(server.Host.DiskTotal)#@ +
+
{{tr "Uptime"}}
+
+ @#secondToDate(server.State.Uptime)#@
-
-

@#server.Name#@

-

{{tr "ServerIsOffline"}}

-
+
+
+

@#server.Name#@

+

{{tr "ServerIsOffline"}}

@@ -129,10 +127,13 @@ el: '#app', delimiters: ['@#', '#@'], data: { + defaultTemplate: {{.Conf.Site.Theme}}, + templates: {{.Themes}}, data: initData, groups: [], cache: [], }, + mixins: [mixinsVue], created() { this.group() }, diff --git a/resource/template/theme-angel-kanade/menu.html b/resource/template/theme-angel-kanade/menu.html index 64f2186..28cd2a2 100644 --- a/resource/template/theme-angel-kanade/menu.html +++ b/resource/template/theme-angel-kanade/menu.html @@ -1,4 +1,5 @@ {{define "theme-angel-kanade/menu"}} +
@@ -15,6 +16,14 @@ {{else}} {{tr "Home"}} {{tr "Services"}} +
+
{{tr "Template" }}
+
+ @#value#@ + + +
+
{{end}}
diff --git a/resource/template/theme-angel-kanade/service.html b/resource/template/theme-angel-kanade/service.html index 7ec8620..c88742a 100644 --- a/resource/template/theme-angel-kanade/service.html +++ b/resource/template/theme-angel-kanade/service.html @@ -76,10 +76,20 @@ {{end}} - {{end}}
{{template "theme-angel-kanade/footer" .}} + {{end}} \ No newline at end of file diff --git a/resource/template/theme-default/header.html b/resource/template/theme-default/header.html index 7c391ea..4baa373 100644 --- a/resource/template/theme-default/header.html +++ b/resource/template/theme-default/header.html @@ -12,7 +12,7 @@ - + diff --git a/resource/template/theme-default/home.html b/resource/template/theme-default/home.html index 91a09a0..b14176e 100644 --- a/resource/template/theme-default/home.html +++ b/resource/template/theme-default/home.html @@ -145,7 +145,6 @@ cache: [], chartDataList: [], activePopup: null, - }, mixins: [mixinsVue], created() { diff --git a/resource/template/theme-server-status/home.html b/resource/template/theme-server-status/home.html index ce57d08..c4dcdf6 100644 --- a/resource/template/theme-server-status/home.html +++ b/resource/template/theme-server-status/home.html @@ -24,17 +24,18 @@ page: 'index', defaultTemplate: {{.Conf.Site.Theme}}, templates: {{.Themes}}, + servers: [], nodesTag: [], nodesNoTag: [], chartDataList: [] }, mixins: [mixinsVue], created() { - initData = JSON.parse('{{.Servers}}').servers; + this.servers = JSON.parse('{{.Servers}}').servers; if(this.showGroup) { - this.nodesTag = this.groupingData(this.handleNodes(initData),"Tag"); + this.nodesTag = this.groupingData(this.handleNodes(this.servers),"Tag"); } else { - this.nodesNoTag = this.handleNodes(initData); + this.nodesNoTag = this.handleNodes(this.servers); } }, mounted() { @@ -367,8 +368,7 @@ chart.setOption(option); }, reloadCharts() { // 重新加载所有图表 - const data = JSON.parse('{{.Servers}}').servers; - data.forEach(node => { + this.servers.forEach(node => { const id = node.ID; const chartData = this.chartDataList[id - 1]; if (chartData) {