|
@@ -495,12 +495,12 @@ func getTimePeroid(ctx *context.Context, recordBeginTime time.Time) (time.Time, |
|
|
|
|
|
|
|
|
} else { |
|
|
} else { |
|
|
|
|
|
|
|
|
beginTime, err = time.Parse("2006-01-02", beginTimeStr) |
|
|
|
|
|
|
|
|
beginTime, err = time.ParseInLocation("2006-01-02", beginTimeStr, time.Local) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return now, now, err |
|
|
return now, now, err |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
endTime, err = time.Parse("2006-01-02", endTimeStr) |
|
|
|
|
|
|
|
|
endTime, err = time.ParseInLocation("2006-01-02", endTimeStr, time.Local) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return now, now, err |
|
|
return now, now, err |
|
|
} |
|
|
} |
|
@@ -520,8 +520,7 @@ func getTimePeroid(ctx *context.Context, recordBeginTime time.Time) (time.Time, |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
func getRecordBeginTime() (time.Time, error) { |
|
|
func getRecordBeginTime() (time.Time, error) { |
|
|
|
|
|
|
|
|
return time.Parse(DATE_FORMAT, setting.RadarMap.RecordBeginTime) |
|
|
|
|
|
|
|
|
return time.ParseInLocation(DATE_FORMAT, setting.RadarMap.RecordBeginTime, time.Local) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
func getTotalPage(total int64, pageSize int) int { |
|
|
func getTotalPage(total int64, pageSize int) int { |
|
|