调整用户指数位置

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

routers/repo/user_data_analysis.go

@@ -40,8 +40,8 @@ func queryUserDataPage(ctx *context.Context, tableName string, queryObj interfac
 		dataHeader := map[string]string{
 			"A1": ctx.Tr("user.static.id"),
 			"B1": ctx.Tr("user.static.name"),
-			"C1": ctx.Tr("user.static.codemergecount"),
-			"D1": ctx.Tr("user.static.UserIndex"),
+			"C1": ctx.Tr("user.static.UserIndex"),
+			"D1": ctx.Tr("user.static.codemergecount"),
 			"E1": ctx.Tr("user.static.commitcount"),
 			"F1": ctx.Tr("user.static.issuecount"),
 			"G1": ctx.Tr("user.static.commentcount"),
@@ -77,8 +77,8 @@ func queryUserDataPage(ctx *context.Context, tableName string, queryObj interfac
 				rows := fmt.Sprint(row)
 				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, fmt.Sprintf("%.2f", userRecord.UserIndex))
+				xlsx.SetCellValue(sheetName, "C"+rows, fmt.Sprintf("%.2f", userRecord.UserIndex))
+				xlsx.SetCellValue(sheetName, "D"+rows, userRecord.CodeMergeCount)
 				xlsx.SetCellValue(sheetName, "E"+rows, userRecord.CommitCount)
 				xlsx.SetCellValue(sheetName, "F"+rows, userRecord.IssueCount)
 				xlsx.SetCellValue(sheetName, "G"+rows, userRecord.CommentCount)
@@ -239,8 +239,8 @@ func QueryUserStaticDataPage(ctx *context.Context) {
 		dataHeader := map[string]string{
 			"A1": ctx.Tr("user.static.id"),
 			"B1": ctx.Tr("user.static.name"),
-			"C1": ctx.Tr("user.static.codemergecount"),
-			"D1": ctx.Tr("user.static.UserIndex"),
+			"C1": ctx.Tr("user.static.UserIndex"),
+			"D1": ctx.Tr("user.static.codemergecount"),
 			"E1": ctx.Tr("user.static.commitcount"),
 			"F1": ctx.Tr("user.static.issuecount"),
 			"G1": ctx.Tr("user.static.commentcount"),
@@ -270,8 +270,8 @@ 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, fmt.Sprintf("%.2f", userRecord.UserIndex))
+			xlsx.SetCellValue(sheetName, "C"+rows, fmt.Sprintf("%.2f", userRecord.UserIndex))
+			xlsx.SetCellValue(sheetName, "D"+rows, userRecord.CodeMergeCount)
 			xlsx.SetCellValue(sheetName, "E"+rows, userRecord.CommitCount)
 			xlsx.SetCellValue(sheetName, "F"+rows, userRecord.IssueCount)
 			xlsx.SetCellValue(sheetName, "G"+rows, userRecord.CommentCount)

web_src/js/components/UserAnalysis.vue

@@ -62,11 +62,6 @@
                         <a :href="AppSubUrl +'../../../'+ scope.row.Name">{{scope.row.Name}} </a>    
                     </template>  
                 </el-table-column>
-                <el-table-column
-                    prop="CodeMergeCount"
-                    label="PR数"
-                    align="center">
-                </el-table-column>
                 <el-table-column
                     prop="UserIndex"
                     label="用户指数"
@@ -76,6 +71,11 @@
                             {{scope.row.UserIndex | rounding}}
                     </template>
                 </el-table-column> 
+                <el-table-column
+                    prop="CodeMergeCount"
+                    label="PR数"
+                    align="center">
+                </el-table-column>
                 <el-table-column
                     prop="CommitCount"
                     label="commit数"