diff --git a/public/js/stats.js b/public/js/stats.js index 338df18..6584fca 100644 --- a/public/js/stats.js +++ b/public/js/stats.js @@ -276,8 +276,8 @@ function renderHBarRanking(rows, { containerId, getValue, getLabel, onClick, for container.innerHTML = rows.map((r, i) => { const pct = Math.max((getValue(r) / max) * 100, 2); const label = getLabel(r).replace(/'/g, "\\'"); - const value = formatValue ? formatValue(getValue(r)) : (getValue(r).toFixed ? getValue(r).toFixed(2) : getValue(r)); - return `
+ const value = formatValue ? formatValue(getValue(r)) : (typeof getValue(r) === 'number' ? getValue(r).toFixed(2) : getValue(r)); + return `
${i + 1}
${label}
diff --git a/server/routes/stats.js b/server/routes/stats.js index 96b3aa4..d1678ec 100644 --- a/server/routes/stats.js +++ b/server/routes/stats.js @@ -310,7 +310,7 @@ router.get('/partner-records', (req, res) => { (category = '派单' AND partner = ?) OR (type = 'income' AND category != '派单' AND category != '接单' AND source = ?) )${dateFilter} - `).get(partner, req.user.id, partner, ...dateParams); + `).get(req.user.id, partner, partner, ...dateParams); const records = db.prepare(` SELECT * FROM records @@ -321,7 +321,6 @@ router.get('/partner-records', (req, res) => { `).all(req.user.id, partner, partner, ...dateParams, Number(limit), offset); res.json({ - dispatch_count: dispatchStats.dispatch_count, dispatch_count: summary.dispatch_count, spread_income: summary.spread_income, rebate_income: summary.rebate_income,