| @@ -290,7 +290,7 @@ func queryMetrics(ctx *context.Context, tableName string, startTime time.Time, e | |||||
| xlsx.SetActiveSheet(index) | xlsx.SetActiveSheet(index) | ||||
| filename := sheetName + "_" + ctx.Tr("user.static."+tableName) + ".xlsx" | filename := sheetName + "_" + ctx.Tr("user.static."+tableName) + ".xlsx" | ||||
| if tableName == "" { | if tableName == "" { | ||||
| filename = sheetName + "_" + startTime.Format("20060102") + "_" + endTime.Format("20060102") | |||||
| filename = sheetName + "_" + startTime.Format("20060102") + "_" + endTime.Format("20060102") + ".xlsx" | |||||
| } | } | ||||
| ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(filename)) | ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(filename)) | ||||
| ctx.Resp.Header().Set("Content-Type", "application/octet-stream") | ctx.Resp.Header().Set("Content-Type", "application/octet-stream") | ||||
| @@ -418,23 +418,10 @@ func QueryUserMetricDataPage(ctx *context.Context) { | |||||
| startDate := ctx.Query("startDate") | startDate := ctx.Query("startDate") | ||||
| endDate := ctx.Query("endDate") | endDate := ctx.Query("endDate") | ||||
| startTime, _ := time.ParseInLocation("2006-01-02", startDate, time.Local) | startTime, _ := time.ParseInLocation("2006-01-02", startDate, time.Local) | ||||
| startTime = startTime.UTC() | |||||
| endTime, _ := time.ParseInLocation("2006-01-02", endDate, time.Local) | endTime, _ := time.ParseInLocation("2006-01-02", endDate, time.Local) | ||||
| page := ctx.QueryInt("page") | |||||
| if page <= 0 { | |||||
| page = 1 | |||||
| } | |||||
| pageSize := ctx.QueryInt("pageSize") | |||||
| if pageSize <= 0 { | |||||
| pageSize = setting.UI.IssuePagingNum | |||||
| } | |||||
| startTime = getStartTime(startTime) | |||||
| queryMetrics(ctx, "", startTime, endTime) | queryMetrics(ctx, "", startTime, endTime) | ||||
| // result, count := models.QueryMetricsPage(startTime.Unix(), endTime.Unix(), page, pageSize) | |||||
| // mapInterface := make(map[string]interface{}) | |||||
| // mapInterface["data"] = result | |||||
| // mapInterface["count"] = count | |||||
| // ctx.JSON(http.StatusOK, mapInterface) | |||||
| } | } | ||||
| func QueryUserStaticDataPage(ctx *context.Context) { | func QueryUserStaticDataPage(ctx *context.Context) { | ||||