Commit ffe402e9 authored by ganjingcun's avatar ganjingcun

统计数据

parent 7fa53182
...@@ -689,29 +689,77 @@ router.get('/report', function (req, res) { ...@@ -689,29 +689,77 @@ router.get('/report', function (req, res) {
var totalActive = results.totalActive.rows[0].count; var totalActive = results.totalActive.rows[0].count;
var dateHour = "" var dateHour = ""
var h = ""
var hourlyDataMap = { var hourlyDataMap = {
athletic: {}, athletic: {},
entertain: {} entertain: {}
} }
var hourlyAvgMapAthletic = {}
var hourlyAvgMapEntertain = {}
var totalAthletic = 0
var totalEntertain = 0
var hourlyAthletic = results.hourlyAthletic.rows; var hourlyAthletic = results.hourlyAthletic.rows;
_.forEach(hourlyAthletic, function (row) { _.forEach(hourlyAthletic, function (row) {
totalAthletic++
dateHour = moment(row.start_time).format("YYYY-MM-DD HH") dateHour = moment(row.start_time).format("YYYY-MM-DD HH")
h = moment(row.start_time).format("H")
if (hourlyDataMap['athletic'][dateHour]) { if (hourlyDataMap['athletic'][dateHour]) {
hourlyDataMap['athletic'][dateHour]++; hourlyDataMap['athletic'][dateHour]++;
} else { } else {
hourlyDataMap['athletic'][dateHour] = 1; hourlyDataMap['athletic'][dateHour] = 1;
} }
if (hourlyAvgMapAthletic[h]) {
hourlyAvgMapAthletic[h]++;
} else {
hourlyAvgMapAthletic[h] = 1;
}
}) })
var hourlyEntertain = results.hourlyEntertain.rows; var hourlyEntertain = results.hourlyEntertain.rows;
_.forEach(hourlyEntertain, function (row) { _.forEach(hourlyEntertain, function (row) {
totalEntertain++
dateHour = moment(row.start_time).format("YYYY-MM-DD HH") dateHour = moment(row.start_time).format("YYYY-MM-DD HH")
h = moment(row.start_time).format("H")
if (hourlyDataMap['entertain'][dateHour]) { if (hourlyDataMap['entertain'][dateHour]) {
hourlyDataMap['entertain'][dateHour]++; hourlyDataMap['entertain'][dateHour]++;
} else { } else {
hourlyDataMap['entertain'][dateHour] = 1; hourlyDataMap['entertain'][dateHour] = 1;
} }
if (hourlyAvgMapEntertain[h]) {
hourlyAvgMapEntertain[h]++;
} else {
hourlyAvgMapEntertain[h] = 1;
}
}) })
var totalDays = moment(to_date).diff(from_date, 'days')
//饼图
var legendDataAthletic = [];
var seriesDataAthletic = [];
for (var i = 0; i < 24; i++) {
legendDataAthletic.push(i);
seriesDataAthletic.push({
name: i,
avg: ((hourlyAvgMapAthletic[i] || 0) / totalDays).toFixed(2),
value: hourlyAvgMapAthletic[i] || 0
});
}
var legendDataEntertain = [];
var seriesDataEntertain = [];
for (var i = 0; i < 24; i++) {
legendDataEntertain.push(i);
seriesDataEntertain.push({
name: i,
avg: ((hourlyAvgMapEntertain[i] || 0) / totalDays).toFixed(2),
value: hourlyAvgMapEntertain[i] || 0
});
}
res.json({ res.json({
entertain: { entertain: {
total: entertainTotal, total: entertainTotal,
...@@ -724,7 +772,14 @@ router.get('/report', function (req, res) { ...@@ -724,7 +772,14 @@ router.get('/report', function (req, res) {
users: athleticUsers users: athleticUsers
}, },
totalActive: totalActive, totalActive: totalActive,
hourlyDataMap: hourlyDataMap hourlyDataMap: hourlyDataMap,
totalDays: totalDays,
totalEntertain: totalEntertain,
totalAthletic: totalAthletic,
legendDataAthletic: legendDataAthletic,
seriesDataAthletic: seriesDataAthletic,
legendDataEntertain: legendDataEntertain,
seriesDataEntertain: seriesDataEntertain
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment