diff --git a/backend/app/schemas/pl/vehicle_fuel.py b/backend/app/schemas/pl/vehicle_fuel.py index 092a6078b..bdf9bec0b 100644 --- a/backend/app/schemas/pl/vehicle_fuel.py +++ b/backend/app/schemas/pl/vehicle_fuel.py @@ -130,6 +130,21 @@ class VehicleFuelPlateMonthItem(BaseModel): alias="last3MonthsRateL100", description="近三个月百公里油耗 L/100km,不足则为 null", ) + avg_rate_last10_l100: Optional[Decimal] = Field( + default=None, + alias="avgRateLast10L100", + description="近10次有效加油段平均百公里油耗 L/100km,不足则为 null", + ) + avg_rate_last20_l100: Optional[Decimal] = Field( + default=None, + alias="avgRateLast20L100", + description="近20次有效加油段平均百公里油耗 L/100km,不足则为 null", + ) + avg_rate_last30_l100: Optional[Decimal] = Field( + default=None, + alias="avgRateLast30L100", + description="近30次有效加油段平均百公里油耗 L/100km,不足则为 null", + ) model_config = {"populate_by_name": True} diff --git a/backend/app/services/pl_vehicle_fuel_service.py b/backend/app/services/pl_vehicle_fuel_service.py index 3378633f4..8becbf069 100644 --- a/backend/app/services/pl_vehicle_fuel_service.py +++ b/backend/app/services/pl_vehicle_fuel_service.py @@ -479,6 +479,41 @@ def rate_l100(liters: Decimal, run_km: Optional[Decimal]) -> Optional[Decimal]: ) +def trip_rate_l100( + prev_liters: Optional[Decimal], + prev_odometer: Optional[Decimal], + curr_odometer: Optional[Decimal], +) -> Optional[Decimal]: + """相邻两次登记的单次油耗:上次升数 × 100 / (本次期初 − 上次期初)。""" + if prev_liters is None or prev_odometer is None or curr_odometer is None: + return None + liters = Decimal(prev_liters) + if liters <= 0: + return None + return rate_l100(liters, Decimal(curr_odometer) - Decimal(prev_odometer)) + + +def avg_recent_trip_rates_l100( + rows: Sequence[Tuple[Optional[Decimal], Optional[Decimal]]], + n: int, +) -> Optional[Decimal]: + """rows 为按时间升序的 (期初公里, 加油升数);取最近 n 个有效单次油耗算术平均。""" + if n <= 0: + return None + rates: list[Decimal] = [] + for i in range(1, len(rows)): + prev_odo, prev_liters = rows[i - 1] + curr_odo, _ = rows[i] + rate = trip_rate_l100(prev_liters, prev_odo, curr_odo) + if rate is not None: + rates.append(rate) + if not rates: + return None + selected = rates[-n:] + total = sum(selected, Decimal("0")) + return (total / Decimal(len(selected))).quantize(Decimal("0.01"), rounding=ROUND_HALF_UP) + + def _odo_pairs( rows: Sequence[PlVehicleFuelRegister], ) -> list[Tuple[date, Optional[Decimal]]]: @@ -526,8 +561,6 @@ def list_plate_month_summary( q_start, q_end = quarter_bounds(anchor) prev_q_start, _ = _ym_bounds(ym_shift(f"{q_start:%Y-%m}", -3)) _, next_q_end = quarter_bounds(q_end) - range_start = min(prev_q_start, last3_start, prev_start) - range_end = max(next_end, next_q_end) vehicle_query = ( db.query(PlVehicle) @@ -547,12 +580,11 @@ def list_plate_month_summary( vehicles = apply_pl_scope(vehicle_query, PlVehicle, user, db, tenant_no).all() personnel_summaries = load_vehicle_personnel_summaries(db, tenant_no, [v.id for v in vehicles]) + # 近 N 次平均需要完整历史;月/季指标仍从同批记录按区间切片。 query = db.query(PlVehicleFuelRegister).filter( PlVehicleFuelRegister.tenant_no == tenant_no, PlVehicleFuelRegister.del_flag == 0, PlVehicleFuelRegister.status == "normal", - PlVehicleFuelRegister.register_date >= range_start, - PlVehicleFuelRegister.register_date < range_end, ) query = apply_pl_scope(query, PlVehicleFuelRegister, user, db, tenant_no) registers = query.order_by( @@ -575,6 +607,7 @@ def list_plate_month_summary( next_q_rows = [r for r in rows if q_end <= r.register_date < next_q_end] prev_q_rows = [r for r in rows if prev_q_start <= r.register_date < q_start] last3_rows = [r for r in rows if last3_start <= r.register_date < cur_end] + odo_liter_rows = [(r.odometer_km, r.fuel_liters) for r in rows] month_km, month_status = period_run_km(_odo_pairs(cur_rows), _odo_pairs(next_rows)) prev_month_km, prev_month_status = period_run_km(_odo_pairs(prev_rows), _odo_pairs(cur_rows)) @@ -606,6 +639,9 @@ def list_plate_month_summary( prevQuarterRateL100=prev_quarter_rate, prevMonthRateL100=prev_month_rate, last3MonthsRateL100=last3_rate, + avgRateLast10L100=avg_recent_trip_rates_l100(odo_liter_rows, 10), + avgRateLast20L100=avg_recent_trip_rates_l100(odo_liter_rows, 20), + avgRateLast30L100=avg_recent_trip_rates_l100(odo_liter_rows, 30), ) ) diff --git a/backend/tests/test_pl_vehicle_fuel_recent_rate.py b/backend/tests/test_pl_vehicle_fuel_recent_rate.py new file mode 100644 index 000000000..5fbb45579 --- /dev/null +++ b/backend/tests/test_pl_vehicle_fuel_recent_rate.py @@ -0,0 +1,39 @@ +"""近 N 次加油段平均百公里油耗(L/100km)算法。""" +from decimal import Decimal + +from app.services.pl_vehicle_fuel_service import avg_recent_trip_rates_l100, trip_rate_l100 + + +def test_trip_rate_uses_previous_liters_over_odometer_delta(): + # (本次期初 - 上次期初) = 200km,上次加油 50L → 25 L/100km + assert trip_rate_l100( + prev_liters=Decimal("50"), + prev_odometer=Decimal("1000"), + curr_odometer=Decimal("1200"), + ) == Decimal("25.00") + + +def test_trip_rate_rejects_non_positive_delta_or_liters(): + assert trip_rate_l100(Decimal("50"), Decimal("1200"), Decimal("1000")) is None + assert trip_rate_l100(Decimal("0"), Decimal("1000"), Decimal("1200")) is None + assert trip_rate_l100(Decimal("-1"), Decimal("1000"), Decimal("1200")) is None + assert trip_rate_l100(Decimal("50"), None, Decimal("1200")) is None + assert trip_rate_l100(Decimal("50"), Decimal("1000"), None) is None + + +def test_avg_recent_takes_last_n_valid_segments_only(): + # 段1: 1000→1100 / 40L = 40 + # 段2: 1100→1300 / 50L = 25 + # 段3: 无效(里程倒退) + # 段4: 1200→1500 / 60L = 20 + rows = [ + (Decimal("1000"), Decimal("40")), + (Decimal("1100"), Decimal("50")), + (Decimal("1300"), Decimal("30")), + (Decimal("1200"), Decimal("60")), # 倒退后的上一笔,下一段用其升数 + (Decimal("1500"), Decimal("10")), + ] + assert avg_recent_trip_rates_l100(rows, 2) == Decimal("22.50") # (25+20)/2 + assert avg_recent_trip_rates_l100(rows, 10) == Decimal("28.33") # (40+25+20)/3 + assert avg_recent_trip_rates_l100(rows[:1], 10) is None + assert avg_recent_trip_rates_l100([], 10) is None diff --git a/backend/tests/test_pl_vehicle_fuel_summary.py b/backend/tests/test_pl_vehicle_fuel_summary.py index a85b66e05..6ce064b58 100644 --- a/backend/tests/test_pl_vehicle_fuel_summary.py +++ b/backend/tests/test_pl_vehicle_fuel_summary.py @@ -73,6 +73,10 @@ def test_summary_includes_html_metrics_and_previous_quarter_across_year(summary_ assert item["quarterRateL100"] == Decimal("50") assert item["prevMonthRateL100"] == Decimal("50") assert item["prevQuarterRateL100"] == Decimal("21.05") + # 五段有效:2、20、10、50、20 → 平均 20.40 + assert item["avgRateLast10L100"] == Decimal("20.40") + assert item["avgRateLast20L100"] == Decimal("20.40") + assert item["avgRateLast30L100"] == Decimal("20.40") def test_summary_follows_requested_month_instead_of_today(summary_db): diff --git a/openspec/changes/pl-fuel-recent-avg-rate/.openspec.yaml b/openspec/changes/pl-fuel-recent-avg-rate/.openspec.yaml new file mode 100644 index 000000000..9bd90dabc --- /dev/null +++ b/openspec/changes/pl-fuel-recent-avg-rate/.openspec.yaml @@ -0,0 +1,3 @@ +schema: spec-driven +created: 2026-11-19 +issue: 48 diff --git a/openspec/changes/pl-fuel-recent-avg-rate/design.md b/openspec/changes/pl-fuel-recent-avg-rate/design.md new file mode 100644 index 000000000..fdfdd1dc0 --- /dev/null +++ b/openspec/changes/pl-fuel-recent-avg-rate/design.md @@ -0,0 +1,14 @@ +## Context + +汇总页与本人登记页共用 `FuelRegisterListPage`;仅 `mode=summary` 显示顶部卡片。原月度指标 API 仍保留字段,前端改为展示近 N 次平均。 + +## Decision + +1. **计算放后端**:租户隔离、数据范围与作废过滤与列表一致;前端只展示。 +2. **复用 `plate-month-summary`**:增加 `avgRateLast10/20/30L100`,拉取该车全部正常未删登记再切片,避免新路由。 +3. **单位 L/100km**:与既有 `rate_l100` 一致;升数≤0 或里程差≤0 的段不计入平均。 +4. **UI**:去掉月份条;三项指标;点击车牌仍写列头车牌过滤。 + +## Risks + +- 全量历史登记加载:自有车加油量通常可控;若日后变大再按车牌限窗。 diff --git a/openspec/changes/pl-fuel-recent-avg-rate/proposal.md b/openspec/changes/pl-fuel-recent-avg-rate/proposal.md new file mode 100644 index 000000000..24f0f21ea --- /dev/null +++ b/openspec/changes/pl-fuel-recent-avg-rate/proposal.md @@ -0,0 +1,26 @@ +## Why + +加油登记汇总页顶部曾改为「待开发」。业务需要按车牌展示近 10/20/30 次平均油耗(L/100km),替代原按月加油量/里程/月季油耗卡片内容。 + +## What Changes + +- 恢复汇总页顶部车牌卡片(复用既有卡片布局,去掉月份选择) +- `plate-month-summary` 增加近 10/20/30 次平均百公里油耗字段 +- 单次油耗:`(上次加油升数 × 100) / (本次期初公里 − 上次期初公里)` +- 近 N 次:同一车牌时间升序中,最近 N 个有效单次的算术平均;无效段跳过 + +## Capabilities + +### New Capabilities + +- (无) + +### Modified Capabilities + +- `pl-vehicle-fuel-summary`: 汇总顶部统计口径改为近 N 次平均 L/100km + +## Impact + +- 后端 `pl_vehicle_fuel_service` / `vehicle_fuel` schema +- Web `FuelPlateMonthCards`、`FuelRegisterListPage`、API 类型 +- 工单:https://gitea.aichengyan.com/cykj/shanxia2.0/issues/48 diff --git a/openspec/changes/pl-fuel-recent-avg-rate/specs/pl-vehicle-fuel-summary/spec.md b/openspec/changes/pl-fuel-recent-avg-rate/specs/pl-vehicle-fuel-summary/spec.md new file mode 100644 index 000000000..c217f2aa5 --- /dev/null +++ b/openspec/changes/pl-fuel-recent-avg-rate/specs/pl-vehicle-fuel-summary/spec.md @@ -0,0 +1,25 @@ +## ADDED Requirements + +### Requirement: 近 N 次平均百公里油耗 + +系统 SHALL 在加油登记汇总顶部按自有车牌展示近 10、20、30 次平均油耗,单位为 L/100km。 + +#### Scenario: 单次油耗计算 + +- **WHEN** 同一车牌存在相邻两次正常未删除登记,且上次加油升数 > 0、本次期初公里 > 上次期初公里 +- **THEN** 该段油耗为 `上次加油升数 × 100 / (本次期初公里 − 上次期初公里)`,保留两位小数 + +#### Scenario: 近 N 次平均 + +- **WHEN** 某车牌存在至少一段有效单次油耗 +- **THEN** 近 N 次平均为时间升序下最近 min(N, 有效段数) 个单次油耗的算术平均;无效段(缺期初、升数≤0、里程未增加)不计入 + +#### Scenario: 数据不足 + +- **WHEN** 某车牌没有有效单次油耗段 +- **THEN** 对应近 N 次平均字段为 null,界面显示 — + +#### Scenario: 点击筛选 + +- **WHEN** 用户点击某车牌卡片 +- **THEN** 下方列表按该车牌过滤;再次点击同一车牌取消过滤 diff --git a/openspec/changes/pl-fuel-recent-avg-rate/tasks.md b/openspec/changes/pl-fuel-recent-avg-rate/tasks.md new file mode 100644 index 000000000..7a2d14256 --- /dev/null +++ b/openspec/changes/pl-fuel-recent-avg-rate/tasks.md @@ -0,0 +1,15 @@ +## 1. 后端 + +- [x] 单次/近 N 次平均算法与单测 +- [x] schema 增加 avgRateLast10/20/30L100 +- [x] `list_plate_month_summary` 填充新字段;汇总回归断言 + +## 2. Web + +- [x] 恢复汇总顶部卡片,展示近 10/20/30 次平均 +- [x] API 类型字段对齐 + +## 3. 验证 + +- [x] `pytest` 加油汇总相关:21 passed +- [ ] 本机打开汇总页目视验收(需在任务 worktree 启前后端) diff --git a/web-admin/src/api/pl/index.ts b/web-admin/src/api/pl/index.ts index bd5ac1387..b167bb742 100644 --- a/web-admin/src/api/pl/index.ts +++ b/web-admin/src/api/pl/index.ts @@ -2262,6 +2262,10 @@ export interface VehicleFuelPlateMonthItem { prevMonthRateL100?: number | string | null /** 近三个月百公里油耗 L/100km;里程不足时为 null */ last3MonthsRateL100?: number | string | null + /** 近 10/20/30 次有效加油段平均百公里油耗 L/100km */ + avgRateLast10L100?: number | string | null + avgRateLast20L100?: number | string | null + avgRateLast30L100?: number | string | null } export interface VehicleFuelPlateMonthSummaryResponse { diff --git a/web-admin/src/views/pl/vehicle-fuel-register/FuelPlateMonthCards.vue b/web-admin/src/views/pl/vehicle-fuel-register/FuelPlateMonthCards.vue index 098701539..90766458c 100644 --- a/web-admin/src/views/pl/vehicle-fuel-register/FuelPlateMonthCards.vue +++ b/web-admin/src/views/pl/vehicle-fuel-register/FuelPlateMonthCards.vue @@ -1,89 +1,41 @@ - + @@ -91,20 +43,13 @@ - -