diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 265e7ed36..7b7f22bce 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -519,6 +519,8 @@ static.RecommendDataset=Recommended Dataset Count
static.CollectImage=Collect Image Count
static.CollectedImage=Collected Image Count
static.RecommendImage=Recommended Image Count
+static.email=Email
+static.location=Location
static.all=All
static.public.user_business_analysis_current_month=Current_Month
static.public.user_business_analysis_current_week=Current_Week
@@ -537,6 +539,7 @@ metrics.hasactivateuser=New contributing activities
metrics.newregistnotactiveuser=New inactive
metrics.averageuser=Average new users
metrics.newuseractiveindex=Activation rate of new users
+metrics.currentdayactivity=Current day contributing activities
metrics.totalregistuser=Cumulative registered users
metrics.totalactiveduser=Cumulative activated users
metrics.totalhasactivityuser=Cumulative active users
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 1b26a930c..cc3b5ddd9 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -524,6 +524,8 @@ static.RecommendDataset=被推荐数据集数
static.CollectImage=收藏镜像数
static.CollectedImage=被收藏镜像数
static.RecommendImage=被推荐镜像数
+static.email=Email
+static.location=所在地区
static.all=所有
static.public.user_business_analysis_current_month=本月
static.public.user_business_analysis_current_week=本周
@@ -542,6 +544,7 @@ metrics.hasactivateuser=新增有贡献活动
metrics.newregistnotactiveuser=新增未激活
metrics.averageuser=平均新增用户
metrics.newuseractiveindex=新增用户激活率
+metrics.currentdayactivity=当日有贡献活动
metrics.totalregistuser=累计注册用户
metrics.totalactiveduser=累计已激活
metrics.totalhasactivityuser=累计有贡献活动
diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go
index a43b91df8..b14170efb 100755
--- a/routers/repo/user_data_analysis.go
+++ b/routers/repo/user_data_analysis.go
@@ -29,6 +29,7 @@ func getUserMetricsExcelHeader(ctx *context.Context) map[string]string {
excelHeader = append(excelHeader, ctx.Tr("user.metrics.hasactivateuser"))
excelHeader = append(excelHeader, ctx.Tr("user.metrics.newregistnotactiveuser"))
excelHeader = append(excelHeader, ctx.Tr("user.metrics.newuseractiveindex"))
+ excelHeader = append(excelHeader, ctx.Tr("user.metrics.currentdayactivity"))
excelHeader = append(excelHeader, ctx.Tr("user.metrics.totalregistuser"))
excelHeader = append(excelHeader, ctx.Tr("user.metrics.totalactiveduser"))
excelHeader = append(excelHeader, ctx.Tr("user.metrics.totalhasactivityuser"))
@@ -67,6 +68,10 @@ func writeUserMetricsExcel(row int, xlsx *excelize.File, sheetName string, userM
}
xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, value)
tmp = tmp + 1
+
+ xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userMetrics.HasActivityUser)
+ tmp = tmp + 1
+
xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userMetrics.TotalUser)
tmp = tmp + 1
xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userMetrics.TotalActivateRegistUser)
@@ -106,6 +111,9 @@ func getExcelHeader(ctx *context.Context) map[string]string {
excelHeader = append(excelHeader, ctx.Tr("user.static.CollectedImage"))
excelHeader = append(excelHeader, ctx.Tr("user.static.RecommendImage"))
+ excelHeader = append(excelHeader, ctx.Tr("user.static.email"))
+ excelHeader = append(excelHeader, ctx.Tr("user.static.RecommendImage"))
+
excelHeader = append(excelHeader, ctx.Tr("user.static.registdate"))
excelHeader = append(excelHeader, ctx.Tr("user.static.countdate"))
@@ -181,6 +189,13 @@ func writeExcel(row int, xlsx *excelize.File, sheetName string, userRecord *mode
tmp = tmp + 1
xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.RecommendImage)
tmp = tmp + 1
+
+ xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.Email)
+ tmp = tmp + 1
+
+ xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.UserLocation)
+ tmp = tmp + 1
+
formatTime := userRecord.RegistDate.Format("2006-01-02 15:04:05")
xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, formatTime[0:len(formatTime)-3])
tmp = tmp + 1
@@ -249,6 +264,13 @@ func writeExcelPage(row int, xlsx *excelize.File, sheetName string, userRecord *
tmp = tmp + 1
xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.RecommendImage)
tmp = tmp + 1
+
+ xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.Email)
+ tmp = tmp + 1
+
+ xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.UserLocation)
+ tmp = tmp + 1
+
formatTime := userRecord.RegistDate.Format("2006-01-02 15:04:05")
xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, formatTime[0:len(formatTime)-3])
tmp = tmp + 1
diff --git a/web_src/js/components/UserAnalysis.vue b/web_src/js/components/UserAnalysis.vue
index cfc91d449..79a593137 100755
--- a/web_src/js/components/UserAnalysis.vue
+++ b/web_src/js/components/UserAnalysis.vue
@@ -213,6 +213,18 @@
label="被推荐镜像数"
width="120px"
align="center">
+
+
+
+
昨日新增注册用户数
未激活:{{ tableDataYesterday.NotActivateRegistUser }} 人
已激活: {{ tableDataYesterday.ActivateRegistUser }} 人
- 有贡献活动: {{ tableDataYesterday.HasActivityUser }} 人
+ 有贡献活动: {{ tableDataYesterday.RegistActivityUser }} 人
@@ -114,7 +114,7 @@
align="center">
@@ -131,6 +131,11 @@
{{scope.row.ActivateIndex | rounding}}
+
+