From e5ad2f6d58e4f293291a5898cd1320554cfb791f Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 17 May 2022 14:27:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E5=88=86?= =?UTF-8?q?=E6=9E=90=E7=BB=9F=E8=AE=A1=E6=9C=AA=E6=BF=80=E6=B4=BB=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/repo/user_data_analysis.go | 8 +++++++- web_src/js/components/UserTrend.vue | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index ea14f99df..6b6bcf233 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -60,7 +60,13 @@ func writeUserMetricsExcel(row int, xlsx *excelize.File, sheetName string, userM xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, "") tmp = tmp + 1 t := userMetrics.ActivateIndex * 100 - xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, fmt.Sprintf("%.2f", t)+"%") + value := "-" + if t < 100 { + value = fmt.Sprintf("%.2f", t) + "%" + } else { + value = "100%" + } + xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, value) tmp = tmp + 1 xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userMetrics.TotalUser) tmp = tmp + 1 diff --git a/web_src/js/components/UserTrend.vue b/web_src/js/components/UserTrend.vue index 6ad8114bc..6b5be7940 100644 --- a/web_src/js/components/UserTrend.vue +++ b/web_src/js/components/UserTrend.vue @@ -763,7 +763,14 @@ }, filters:{ rounding (value) { + if(value>=1){ + return "100%" + }else if(value==0){ + return "-" + }else{ return Number(value*100).toFixed(2) + "%" + } + }, transformTimestamp(timestamp){ let a = new Date(timestamp*1000);