Browse Source

提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>
tags/v1.22.1.3
zouap 3 years ago
parent
commit
6b3e8c554c
3 changed files with 3 additions and 6 deletions
  1. +1
    -1
      models/user_business_analysis.go
  2. +1
    -1
      routers/repo/user_data_analysis.go
  3. +1
    -4
      web_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)

DataDate := currentTimeNow.Format("2006-01-02")
DataDate := currentTimeNow.Format("2006-01-02") + " 00:01"

cond := "type != 1 and is_active=true"
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])

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>
</el-table-column>
<el-table-column
prop="CountDate"
prop="DataDate"
label="系统统计时间"
width="120px"
align="center">
<template slot-scope="scope">
{{scope.row.CountDate | transformTimestamp}}
</template>
</el-table-column>
</el-table>
</div>


Loading…
Cancel
Save