diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index d1ce19c79..cac2153bb 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -406,6 +406,7 @@ static.sheetname=User Analysis static.id=ID static.name=User Name static.codemergecount=PR Count +static.commitcount=Commit Count static.issuecount=Issue Count static.commentcount=Comment Count static.focusrepocount=Focus Repo Count diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 47b900e93..9918d47e0 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -409,6 +409,7 @@ static.sheetname=用户分析 static.id=ID static.name=用户名 static.codemergecount=PR数 +static.commitcount=commit次数 static.issuecount=提出任务数 static.commentcount=评论数 static.focusrepocount=关注项目数 diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go index 4a63bf509..134896177 100755 --- a/routers/repo/user_data_analysis.go +++ b/routers/repo/user_data_analysis.go @@ -73,19 +73,20 @@ func QueryUserStaticDataPage(ctx *context.Context) { "A1": ctx.Tr("user.static.id"), "B1": ctx.Tr("user.static.name"), "C1": ctx.Tr("user.static.codemergecount"), - "D1": ctx.Tr("user.static.issuecount"), - "E1": ctx.Tr("user.static.commentcount"), - "F1": ctx.Tr("user.static.focusrepocount"), - "G1": ctx.Tr("user.static.starrepocount"), - "H1": ctx.Tr("user.static.logincount"), - "I1": ctx.Tr("user.static.watchedcount"), - "J1": ctx.Tr("user.static.commitcodesize"), - "K1": ctx.Tr("user.static.solveissuecount"), - "L1": ctx.Tr("user.static.encyclopediascount"), - "M1": ctx.Tr("user.static.createrepocount"), - "N1": ctx.Tr("user.static.openiindex"), - "O1": ctx.Tr("user.static.registdate"), - "P1": ctx.Tr("user.static.countdate"), + "D1": ctx.Tr("user.static.commitcount"), + "E1": ctx.Tr("user.static.issuecount"), + "F1": ctx.Tr("user.static.commentcount"), + "G1": ctx.Tr("user.static.focusrepocount"), + "H1": ctx.Tr("user.static.starrepocount"), + "I1": ctx.Tr("user.static.logincount"), + "J1": ctx.Tr("user.static.watchedcount"), + "K1": ctx.Tr("user.static.commitcodesize"), + "L1": ctx.Tr("user.static.solveissuecount"), + "M1": ctx.Tr("user.static.encyclopediascount"), + "N1": ctx.Tr("user.static.createrepocount"), + "O1": ctx.Tr("user.static.openiindex"), + "P1": ctx.Tr("user.static.registdate"), + "Q1": ctx.Tr("user.static.countdate"), } for k, v := range dataHeader { //设置单元格的值 @@ -98,19 +99,20 @@ func QueryUserStaticDataPage(ctx *context.Context) { xlsx.SetCellValue(sheetName, "A"+rows, userRecord.ID) xlsx.SetCellValue(sheetName, "B"+rows, userRecord.Name) xlsx.SetCellValue(sheetName, "C"+rows, userRecord.CodeMergeCount) - xlsx.SetCellValue(sheetName, "D"+rows, userRecord.IssueCount) - xlsx.SetCellValue(sheetName, "E"+rows, userRecord.CommentCount) - xlsx.SetCellValue(sheetName, "F"+rows, userRecord.FocusRepoCount) - xlsx.SetCellValue(sheetName, "G"+rows, userRecord.StarRepoCount) - xlsx.SetCellValue(sheetName, "H"+rows, userRecord.LoginCount) - xlsx.SetCellValue(sheetName, "I"+rows, userRecord.WatchedCount) - xlsx.SetCellValue(sheetName, "J"+rows, userRecord.CommitCodeSize) - xlsx.SetCellValue(sheetName, "K"+rows, userRecord.SolveIssueCount) - xlsx.SetCellValue(sheetName, "L"+rows, userRecord.EncyclopediasCount) - xlsx.SetCellValue(sheetName, "M"+rows, userRecord.CreateRepoCount) - xlsx.SetCellValue(sheetName, "N"+rows, userRecord.OpenIIndex) - xlsx.SetCellValue(sheetName, "O"+rows, userRecord.RegistDate.Format("2006-01-02")) - xlsx.SetCellValue(sheetName, "P"+rows, time.Unix(userRecord.CountDate, 0).Format("2006-01-02")) + xlsx.SetCellValue(sheetName, "D"+rows, userRecord.CommitCount) + xlsx.SetCellValue(sheetName, "E"+rows, userRecord.IssueCount) + xlsx.SetCellValue(sheetName, "F"+rows, userRecord.CommentCount) + xlsx.SetCellValue(sheetName, "G"+rows, userRecord.FocusRepoCount) + xlsx.SetCellValue(sheetName, "H"+rows, userRecord.StarRepoCount) + xlsx.SetCellValue(sheetName, "I"+rows, userRecord.LoginCount) + xlsx.SetCellValue(sheetName, "J"+rows, userRecord.WatchedCount) + xlsx.SetCellValue(sheetName, "K"+rows, userRecord.CommitCodeSize) + xlsx.SetCellValue(sheetName, "L"+rows, userRecord.SolveIssueCount) + xlsx.SetCellValue(sheetName, "M"+rows, userRecord.EncyclopediasCount) + xlsx.SetCellValue(sheetName, "N"+rows, userRecord.CreateRepoCount) + xlsx.SetCellValue(sheetName, "O"+rows, userRecord.OpenIIndex) + xlsx.SetCellValue(sheetName, "P"+rows, userRecord.RegistDate.Format("2006-01-02")) + xlsx.SetCellValue(sheetName, "Q"+rows, time.Unix(userRecord.CountDate, 0).Format("2006-01-02")) } //设置默认打开的表单 diff --git a/web_src/js/components/UserAnalysis.vue b/web_src/js/components/UserAnalysis.vue index 0477dc874..609306201 100755 --- a/web_src/js/components/UserAnalysis.vue +++ b/web_src/js/components/UserAnalysis.vue @@ -29,7 +29,7 @@ - 下载报告 + 下载报告