KJZH001/nezha-2023
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #223 from liuyanxi975/master [no ci]

Browse Source 
改进剩余流量显示

Co-authored-by: liuyanxi975 <24417037+liuyanxi975@users.noreply.github.com>
This commit is contained in:
naiba 2022-05-30 18:04:41 +08:00 committed by GitHub
commit 65f5e906c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,6 +148,17 @@ var funcMap = template.FuncMap{
"add": func(a, b int) int {
return a + b
},
"Transleft": func(a, b float64) (n float64) {
n, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", (100-(a/b)*100)), 64)
if n < 0 {
n = 0
}
return
},
"UintToFloat": func(a uint64) (n float64) {
n, _ = strconv.ParseFloat((strconv.FormatUint(a, 10)), 64)
return
},
"dayBefore": func(i int) string {
year, month, day := time.Now().Date()
today := time.Date(year, month, day, 0, 0, 0, 0, time.Local)

3
resource/l10n/zh-CN.toml vendored
View File

@ -528,3 +528,6 @@ other = "任务失败"
[IPChanged]
other = "IP变更"
[Transleft]
other = "流量剩余"

28
resource/template/theme-default/service.html vendored
View File

@ -53,8 +53,7 @@
<th class="ui center aligned">MIN</th>
<th class="ui center aligned">{{tr "NextCheck"}}</th>
<th class="ui center aligned">{{tr "CurrentUsage"}}</th>
<th class="ui center aligned" style="display:none!important">用量</th>
<th class="ui center aligned" id="TotalTable" style="display:none!important">总量</th>
<th class='ui center aligned' style='padding: 0px 31px 0px 31px;'>{{tr "Transleft"}}</th>
</tr>
</thead>
<tbody>
@ -70,8 +69,7 @@
<td class="ui center aligned">{{$stats.Min|bf}}</td>
<td class="ui center aligned">{{(index $stats.NextUpdate $innerId)|sft}}</td>
<td class="ui center aligned">{{$transfer|bf}}</td>
<td class="ui center aligned used" style="display:none!important">{{$transfer}}</td>
<td class="ui center aligned total" style="display:none!important">{{$stats.Max}}</td>
<td class="ui center aligned" style="padding: 14px 0px 0px 0px; position: relative;"><div class="thirteen wide column"><div class="ui progress fine"><div class="bar" style="transition-duration: 300ms; min-width: unset; background-color: rgb(10, 148, 242); width: {{Transleft (UintToFloat $transfer) (UintToFloat $stats.Max)}}% !important;"></div><small style="position: absolute; top: 4px; margin-left: -20px;">{{Transleft (UintToFloat $transfer) (UintToFloat $stats.Max)}} %</small></div></div></td>
</tr>
{{end}}
{{end}}
@ -82,27 +80,5 @@
</div>
</div>
</div>
<script>
window.onload = function(){
var used = []
var total = []
var percent = []
$("#TotalTable").after("<th class='ui center aligned' style='padding: 0px 31px 0px 31px;'>剩余</th>")
$('.used').each(function () {
used.push($(this).html())
})
$('.total').each(function () {
total.push($(this).html())
})
for(var i=0;i<used.length;i++){
percent[i] = (100 - ((used[i] / total[i]) * 100)).toFixed(2)
if (percent[i] < 25){
$(".total").eq(i).after("<td class='ui center aligned' style='padding: 14px 0px 0px 0px; position: relative;><div class='thirteen wide column'><div class='ui progress warning'><div class='bar' style='transition-duration: 300ms; min-width: unset; background-color: rgb(10, 148, 242); width: "+percent[i]+"% !important;'><small>"+percent[i]+"%</small></div></div></div></td>")
}else{
$(".total").eq(i).after("<td class='ui center aligned' style='padding: 14px 0px 0px 0px; position: relative;'><div class='thirteen wide column'><div class='ui progress fine'><div class='bar' style='transition-duration: 300ms; min-width: unset; background-color: rgb(10, 148, 242); width: "+percent[i]+"% !important;'><small>"+percent[i]+"%</small></div></div></div></td>")
}
}
}
</script>
{{template "common/footer" .}}
{{end}}