用户分析增加

Signed-off-by: zouap <zouap@pcl.ac.cn>

options/locale/locale_zh-CN.ini

@@ -470,6 +470,11 @@ static.encyclopediascount=百科页面贡献次数
 static.createrepocount=创建项目数
 static.openiindex=OpenI指数
 static.registdate=用户注册时间
+static.CloudBrainTaskNum=云脑任务数
+static.CloudBrainRunTime=云脑运行时间（小时）
+static.CommitDatasetNum=上传（提交）数据集文件数
+static.CommitModelCount=提交模型数
+static.UserIndex=用户指数
 static.countdate=系统统计时间
 static.all=所有
 static.public.user_business_analysis_current_month=本月

routers/repo/user_data_analysis.go

@@ -54,7 +54,12 @@ func queryUserDataPage(ctx *context.Context, tableName string, queryObj interfac
 			"N1": ctx.Tr("user.static.createrepocount"),
 			"O1": ctx.Tr("user.static.openiindex"),
 			"P1": ctx.Tr("user.static.registdate"),
-			"Q1": ctx.Tr("user.static.countdate"),
+			"Q1": ctx.Tr("user.static.CloudBrainTaskNum"),
+			"R1": ctx.Tr("user.static.CloudBrainRunTime"),
+			"S1": ctx.Tr("user.static.CommitDatasetNum"),
+			"T1": ctx.Tr("user.static.CommitModelCount"),
+			"U1": ctx.Tr("user.static.UserIndex"),
+			"V1": ctx.Tr("user.static.countdate"),
 		}
 		for k, v := range dataHeader {
 			//设置单元格的值
@@ -89,8 +94,14 @@ func queryUserDataPage(ctx *context.Context, tableName string, queryObj interfac
 				formatTime := userRecord.RegistDate.Format("2006-01-02 15:04:05")
 				xlsx.SetCellValue(sheetName, "P"+rows, formatTime[0:len(formatTime)-3])
 
+				xlsx.SetCellValue(sheetName, "Q"+rows, userRecord.CloudBrainTaskNum)
+				xlsx.SetCellValue(sheetName, "R"+rows, userRecord.CloudBrainRunTime)
+				xlsx.SetCellValue(sheetName, "S"+rows, userRecord.CommitDatasetNum)
+				xlsx.SetCellValue(sheetName, "T"+rows, userRecord.CommitModelCount)
+				xlsx.SetCellValue(sheetName, "U"+rows, userRecord.UserIndex)
+
 				formatTime = userRecord.DataDate
-				xlsx.SetCellValue(sheetName, "Q"+rows, formatTime)
+				xlsx.SetCellValue(sheetName, "V"+rows, formatTime)
 			}
 
 			indexTotal += PAGE_SIZE

web_src/js/components/UserAnalysis.vue

@@ -133,7 +133,37 @@
                     <template slot-scope="scope">
                         {{scope.row.RegistDate | transformTimestamp}}
                     </template>
+                </el-table-column> 
+                <el-table-column
+                    prop="CloudBrainTaskNum"
+                    label="云脑任务数"
+                    width="120px"
+                    align="center">
                 </el-table-column>   
+                <el-table-column
+                    prop="CloudBrainRunTime"
+                    label="云脑运行时间（小时）"
+                    width="120px"
+                    align="center">
+                </el-table-column> 
+                <el-table-column
+                    prop="CommitDatasetNum"
+                    label="上传（提交）数据集文件数"
+                    width="120px"
+                    align="center">
+                </el-table-column> 
+                <el-table-column
+                    prop="CommitModelCount"
+                    label="提交模型数"
+                    width="120px"
+                    align="center">
+                </el-table-column> 
+                <el-table-column
+                    prop="UserIndex"
+                    label="用户指数"
+                    width="120px"
+                    align="center">
+                </el-table-column> 
                 <el-table-column
                     prop="DataDate"
                     label="系统统计时间"
@@ -178,7 +208,7 @@
                 value_time: '',
                 search:'',
                 data:'',
-                columns: [{title: 'ID',key: 'ID'},{title: '用户名',key: 'Name'},{title: 'PR数',key: 'CodeMergeCount'},{title: 'commit数',key:'CommitCount'},{title: '提出任务数',key: 'IssueCount'},{title: '评论数',key: 'CommentCount'},{title: '关注项目数',key: 'FocusRepoCount'},{title: '点赞项目数',key: 'StarRepoCount'},{title: '登录次数',key: 'LoginCount'},{title:'关注者数',key:'WatchedCount'},{title:'commit代码行数',key:'CommitCodeSize'},{title:'已解决任务数',key:'SolveIssueCount'},{title:'百科页面贡献次数',key:'EncyclopediasCount'},{title:'创建项目',key:'CreateRepoCount'},{title:'用户注册时间',key:'RegistDate'},{title:'系统统计时间',key:'CountDate'}],
+                columns: [{title: 'ID',key: 'ID'},{title: '用户名',key: 'Name'},{title: 'PR数',key: 'CodeMergeCount'},{title: 'commit数',key:'CommitCount'},{title: '提出任务数',key: 'IssueCount'},{title: '评论数',key: 'CommentCount'},{title: '关注项目数',key: 'FocusRepoCount'},{title: '点赞项目数',key: 'StarRepoCount'},{title: '登录次数',key: 'LoginCount'},{title:'关注者数',key:'WatchedCount'},{title:'commit代码行数',key:'CommitCodeSize'},{title:'已解决任务数',key:'SolveIssueCount'},{title:'百科页面贡献次数',key:'EncyclopediasCount'},{title:'创建项目',key:'CreateRepoCount'},{title:'用户注册时间',key:'RegistDate'},{title:'云脑任务数',key:'CloudBrainTaskNum'},{title:'云脑运行时间（小时）',key:'CloudBrainRunTime'},{title:'上传（提交）数据集文件数',key:'CommitDatasetNum'},{title:'提交模型数',key:'CommitModelCount'},{title:'用户指数',key:'UserIndex'},{title:'系统统计时间',key:'CountDate'}],
                 blob:'',
                 fileName:'',
                 dynamic:7,