调整用户分析顺序

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

routers/repo/user_data_analysis.go

@@ -54,11 +54,11 @@ func queryUserDataPage(ctx *context.Context, tableName string, queryObj interfac
 			"N1": ctx.Tr("user.static.encyclopediascount"),
 			"O1": ctx.Tr("user.static.createrepocount"),
 			"P1": ctx.Tr("user.static.openiindex"),
-			"Q1": ctx.Tr("user.static.registdate"),
-			"R1": ctx.Tr("user.static.CloudBrainTaskNum"),
-			"S1": ctx.Tr("user.static.CloudBrainRunTime"),
-			"T1": ctx.Tr("user.static.CommitDatasetNum"),
-			"U1": ctx.Tr("user.static.CommitModelCount"),
+			"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.registdate"),
 			"V1": ctx.Tr("user.static.countdate"),
 		}
 		for k, v := range dataHeader {
@@ -91,14 +91,12 @@ func queryUserDataPage(ctx *context.Context, tableName string, queryObj interfac
 				xlsx.SetCellValue(sheetName, "N"+rows, userRecord.EncyclopediasCount)
 				xlsx.SetCellValue(sheetName, "O"+rows, userRecord.CreateRepoCount)
 				xlsx.SetCellValue(sheetName, "P"+rows, fmt.Sprintf("%.2f", userRecord.OpenIIndex))
-
+				xlsx.SetCellValue(sheetName, "Q"+rows, userRecord.CloudBrainTaskNum)
+				xlsx.SetCellValue(sheetName, "R"+rows, fmt.Sprintf("%.2f", float64(userRecord.CloudBrainRunTime)/3600))
+				xlsx.SetCellValue(sheetName, "S"+rows, userRecord.CommitDatasetNum)
+				xlsx.SetCellValue(sheetName, "T"+rows, userRecord.CommitModelCount)
 				formatTime := userRecord.RegistDate.Format("2006-01-02 15:04:05")
-				xlsx.SetCellValue(sheetName, "Q"+rows, formatTime[0:len(formatTime)-3])
-
-				xlsx.SetCellValue(sheetName, "R"+rows, userRecord.CloudBrainTaskNum)
-				xlsx.SetCellValue(sheetName, "S"+rows, fmt.Sprintf("%.2f", float64(userRecord.CloudBrainRunTime)/3600))
-				xlsx.SetCellValue(sheetName, "T"+rows, userRecord.CommitDatasetNum)
-				xlsx.SetCellValue(sheetName, "U"+rows, userRecord.CommitModelCount)
+				xlsx.SetCellValue(sheetName, "U"+rows, formatTime[0:len(formatTime)-3])
 				formatTime = userRecord.DataDate
 				xlsx.SetCellValue(sheetName, "V"+rows, formatTime)
 			}
@@ -255,11 +253,11 @@ func QueryUserStaticDataPage(ctx *context.Context) {
 			"N1": ctx.Tr("user.static.encyclopediascount"),
 			"O1": ctx.Tr("user.static.createrepocount"),
 			"P1": ctx.Tr("user.static.openiindex"),
-			"Q1": ctx.Tr("user.static.registdate"),
-			"R1": ctx.Tr("user.static.CloudBrainTaskNum"),
-			"S1": ctx.Tr("user.static.CloudBrainRunTime"),
-			"T1": ctx.Tr("user.static.CommitDatasetNum"),
-			"U1": ctx.Tr("user.static.CommitModelCount"),
+			"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.registdate"),
 			"V1": ctx.Tr("user.static.countdate"),
 		}
 		for k, v := range dataHeader {
@@ -286,13 +284,12 @@ func QueryUserStaticDataPage(ctx *context.Context) {
 			xlsx.SetCellValue(sheetName, "N"+rows, userRecord.EncyclopediasCount)
 			xlsx.SetCellValue(sheetName, "O"+rows, userRecord.CreateRepoCount)
 			xlsx.SetCellValue(sheetName, "P"+rows, fmt.Sprintf("%.2f", userRecord.OpenIIndex))
-
+			xlsx.SetCellValue(sheetName, "Q"+rows, userRecord.CloudBrainTaskNum)
+			xlsx.SetCellValue(sheetName, "R"+rows, fmt.Sprintf("%.2f", float64(userRecord.CloudBrainRunTime)/3600))
+			xlsx.SetCellValue(sheetName, "S"+rows, userRecord.CommitDatasetNum)
+			xlsx.SetCellValue(sheetName, "T"+rows, userRecord.CommitModelCount)
 			formatTime := userRecord.RegistDate.Format("2006-01-02 15:04:05")
-			xlsx.SetCellValue(sheetName, "Q"+rows, formatTime[0:len(formatTime)-3])
-			xlsx.SetCellValue(sheetName, "R"+rows, userRecord.CloudBrainTaskNum)
-			xlsx.SetCellValue(sheetName, "S"+rows, fmt.Sprintf("%.2f", float64(userRecord.CloudBrainRunTime)/3600))
-			xlsx.SetCellValue(sheetName, "T"+rows, userRecord.CommitDatasetNum)
-			xlsx.SetCellValue(sheetName, "U"+rows, userRecord.CommitModelCount)
+			xlsx.SetCellValue(sheetName, "U"+rows, formatTime[0:len(formatTime)-3])
 			formatTime = userRecord.DataDate
 			xlsx.SetCellValue(sheetName, "V"+rows, formatTime)
 		}

web_src/js/components/UserAnalysis.vue

@@ -134,15 +134,6 @@
                     label="创建项目"
                     align="center">
                 </el-table-column>  
-                <el-table-column
-                    prop="RegistDate"
-                    label="用户注册时间"
-                    width="120px"
-                    align="center">
-                    <template slot-scope="scope">
-                        {{scope.row.RegistDate | transformTimestamp}}
-                    </template>
-                </el-table-column> 
                 <el-table-column
                     prop="CloudBrainTaskNum"
                     label="云脑任务数"
@@ -170,7 +161,15 @@
                     width="120px"
                     align="center">
                 </el-table-column> 
-                
+                 <el-table-column
+                    prop="RegistDate"
+                    label="用户注册时间"
+                    width="120px"
+                    align="center">
+                    <template slot-scope="scope">
+                        {{scope.row.RegistDate | transformTimestamp}}
+                    </template>
+                </el-table-column> 
                 <el-table-column
                     prop="DataDate"
                     label="系统统计时间"