3 changed files with 3 additions and 6 deletions
Unified View
Diff Options
-
+1 -1models/user_business_analysis.go
-
+1 -1routers/repo/user_data_analysis.go
-
+1 -4web_src/js/components/UserAnalysis.vue
+ 1
- 1
models/user_business_analysis.go
View File
| @@ -387,7 +387,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, CommitCodeSizeMap map[s | |||||
| OpenIIndexMap := queryUserRepoOpenIIndex(startTime.Unix(), end_unix) | OpenIIndexMap := queryUserRepoOpenIIndex(startTime.Unix(), end_unix) | ||||
| DataDate := currentTimeNow.Format("2006-01-02") | |||||
| DataDate := currentTimeNow.Format("2006-01-02") + " 00:01" | |||||
| cond := "type != 1 and is_active=true" | cond := "type != 1 and is_active=true" | ||||
| count, err := sess.Where(cond).Count(new(User)) | count, err := sess.Where(cond).Count(new(User)) | ||||
+ 1
- 1
routers/repo/user_data_analysis.go
View File
| @@ -88,7 +88,7 @@ func queryUserDataPage(ctx *context.Context, tableName string, queryObj interfac | |||||
| xlsx.SetCellValue(sheetName, "P"+rows, formatTime[0:len(formatTime)-3]) | xlsx.SetCellValue(sheetName, "P"+rows, formatTime[0:len(formatTime)-3]) | ||||
| formatTime = userRecord.DataDate | formatTime = userRecord.DataDate | ||||
| xlsx.SetCellValue(sheetName, "Q"+rows, formatTime+" 00:01") | |||||
| xlsx.SetCellValue(sheetName, "Q"+rows, formatTime) | |||||
| } | } | ||||
| //设置默认打开的表单 | //设置默认打开的表单 | ||||
+ 1
- 4
web_src/js/components/UserAnalysis.vue
View File
| @@ -135,13 +135,10 @@ | |||||
| </template> | </template> | ||||
| </el-table-column> | </el-table-column> | ||||
| <el-table-column | <el-table-column | ||||
| prop="CountDate" | |||||
| prop="DataDate" | |||||
| label="系统统计时间" | label="系统统计时间" | ||||
| width="120px" | width="120px" | ||||
| align="center"> | align="center"> | ||||
| <template slot-scope="scope"> | |||||
| {{scope.row.CountDate | transformTimestamp}} | |||||
| </template> | |||||
| </el-table-column> | </el-table-column> | ||||
| </el-table> | </el-table> | ||||
| </div> | </div> | ||||