tcjlj/nezha
1
0
Fork 0
mirror of https://github.com/nezhahq/nezha.git synced 2025-02-02 09:38:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #154 from MikoyChinese/theme-mdui

Browse Source 
Round check next time format to second

Co-authored-by: MikoyChinese <22676744+MikoyChinese@users.noreply.github.com>
This commit is contained in:
naiba 2022-01-14 14:18:57 +09:00 committed by GitHub
commit 3144620a15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/dashboard/controller/controller.go
View File

@ -45,7 +45,7 @@ func ServeWeb(port uint) *http.Server {
return time.Duration(time.Duration(duration) * time.Second).String() return time.Duration(time.Duration(duration) * time.Second).String()
}, },
"sft": func(future time.Time) string { "sft": func(future time.Time) string {
return time.Until(future).String() return time.Until(future).Round(time.Second).String()
}, },
"bf": func(b uint64) string { "bf": func(b uint64) string {
return bytefmt.ByteSize(b) return bytefmt.ByteSize(b)

4
resource/template/theme-mdui/home.html vendored
View File

@ -59,9 +59,9 @@
<li class="mdui-list-item" :id="'mem-' + server.ID"> <li class="mdui-list-item" :id="'mem-' + server.ID">
<i class="mdui-list-item-icon mdui-icon material-icons">straighten</i> <i class="mdui-list-item-icon mdui-icon material-icons">straighten</i>
<div class="mdui-list-item-content"> <div class="mdui-list-item-content">
<at class="mdui-list-item-title mdui-list-item-one-line">MEM <span>@#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0)#@%</span></at> <at class="mdui-list-item-title mdui-list-item-one-line">MEM <span>@#server.live?parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0):'NaN'#@%</span></at>
<div class="mdui-progress"> <div class="mdui-progress">
<div class="mdui-progress-determinate mdui-color-pink-400" :style="'width: ' + parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0) + '%;'"></div> <div class="mdui-progress-determinate mdui-color-pink-400" :style="'width: ' + (server.live?parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0):'0') + '%;'"></div>
</div> </div>
</div> </div>
</li> </li>