From 641b79bd4cc2158dd3b8e7bb7d00dfec1b559d79 Mon Sep 17 00:00:00 2001 From: naiba <hi@nai.ba> Date: Sun, 22 Oct 2023 20:12:38 +0800 Subject: [PATCH] fix `theme-angel-kanade` byte format --- README.md | 2 +- resource/template/theme-angel-kanade/home.html | 8 ++++---- service/singleton/singleton.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2c49355375..2f2e54d776 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ <br> <small><i>LOGO designed by <a href="https://xio.ng" target="_blank">熊大</a> .</i></small> <br><br> -<img src="https://img.shields.io/github/actions/workflow/status/naiba/nezha/dashboard.yml?branch=master&label=Dash%20v0.15.4&logo=github&style=for-the-badge"> <img src="https://img.shields.io/github/v/release/nezhahq/agent?color=brightgreen&label=Agent&style=for-the-badge&logo=github"> <img src="https://img.shields.io/github/actions/workflow/status/nezhahq/agent/agent.yml?branch=v0.15.5&label=Agent%20CI&logo=github&style=for-the-badge"> <img src="https://img.shields.io/badge/Installer-v0.15.0-brightgreen?style=for-the-badge&logo=linux"> +<img src="https://img.shields.io/github/actions/workflow/status/naiba/nezha/dashboard.yml?branch=master&label=Dash%20v0.15.5&logo=github&style=for-the-badge"> <img src="https://img.shields.io/github/v/release/nezhahq/agent?color=brightgreen&label=Agent&style=for-the-badge&logo=github"> <img src="https://img.shields.io/github/actions/workflow/status/nezhahq/agent/agent.yml?branch=v0.15.5&label=Agent%20CI&logo=github&style=for-the-badge"> <img src="https://img.shields.io/badge/Installer-v0.15.0-brightgreen?style=for-the-badge&logo=linux"> <br> <br> <p>:trollface: <b>Nezha Monitoring: Self-hostable, lightweight, servers and websites monitoring and O&M tool.</b></p> diff --git a/resource/template/theme-angel-kanade/home.html b/resource/template/theme-angel-kanade/home.html index 83792d12e2..f13f1539ee 100644 --- a/resource/template/theme-angel-kanade/home.html +++ b/resource/template/theme-angel-kanade/home.html @@ -100,9 +100,9 @@ <div class="thirteen wide column"> <i class="bi bi-cpu-fill" style="font-size: 1.1rem; color: #4a86e8;"></i> @#getCoreAndGHz(server.Host.CPU)#@ - <i class="bi bi-memory" style="font-size: 1.1rem; color: #00ac0d;"></i> @#getK2Gb(server.Host.MemTotal)#@ + <i class="bi bi-memory" style="font-size: 1.1rem; color: #00ac0d;"></i> @#getByteToGB(server.Host.MemTotal)#@ - <i class="bi bi-hdd-rack-fill" style="font-size: 1.1rem; color: #980000"></i> @#getK2Gb(server.Host.DiskTotal)#@ + <i class="bi bi-hdd-rack-fill" style="font-size: 1.1rem; color: #980000"></i> @#getByteToGB(server.Host.DiskTotal)#@ </div> <div class="three wide column">{{tr "Uptime"}}</div> <div class="thirteen wide column"> @@ -274,8 +274,8 @@ return Core.replace('Physical','Core'); }, - getK2Gb(bs){ - return (bs/1024/1024).toFixed(2) + 'GB' + getByteToGB(bs){ + return (bs/1024/1024/1024).toFixed(2) + 'GB' }, listTipsMouseenter(obj,strs,tipsNum=1){ this.layerIndex = layer.tips(strs, '#'+obj,{tips: [tipsNum, 'rgb(0 0 0 / 85%)'],time:0}); diff --git a/service/singleton/singleton.go b/service/singleton/singleton.go index fc79e6e99f..4d8db0781a 100644 --- a/service/singleton/singleton.go +++ b/service/singleton/singleton.go @@ -12,7 +12,7 @@ import ( "github.com/naiba/nezha/pkg/utils" ) -var Version = "v0.15.4" // !!记得修改 README 中的 badge 版本!! +var Version = "v0.15.5" // !!记得修改 README 中的 badge 版本!! var ( Conf *model.Config