From b4c4929dbb4c1e96c6b203a93e543f942e1b69ac Mon Sep 17 00:00:00 2001 From: kkfluous Date: Tue, 14 Apr 2026 22:44:01 +0800 Subject: [PATCH 01/79] =?UTF-8?q?feat:=20=E9=83=A8=E9=97=A8/=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=88=97=E8=A1=A8=E8=A1=A5?= =?UTF-8?q?=E9=BD=90=E6=97=A0=E8=BD=A6=E8=BE=86=E4=B8=9A=E5=8A=A1=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /dept-stats 在按车辆聚合后，查询 tab_user 把业务部门内所有在职用户补进 managers 列表，无车辆显示为 0 辆。跳过公务车部门。 Co-Authored-By: Claude Opus 4.6 (1M context) --- src/server/routes/vehicles.ts | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/server/routes/vehicles.ts b/src/server/routes/vehicles.ts index 56d8ca5..1572a35 100644 --- a/src/server/routes/vehicles.ts +++ b/src/server/routes/vehicles.ts @@ -690,6 +690,28 @@ app.get('/dept-stats', async (c) => { mgrMap.get(mgr)!.push(v); } + // 补齐：业务部门内所有在职用户，即使当前无车辆也需显示 + const deptNames = Array.from(deptMap.keys()).filter((d) => d !== '公务车'); + if (deptNames.length > 0) { + const placeholders = deptNames.map(() => '?').join(','); + const [userRows] = await pool.query( + `SELECT u.user_name, dep.dep_name + FROM tab_user u + LEFT JOIN tab_department dep ON dep.id = u.dep_id AND dep.is_deleted = 0 + WHERE u.is_deleted = 0 + AND dep.dep_name IN (${placeholders})`, + deptNames, + ); + for (const r of userRows as any[]) { + const dept = r.dep_name as string | null; + const mgr = r.user_name as string | null; + if (!dept || !mgr) continue; + const mgrMap = deptMap.get(dept); + if (!mgrMap) continue; + if (!mgrMap.has(mgr)) mgrMap.set(mgr, []); + } + } + // Compute attendance & avg mileage from realtime data const getMileageStats = (vList: Vehicle[]) => { const todayActive = vList.filter((v) => (todayMileageMap.get(v.plateNumber) || 0) > 0).length; From 8660c0d99994ef81f9ed0fcf9986c1a72000f1d0 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Tue, 14 Apr 2026 22:48:07 +0800 Subject: [PATCH 02/79] =?UTF-8?q?fix:=20=E9=83=A8=E9=97=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=9A=90=E8=97=8F=E9=9D=9E=E4=B8=9A=E5=8A=A1=E5=91=98?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=EF=BC=88=E8=B6=85=E7=BA=A7=E7=94=A8=E6=88=B7?= =?UTF-8?q?/=E5=88=98=E6=80=9D=E5=AE=87/=E6=BD=98=E8=88=92/=E9=BB=84?= =?UTF-8?q?=E5=8D=93=E5=8D=8E/=E8=AE=B8=E9=93=AE=E6=9D=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 (1M context) --- src/server/routes/vehicles.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/server/routes/vehicles.ts b/src/server/routes/vehicles.ts index 1572a35..ba14d7c 100644 --- a/src/server/routes/vehicles.ts +++ b/src/server/routes/vehicles.ts @@ -680,10 +680,14 @@ app.get('/dept-stats', async (c) => { if (plate) todayMileageMap.set(plate, Number(row.day_mileage) || 0); } + // 不在部门列表展示的用户（非业务员或管理账号） + const EXCLUDED_MANAGERS = new Set(['超级用户', '刘思宇', '潘舒', '黄卓华', '许铮杰']); + const deptMap = new Map>(); for (const v of withManager) { const dept = v.departmentName || '公务车'; const mgr = v.customerManager || '未分配'; + if (EXCLUDED_MANAGERS.has(mgr)) continue; if (!deptMap.has(dept)) deptMap.set(dept, new Map()); const mgrMap = deptMap.get(dept)!; if (!mgrMap.has(mgr)) mgrMap.set(mgr, []); @@ -706,6 +710,7 @@ app.get('/dept-stats', async (c) => { const dept = r.dep_name as string | null; const mgr = r.user_name as string | null; if (!dept || !mgr) continue; + if (EXCLUDED_MANAGERS.has(mgr)) continue; const mgrMap = deptMap.get(dept); if (!mgrMap) continue; if (!mgrMap.has(mgr)) mgrMap.set(mgr, []); From d6c31dd2b67e36383d9a5b019f0c12cd8ea45ce9 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Wed, 15 Apr 2026 10:22:19 +0800 Subject: [PATCH 03/79] =?UTF-8?q?fix:=20=E5=AE=9E=E6=97=B6=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E7=B4=AF=E8=AE=A1=E6=80=BB=E9=87=8C=E7=A8=8B=E5=B0=91?= =?UTF-8?q?=E7=AE=97=EF=BC=8CG7S=20=E6=95=B0=E6=8D=AE=E6=BA=90=20total=5Fk?= =?UTF-8?q?m=20=E4=B8=BA=20NULL=20=E6=97=B6=E7=94=A8=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=BA=93=20vehicle=5Ftotal=5Fmileage=20=E5=85=9C=E5=BA=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 (1M context) --- src/server/routes/mileage/cache.ts | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/src/server/routes/mileage/cache.ts b/src/server/routes/mileage/cache.ts index 63945ef..b88352f 100644 --- a/src/server/routes/mileage/cache.ts +++ b/src/server/routes/mileage/cache.ts @@ -49,10 +49,26 @@ interface MileageRow { source: string; } +async function fetchBizTotalMileageMap(): Promise> { + // v_vehicle_daily_stats.total_km 对 G7S 数据源常为 NULL（G7 只回传日增量）， + // 业务库 tab_mileage_assessment_vehicle.vehicle_total_mileage 是累加后的权威累计值， + // 用它兜底保证 totalKm 汇总完整。 + const [rows] = await pool.execute( + 'SELECT plate_number, vehicle_total_mileage FROM tab_mileage_assessment_vehicle WHERE is_deleted = 0' + ) as [{ plate_number: string; vehicle_total_mileage: string | number | null }[], unknown]; + const map = new Map(); + for (const r of rows) { + const km = Number(r.vehicle_total_mileage); + if (Number.isFinite(km) && km > 0) map.set(r.plate_number, km); + } + return map; +} + function mergeVehicles( mileageRows: MileageRow[], infoMap: Map, yesterdayMap: Map, + bizTotalMap: Map, ): CachedVehicle[] { const mileageMap = new Map(); for (const row of mileageRows) { @@ -66,11 +82,13 @@ function mergeVehicles( const info = infoMap.get(m.plate); const dailyKm = Number(m.daily_km) || 0; const source = m.source || 'NONE'; + const gpsTotal = m.total_km !== null ? Number(m.total_km) : null; + const bizTotal = bizTotalMap.get(m.plate); return { plate: m.plate, vin: m.vin, dailyKm, - totalKm: m.total_km !== null ? Number(m.total_km) : null, + totalKm: gpsTotal !== null ? gpsTotal : (bizTotal ?? null), source, isOnline: source !== 'NONE' && dailyKm > 0, isDataSynced: source !== 'NONE', @@ -91,7 +109,7 @@ export async function refreshMonitoringCache(): Promise { console.log('[mileage] refreshing monitoring cache...'); const start = Date.now(); - const [mileageRows, yesterdayMap, infoMap, targetRows] = await Promise.all([ + const [mileageRows, yesterdayMap, infoMap, targetRows, bizTotalMap] = await Promise.all([ (async () => { const [dateRows] = await mileagePool.execute( 'SELECT MAX(stat_date) as latest FROM v_vehicle_daily_stats' @@ -124,6 +142,7 @@ export async function refreshMonitoringCache(): Promise { JOIN tab_mileage_assessment_vehicle v ON v.target_id = t.id AND v.is_deleted = 0 WHERE t.is_deleted = 0` ).then(([rows]) => rows as { id: number; target_name: string; plate_number: string }[]), + fetchBizTotalMileageMap(), ]); const targetPlatesMap = new Map>(); @@ -134,7 +153,7 @@ export async function refreshMonitoringCache(): Promise { } const targetNames = Array.from(targetPlatesMap.keys()); - const vehicles = mergeVehicles(mileageRows, infoMap, yesterdayMap); + const vehicles = mergeVehicles(mileageRows, infoMap, yesterdayMap, bizTotalMap); const totalToday = vehicles.reduce((sum, v) => sum + v.dailyKm, 0); const totalAll = vehicles.reduce((sum, v) => sum + (v.totalKm || 0), 0); @@ -153,7 +172,7 @@ export async function refreshMonitoringCache(): Promise { } export async function queryDateMileage(dateStr: string): Promise { - const [mileageRows, yesterdayRows, infoMap] = await Promise.all([ + const [mileageRows, yesterdayRows, infoMap, bizTotalMap] = await Promise.all([ mileagePool.execute( 'SELECT plate, vin, daily_km, total_km, source FROM v_vehicle_daily_stats WHERE stat_date = ?', [dateStr] @@ -163,6 +182,7 @@ export async function queryDateMileage(dateStr: string): Promise r as { plate: string; daily_km: string }[]), fetchVehicleInfoMap(), + fetchBizTotalMileageMap(), ]); const yesterdayMap = new Map(); @@ -172,7 +192,7 @@ export async function queryDateMileage(dateStr: string): Promise existing) yesterdayMap.set(r.plate, km); } - return mergeVehicles(mileageRows, infoMap, yesterdayMap); + return mergeVehicles(mileageRows, infoMap, yesterdayMap, bizTotalMap); } export function buildDateFilters(vehicles: CachedVehicle[]): MonitoringFilters { From 820fde55474e7d4ef48d1ddeb75b8682086a1a6c Mon Sep 17 00:00:00 2001 From: kkfluous Date: Wed, 15 Apr 2026 16:50:25 +0800 Subject: [PATCH 04/79] =?UTF-8?q?feat:=20=E8=B5=84=E4=BA=A7=E6=80=BB?= =?UTF-8?q?=E8=A7=88=E6=96=B0=E5=A2=9E=E6=89=80=E5=B1=9E=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E7=AD=9B=E9=80=89=EF=BC=8C=E6=94=AF=E6=8C=81=E6=8C=89=E5=BD=92?= =?UTF-8?q?=E5=B1=9E=E4=B8=BB=E4=BD=93=E8=BF=87=E6=BB=A4=E5=85=A8=E9=A1=B5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 后端：新增 /api/vehicles/subjects 端点返回公司列表+台数预览；所有聚合端点接受 ?subject= 参数按 tab_truck.org_id 对应的主体公司过滤 - 前端：标题下方新增 Scope Chip 单选下拉，支持搜索+台数预览，选中后全页 KPI/汇总/库存统计按公司联动刷新 Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/assets/AssetsModule.tsx | 214 +++++++++++++++++++++++----- src/modules/assets/api.ts | 56 ++++++-- src/server/routes/vehicles.ts | 48 ++++++- 3 files changed, 260 insertions(+), 58 deletions(-) diff --git a/src/modules/assets/AssetsModule.tsx b/src/modules/assets/AssetsModule.tsx index 48c38cb..1af81e4 100644 --- a/src/modules/assets/AssetsModule.tsx +++ b/src/modules/assets/AssetsModule.tsx @@ -30,10 +30,11 @@ import { LabelList, } from 'recharts'; import type { SummaryData, TypeSummary, VehicleListItem, DeptGroup, RegionGroup, CustomerStats, RegionalInventoryStats } from './types'; -import { fetchSummary, fetchByType, fetchVehicleList, fetchWeeklyDetail, fetchDeptStats, fetchRegionStats, fetchCustomerStats, fetchInventoryStats, fetchRegionChart } from './api'; +import { fetchSummary, fetchByType, fetchVehicleList, fetchWeeklyDetail, fetchDeptStats, fetchRegionStats, fetchCustomerStats, fetchInventoryStats, fetchRegionChart, fetchSubjects, type SubjectOption } from './api'; import type { WeeklyDetailItem } from './api'; import { SearchSelect } from '../../components/SearchSelect'; import { MultiSearchSelect } from '../../components/MultiSearchSelect'; +import Blur from '../../components/Blur'; // --- Constants --- @@ -57,6 +58,13 @@ export default function AssetsModule() { } }, [activeTab]); const [theme, setTheme] = useState<'soft' | 'minimal' | 'vibrant'>('soft'); + + // 所属公司（归属主体）筛选 —— 影响全页聚合 + const [selectedSubject, setSelectedSubject] = useState(null); + const [subjects, setSubjects] = useState([]); + const [subjectDropdownOpen, setSubjectDropdownOpen] = useState(false); + const [subjectSearch, setSubjectSearch] = useState(''); + const subjectDropdownRef = useRef(null); const [expandedModels, setExpandedModels] = useState>(new Set()); const [expandedAssetTypes, setExpandedAssetTypes] = useState>(new Set()); const [showPlateNumbers, setShowPlateNumbers] = useState<{ @@ -140,12 +148,12 @@ export default function AssetsModule() { setLoading(true); setError(null); const [s, byType, dept, region, cust, inv] = await Promise.all([ - fetchSummary(), - fetchByType(), - fetchDeptStats(), - fetchRegionStats(), - fetchCustomerStats(), - fetchInventoryStats(), + fetchSummary(selectedSubject), + fetchByType(selectedSubject), + fetchDeptStats(selectedSubject), + fetchRegionStats(undefined, selectedSubject), + fetchCustomerStats(selectedSubject), + fetchInventoryStats(selectedSubject), ]); setSummary(s); setProcessedData(byType); @@ -159,7 +167,7 @@ export default function AssetsModule() { } finally { setLoading(false); } - }, []); + }, [selectedSubject]); useEffect(() => { loadData(); @@ -167,22 +175,43 @@ export default function AssetsModule() { return () => clearInterval(interval); }, [loadData]); + // 归属公司列表（仅首次加载，公司集合相对稳定） + useEffect(() => { + fetchSubjects().then(setSubjects).catch(() => setSubjects([])); + }, []); + + // 点击外部关闭归属公司下拉 + useEffect(() => { + if (!subjectDropdownOpen) return; + const handler = (e: MouseEvent) => { + if (subjectDropdownRef.current && !subjectDropdownRef.current.contains(e.target as Node)) { + setSubjectDropdownOpen(false); + } + }; + document.addEventListener('mousedown', handler); + return () => document.removeEventListener('mousedown', handler); + }, [subjectDropdownOpen]); + // Re-fetch region data when filters change useEffect(() => { const hasFilter = regionFilters.customer || regionFilters.city || regionFilters.region; if (hasFilter) { - fetchRegionStats({ customer: regionFilters.customer || undefined, city: regionFilters.city || undefined, region: regionFilters.region || undefined }) - .then(setRegionData).catch(() => {}); + fetchRegionStats( + { customer: regionFilters.customer || undefined, city: regionFilters.city || undefined, region: regionFilters.region || undefined }, + selectedSubject, + ).then(setRegionData).catch(() => {}); } else { // No filters: use data from the main loadData cycle - fetchRegionStats().then(setRegionData).catch(() => {}); + fetchRegionStats(undefined, selectedSubject).then(setRegionData).catch(() => {}); } - }, [regionFilters]); + }, [regionFilters, selectedSubject]); // Fetch region chart data when view changes useEffect(() => { - fetchRegionChart(regionChartView, regionChartView === 'province' ? 5 : 8).then(setRegionChartData).catch(() => setRegionChartData([])); - }, [regionChartView]); + fetchRegionChart(regionChartView, regionChartView === 'province' ? 5 : 8, 'realtime', selectedSubject) + .then(setRegionChartData) + .catch(() => setRegionChartData([])); + }, [regionChartView, selectedSubject]); // Load modal vehicles useEffect(() => { @@ -235,11 +264,11 @@ export default function AssetsModule() { else if (showPlateNumbers.isTrailer === false) params.vehicleType = '其他'; } } - fetchVehicleList(params) + fetchVehicleList({ ...params, subject: selectedSubject }) .then(setModalVehicles) .catch(() => setModalVehicles([])) .finally(() => setModalLoading(false)); - }, [showPlateNumbers]); + }, [showPlateNumbers, selectedSubject]); const allTypesExpanded = processedData.length > 0 && processedData.every((t) => expandedAssetTypes.has(t.type)); @@ -439,9 +468,9 @@ export default function AssetsModule() { const [customerProvinceData, setCustomerProvinceData] = useState<{ name: string; value: number }[]>([]); useEffect(() => { if (customerChartView === 'province') { - fetchRegionChart('province', 5, 'vehicle').then(setCustomerProvinceData).catch(() => setCustomerProvinceData([])); + fetchRegionChart('province', 5, 'vehicle', selectedSubject).then(setCustomerProvinceData).catch(() => setCustomerProvinceData([])); } - }, [customerChartView]); + }, [customerChartView, selectedSubject]); const customerPieData = useMemo(() => { if (customerChartView === 'region') { @@ -512,6 +541,115 @@ export default function AssetsModule() { + {/* 归属公司作用域筛选 (Scope Chip) */} +
+
+ + {subjectDropdownOpen && ( +
+
+
+ + setSubjectSearch(e.target.value)} + placeholder="搜索公司名" + className="w-full h-7 pl-6 pr-2 text-[11px] bg-gray-50 border border-gray-100 rounded focus:outline-none focus:border-blue-300 focus:bg-white" + /> +
+
+
+ +
+ {subjects + .filter((s) => !subjectSearch || s.name.toLowerCase().includes(subjectSearch.toLowerCase())) + .map((s) => { + const active = selectedSubject === s.name; + return ( + + ); + })} + {subjects.filter((s) => !subjectSearch || s.name.toLowerCase().includes(subjectSearch.toLowerCase())).length === 0 && ( +
未找到匹配公司
+ )} +
+
+ )} +
+
+ {/* Tab row */}
{TABS.map(tab => ( @@ -1488,7 +1626,7 @@ export default function AssetsModule() { >
{isManagerExpanded ? : } - {m.manager} + {m.manager}
+ {(data?.targets || []).map(t => ( + + ))} +
+ + {/* Summary Cards */} +
+
+
+ + 已达标车辆 +
+
+ {loading ? '-' : summary?.qualifiedCount ?? 0} + 台 +
+

达标概率 ≥ 120%

+
+
+
+ + 无望达标 +
+
+ {loading ? '-' : summary?.hopelessCount ?? 0} + 台 +
+

达标概率 < 60%

+
+
+
+ + 可干预 +
+
+ {loading ? '-' : summary?.suggestionCount ?? 0} + 条 +
+

+ 预计可新增达标 +{summary?.estimatedGain ?? 0} 台 +

+
+
+ + {/* Refresh Button */} +
+ +
+ + {/* Suggestion List */} + {loading ? ( +
+
+
+ ) : ( + + )} + + {/* Detail Modal */} + {selectedSuggestion && ( + setSelectedSuggestion(null)} + onNotifySuccess={handleNotifySuccess} + /> + )} +
+
+ ); +} +``` + +- [ ] **Step 2: Commit** + +```bash +git add src/modules/scheduling/SchedulingModule.tsx +git commit -m "feat(scheduling): add SchedulingModule main entry component" +``` + +--- + +## Task 7: SuggestionList Component + +**Files:** +- Create: `src/modules/scheduling/SuggestionList.tsx` + +- [ ] **Step 1: Create SuggestionList.tsx** + +```tsx +// src/modules/scheduling/SuggestionList.tsx + +import { ArrowRightLeft, AlertTriangle, CheckCircle } from 'lucide-react'; +import { motion } from 'motion/react'; +import type { SchedulingSuggestion } from './types'; +import Blur from '../../components/Blur'; + +function fmtKm(value: number): string { + if (value >= 10000) return (value / 10000).toFixed(1) + '万'; + return value.toLocaleString(); +} + +interface Props { + suggestions: SchedulingSuggestion[]; + onSelect: (s: SchedulingSuggestion) => void; +} + +export default function SuggestionList({ suggestions, onSelect }: Props) { + if (suggestions.length === 0) { + return ( +
+
+ +
+

暂无调度建议

+

所有车辆当前无需干预

+
+ ); + } + + return ( +
+
+
+

智能调度干预清单

+ {suggestions.length} 条建议 +
+ +
+ {suggestions.map((s, idx) => ( + onSelect(s)} + className="p-4 hover:bg-slate-50/50 cursor-pointer transition-colors active:bg-slate-100" + > +
+
+ {/* Priority indicator */} +
+ {s.type === 'rescue_hopeless' + ? + : + } +
+ +
+
+ + {s.currentVehicle.plateNumber} + + + {s.type === 'rescue_hopeless' ? '无望达标' : '已达标'} + + + {s.currentVehicle.vehicleType} + + + {s.currentVehicle.region} + +
+
+ + 客户: {s.currentVehicle.customer || '-'} + + + 日均: {Math.round(s.currentVehicle.customerAvgDaily)} KM + + + 完成率: = 1 ? 'text-emerald-600' : 'text-slate-600'}`}> + {Math.round(s.currentVehicle.completionRate * 100)}% + + +
+
+
+ +
+
可替换
+
{s.candidates.length} 辆
+
+
+ + ))} +
+
+ ); +} +``` + +- [ ] **Step 2: Commit** + +```bash +git add src/modules/scheduling/SuggestionList.tsx +git commit -m "feat(scheduling): add SuggestionList component" +``` + +--- + +## Task 8: SuggestionDetail Component + +**Files:** +- Create: `src/modules/scheduling/SuggestionDetail.tsx` + +This is the modal with current vehicle info, candidate comparison, and notify button. Designed to be screenshot-friendly. + +- [ ] **Step 1: Create SuggestionDetail.tsx** + +```tsx +// src/modules/scheduling/SuggestionDetail.tsx + +import { useState } from 'react'; +import { X, ArrowRightLeft, Truck, MapPin, TrendingUp, AlertTriangle, CheckCircle, Send } from 'lucide-react'; +import { motion, AnimatePresence } from 'motion/react'; +import { sendNotify } from './api'; +import type { SchedulingSuggestion, CandidateVehicle } from './types'; +import Blur from '../../components/Blur'; + +function fmtKm(value: number): string { + if (value >= 10000) return (value / 10000).toFixed(1) + '万'; + return value.toLocaleString(); +} + +interface Props { + suggestion: SchedulingSuggestion; + onClose: () => void; + onNotifySuccess: () => void; +} + +export default function SuggestionDetail({ suggestion, onClose, onNotifySuccess }: Props) { + const [sending, setSending] = useState(false); + const [sentPlates, setSentPlates] = useState>(new Set()); + const s = suggestion; + const v = s.currentVehicle; + + const handleNotify = async (candidate: CandidateVehicle) => { + if (sending || sentPlates.has(candidate.plateNumber)) return; + setSending(true); + try { + const result = await sendNotify({ + suggestionId: s.id, + currentPlate: v.plateNumber, + candidatePlate: candidate.plateNumber, + }); + if (result.success) { + setSentPlates(prev => new Set(prev).add(candidate.plateNumber)); + onNotifySuccess(); + } else { + alert(result.message || '发送失败'); + } + } catch (e) { + alert('网络错误，请重试'); + } finally { + setSending(false); + } + }; + + return ( +
+ + {/* Header */} +
+
+ +

+ 智能调度干预 — {s.type === 'rescue_hopeless' ? '抢救低里程' : '释放已达标'} +

+
+ +
+ +
+ {/* Current Vehicle Card */} +
+
+
+
+ 当前车辆 +
+
+ {v.plateNumber} +
+
{v.vehicleType} · {v.targetName}
+
+
+
完成率
+
= 1 ? 'text-emerald-600' : v.completionRate >= 0.6 ? 'text-amber-600' : 'text-rose-600' + }`}> + {Math.round(v.completionRate * 100)}% +
+
+
+
+
+
累计里程
+
{fmtKm(v.totalMileage)} KM
+
+
+
年度目标
+
{fmtKm(v.yearTarget)} KM
+
+
+
区域
+
+ {v.region} +
+
+
+
客户日均
+
{Math.round(v.customerAvgDaily)} KM
+
+
+
+
客户:
+
+ {v.customer || '-'} +
+
+
+ + {/* Reason */} +
+
建议原因
+

{s.reason}

+
+ + {/* Candidates */} +
+
+

+ + 推荐替换车辆 +

+ 基于车型、区域及里程匹配 +
+ +
+ {s.candidates.length > 0 ? s.candidates.map(c => ( +
+
+
+
+ +
+
+
+ {c.plateNumber} +
+
+ {c.vehicleType} · {c.targetName || '库存'} +
+
+
+
+ {c.canQualifyAfterSwap ? ( + + 换后可达标 + + ) : ( + + 需关注 + + )} +
+
+ + {/* Before/After Comparison Grid */} +
+
+
当前里程
+
{fmtKm(c.totalMileage)} KM
+
+
+
里程缺口
+
{fmtKm(c.mileageGap)} KM
+
+
+
区域
+
+ {c.region} +
+
+
+
换后预测
+
+ {fmtKm(c.predictedAfterSwap)} KM +
+
+
+ + {/* Action */} +
+ +
+
+ )) : ( +
+

暂无匹配的可替换车辆

+
+ )} +
+
+
+ + {/* Footer */} +
+ +
+ +
+ ); +} +``` + +- [ ] **Step 2: Commit** + +```bash +git add src/modules/scheduling/SuggestionDetail.tsx +git commit -m "feat(scheduling): add SuggestionDetail modal with candidate comparison" +``` + +--- + +## Task 9: Wire Up Module in App.tsx + +**Files:** +- Modify: `src/App.tsx` + +- [ ] **Step 1: Add scheduling module to App.tsx** + +In `src/App.tsx`, add the import and module config: + +```typescript +// Add import at top (after existing imports): +import { Truck, Route, Activity } from 'lucide-react'; +import SchedulingModule from './modules/scheduling/SchedulingModule'; + +// Update MODULES array to add scheduling: +const MODULES: ModuleConfig[] = [ + { id: 'assets', label: '资产管理', icon: Truck, component: AssetsModule }, + { id: 'mileage', label: '里程管理', icon: Route, component: MileageModule }, + { id: 'scheduling', label: '智能调度', icon: Activity, component: SchedulingModule }, +]; +``` + +Also update the Shell.tsx PATH_MAP in `src/components/Shell.tsx`: + +```typescript +const PATH_MAP: Record = { + '/vehicle': 'assets', + '/assets': 'assets', + '/mileage': 'mileage', + '/scheduling': 'scheduling', +}; +``` + +- [ ] **Step 2: Verify TypeScript compiles** + +```bash +cd /Users/kkfluous/Projects/ai-coding/ln-bi && npx tsc --noEmit 2>&1 | head -20 +``` + +- [ ] **Step 3: Commit** + +```bash +git add src/App.tsx src/components/Shell.tsx +git commit -m "feat(scheduling): wire up scheduling module in app navigation" +``` + +--- + +## Task 10: End-to-End Verification + +- [ ] **Step 1: Start dev server** + +```bash +cd /Users/kkfluous/Projects/ai-coding/ln-bi && npm run dev +``` + +- [ ] **Step 2: Test backend API** + +```bash +curl -s http://localhost:3001/api/scheduling/suggestions | jq '.summary' +curl -s http://localhost:3001/api/scheduling/suggestions | jq '.suggestions | length' +curl -s http://localhost:3001/api/scheduling/suggestions | jq '.suggestions[0].currentVehicle.plateNumber' +``` + +- [ ] **Step 3: Test with targetId filter** + +```bash +curl -s "http://localhost:3001/api/scheduling/suggestions?targetId=1" | jq '.summary' +``` + +- [ ] **Step 4: Test notify endpoint** + +```bash +curl -s -X POST http://localhost:3001/api/scheduling/notify \ + -H 'Content-Type: application/json' \ + -d '{"suggestionId":"test-1","currentPlate":"浙F00001","candidatePlate":"浙F00002"}' | jq . +``` + +Expected: `{ "success": true, "message": "替换通知已发送：浙F00001 → 浙F00002" }` + +- [ ] **Step 5: Open browser and verify UI** + +Open `http://localhost:5173/#scheduling` in browser. Verify: +1. Batch selector shows all target options +2. Three summary cards display counts +3. Suggestion list renders with priority badges +4. Clicking a suggestion opens the detail modal +5. Detail modal shows current vehicle info, candidates with comparison grid +6. "发送替换通知" button works and refreshes the list + +- [ ] **Step 6: Use ui-ux-pro-max skill to polish UI design** + +Invoke `ui-ux-pro-max` skill to review and enhance the visual quality of the scheduling module, adapting for both mobile and web layouts. + +- [ ] **Step 7: Final commit** + +```bash +git add -A +git commit -m "feat(scheduling): complete smart scheduling module with algorithm, API, and UI" +``` From ebe46c6f731453b5dd0dc9fab2357476c0966cf9 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 20:20:18 +0800 Subject: [PATCH 12/79] feat(scheduling): add backend type definitions Co-Authored-By: Claude Sonnet 4.6 --- src/server/routes/scheduling/types.ts | 99 +++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 src/server/routes/scheduling/types.ts diff --git a/src/server/routes/scheduling/types.ts b/src/server/routes/scheduling/types.ts new file mode 100644 index 0000000..eac2b5a --- /dev/null +++ b/src/server/routes/scheduling/types.ts @@ -0,0 +1,99 @@ +export interface SchedulingVehicleInfo { + plateNumber: string; + targetId: number; + targetName: string; + vehicleType: string; + totalMileage: number; + completionRate: number; + yearTarget: number; + region: string; + province: string; + customer: string | null; + customerAvgDaily: number; + predictedYearEnd: number; + daysLeft: number; +} + +export interface CandidateVehicle { + plateNumber: string; + targetId: number | null; + targetName: string | null; + vehicleType: string; + totalMileage: number; + completionRate: number; + yearTarget: number | null; + region: string; + province: string; + mileageGap: number; + predictedAfterSwap: number; + canQualifyAfterSwap: boolean; +} + +export interface SchedulingSuggestion { + id: string; + priority: 'high' | 'medium'; + type: 'replace_qualified' | 'rescue_hopeless'; + currentVehicle: SchedulingVehicleInfo; + candidates: CandidateVehicle[]; + reason: string; +} + +export interface SchedulingSummary { + qualifiedCount: number; + hopelessCount: number; + suggestionCount: number; + estimatedGain: number; +} + +export interface SchedulingTargetOption { + id: number; + name: string; + vehicleCount: number; +} + +export interface SchedulingResponse { + summary: SchedulingSummary; + suggestions: SchedulingSuggestion[]; + targets: SchedulingTargetOption[]; +} + +export interface NotifyRequest { + suggestionId: string; + currentPlate: string; + candidatePlate: string; +} + +export type VehicleClassification = 'qualified' | 'hopeless' | 'normal'; + +export interface EnrichedVehicle { + plateNumber: string; + targetId: number; + targetName: string; + vehicleType: string; + totalMileage: number; + currentYearMileage: number; + completionRate: number; + yearTarget: number; + isQualified: boolean; + currentYearIsQualified: boolean; + dailyRequiredMileage: number; + region: string; + province: string; + customer: string | null; + customerAvgDaily: number; + predictedYearEnd: number; + daysLeft: number; + classification: VehicleClassification; +} + +export interface InventoryVehicle { + plateNumber: string; + vehicleType: string; + region: string; + province: string; + totalMileage: number; + targetId: number | null; + targetName: string | null; + yearTarget: number | null; + completionRate: number; +} From 569b5ea3490c39faac571faab812ea146da274d1 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 20:20:23 +0800 Subject: [PATCH 13/79] feat(scheduling): add frontend types and API client Co-Authored-By: Claude Sonnet 4.6 --- src/modules/scheduling/api.ts | 23 +++++++++++++ src/modules/scheduling/types.ts | 58 +++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 src/modules/scheduling/api.ts create mode 100644 src/modules/scheduling/types.ts diff --git a/src/modules/scheduling/api.ts b/src/modules/scheduling/api.ts new file mode 100644 index 0000000..f67ed2e --- /dev/null +++ b/src/modules/scheduling/api.ts @@ -0,0 +1,23 @@ +import { fetchJson } from '../../auth/api-client'; +import type { SchedulingResponse } from './types'; + +const BASE = '/api/scheduling'; + +export async function fetchSuggestions(targetId?: number): Promise { + const params = new URLSearchParams(); + if (targetId !== undefined) params.set('targetId', String(targetId)); + const qs = params.toString(); + return fetchJson(`${BASE}/suggestions${qs ? `?${qs}` : ''}`); +} + +export async function sendNotify(body: { + suggestionId: string; + currentPlate: string; + candidatePlate: string; +}): Promise<{ success: boolean; message: string }> { + return fetchJson<{ success: boolean; message: string }>(`${BASE}/notify`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(body), + }); +} diff --git a/src/modules/scheduling/types.ts b/src/modules/scheduling/types.ts new file mode 100644 index 0000000..7cbbe12 --- /dev/null +++ b/src/modules/scheduling/types.ts @@ -0,0 +1,58 @@ +export interface SchedulingVehicleInfo { + plateNumber: string; + targetId: number; + targetName: string; + vehicleType: string; + totalMileage: number; + completionRate: number; + yearTarget: number; + region: string; + province: string; + customer: string | null; + customerAvgDaily: number; + predictedYearEnd: number; + daysLeft: number; +} + +export interface CandidateVehicle { + plateNumber: string; + targetId: number | null; + targetName: string | null; + vehicleType: string; + totalMileage: number; + completionRate: number; + yearTarget: number | null; + region: string; + province: string; + mileageGap: number; + predictedAfterSwap: number; + canQualifyAfterSwap: boolean; +} + +export interface SchedulingSuggestion { + id: string; + priority: 'high' | 'medium'; + type: 'replace_qualified' | 'rescue_hopeless'; + currentVehicle: SchedulingVehicleInfo; + candidates: CandidateVehicle[]; + reason: string; +} + +export interface SchedulingSummary { + qualifiedCount: number; + hopelessCount: number; + suggestionCount: number; + estimatedGain: number; +} + +export interface SchedulingTargetOption { + id: number; + name: string; + vehicleCount: number; +} + +export interface SchedulingResponse { + summary: SchedulingSummary; + suggestions: SchedulingSuggestion[]; + targets: SchedulingTargetOption[]; +} From 460c9906e1f5f954eaca953b1bffbe1a41357d53 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 20:21:50 +0800 Subject: [PATCH 14/79] feat(scheduling): add algorithm pure functions and export mapRegion Co-Authored-By: Claude Opus 4.6 (1M context) --- src/server/routes/scheduling/algorithm.ts | 185 ++++++++++++++++++++++ src/server/routes/vehicles.ts | 2 +- 2 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 src/server/routes/scheduling/algorithm.ts diff --git a/src/server/routes/scheduling/algorithm.ts b/src/server/routes/scheduling/algorithm.ts new file mode 100644 index 0000000..5e83505 --- /dev/null +++ b/src/server/routes/scheduling/algorithm.ts @@ -0,0 +1,185 @@ +import type { + EnrichedVehicle, InventoryVehicle, SchedulingSuggestion, + CandidateVehicle, VehicleClassification, SchedulingSummary, +} from './types.js'; + +// --------------------------------------------------------------------------- +// 1. Vehicle type compatibility +// --------------------------------------------------------------------------- + +export function isTypeCompatible(sourceType: string, candidateType: string): boolean { + if (sourceType === candidateType) return true; + // Cold-chain 4.5T can replace plain-cargo 4.5T + if (candidateType === '4.5T冷链' && (sourceType === '4.5T冷链' || sourceType === '4.5T普货')) return true; + return false; +} + +// --------------------------------------------------------------------------- +// 2. Vehicle classification +// --------------------------------------------------------------------------- + +export function classifyVehicle( + currentYearIsQualified: boolean, + predictedYearEnd: number, + yearTarget: number, +): VehicleClassification { + if (currentYearIsQualified || predictedYearEnd / yearTarget >= 1.2) return 'qualified'; + if (predictedYearEnd / yearTarget < 0.6) return 'hopeless'; + return 'normal'; +} + +// --------------------------------------------------------------------------- +// 3. Helper – convert EnrichedVehicle to SchedulingVehicleInfo shape +// --------------------------------------------------------------------------- + +import type { SchedulingVehicleInfo } from './types.js'; + +export function toVehicleInfo(v: EnrichedVehicle): SchedulingVehicleInfo { + return { + plateNumber: v.plateNumber, + targetId: v.targetId, + targetName: v.targetName, + vehicleType: v.vehicleType, + totalMileage: v.totalMileage, + completionRate: v.completionRate, + yearTarget: v.yearTarget, + region: v.region, + province: v.province, + customer: v.customer, + customerAvgDaily: v.customerAvgDaily, + predictedYearEnd: v.predictedYearEnd, + daysLeft: v.daysLeft, + }; +} + +// --------------------------------------------------------------------------- +// 4. Main algorithm – generate scheduling suggestions +// --------------------------------------------------------------------------- + +export function generateSuggestions( + vehicles: EnrichedVehicle[], + inventoryVehicles: InventoryVehicle[], +): { suggestions: SchedulingSuggestion[]; summary: SchedulingSummary } { + const qualified = vehicles.filter((v) => v.classification === 'qualified'); + const hopeless = vehicles.filter((v) => v.classification === 'hopeless'); + + const suggestions: SchedulingSuggestion[] = []; + + // --- rescue_hopeless (high priority) --- + for (const vehicle of hopeless) { + const candidates: CandidateVehicle[] = inventoryVehicles + .filter( + (inv) => + isTypeCompatible(vehicle.vehicleType, inv.vehicleType) && + inv.region === vehicle.region && + inv.completionRate >= 0.8, + ) + .map((inv) => { + const mileageGap = (inv.yearTarget ?? 0) - inv.totalMileage; + const predictedAfterSwap = + inv.totalMileage + vehicle.customerAvgDaily * vehicle.daysLeft; + const canQualifyAfterSwap = + inv.yearTarget != null && predictedAfterSwap >= inv.yearTarget; + return { + plateNumber: inv.plateNumber, + targetId: inv.targetId, + targetName: inv.targetName, + vehicleType: inv.vehicleType, + totalMileage: inv.totalMileage, + completionRate: inv.completionRate, + yearTarget: inv.yearTarget, + region: inv.region, + province: inv.province, + mileageGap, + predictedAfterSwap, + canQualifyAfterSwap, + }; + }) + .sort((a, b) => { + if (a.canQualifyAfterSwap !== b.canQualifyAfterSwap) + return a.canQualifyAfterSwap ? -1 : 1; + return b.completionRate - a.completionRate; + }) + .slice(0, 5); + + const reason = `${vehicle.customer}日均里程仅 ${Math.round(vehicle.customerAvgDaily)} KM，该车达标概率 ${Math.round((vehicle.predictedYearEnd / vehicle.yearTarget) * 100)}%，建议替换为已达标车辆，将此车调配给高里程客户。`; + + suggestions.push({ + id: `hopeless-${vehicle.plateNumber}`, + priority: 'high', + type: 'rescue_hopeless', + currentVehicle: toVehicleInfo(vehicle), + candidates, + reason, + }); + } + + // --- replace_qualified (medium priority) --- + for (const vehicle of qualified) { + if (vehicle.customerAvgDaily <= vehicle.dailyRequiredMileage) continue; + + const candidates: CandidateVehicle[] = inventoryVehicles + .filter( + (inv) => + isTypeCompatible(vehicle.vehicleType, inv.vehicleType) && + inv.region === vehicle.region, + ) + .map((inv) => { + const mileageGap = (inv.yearTarget ?? 0) - inv.totalMileage; + const predictedAfterSwap = + inv.totalMileage + vehicle.customerAvgDaily * vehicle.daysLeft; + const canQualifyAfterSwap = + inv.yearTarget != null && predictedAfterSwap >= inv.yearTarget; + return { + plateNumber: inv.plateNumber, + targetId: inv.targetId, + targetName: inv.targetName, + vehicleType: inv.vehicleType, + totalMileage: inv.totalMileage, + completionRate: inv.completionRate, + yearTarget: inv.yearTarget, + region: inv.region, + province: inv.province, + mileageGap, + predictedAfterSwap, + canQualifyAfterSwap, + }; + }) + .sort((a, b) => { + if (a.canQualifyAfterSwap !== b.canQualifyAfterSwap) + return a.canQualifyAfterSwap ? -1 : 1; + return b.mileageGap - a.mileageGap; + }) + .slice(0, 5); + + const reason = `${vehicle.customer}日均里程 ${Math.round(vehicle.customerAvgDaily)} KM（高里程），该车已达标（完成率 ${Math.round(vehicle.completionRate * 100)}%），建议换上里程缺口大的车辆以加速达标。`; + + suggestions.push({ + id: `qualified-${vehicle.plateNumber}`, + priority: 'medium', + type: 'replace_qualified', + currentVehicle: toVehicleInfo(vehicle), + candidates, + reason, + }); + } + + // Sort: high priority first + suggestions.sort((a, b) => { + if (a.priority === b.priority) return 0; + return a.priority === 'high' ? -1 : 1; + }); + + const estimatedGain = suggestions.filter((s) => + s.candidates.some((c) => c.canQualifyAfterSwap), + ).length; + + const summary: SchedulingSummary = { + qualifiedCount: qualified.length, + hopelessCount: hopeless.length, + suggestionCount: suggestions.length, + estimatedGain, + }; + + return { suggestions, summary }; +} diff --git a/src/server/routes/vehicles.ts b/src/server/routes/vehicles.ts index 9788d9e..748819f 100644 --- a/src/server/routes/vehicles.ts +++ b/src/server/routes/vehicles.ts @@ -91,7 +91,7 @@ WHERE truck.is_deleted = 0 const REGIONS = ['嘉兴', '广东', '北京', '新疆', '其他'] as const; const INVENTORY_REGIONS = ['江浙沪', '广东', '新疆', '其它'] as const; -function mapRegion(province: string | null, city: string | null): string { +export function mapRegion(province: string | null, city: string | null): string { if (!province && !city) return '其他'; const loc = (city || province || '').trim(); if (loc.includes('嘉兴') || loc.includes('浙江') || loc.includes('上海') || loc.includes('江苏')) return '嘉兴'; From 86d5bc8738fac1205e8ce0950794ed998e4f750d Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 20:23:29 +0800 Subject: [PATCH 15/79] feat(scheduling): add notify route and wire up scheduling router Co-Authored-By: Claude Sonnet 4.6 --- src/server/index.ts | 2 ++ src/server/routes/scheduling/index.ts | 10 +++++++ src/server/routes/scheduling/notify.ts | 41 ++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 src/server/routes/scheduling/index.ts create mode 100644 src/server/routes/scheduling/notify.ts diff --git a/src/server/index.ts b/src/server/index.ts index c718588..fdd9411 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -5,6 +5,7 @@ import { cors } from 'hono/cors'; import dotenv from 'dotenv'; import vehiclesRouter from './routes/vehicles.js'; import mileageRouter from './routes/mileage/index.js'; +import schedulingRouter from './routes/scheduling/index.js'; import authRouter from './auth/login.js'; import { authMiddleware } from './auth/middleware.js'; @@ -22,6 +23,7 @@ app.use('/api/*', authMiddleware); app.route('/api/vehicles', vehiclesRouter); app.route('/api/mileage', mileageRouter); +app.route('/api/scheduling', schedulingRouter); app.get('/api/health', (c) => c.json({ status: 'ok', time: new Date().toISOString() })); diff --git a/src/server/routes/scheduling/index.ts b/src/server/routes/scheduling/index.ts new file mode 100644 index 0000000..1233612 --- /dev/null +++ b/src/server/routes/scheduling/index.ts @@ -0,0 +1,10 @@ +import { Hono } from 'hono'; +import suggestionsRouter from './suggestions.js'; +import notifyRouter from './notify.js'; + +const app = new Hono(); + +app.route('/suggestions', suggestionsRouter); +app.route('/notify', notifyRouter); + +export default app; diff --git a/src/server/routes/scheduling/notify.ts b/src/server/routes/scheduling/notify.ts new file mode 100644 index 0000000..49cbfd0 --- /dev/null +++ b/src/server/routes/scheduling/notify.ts @@ -0,0 +1,41 @@ +import { Hono } from 'hono'; +import type { AuthUser } from '../../auth/types.js'; +import type { NotifyRequest } from './types.js'; + +const app = new Hono(); + +// In-memory set of processed suggestion IDs +const processedSuggestions = new Set(); + +export function isProcessed(suggestionId: string): boolean { + return processedSuggestions.has(suggestionId); +} + +app.post('/', async (c) => { + try { + const body = await c.req.json(); + const { suggestionId, currentPlate, candidatePlate } = body; + + if (!suggestionId || !currentPlate || !candidatePlate) { + return c.json({ success: false, message: '缺少必要参数' }, 400); + } + + if (processedSuggestions.has(suggestionId)) { + return c.json({ success: false, message: '该建议已处理' }, 409); + } + + const user = (c as any).get('user') as AuthUser | undefined; + const operator = user?.userName || '未知'; + + console.log(`[scheduling:notify] operator=${operator} suggestion=${suggestionId} current=${currentPlate} candidate=${candidatePlate}`); + + processedSuggestions.add(suggestionId); + + return c.json({ success: true, message: `替换通知已发送：${currentPlate} → ${candidatePlate}` }); + } catch (e: unknown) { + console.error('scheduling notify error:', e); + return c.json({ success: false, message: '发送通知失败' }, 500); + } +}); + +export default app; From 4169e04a9cd6f2dcb94674a9e4563c0fba0b6fe3 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 20:23:56 +0800 Subject: [PATCH 16/79] feat(scheduling): add suggestions route with data aggregation Co-Authored-By: Claude Opus 4.6 (1M context) --- src/server/routes/scheduling/suggestions.ts | 295 ++++++++++++++++++++ 1 file changed, 295 insertions(+) create mode 100644 src/server/routes/scheduling/suggestions.ts diff --git a/src/server/routes/scheduling/suggestions.ts b/src/server/routes/scheduling/suggestions.ts new file mode 100644 index 0000000..1aab875 --- /dev/null +++ b/src/server/routes/scheduling/suggestions.ts @@ -0,0 +1,295 @@ +import { Hono } from 'hono'; +import pool from '../../db.js'; +import mileagePool from '../../mileage-db.js'; +import { fetchVehicleInfoMap } from '../mileage/vehicle-info.js'; +import { mapRegion } from '../vehicles.js'; +import { filterByPermission, maskCustomerNames } from '../../auth/permissions.js'; +import { classifyVehicle, generateSuggestions } from './algorithm.js'; +import type { EnrichedVehicle, InventoryVehicle, SchedulingResponse } from './types.js'; +import type { AuthUser } from '../../auth/types.js'; + +// --------------------------------------------------------------------------- +// Helper: vehicle type classification +// --------------------------------------------------------------------------- + +function classifyVehicleType(type: string, model: string): string { + if (type === '4.5T' && model.includes('冷链')) return '4.5T冷链'; + if (type === '4.5T') return '4.5T普货'; + if (type === '18T') return '18T'; + if (type === '49T') return '49T'; + if (type === '挂车' || model.includes('挂车')) return '挂车'; + return type || '其他'; +} + +// --------------------------------------------------------------------------- +// Route +// --------------------------------------------------------------------------- + +const app = new Hono(); + +app.get('/', async (c) => { + try { + const targetIdParam = c.req.query('targetId'); + const filterTargetId = targetIdParam ? Number(targetIdParam) : null; + + // ---- Query 1: Assessment targets ---- + const [targets] = await pool.execute( + 'SELECT id, target_name, annual_mileage_per_vehicle FROM tab_mileage_assessment_target WHERE is_deleted = 0 ORDER BY id', + ) as [any[], unknown]; + + const targetMap = new Map(); + for (const t of targets) { + targetMap.set(t.id, { + targetName: t.target_name, + annualMileage: Number(t.annual_mileage_per_vehicle) || 0, + }); + } + + // ---- Query 2: Assessment vehicles ---- + const [assessmentRows] = await pool.execute(` + SELECT target_id, plate_number, today_mileage, vehicle_total_mileage, + current_mileage, current_year_mileage, current_year_mileage_task, + completion_rate, is_qualified, current_year_is_qualified, + daily_required_mileage, current_year_assessment_end_date + FROM tab_mileage_assessment_vehicle WHERE is_deleted = 0 + `) as [any[], unknown]; + + // ---- Query 3: Vehicle info (customer, dept, manager) ---- + const vehicleInfoMap = await fetchVehicleInfoMap(); + + // ---- Query 4: Vehicle types from tab_truck ---- + const [truckTypeRows] = await pool.execute(` + SELECT truck.plate_number, dic_type.dic_name AS type_name, truck.model AS model_raw + FROM tab_truck truck + LEFT JOIN tab_dic dic_type ON dic_type.parent_code = 'dic_truck_type' + AND dic_type.dic_code = truck.model AND dic_type.is_deleted = 0 + WHERE truck.is_deleted = 0 AND truck.is_operation = 1 + `) as [any[], unknown]; + + const truckTypeMap = new Map(); + for (const row of truckTypeRows) { + truckTypeMap.set(row.plate_number, { + typeName: row.type_name || '', + modelRaw: row.model_raw || '', + }); + } + + // ---- Query 5: Real-time location ---- + const [locationRows] = await pool.execute(` + SELECT plate_number, province, city + FROM tab_truck_remote_sync_realtime_info + WHERE is_deleted = 0 AND plate_number IS NOT NULL + `) as [any[], unknown]; + + const locationMap = new Map(); + for (const row of locationRows) { + locationMap.set(row.plate_number, { + province: row.province || '', + city: row.city || '', + }); + } + + // ---- Collect all plates for Query 6 ---- + const allPlates = assessmentRows.map((r: any) => r.plate_number as string); + + // ---- Query 6: Customer daily avg (from mileage DB) ---- + const customerAvgDailyMap = new Map(); + if (allPlates.length > 0) { + const placeholders = allPlates.map(() => '?').join(','); + const [dailyRows] = await mileagePool.execute( + `SELECT plate, AVG(daily_km) as avg_daily + FROM v_vehicle_daily_stats + WHERE stat_date >= DATE_SUB(CURDATE(), INTERVAL 30 DAY) + AND stat_date < CURDATE() + AND plate IN (${placeholders}) + GROUP BY plate`, + allPlates, + ) as [any[], unknown]; + + // Build plate → avg_daily map + const plateAvgMap = new Map(); + for (const row of dailyRows) { + plateAvgMap.set(row.plate, Number(row.avg_daily) || 0); + } + + // Aggregate per customer: average of all plates belonging to each customer + const customerPlates = new Map(); + for (const plate of allPlates) { + const info = vehicleInfoMap.get(plate); + const customer = info?.customer || '未知客户'; + if (!customerPlates.has(customer)) customerPlates.set(customer, []); + const avg = plateAvgMap.get(plate); + if (avg !== undefined) customerPlates.get(customer)!.push(avg); + } + for (const [customer, avgs] of customerPlates) { + if (avgs.length > 0) { + customerAvgDailyMap.set(customer, avgs.reduce((s, v) => s + v, 0) / avgs.length); + } + } + } + + // ---- Query 7: Inventory vehicles (rent_status = 0) ---- + const [inventoryTruckRows] = await pool.execute(` + SELECT truck.plate_number, dic_type.dic_name AS type_name, truck.model AS model_raw + FROM tab_truck truck + LEFT JOIN tab_dic dic_type ON dic_type.parent_code = 'dic_truck_type' + AND dic_type.dic_code = truck.model AND dic_type.is_deleted = 0 + WHERE truck.is_deleted = 0 AND truck.is_operation = 1 + AND truck.truck_rent_status = 0 + `) as [any[], unknown]; + + // ---- Build assessment vehicle lookup for inventory cross-reference ---- + const assessmentByPlate = new Map(); + for (const row of assessmentRows) { + assessmentByPlate.set(row.plate_number, row); + } + + // ---- Enrich assessment vehicles ---- + const now = new Date(); + const yearEnd = new Date(now.getFullYear(), 11, 31); // Dec 31 + + const enrichedVehicles: EnrichedVehicle[] = []; + for (const row of assessmentRows) { + const targetId = row.target_id as number; + if (filterTargetId !== null && targetId !== filterTargetId) continue; + + const target = targetMap.get(targetId); + if (!target) continue; + + const plate = row.plate_number as string; + const info = vehicleInfoMap.get(plate); + const loc = locationMap.get(plate); + const truckType = truckTypeMap.get(plate); + + const province = loc?.province || ''; + const city = loc?.city || ''; + const region = mapRegion(province, city); + + const vehicleType = truckType + ? classifyVehicleType(truckType.typeName, truckType.modelRaw) + : '其他'; + + const endDate = row.current_year_assessment_end_date + ? new Date(row.current_year_assessment_end_date) + : yearEnd; + const daysLeft = Math.max(1, Math.ceil((endDate.getTime() - now.getTime()) / 86400000)); + + const customer = info?.customer || null; + const customerAvgDaily = customerAvgDailyMap.get(customer || '未知客户') || 0; + const currentYearMileage = Number(row.current_year_mileage) || 0; + const yearTarget = Number(row.current_year_mileage_task) || 0; + const predictedYearEnd = currentYearMileage + customerAvgDaily * daysLeft; + + const currentYearIsQualified = row.current_year_is_qualified === 1; + const classification = classifyVehicle(currentYearIsQualified, predictedYearEnd, yearTarget); + + enrichedVehicles.push({ + plateNumber: plate, + targetId, + targetName: target.targetName, + vehicleType, + totalMileage: Number(row.vehicle_total_mileage) || 0, + currentYearMileage, + completionRate: Number(row.completion_rate) || 0, + yearTarget, + isQualified: row.is_qualified === 1, + currentYearIsQualified, + dailyRequiredMileage: Number(row.daily_required_mileage) || 0, + region, + province, + customer, + customerAvgDaily, + predictedYearEnd, + daysLeft, + classification, + }); + } + + // ---- Build inventory vehicles ---- + const inventoryVehicles: InventoryVehicle[] = []; + for (const row of inventoryTruckRows) { + const plate = row.plate_number as string; + const loc = locationMap.get(plate); + const province = loc?.province || ''; + const city = loc?.city || ''; + const region = mapRegion(province, city); + const vehicleType = classifyVehicleType(row.type_name || '', row.model_raw || ''); + + // Cross-reference with assessment data + const assessment = assessmentByPlate.get(plate); + inventoryVehicles.push({ + plateNumber: plate, + vehicleType, + region, + province, + totalMileage: assessment ? Number(assessment.vehicle_total_mileage) || 0 : 0, + targetId: assessment ? (assessment.target_id as number) : null, + targetName: assessment ? (targetMap.get(assessment.target_id)?.targetName ?? null) : null, + yearTarget: assessment ? Number(assessment.current_year_mileage_task) || null : null, + completionRate: assessment ? Number(assessment.completion_rate) || 0 : 0, + }); + } + + // ---- Run algorithm ---- + const { suggestions, summary } = generateSuggestions(enrichedVehicles, inventoryVehicles); + + // ---- Permission filtering & customer name masking ---- + const user = (c as any).get('user') as AuthUser | undefined; + + // Attach department/manager info so filterByPermission can work + const suggestionsWithPermFields = suggestions.map((s) => { + const info = vehicleInfoMap.get(s.currentVehicle.plateNumber); + return { + ...s, + department: info?.department || null, + departmentName: info?.department || null, + managerId: info?.manager_id || null, + }; + }); + + const filtered = user + ? filterByPermission(suggestionsWithPermFields, user) + : suggestionsWithPermFields; + + // Mask customer names in suggestions + const masked = maskCustomerNames( + filtered.map((s) => { + // Strip permission-filtering fields from response + const { department, departmentName, managerId, ...rest } = s; + return rest; + }), + ); + + // ---- Build target options list for filter UI ---- + const targetVehicleCounts = new Map(); + for (const v of enrichedVehicles) { + targetVehicleCounts.set(v.targetId, (targetVehicleCounts.get(v.targetId) || 0) + 1); + } + + const targetOptions = targets.map((t: any) => ({ + id: t.id as number, + name: t.target_name as string, + vehicleCount: targetVehicleCounts.get(t.id) || 0, + })); + + const response: SchedulingResponse = { + summary, + suggestions: masked, + targets: targetOptions, + }; + + return c.json(response); + } catch (e: unknown) { + console.error('scheduling suggestions error:', e); + return c.json( + { + summary: { qualifiedCount: 0, hopelessCount: 0, suggestionCount: 0, estimatedGain: 0 }, + suggestions: [], + targets: [], + } satisfies SchedulingResponse, + 500, + ); + } +}); + +export default app; From 82ee7f5480a278b8e8f6cfeb8dbb767a4d845ed3 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 20:25:13 +0800 Subject: [PATCH 17/79] feat(scheduling): add SchedulingModule main entry component Co-Authored-By: Claude Sonnet 4.6 --- src/modules/scheduling/SchedulingModule.tsx | 149 ++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 src/modules/scheduling/SchedulingModule.tsx diff --git a/src/modules/scheduling/SchedulingModule.tsx b/src/modules/scheduling/SchedulingModule.tsx new file mode 100644 index 0000000..d99720a --- /dev/null +++ b/src/modules/scheduling/SchedulingModule.tsx @@ -0,0 +1,149 @@ +import { useState, useEffect, useCallback } from 'react'; +import { Activity, AlertTriangle, CheckCircle, TrendingUp, RotateCcw } from 'lucide-react'; +import { motion } from 'motion/react'; +import { fetchSuggestions } from './api'; +import type { SchedulingResponse, SchedulingSuggestion } from './types'; +import SuggestionList from './SuggestionList'; +import SuggestionDetail from './SuggestionDetail'; + +function shortTargetName(name: string): string { + const match = name.match(/(\d+)[辆台](.+)/); + if (!match) return name; + const count = match[1]; + let desc = match[2]; + desc = desc.replace('4.5T普货', '普货'); + desc = desc.replace('4.5T冷链车', '冷藏车'); + desc = desc.replace('4.5T冷链', '冷藏车'); + return `${count}台${desc}`; +} + +export default function SchedulingModule() { + const [data, setData] = useState(null); + const [loading, setLoading] = useState(false); + const [selectedTargetId, setSelectedTargetId] = useState(undefined); + const [selectedSuggestion, setSelectedSuggestion] = useState(null); + + const loadData = useCallback(async () => { + setLoading(true); + try { + const result = await fetchSuggestions(selectedTargetId); + setData(result); + } finally { + setLoading(false); + } + }, [selectedTargetId]); + + useEffect(() => { + loadData(); + }, [loadData]); + + const handleNotifySuccess = useCallback(() => { + loadData(); + }, [loadData]); + + return ( +
+
+ + {/* Batch Selector */} +
+ + {data?.targets.map((target) => ( + + ))} +
+ + {loading && !data ? ( + /* Loading State */ +
+
+
+ ) : data ? ( + <> + {/* Summary Cards */} +
+ {/* Card 1: 已达标车辆 */} +
+
+ + 已达标车辆 +
+
{data.summary.qualifiedCount}
+
达标概率 ≥ 120%
+
+ + {/* Card 2: 无望达标 */} +
+
+ + 无望达标 +
+
{data.summary.hopelessCount}
+
达标概率 < 60%
+
+ + {/* Card 3: 可干预 */} +
+
+ + 可干预 +
+
{data.summary.suggestionCount}
+
+ 预计可新增达标 +{data.summary.estimatedGain} 台 +
+
+
+ + {/* Refresh Button */} +
+ +
+ + {/* Suggestion List */} + + + ) : null} + + {/* Detail Modal */} + {selectedSuggestion && ( + setSelectedSuggestion(null)} + onNotifySuccess={handleNotifySuccess} + /> + )} + +
+
+ ); +} From 9c005bebc8772c91b58ef6d5e38abd820400d6c9 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 20:25:21 +0800 Subject: [PATCH 18/79] feat(scheduling): add SuggestionList component Co-Authored-By: Claude Sonnet 4.6 --- src/modules/scheduling/SuggestionList.tsx | 129 ++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 src/modules/scheduling/SuggestionList.tsx diff --git a/src/modules/scheduling/SuggestionList.tsx b/src/modules/scheduling/SuggestionList.tsx new file mode 100644 index 0000000..b9e1dfc --- /dev/null +++ b/src/modules/scheduling/SuggestionList.tsx @@ -0,0 +1,129 @@ +import { ArrowRightLeft, AlertTriangle, CheckCircle } from 'lucide-react'; +import { motion } from 'motion/react'; +import type { SchedulingSuggestion } from './types'; +import Blur from '../../components/Blur'; + +interface Props { + suggestions: SchedulingSuggestion[]; + onSelect: (s: SchedulingSuggestion) => void; +} + +function fmtKm(value: number): string { + if (value >= 10000) return (value / 10000).toFixed(1) + '万'; + return value.toLocaleString(); +} + +export default function SuggestionList({ suggestions, onSelect }: Props) { + if (suggestions.length === 0) { + return ( +
+
+ +

暂无调度建议

+

所有车辆当前无需干预

+
+
+ ); + } + + return ( +
+ {/* Header */} +
+
+ 智能调度干预清单 + + {suggestions.length} + +
+ + {/* Rows */} +
+ {suggestions.map((s, idx) => { + const isHigh = s.priority === 'high' || s.type === 'rescue_hopeless'; + + return ( + onSelect(s)} + > +
+ {/* Priority icon */} +
+ {isHigh ? ( + + ) : ( + + )} +
+ + {/* Content */} +
+ {/* Top row: plate + badges */} +
+ + + {s.currentVehicle.plateNumber} + + + + {/* Type badge */} + + {s.type === 'rescue_hopeless' ? '无望达标' : '已达标'} + + + {/* Vehicle type badge */} + + {s.currentVehicle.vehicleType} + + + {/* Region badge */} + + {s.currentVehicle.region} + +
+ + {/* Info line */} +
+ + 客户:{' '} + + {s.currentVehicle.customer ?? '—'} + + + + 日均: {fmtKm(s.currentVehicle.customerAvgDaily)} KM + + + 完成率: {s.currentVehicle.completionRate}% + +
+
+ + {/* Right: candidate count */} +
+ {s.candidates.length} + 辆 +
+
+ + ); + })} +
+
+ ); +} From 2e82a308934a140bb40c889a8d2f57552b332cde Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 20:25:58 +0800 Subject: [PATCH 19/79] feat(scheduling): add SuggestionDetail modal with candidate comparison Co-Authored-By: Claude Sonnet 4.6 --- src/modules/scheduling/SuggestionDetail.tsx | 248 ++++++++++++++++++++ 1 file changed, 248 insertions(+) create mode 100644 src/modules/scheduling/SuggestionDetail.tsx diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx new file mode 100644 index 0000000..afbec72 --- /dev/null +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -0,0 +1,248 @@ +import { useState } from 'react'; +import { + X, + Truck, + MapPin, + AlertTriangle, + CheckCircle, + Send, +} from 'lucide-react'; +import { motion } from 'motion/react'; +import { sendNotify } from './api'; +import type { SchedulingSuggestion, CandidateVehicle } from './types'; +import Blur from '../../components/Blur'; + +interface Props { + suggestion: SchedulingSuggestion; + onClose: () => void; + onNotifySuccess: () => void; +} + +function fmtKm(value: number): string { + if (value >= 10000) return (value / 10000).toFixed(1) + '万'; + return value.toLocaleString(); +} + +export default function SuggestionDetail({ suggestion: s, onClose, onNotifySuccess }: Props) { + const [sending, setSending] = useState(false); + const [sentPlates, setSentPlates] = useState>(new Set()); + + const v = s.currentVehicle; + const isRescue = s.type === 'rescue_hopeless'; + + const headerBg = isRescue ? 'bg-rose-600' : 'bg-amber-600'; + const title = isRescue ? '智能调度干预 — 抢救低里程' : '智能调度干预 — 释放已达标'; + + const cardBg = isRescue + ? 'bg-rose-50 border border-rose-100' + : 'bg-amber-50 border border-amber-100'; + + const completionColor = + v.completionRate >= 1 + ? 'text-emerald-600' + : v.completionRate >= 0.6 + ? 'text-amber-600' + : 'text-rose-600'; + + const handleNotify = async (candidate: CandidateVehicle) => { + if (sending || sentPlates.has(candidate.plateNumber)) return; + setSending(true); + try { + const result = await sendNotify({ + suggestionId: s.id, + currentPlate: v.plateNumber, + candidatePlate: candidate.plateNumber, + }); + if (result.success) { + setSentPlates(prev => new Set(prev).add(candidate.plateNumber)); + onNotifySuccess(); + } else { + alert(result.message || '发送失败'); + } + } catch (e) { + alert('网络错误，请重试'); + } finally { + setSending(false); + } + }; + + return ( +
+ + {/* Header */} +
+ {title} + +
+ + {/* Scrollable body */} +
+ {/* Current Vehicle Card */} +
+
+
+ + {v.plateNumber} + + + {v.vehicleType} + +
+
+ + {(v.completionRate * 100).toFixed(1)}% + +
完成率
+
+
+ +
{v.targetName}
+ +
+
+
累计里程
+
{fmtKm(v.totalMileage)} km
+
+
+
年度目标
+
{fmtKm(v.yearTarget)} km
+
+
+
+ 区域 +
+
{v.region}
+
+
+
客户日均
+
{fmtKm(v.customerAvgDaily)} km
+
+
+ + {v.customer && ( +
+ 客户：{v.customer} +
+ )} +
+ + {/* Reason Card */} +
+ 建议原因 + {s.reason} +
+ + {/* Candidates Section */} +
+
+ + 推荐替换车辆 +
+
基于车型、区域及里程匹配
+ +
+ {s.candidates.map(c => { + const alreadySent = sentPlates.has(c.plateNumber); + const predColor = + c.canQualifyAfterSwap ? 'text-emerald-600' : 'text-amber-600'; + + return ( +
+
+
+ + {c.plateNumber} + + + {c.vehicleType} + + {c.targetName ? ( + {c.targetName} + ) : ( + 库存 + )} +
+ {c.canQualifyAfterSwap ? ( + + 换后可达标 + + ) : ( + + 需关注 + + )} +
+ +
+
+
当前里程
+
{fmtKm(c.totalMileage)} km
+
+
+
里程缺口
+
{fmtKm(c.mileageGap)} km
+
+
+
+ 区域 +
+
{c.region}
+
+
+
换后预测
+
{fmtKm(c.predictedAfterSwap)} km
+
+
+ + +
+ ); + })} +
+
+
+ + {/* Footer */} +
+ +
+ +
+ ); +} From db5ca2e686830f816c5627b32ac99bee7004c5c9 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 20:26:53 +0800 Subject: [PATCH 20/79] feat(scheduling): wire up scheduling module in app navigation Co-Authored-By: Claude Opus 4.6 (1M context) --- src/App.tsx | 4 +++- src/components/Shell.tsx | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/App.tsx b/src/App.tsx index 92b0ccd..044a887 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,7 +1,8 @@ -import { Truck, Route } from 'lucide-react'; +import { Truck, Route, Activity } from 'lucide-react'; import { Shell, type ModuleConfig } from './components/Shell'; import AssetsModule from './modules/assets/AssetsModule'; import MileageModule from './modules/mileage/MileageModule'; +import SchedulingModule from './modules/scheduling/SchedulingModule'; import AuthProvider from './auth/AuthProvider'; import { useAuth } from './auth/useAuth'; import UnauthorizedPage from './auth/UnauthorizedPage'; @@ -9,6 +10,7 @@ import UnauthorizedPage from './auth/UnauthorizedPage'; const MODULES: ModuleConfig[] = [ { id: 'assets', label: '资产管理', icon: Truck, component: AssetsModule }, { id: 'mileage', label: '里程管理', icon: Route, component: MileageModule }, + { id: 'scheduling', label: '智能调度', icon: Activity, component: SchedulingModule }, ]; function AuthGate() { diff --git a/src/components/Shell.tsx b/src/components/Shell.tsx index b84f144..c56b931 100644 --- a/src/components/Shell.tsx +++ b/src/components/Shell.tsx @@ -14,6 +14,7 @@ const PATH_MAP: Record = { '/vehicle': 'assets', '/assets': 'assets', '/mileage': 'mileage', + '/scheduling': 'scheduling', }; function getInitialModule(modules: ModuleConfig[]): string { From 253cc2f2c0629b9b972012a30b8a9356bd6516f7 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 20:31:44 +0800 Subject: [PATCH 21/79] fix(scheduling): fix vehicle type classification and algorithm candidate matching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - classifyVehicleType now parses dic_type.dic_name (e.g. "4.5吨冷链车") instead of raw model code - Remove overly strict completionRate >= 0.8 filter for hopeless candidates - Use vehicle's yearTarget as fallback when inventory has no assessment target - Filter out suggestions with no candidates (not actionable) - estimatedGain counts rescue_hopeless suggestions as potential gains Co-Authored-By: Claude Opus 4.6 (1M context) --- .DS_Store | Bin 0 -> 8196 bytes docker-compose.yml | 6 +- docs/.DS_Store | Bin 0 -> 8196 bytes docs/superpowers/.DS_Store | Bin 0 -> 10244 bytes .../plans/2026-03-27-three-modules.md | 753 ++++++++++++++ .../2026-04-02-mileage-backend-refactor.md | 926 ++++++++++++++++++ .../specs/2026-03-27-three-modules-design.md | 153 +++ scripts-tmp/excel_plates.txt | 178 ++++ scripts-tmp/find_extra.ts | 60 ++ src/auth/AuthProvider.tsx | 3 +- src/modules/mileage/StatisticsView.tsx | 5 +- src/server/routes/scheduling/algorithm.ts | 35 +- src/server/routes/scheduling/suggestions.ts | 19 +- 13 files changed, 2110 insertions(+), 28 deletions(-) create mode 100644 .DS_Store create mode 100644 docs/.DS_Store create mode 100644 docs/superpowers/.DS_Store create mode 100644 docs/superpowers/plans/2026-03-27-three-modules.md create mode 100644 docs/superpowers/plans/2026-04-02-mileage-backend-refactor.md create mode 100644 docs/superpowers/specs/2026-03-27-three-modules-design.md create mode 100644 scripts-tmp/excel_plates.txt create mode 100644 scripts-tmp/find_extra.ts diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..eec867796ed82c702bb07018cb7c042e6172c0bc GIT binary patch literal 8196 zcmeHMTWl0n7(U;$&>1?=0a{tG1DkG%fGw03Xt^cZn{q2fwx!#0S$20uIxw9nJG0wj zscB4n0nzxR@fLaV7I{!n;)^DVqK}Fu7~=y*qrPZ@FDeiIGiMfhfy4)66z3#!{`23? zng5^fKeK0+F^0ChwwAF7V@#yWqe?k-w`iW;yJj>YkdzVy`LoQ3Gn_H)4DlCcScifz z17QZj41^g7GZ1Fr-;e=%XM0V&&3m6~!#>PFn1TOg2E6?tN|#6D0iEE~-#V!Cj{roy zBY@v%tat;W(SXJSI>9MvsDZl@<*o>h7~t+Cj|O(}fKG7A-5G+z2ZEImoKWDePV+~7 zbA~vlVIO87%)rbHc;!>dG-k6bb0(kPGsC9gxD5?oLMSPnHM>kK6U)Vei9vfL;ilcZ z)0WQd_qZP0HZ#R>Iu{E3brjD6ImVJtcfM6S7bEk!LdU8Cb zQ)uVkBT5p*c)lveBh4w7=c;|l{(=2+N?A~#8}A-=4cl_|={bjJN~v%t!0lPv+LO~g zeP7l#^Fx-CQs!sVW;So8UA@&b6UIY2$ts*|&Nj_GwqtnH^e0_?)b(^TRLKFy&bjUW zWJ!bO=T=JI(f8^!sZr27Xlkc&T5yog&0Dmrc13+-^Okt$_O1smS19urER?I{0m`K1 z8V?$Ju0QQ$bxSj>BfTSr<_`8149CcrdXJSJ(xv&RlP*_87B9KGT2;BhO^2dsGM_Py z=MDFS5)(y#ji_29AJFKYx@^r`MH7|tG!L!5T&+>}dz$u~PQ4a5tW@undmIX0RMOmV zwcH^093u!wio+#M@_Mz`OlNdcQZ&9!i@ZtgEAaeF%1$oaDp#q=tUWYDAvzM5wW{sv zA#d4TX~*pz)-CUrE^*y`q#JMs(>c9+gdiB)(GHUOkCfz|Q>SLQwy&gY?55qxPGAft@hDE=G|u30JcZ}+0$#*fyoxvQCeGt+yoXEp1fSw_T*bHe4&UQv z{Ek0xU6>^-5+cH4p+=|^>V?%pv(O@J5;hCFg>E4!q=ln`EsXL2gkq^3{p?@bXl?NZWbah%w8%MeN^;nRw)atW3?g`i!v)dNnOJZ}-n>PkLR3lvc4?eg<}=mR9i24IB}M$ZP=1A7Wk0ZA z*mXkrJS;>6_n?8W-G*)0?V~$^UK~OShmnDXAy}|+oN#^;<9HYoc!W^?7~%X0Jc(!U zES@8*zl4|Z3SPtOg!FfC0q^1ie29zqIKceZg!rFuZ5oQZiumOezfMMRA(698+d4wB zBI>7_-%(r%k0#=s|2uF0{r`@NISeMuK$wB489-@AqN9yux7+i)vv!oO!*qGgvzy@5 wccE^|hXCSl{9#DrD4BXb@qkWnN)l@S_=f=h2l-$4sU5!m!}q_B&^xpH6HA9^ZvX%Q literal 0 HcmV?d00001 diff --git a/docker-compose.yml b/docker-compose.yml index ddc7e6e..5262bf7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,10 +5,10 @@ services: image: harbor.lnh2e.com/lingniu-v1/ln-bi:main-1.0.0 network_mode: host environment: - DB_HOST: "192.168.130.111" + DB_HOST: "47.101.148.99" DB_PORT: "3306" - DB_USER: "linsset_01" - DB_PASSWORD: "LN3456#&" + DB_USER: "root" + DB_PASSWORD: "LN#Passw0rd@2026" DB_NAME: "lingniu_prod" SERVER_PORT: "8111" EXTERNAL_API_BASE: "https://lnh2e.com" diff --git a/docs/.DS_Store b/docs/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..894578ac335e82154852446654c6d960af3d5d38 GIT binary patch literal 8196 zcmeHMU2GIp6u#fI&>1?=0a{tG1DkG%fGw03X!%RFe+m>RvMt?~pJjJvqyy8LvNO9| zEH#aZFZ^hH()bs7@-OnBqQnj7ELY1YcAhJTrF|q|i5FAkIzhJ@?#u z&b{}XIp4iKTgDhV^4e;~B8)MSsz;SdYHm}!d9U75gkYqcC`g~N92;deD>9vWVF^7D zdLZ;b=z-7!p$G0p573+K6>*w(pU;ME=z-7!|4R>e_d}GbN8ZZEE@kLRtBYnH6G% zSSjvL4BN$on|AX~M>@CHr+f1QS=-EySWZfrn@yY9yqR|OcGFB4kLfg4FQ&y zH+Rcaa>%iBZl}Lk(xCOZl#+M!-8wC56!b1y+NqvmDx|Y>7A&b>*4W&-Dc-$x$0L`j zl)3Zf%Qf;4`PFibM-4qUn0B(dr5V(ss8OlMA~RtprC zs}IV34jC^hX)d@@Zj$?sP(VnE!$(@=wQ9ea&giD3XndbGd4oDo;Qp7C9zM8Pu2GX& zdt`)6bR<63u6C*iyluCq9k+K>x4a`=kSz&gs2H3drC@+i2APq%`g+b!&!e z`;+92opq`@=q=Z-X}%4MA`7e3gxW7EUy3P3F|2|?AfV66u^`4upC%Sx!Mm}Kbl&kD z9g8<{PNGLoWzDRMZD$7weBYDo&M3=5uwWe)z`}L6I zFqF+T_M5y1m!qDb$+7VPw6J%N54Kne$ufrb%SuyK^4{x~M^I41D~ z#r!FX`ls;>p2rJ#ks|+9yoT5DCf=gBe;?=Z0Y1hjxPZ?B1bj#F|0}LeiRm4sXyz1u zOdr#QM9wm8>kvtl5OK5eUCEX4Q$@V|zkB-M|L@APhldJ15PIOwcmU;HiLMS>Yr4D3 z%eA9a4^s7tCpXEduR@KVjuZ9MaiZ7%VMzTbiF!KmfKGBsBUJwL9|G?DAKu~nAHM(h H-249z(Q=1o literal 0 HcmV?d00001 diff --git a/docs/superpowers/.DS_Store b/docs/superpowers/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5115dd2fcf9c16235253b2aa2a53c261b73cc794 GIT binary patch literal 10244 zcmeHMU2GIp6u#fIr89J(1GG}G1Dh^Hz!pjiwEQL8Kjpv3wsc#5mff9^4oqjt&Td;Q zHI0ccAR3=E{zabri#(_(@kJ9w(MLrSjPU`ZQC~E{7nKLk+&f!ni-{(Z0GUbdJ@?#u z&b{}X`OciZcNt@7%^Ry3i!jDyDn8Xzs&4Z5<9?a;NI{Q32-0WFOAmX4Y1>UtlMOpU z4}=~FJrH^z^g!r=+rtBtv;9Xd6Ev(t4}=~FJuu+`|N9W3;?r0_#|7n|4yyPOfM_vw z^M~4W4&XYGfW`tkE+|)}ImPJ#fhvL{2823|M|^Rjv4D;XD%2T-IzzBBf)fh(>ZBLp z;tVlC!#eap=z-}T@WZBr4Kkahm^118em*^DTVAfd{%c4@#U(RJIYS*~CiCW-9tu^hu4ZgumH;c?x#7?2fN zNorN2qmApDY9oznR*%(2M%Opg*GASft{WRu`|{IO|6i9XNG z=GypV35(_zQd-_K_n0)PHDtEa)Lz9D^PrraJ%90%Wpxcrn_?YXcRqBfT$?j@o?5B) zkuRN`^{{1TdsAMcG+7L{ebMntbs_ZzgQovz`pV#wM#nuk_js@LfI{E@b-NwpCuEZ6T>yF4;p z)>1-nrCP6c9VHMbnkRZ1)wO!Jol2Xwq8VbHW_5$!GbH@4Xxl~SX0=jJWZZ!PGSO2+ zUyI(RAM}^qk@9k#gQnwe>7p2WfX4c~{#4fN93~J3JK9FQ{FPF_uhd~!IhPNTH+I$N zdaplSi(zmZ7FI1N*W-G(tbHLTHO+E{ECN2gR)K#xT6i_l*b32%erSpYcXTvXFF1vg zo6Z_oJKMnyu`C;9r`faY410%NV4twB*mvw_c9s1BUEfWE~!&WNGa)vHXKx;C)emmjx^4TN6Kt1f^YE&uyk~x7>55frnm4yhz);|}0M#1< zfTMm=tZ>wGR7^qaB_4-nG`lHW%n{j-TCFsYjxLcYT(pvaUACOq?b-~% zR@beRDKs^Svubriqe20w6$NZv6R{ACx^a_2p{NxH?4lU4j5F2M?Hx4DMNR&{aDJIx zVL!3o*fqlWY|KLy?n6DHyA@loi{m?vZX84shmeMW0XT4RjF5f;V|Wzfc#LrV1R?z? zJdNk@JYFEQzk*ls8s5O0g!T7u9`EBLe2feDG(i2gg!x}^bqbDm77#2bexHovp?KD@ zUFR_M`p7R~9;HZ=W$vN`Ibl(lAj1S1CdgZxAa4w|FhSBU#4thL **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Add department, region, and customer operations statistics sections to the dashboard, ported from lnoneos prototype with real MySQL data. + +**Architecture:** All 3 new API endpoints aggregate from the existing `getVehicles()` cache (no new DB queries). A new macro-region mapping function converts province/city to 华东/华南/etc. The frontend adds 3 new collapsible sections below the existing asset summary table, each with desktop table + mobile card views. The existing vehicle list modal is extended with new filter params (manager, customer, isColdChain, isTrailer). + +**Tech Stack:** Hono (backend), React + Tailwind CSS + Motion (frontend), TypeScript throughout. + +**Reference:** lnoneos prototype at `/Users/kkfluous/Projects/ai-coding/lnoneos/src/App.tsx` + +--- + +### Task 1: Backend — Macro-region mapping + vehicle type classification helpers + +**Files:** +- Modify: `src/server/routes/vehicles.ts` (add functions after line ~111) + +- [ ] **Step 1: Add macro-region mapping function** + +Add after `mapInventoryRegion` (line 111) in `src/server/routes/vehicles.ts`: + +```typescript +// Macro-region mapping: province/city -> 华东/华南/华北/华中/西南/西北/其他 +function mapMacroRegion(province: string | null, city: string | null): string { + const prov = (province || '').trim(); + const c = (city || '').trim(); + const loc = prov + c; + // 华东: 上海/江苏/浙江/安徽/福建/江西/山东 + if (/上海|江苏|浙江|安徽|福建|江西|山东|南京|杭州|合肥|济南|青岛|苏州|宁波|厦门|嘉兴|无锡/.test(loc)) return '华东'; + // 华南: 广东/广西/海南 + if (/广东|广西|海南|广州|深圳|佛山|东莞|珠海|惠州|中山|南宁/.test(loc)) return '华南'; + // 华北: 北京/天津/河北/山西/内蒙古 + if (/北京|天津|河北|山西|内蒙古|石家庄|太原|呼和浩特/.test(loc)) return '华北'; + // 华中: 河南/湖北/湖南 + if (/河南|湖北|湖南|郑州|武汉|长沙/.test(loc)) return '华中'; + // 西南: 重庆/四川/贵州/云南/西藏 + if (/重庆|四川|贵州|云南|西藏|成都|昆明|贵阳/.test(loc)) return '西南'; + // 西北: 陕西/甘肃/青海/宁夏/新疆 + if (/陕西|甘肃|青海|宁夏|新疆|西安|兰州|乌鲁木齐/.test(loc)) return '西北'; + return '其他'; +} + +// Vehicle type classification for per-type counts +type VehicleTypeCounts = { t4_5: number; t4_5c: number; t18: number; t49: number; trailer: number; other: number; total: number }; + +function classifyVehicleType(v: Vehicle): keyof Omit { + if (v.type === '4.5T' && !v.model.includes('冷链')) return 't4_5'; + if (v.type === '4.5T' && v.model.includes('冷链')) return 't4_5c'; + if (v.type === '18T') return 't18'; + if (v.type === '49T') return 't49'; + if (v.type === '挂车' || v.model.includes('挂车')) return 'trailer'; + return 'other'; +} + +function countByType(vehicles: Vehicle[]): VehicleTypeCounts { + const counts: VehicleTypeCounts = { t4_5: 0, t4_5c: 0, t18: 0, t49: 0, trailer: 0, other: 0, total: 0 }; + for (const v of vehicles) { + counts[classifyVehicleType(v)]++; + counts.total++; + } + return counts; +} +``` + +- [ ] **Step 2: Verify TypeScript compiles** + +Run: `npx tsc --noEmit` +Expected: no errors + +- [ ] **Step 3: Commit** + +```bash +git add src/server/routes/vehicles.ts +git commit -m "feat: add macro-region mapping and vehicle type classification helpers" +``` + +--- + +### Task 2: Backend — Three new API endpoints + +**Files:** +- Modify: `src/server/routes/vehicles.ts` (add endpoints before the `/list` endpoint) + +- [ ] **Step 1: Add `/dept-stats` endpoint** + +Add before the `VEHICLE_TYPE_FILTERS` const (which is before `/list`) in `src/server/routes/vehicles.ts`: + +```typescript +// GET /api/vehicles/dept-stats +app.get('/dept-stats', async (c) => { + const vehicles = await getVehicles(); + // Only count operating vehicles for department stats (those with a customerManager) + const withManager = vehicles.filter((v) => v.customerManager); + + const deptMap = new Map>(); + for (const v of withManager) { + const dept = v.departmentName || '未分配'; + const mgr = v.customerManager!; + if (!deptMap.has(dept)) deptMap.set(dept, new Map()); + const mgrMap = deptMap.get(dept)!; + if (!mgrMap.has(mgr)) mgrMap.set(mgr, []); + mgrMap.get(mgr)!.push(v); + } + + const result = Array.from(deptMap.entries()).map(([department, mgrMap]) => { + const allDeptVehicles = Array.from(mgrMap.values()).flat(); + const managers = Array.from(mgrMap.entries()) + .map(([manager, mvs]) => ({ + manager, + department, + ...countByType(mvs), + })) + .sort((a, b) => b.total - a.total); + + return { + department, + totalAssets: allDeptVehicles.length, + operatingCount: allDeptVehicles.filter((v) => v.status === 'Operating').length, + idleCount: allDeptVehicles.filter((v) => v.status !== 'Operating').length, + managers, + }; + }).sort((a, b) => b.totalAssets - a.totalAssets); + + return c.json(result); +}); +``` + +- [ ] **Step 2: Add `/region-stats` endpoint** + +```typescript +// GET /api/vehicles/region-stats +app.get('/region-stats', async (c) => { + const vehicles = await getVehicles(); + const operating = vehicles.filter((v) => v.status === 'Operating'); + + const regionMap = new Map(); + for (const v of operating) { + const region = mapMacroRegion(v.province, v.city); + if (!regionMap.has(region)) regionMap.set(region, []); + regionMap.get(region)!.push(v); + } + + const regionOrder = ['华东', '华南', '华北', '华中', '西南', '西北', '其他']; + const result = regionOrder + .filter((r) => regionMap.has(r)) + .map((region) => { + const rv = regionMap.get(region)!; + const customers = Array.from(new Set(rv.map((v) => v.customerName).filter(Boolean))) as string[]; + const typeBreakdown = ['4.5T', '18T', '49T'].map((type) => { + const typeVehicles = rv.filter((v) => v.type === type); + return { + type, + total: typeVehicles.length, + operating: typeVehicles.filter((v) => v.status === 'Operating').length, + inventory: typeVehicles.filter((v) => v.status === 'Inventory').length, + customers: Array.from(new Set(typeVehicles.map((v) => v.customerName).filter(Boolean))) as string[], + }; + }).filter((t) => t.total > 0); + + return { + region, + totalAssets: rv.length, + operatingCount: rv.filter((v) => v.status === 'Operating').length, + inventoryCount: rv.filter((v) => v.status === 'Inventory').length, + customers, + typeBreakdown, + }; + }); + + return c.json(result); +}); +``` + +- [ ] **Step 3: Add `/customer-stats` endpoint** + +```typescript +// GET /api/vehicles/customer-stats +app.get('/customer-stats', async (c) => { + const vehicles = await getVehicles(); + const operating = vehicles.filter((v) => v.status === 'Operating' && v.customerName); + + const custMap = new Map(); + for (const v of operating) { + const cust = v.customerName!; + if (!custMap.has(cust)) custMap.set(cust, []); + custMap.get(cust)!.push(v); + } + + const result = Array.from(custMap.entries()) + .map(([customer, cvs]) => { + const first = cvs[0]; + return { + customer, + manager: first.customerManager || '', + brand: first.brandLabel || '', + department: first.departmentName || '', + region: mapMacroRegion(first.province, first.city), + city: first.city || '', + ...countByType(cvs), + }; + }) + .sort((a, b) => b.total - a.total); + + return c.json(result); +}); +``` + +- [ ] **Step 4: Verify TypeScript compiles** + +Run: `npx tsc --noEmit` +Expected: no errors + +- [ ] **Step 5: Commit** + +```bash +git add src/server/routes/vehicles.ts +git commit -m "feat: add dept-stats, region-stats, customer-stats API endpoints" +``` + +--- + +### Task 3: Backend — Extend `/list` with new filter params + +**Files:** +- Modify: `src/server/routes/vehicles.ts` (the `/list` endpoint) + +- [ ] **Step 1: Add manager, customer, isColdChain, isTrailer filters** + +In the `/list` endpoint, after the existing `category` filter block, add: + +```typescript + const { batch, model, location, status, category, vehicleType, manager, customer, isColdChain, isTrailer } = c.req.query(); +``` + +(Replace the existing destructure line.) + +Then after the `if (category)` block, add: + +```typescript + if (manager) { + filtered = filtered.filter((v) => v.customerManager === manager); + } + if (customer) { + filtered = filtered.filter((v) => v.customerName === customer); + } + if (isColdChain !== undefined) { + const wantCold = isColdChain === 'true'; + filtered = filtered.filter((v) => wantCold ? v.model.includes('冷链') : !v.model.includes('冷链')); + } + if (isTrailer !== undefined) { + const wantTrailer = isTrailer === 'true'; + filtered = filtered.filter((v) => wantTrailer ? (v.type === '挂车' || v.model.includes('挂车')) : !(v.type === '挂车' || v.model.includes('挂车'))); + } +``` + +- [ ] **Step 2: Verify TypeScript compiles and build passes** + +Run: `npx tsc --noEmit && npx vite build` +Expected: no errors, successful build + +- [ ] **Step 3: Commit** + +```bash +git add src/server/routes/vehicles.ts +git commit -m "feat: extend /list endpoint with manager, customer, coldchain, trailer filters" +``` + +--- + +### Task 4: Frontend — Types and API client + +**Files:** +- Modify: `src/types.ts` +- Modify: `src/api.ts` + +- [ ] **Step 1: Add new interfaces to `src/types.ts`** + +Append at end of file: + +```typescript +export interface ManagerStats { + manager: string; + department: string; + t4_5: number; + t4_5c: number; + t18: number; + t49: number; + trailer: number; + other: number; + total: number; +} + +export interface DeptGroup { + department: string; + totalAssets: number; + operatingCount: number; + idleCount: number; + managers: ManagerStats[]; +} + +export interface RegionGroup { + region: string; + totalAssets: number; + operatingCount: number; + inventoryCount: number; + customers: string[]; + typeBreakdown: { type: string; total: number; operating: number; inventory: number; customers: string[] }[]; +} + +export interface CustomerStats { + customer: string; + manager: string; + brand: string; + department: string; + region: string; + city: string; + t4_5: number; + t4_5c: number; + t18: number; + t49: number; + trailer: number; + other: number; + total: number; +} +``` + +- [ ] **Step 2: Add API functions to `src/api.ts`** + +Add imports at top: + +```typescript +import type { + SummaryData, + TypeSummary, + VehicleListItem, + DeptGroup, + RegionGroup, + CustomerStats, +} from './types'; +``` + +Add after `fetchVehicleList`: + +```typescript +export async function fetchDeptStats(): Promise { + return fetchJson(`${BASE}/dept-stats`); +} + +export async function fetchRegionStats(): Promise { + return fetchJson(`${BASE}/region-stats`); +} + +export async function fetchCustomerStats(): Promise { + return fetchJson(`${BASE}/customer-stats`); +} +``` + +Also update `fetchVehicleList` params type to include new filters: + +```typescript +export async function fetchVehicleList(params: { + batch?: string; + model?: string; + location?: string; + status?: string; + category?: string; + vehicleType?: string; + manager?: string; + customer?: string; + isColdChain?: string; + isTrailer?: string; +}): Promise { + const query = new URLSearchParams(); + if (params.batch) query.set('batch', params.batch); + if (params.model) query.set('model', params.model); + if (params.location) query.set('location', params.location); + if (params.status) query.set('status', params.status); + if (params.category) query.set('category', params.category); + if (params.vehicleType) query.set('vehicleType', params.vehicleType); + if (params.manager) query.set('manager', params.manager); + if (params.customer) query.set('customer', params.customer); + if (params.isColdChain) query.set('isColdChain', params.isColdChain); + if (params.isTrailer) query.set('isTrailer', params.isTrailer); + return fetchJson(`${BASE}/list?${query.toString()}`); +} +``` + +- [ ] **Step 3: Verify TypeScript compiles** + +Run: `npx tsc --noEmit` +Expected: no errors + +- [ ] **Step 4: Commit** + +```bash +git add src/types.ts src/api.ts +git commit -m "feat: add frontend types and API client for dept/region/customer stats" +``` + +--- + +### Task 5: Frontend — Extend App.tsx state, data loading, imports, and showPlateNumbers + +**Files:** +- Modify: `src/App.tsx` + +- [ ] **Step 1: Update imports** + +Replace the existing import lines at top of `src/App.tsx`: + +```typescript +import { + Truck, + Warehouse, + Activity, + PlusCircle, + MinusCircle, + History, + ChevronDown, + ChevronRight, + Info, + Loader2, + Search, + Filter, + ArrowRightLeft, +} from 'lucide-react'; +``` + +Update type imports: + +```typescript +import type { SummaryData, TypeSummary, VehicleListItem, DeptGroup, RegionGroup, CustomerStats } from './types'; +import { fetchSummary, fetchByType, fetchVehicleList, fetchWeeklyDetail, fetchDeptStats, fetchRegionStats, fetchCustomerStats } from './api'; +``` + +- [ ] **Step 2: Add new state variables** + +After the existing state declarations (after `const [modalLoading, setModalLoading] = useState(false);`), add: + +```typescript + // Dept/Region/Customer data + const [deptData, setDeptData] = useState([]); + const [regionData, setRegionData] = useState([]); + const [customerData, setCustomerData] = useState([]); + + // Dept section state + const [deptViewMode, setDeptViewMode] = useState<'department' | 'manager'>('department'); + const [expandedDepts, setExpandedDepts] = useState>(new Set()); + const [expandedManagerDetails, setExpandedManagerDetails] = useState>(new Set()); + const [selectedManager, setSelectedManager] = useState('All'); + + // Region section state + const [expandedRegions, setExpandedRegions] = useState>(new Set()); + const [regionFilters, setRegionFilters] = useState({ region: '', city: '', customer: '' }); + const [isRegionFilterOpen, setIsRegionFilterOpen] = useState(false); + + // Customer section state + const [expandedCustomers, setExpandedCustomers] = useState>(new Set()); + const [customerFilters, setCustomerFilters] = useState({ customer: '', brand: '', department: '', manager: '', region: '' }); + const [isCustomerFilterOpen, setIsCustomerFilterOpen] = useState(false); +``` + +- [ ] **Step 3: Update loadData to fetch all 3 new endpoints** + +Update the `loadData` callback: + +```typescript + const loadData = useCallback(async () => { + try { + setLoading(true); + setError(null); + const [s, byType, dept, region, cust] = await Promise.all([ + fetchSummary(), + fetchByType(), + fetchDeptStats(), + fetchRegionStats(), + fetchCustomerStats(), + ]); + setSummary(s); + setProcessedData(byType); + setDeptData(dept); + setRegionData(region); + setCustomerData(cust); + setLastUpdate(new Date().toLocaleString('zh-CN')); + } catch (e) { + setError(e instanceof Error ? e.message : '数据加载失败'); + } finally { + setLoading(false); + } + }, []); +``` + +- [ ] **Step 4: Extend showPlateNumbers type** + +Update the showPlateNumbers state type: + +```typescript + const [showPlateNumbers, setShowPlateNumbers] = useState<{ + batch: string; + model: string; + location: string; + category?: 'Inventory' | 'Pending' | 'Delivered' | 'Returned' | 'Replaced' | 'Operating'; + vehicleType?: string; + manager?: string; + customer?: string; + isColdChain?: boolean; + isTrailer?: boolean; + } | null>(null); +``` + +- [ ] **Step 5: Update modal loading to pass new filter params** + +In the `useEffect` for modal loading, update the params block (the "Normal vehicle list" section): + +```typescript + // Normal vehicle list + setModalWeeklyDetail([]); + const params: Record = {}; + if (showPlateNumbers.vehicleType) params.vehicleType = showPlateNumbers.vehicleType; + if (showPlateNumbers.batch !== 'All') params.batch = showPlateNumbers.batch; + if (showPlateNumbers.model !== 'All') params.model = showPlateNumbers.model; + if (showPlateNumbers.location !== 'All') params.location = showPlateNumbers.location; + if (cat === 'Inventory') params.status = 'Inventory'; + if (cat === 'Operating') params.category = 'Operating'; + if (showPlateNumbers.manager) params.manager = showPlateNumbers.manager; + if (showPlateNumbers.customer) params.customer = showPlateNumbers.customer; + if (showPlateNumbers.isColdChain !== undefined) params.isColdChain = String(showPlateNumbers.isColdChain); + if (showPlateNumbers.isTrailer !== undefined) params.isTrailer = String(showPlateNumbers.isTrailer); +``` + +- [ ] **Step 6: Add toggle helpers and derived data** + +After the existing `toggleModel` function, add: + +```typescript + const toggleDept = (dept: string) => { + const newSet = new Set(expandedDepts); + if (newSet.has(dept)) newSet.delete(dept); + else newSet.add(dept); + setExpandedDepts(newSet); + }; + + const toggleManagerDetails = (manager: string) => { + const newSet = new Set(expandedManagerDetails); + if (newSet.has(manager)) newSet.delete(manager); + else newSet.add(manager); + setExpandedManagerDetails(newSet); + }; + + const toggleRegion = (region: string) => { + const newSet = new Set(expandedRegions); + if (newSet.has(region)) newSet.delete(region); + else newSet.add(region); + setExpandedRegions(newSet); + }; + + const toggleCustomer = (customer: string) => { + const newSet = new Set(expandedCustomers); + if (newSet.has(customer)) newSet.delete(customer); + else newSet.add(customer); + setExpandedCustomers(newSet); + }; + + // Derived data for dept section + const allManagersList = deptData.flatMap((d) => d.managers.map((m) => m.manager)).filter((v, i, a) => a.indexOf(v) === i).sort(); + const managerStats = deptData + .flatMap((d) => d.managers) + .filter((m) => selectedManager === 'All' || m.manager === selectedManager) + .sort((a, b) => b.total - a.total); + + // Derived data for customer section + const filteredCustomerStats = customerData.filter((s) => { + const mc = !customerFilters.customer || s.customer.toLowerCase().includes(customerFilters.customer.toLowerCase()); + const mb = !customerFilters.brand || s.brand === customerFilters.brand; + const md = !customerFilters.department || s.department === customerFilters.department; + const mm = !customerFilters.manager || s.manager.toLowerCase().includes(customerFilters.manager.toLowerCase()); + const mr = !customerFilters.region || s.region === customerFilters.region; + return mc && mb && md && mm && mr; + }); + const uniqueBrands = Array.from(new Set(customerData.map((s) => s.brand).filter(Boolean))); + const uniqueDepts = Array.from(new Set(customerData.map((s) => s.department).filter(Boolean))); + const uniqueRegions = Array.from(new Set(customerData.map((s) => s.region))); + const uniqueCities = Array.from(new Set(customerData.map((s) => s.city).filter(Boolean))); + + // Derived data for region section + const filteredRegionData = regionData.filter((r) => !regionFilters.region || r.region === regionFilters.region); +``` + +- [ ] **Step 7: Verify TypeScript compiles** + +Run: `npx tsc --noEmit` +Expected: no errors + +- [ ] **Step 8: Commit** + +```bash +git add src/App.tsx +git commit -m "feat: add state, data loading, and helpers for 3 new modules" +``` + +--- + +### Task 6: Frontend — Department Operations UI + +**Files:** +- Modify: `src/App.tsx` (add section after the asset summary table's closing `
`, before the Plate Number Modal) + +- [ ] **Step 1: Add the department operations section** + +Insert the department operations section JSX. Reference: lnoneos lines 1362-1880. This section goes right after the closing `
` of the asset summary table (`bg-white rounded-sm border...`) and before `{/* Plate Number Modal */}`. + +The section includes: +1. Header with title "部门运营统计" +2. Dark summary bar (总资产/运营中/闲置中 — skip 平均出勤) +3. Toggle buttons (按部门 / 按业务员) + manager filter dropdown +4. Desktop table view (`hidden lg:block`) + - Department mode: department rows expandable to show manager cards with 6 vehicle type cells + - Manager mode: flat manager rows expandable to show 6 vehicle type cells +5. Mobile card view (`lg:hidden`) + +Port the JSX from lnoneos lines 1362-1880, replacing: +- `MOCK_DEPT_STATS` → `deptData` +- `DEPT_TOTALS.total` → `deptData.reduce((s, d) => s + d.totalAssets, 0)` +- `allManagersList` / `managerStats` / `deptViewMode` / `expandedDepts` / `expandedManagerDetails` / `selectedManager` → already defined in Task 5 +- `setShowPlateNumbers` calls: keep the same structure but remove `source` field (not needed in ln-bi) +- Remove `ArrowRightLeft` icon usage in toggle buttons — replace with simple text button +- All `rounded-2xl` → `rounded-sm` to match ln-bi style +- All `shadow-sm` stay as is + +The `setShowPlateNumbers` calls from lnoneos use `manager`, `type`, `isColdChain`, `isTrailer` fields which we added to the state type in Task 5. + +- [ ] **Step 2: Verify TypeScript compiles and build passes** + +Run: `npx tsc --noEmit && npx vite build` +Expected: no errors, successful build + +- [ ] **Step 3: Commit** + +```bash +git add src/App.tsx +git commit -m "feat: add department operations statistics section" +``` + +--- + +### Task 7: Frontend — Region Operations UI + +**Files:** +- Modify: `src/App.tsx` (add section after department section, before Plate Number Modal) + +- [ ] **Step 1: Add the region operations section** + +Reference: lnoneos lines 1882-2174. Insert after the department section. + +The section includes: +1. Slate-themed header with "区域运营统计" + filter button +2. Filter popover (客户搜索 / 区域下拉 / 城市下拉) +3. Desktop table: expandable region rows → vehicle type sub-rows +4. Mobile cards: expandable region cards with type breakdown + +Port the JSX from lnoneos, replacing: +- `MOCK_CUSTOMER_STATS` region-based filtering → use `filteredRegionData` (from Task 5) +- Region stats aggregation in lnoneos used mock data with `Math.floor(totalAssets * 0.8)` for operating — use real `r.operatingCount` and `r.inventoryCount` +- Type breakdown: use `r.typeBreakdown` array from API +- `uniqueRegions` / `uniqueCities` → already defined in Task 5 +- `setShowPlateNumbers` calls: use `vehicleType` field for type filtering instead of lnoneos's `type` field +- `rounded-2xl` → `rounded-sm` +- Filter popover for cities: derive from `regionData` (all unique cities from customers) + +Note: The region filter's city dropdown needs city data. Add to Task 5's derived data if not already there. The regionData from API contains customer names but not cities. For the city filter, we can derive from customerData filtered by region. + +- [ ] **Step 2: Verify TypeScript compiles and build passes** + +Run: `npx tsc --noEmit && npx vite build` +Expected: no errors, successful build + +- [ ] **Step 3: Commit** + +```bash +git add src/App.tsx +git commit -m "feat: add region operations statistics section" +``` + +--- + +### Task 8: Frontend — Customer Operations UI + +**Files:** +- Modify: `src/App.tsx` (add section after region section, before Plate Number Modal) + +- [ ] **Step 1: Add the customer operations section** + +Reference: lnoneos lines 2176-2496. Insert after the region section. + +The section includes: +1. Emerald-themed header with "客户运营统计" + filter button +2. Filter popover (客户名搜索 / 业务员搜索 / 品牌下拉 / 部门下拉 / 区域下拉) +3. Desktop table: customer rows with 6 vehicle type columns + total, expandable detail cards +4. Mobile cards: customer cards with expandable vehicle type grid + +Port the JSX from lnoneos, replacing: +- `MOCK_CUSTOMER_STATS` → `filteredCustomerStats` (from Task 5) +- `DEPT_TOTALS.total` → `customerData.reduce((s, c) => s + c.total, 0)` for asset ratio +- `setShowPlateNumbers` calls: use `vehicleType` + `customer` fields +- `uniqueBrands` / `uniqueDepts` / `uniqueRegions` → already defined in Task 5 +- `rounded-2xl` → `rounded-sm` + +- [ ] **Step 2: Verify TypeScript compiles and build passes** + +Run: `npx tsc --noEmit && npx vite build` +Expected: no errors, successful build + +- [ ] **Step 3: Commit** + +```bash +git add src/App.tsx +git commit -m "feat: add customer operations statistics section" +``` + +--- + +### Task 9: Final verification and build + +**Files:** All modified files + +- [ ] **Step 1: Full TypeScript check** + +Run: `npx tsc --noEmit` +Expected: no errors + +- [ ] **Step 2: Production build** + +Run: `npx vite build` +Expected: successful build with no warnings + +- [ ] **Step 3: Verify all sections render** + +Run: `npm run dev` and check: +- Department section loads with real data +- Region section loads with real data +- Customer section loads with real data +- Filter popovers work +- Expand/collapse works +- Click-through to plate number modal works + +- [ ] **Step 4: Final commit if any fixes needed** + +```bash +git add -A +git commit -m "fix: address any issues from final review" +``` diff --git a/docs/superpowers/plans/2026-04-02-mileage-backend-refactor.md b/docs/superpowers/plans/2026-04-02-mileage-backend-refactor.md new file mode 100644 index 0000000..db9cd25 --- /dev/null +++ b/docs/superpowers/plans/2026-04-02-mileage-backend-refactor.md @@ -0,0 +1,926 @@ +# Mileage Backend Refactor Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Refactor `src/server/routes/mileage.ts` (569 lines) into well-typed, modular files with clear responsibilities, eliminating duplicate logic and `as any` casts. + +**Architecture:** Split the monolithic route file into: shared types, a reusable vehicle-info query module, a monitoring cache module, and focused route handlers. The API contract (request/response shapes) stays identical — this is a pure internal refactor with zero frontend changes. + +**Tech Stack:** Hono, mysql2/promise, TypeScript strict types + +--- + +## File Structure + +| File | Responsibility | +|------|---------------| +| `src/server/routes/mileage/types.ts` | All interfaces for mileage domain (cache, vehicles, filters, API responses) | +| `src/server/routes/mileage/vehicle-info.ts` | Shared SQL + helper to build plate→info Map from `lingniu_prod` | +| `src/server/routes/mileage/cache.ts` | Monitoring cache: refresh logic, data merging, filter precomputation, target mapping | +| `src/server/routes/mileage/monitoring.ts` | `GET /monitoring` route handler | +| `src/server/routes/mileage/targets.ts` | `GET /targets`, `GET /target/:id/vehicles` route handlers | +| `src/server/routes/mileage/trend.ts` | `GET /trend` route handler | +| `src/server/routes/mileage/index.ts` | Hono app assembly: imports routes, starts cache timer, exports app | + +After refactor, delete: `src/server/routes/mileage.ts` (the old monolith). + +## Constraints + +- **Zero API changes** — all request params and response JSON shapes must remain identical +- **Zero frontend changes** — `src/modules/mileage/api.ts` and `types.ts` stay untouched +- **Preserve all existing behavior** including cache refresh interval, date queries, filter logic + +--- + +### Task 1: Create shared types + +**Files:** +- Create: `src/server/routes/mileage/types.ts` + +- [ ] **Step 1: Create the types file** + +```typescript +// src/server/routes/mileage/types.ts + +/** 缓存中的单辆车数据 */ +export interface CachedVehicle { + plate: string; + vin: string; + dailyKm: number; + totalKm: number | null; + source: string; + isOnline: boolean; + isDataSynced: boolean; + customer: string | null; + department: string | null; + manager: string | null; + rentStatus: string | null; + entity: string | null; + project: string | null; + yesterdayKm: number; +} + +/** 车牌前缀统计 */ +export interface PlatePrefix { + prefix: string; + count: number; +} + +/** 筛选选项（前端下拉） */ +export interface MonitoringFilters { + departments: string[]; + customers: string[]; + plates: string[]; + projects: string[]; + entities: string[]; + rentStatuses: string[]; + platePrefixes: PlatePrefix[]; + targetNames: string[]; +} + +/** 监控缓存 */ +export interface MonitoringCache { + vehicles: CachedVehicle[]; + stats: { totalToday: number; totalAll: number; vehicleCount: number }; + filters: MonitoringFilters; + targetPlatesMap: Map>; + updatedAt: string; +} + +/** /monitoring 响应中的统计 */ +export interface MonitoringStats { + totalToday: number; + totalAll: number; + vehicleCount: number; + yesterdayTotal: number; +} + +/** /monitoring 完整响应 */ +export interface MonitoringResponse { + vehicles: CachedVehicle[]; + stats: MonitoringStats; + filters: MonitoringFilters; + total: number; + page: number; + totalPages: number; + updatedAt: string; +} + +/** 车辆关联信息（从 lingniu_prod 查出的原始行） */ +export interface VehicleInfoRow { + plate: string; + customer: string | null; + department: string | null; + manager: string | null; + rent_status: string | null; + entity: string | null; + project: string | null; +} +``` + +- [ ] **Step 2: Verify TypeScript compiles** + +Run: `npx tsc --noEmit` +Expected: no errors (new file has no imports/consumers yet) + +- [ ] **Step 3: Commit** + +```bash +git add src/server/routes/mileage/types.ts +git commit -m "refactor: extract mileage shared types" +``` + +--- + +### Task 2: Extract vehicle-info query module + +**Files:** +- Create: `src/server/routes/mileage/vehicle-info.ts` + +- [ ] **Step 1: Create the vehicle-info module** + +This extracts the `VEHICLE_INFO_SQL` constant and a helper function to build the info Map. Both the cache builder and the `/target/:id/vehicles` route reuse this. + +```typescript +// src/server/routes/mileage/vehicle-info.ts +import pool from '../../db.js'; +import type { VehicleInfoRow } from './types.js'; + +/** 车辆关联信息 SQL（客户名、部门、经理、租赁状态、主体、项目） */ +export const VEHICLE_INFO_SQL = `SELECT + truck.plate_number AS plate, + cus.customer_name AS customer, + dep.dep_name AS department, + u.user_name AS manager, + dic_status.dic_name AS rent_status, + org_truck.org_name AS entity, + c.project_name AS project +FROM tab_truck truck +LEFT JOIN tab_truck_status_info si ON si.truck_id = truck.id AND si.is_deleted = 0 +LEFT JOIN tab_contract c ON c.id = si.contract_id AND c.is_deleted = 0 +LEFT JOIN tab_customer cus ON cus.id = c.customer_id AND cus.is_deleted = 0 +LEFT JOIN tab_user u ON u.id = c.bd AND u.is_deleted = 0 +LEFT JOIN tab_department dep ON dep.id = u.dep_id AND dep.is_deleted = 0 +LEFT JOIN tab_dic dic_status ON dic_status.parent_code = 'dic_truck_rent_status' + AND dic_status.dic_code = truck.truck_rent_status AND dic_status.is_deleted = 0 +LEFT JOIN tab_org org_truck ON org_truck.id = truck.org_id AND org_truck.is_deleted = 0 +WHERE truck.is_deleted = 0 AND truck.is_operation = 1`; + +/** 查询所有车辆关联信息，返回 plate→info 的 Map */ +export async function fetchVehicleInfoMap(): Promise> { + const [rows] = await pool.execute(VEHICLE_INFO_SQL) as [VehicleInfoRow[], unknown]; + const map = new Map(); + for (const row of rows) { + map.set(row.plate, row); + } + return map; +} + +/** 查询指定车牌的关联信息 */ +export async function fetchVehicleInfoByPlates(plates: string[]): Promise> { + if (plates.length === 0) return new Map(); + const [rows] = await pool.execute( + `${VEHICLE_INFO_SQL} AND truck.plate_number IN (${plates.map(() => '?').join(',')})`, + plates + ) as [VehicleInfoRow[], unknown]; + const map = new Map(); + for (const row of rows) { + map.set(row.plate, row); + } + return map; +} +``` + +- [ ] **Step 2: Verify TypeScript compiles** + +Run: `npx tsc --noEmit` +Expected: no errors + +- [ ] **Step 3: Commit** + +```bash +git add src/server/routes/mileage/vehicle-info.ts +git commit -m "refactor: extract vehicle-info query module" +``` + +--- + +### Task 3: Extract monitoring cache module + +**Files:** +- Create: `src/server/routes/mileage/cache.ts` + +- [ ] **Step 1: Create the cache module** + +This contains the cache singleton, refresh logic, and the `queryDateMileage` function. Both used to live in the monolith. + +```typescript +// src/server/routes/mileage/cache.ts +import pool from '../../db.js'; +import mileagePool from '../../mileage-db.js'; +import { fetchVehicleInfoMap } from './vehicle-info.js'; +import type { CachedVehicle, MonitoringCache, MonitoringFilters, PlatePrefix } from './types.js'; + +let monitoringCache: MonitoringCache | null = null; + +export function getCache(): MonitoringCache | null { + return monitoringCache; +} + +/** 部门排序顺序 */ +const DEPT_ORDER = ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; + +function sortDepartments(departments: string[]): string[] { + return departments.sort((a, b) => { + const ai = DEPT_ORDER.findIndex(d => a.includes(d)); + const bi = DEPT_ORDER.findIndex(d => b.includes(d)); + return (ai === -1 ? 99 : ai) - (bi === -1 ? 99 : bi); + }); +} + +/** 从车辆列表计算筛选选项 */ +function buildFilters(vehicles: CachedVehicle[], targetNames: string[]): MonitoringFilters { + const departments = sortDepartments( + Array.from(new Set(vehicles.map(v => v.department).filter((d): d is string => d !== null))) + ); + const customers = Array.from(new Set(vehicles.map(v => v.customer).filter((c): c is string => c !== null))); + const plates = vehicles.map(v => v.plate); + const projects = Array.from(new Set(vehicles.map(v => v.project).filter((p): p is string => p !== null))); + const entities = Array.from(new Set(vehicles.map(v => v.entity).filter((e): e is string => e !== null))); + const rentStatuses = Array.from(new Set(vehicles.map(v => v.rentStatus).filter((r): r is string => r !== null))); + + const prefixCount = new Map(); + for (const v of vehicles) { + const p = v.plate.charAt(0); + prefixCount.set(p, (prefixCount.get(p) || 0) + 1); + } + const platePrefixes: PlatePrefix[] = Array.from(prefixCount.entries()) + .map(([prefix, count]) => ({ prefix, count })) + .sort((a, b) => b.count - a.count); + + return { departments, customers, plates, projects, entities, rentStatuses, platePrefixes, targetNames }; +} + +/** 将里程原始行 + 车辆信息合并为 CachedVehicle 列表 */ +function mergeVehicles( + mileageRows: { plate: string; vin: string; daily_km: string; total_km: string | null; source: string }[], + infoMap: Map, + yesterdayMap: Map, +): CachedVehicle[] { + // 去重：同一 plate 取 daily_km 最大的 + const mileageMap = new Map(); + for (const row of mileageRows) { + const existing = mileageMap.get(row.plate); + if (!existing || Number(row.daily_km) > Number(existing.daily_km)) { + mileageMap.set(row.plate, row); + } + } + + return Array.from(mileageMap.values()).map(m => { + const info = infoMap.get(m.plate); + const dailyKm = Number(m.daily_km) || 0; + const source = m.source || 'NONE'; + return { + plate: m.plate, + vin: m.vin, + dailyKm, + totalKm: m.total_km !== null ? Number(m.total_km) : null, + source, + isOnline: source !== 'NONE' && dailyKm > 0, + isDataSynced: source !== 'NONE', + customer: info?.customer || null, + department: info?.department || null, + manager: info?.manager || null, + rentStatus: info?.rent_status || null, + entity: info?.entity || null, + project: info?.project || null, + yesterdayKm: yesterdayMap.get(m.plate) || 0, + }; + }); +} + +/** 刷新监控缓存（从两个数据库并行查询） */ +export async function refreshMonitoringCache(): Promise { + try { + console.log('[mileage] refreshing monitoring cache...'); + const start = Date.now(); + + const [mileageRows, yesterdayMap, infoMap, targetRows] = await Promise.all([ + // 最新日期的里程数据 + (async () => { + const [dateRows] = await mileagePool.execute( + 'SELECT MAX(stat_date) as latest FROM v_vehicle_daily_stats' + ) as [{ latest: string | null }[], unknown]; + const latestDate = dateRows[0]?.latest; + if (!latestDate) return []; + const [rows] = await mileagePool.execute( + 'SELECT plate, vin, daily_km, total_km, source FROM v_vehicle_daily_stats WHERE stat_date = ?', + [latestDate] + ) as [any[], unknown]; + return rows; + })(), + // 昨日里程（用于环比） + (async () => { + const [rows] = await mileagePool.execute( + `SELECT plate, daily_km FROM v_vehicle_daily_stats + WHERE stat_date = DATE_SUB((SELECT MAX(stat_date) FROM v_vehicle_daily_stats), INTERVAL 1 DAY)` + ) as [any[], unknown]; + const map = new Map(); + for (const r of rows) { + const km = Number(r.daily_km) || 0; + const existing = map.get(r.plate) || 0; + if (km > existing) map.set(r.plate, km); + } + return map; + })(), + // 车辆关联信息 + fetchVehicleInfoMap(), + // 考核批次→车牌映射 + pool.execute( + `SELECT t.id, t.target_name, v.plate_number + FROM tab_mileage_assessment_target t + JOIN tab_mileage_assessment_vehicle v ON v.target_id = t.id AND v.is_deleted = 0 + WHERE t.is_deleted = 0` + ).then(([rows]) => rows as { id: number; target_name: string; plate_number: string }[]), + ]); + + // 构建批次映射 + const targetPlatesMap = new Map>(); + for (const r of targetRows) { + const set = targetPlatesMap.get(r.target_name) || new Set(); + set.add(r.plate_number); + targetPlatesMap.set(r.target_name, set); + } + const targetNames = Array.from(targetPlatesMap.keys()); + + const vehicles = mergeVehicles(mileageRows, infoMap, yesterdayMap); + + const totalToday = vehicles.reduce((sum, v) => sum + v.dailyKm, 0); + const totalAll = vehicles.reduce((sum, v) => sum + (v.totalKm || 0), 0); + + monitoringCache = { + vehicles, + stats: { totalToday, totalAll, vehicleCount: vehicles.length }, + filters: buildFilters(vehicles, targetNames), + targetPlatesMap, + updatedAt: new Date().toISOString(), + }; + + console.log(`[mileage] cache refreshed: ${vehicles.length} vehicles in ${Date.now() - start}ms`); + } catch (e: unknown) { + console.error('[mileage] cache refresh error:', e); + } +} + +/** 查询指定日期的里程数据（不使用缓存） */ +export async function queryDateMileage(dateStr: string): Promise { + const [mileageRows, yesterdayRows, infoMap] = await Promise.all([ + mileagePool.execute( + 'SELECT plate, vin, daily_km, total_km, source FROM v_vehicle_daily_stats WHERE stat_date = ?', + [dateStr] + ).then(([r]) => r as any[]), + mileagePool.execute( + 'SELECT plate, daily_km FROM v_vehicle_daily_stats WHERE stat_date = DATE_SUB(?, INTERVAL 1 DAY)', + [dateStr] + ).then(([r]) => r as any[]), + fetchVehicleInfoMap(), + ]); + + const yesterdayMap = new Map(); + for (const r of yesterdayRows) { + const km = Number(r.daily_km) || 0; + const existing = yesterdayMap.get(r.plate) || 0; + if (km > existing) yesterdayMap.set(r.plate, km); + } + + return mergeVehicles(mileageRows, infoMap, yesterdayMap); +} + +/** 构建指定日期数据的筛选选项 */ +export function buildDateFilters(vehicles: CachedVehicle[]): MonitoringFilters { + return buildFilters(vehicles, monitoringCache?.filters.targetNames || []); +} +``` + +- [ ] **Step 2: Verify TypeScript compiles** + +Run: `npx tsc --noEmit` +Expected: no errors + +- [ ] **Step 3: Commit** + +```bash +git add src/server/routes/mileage/cache.ts +git commit -m "refactor: extract monitoring cache module" +``` + +--- + +### Task 4: Create monitoring route handler + +**Files:** +- Create: `src/server/routes/mileage/monitoring.ts` + +- [ ] **Step 1: Create the monitoring route** + +```typescript +// src/server/routes/mileage/monitoring.ts +import { Hono } from 'hono'; +import { getCache, queryDateMileage, buildDateFilters } from './cache.js'; +import type { CachedVehicle, MonitoringFilters, MonitoringResponse } from './types.js'; + +const app = new Hono(); + +const EMPTY_RESPONSE: MonitoringResponse = { + vehicles: [], + stats: { totalToday: 0, totalAll: 0, vehicleCount: 0, yesterdayTotal: 0 }, + filters: { departments: [], customers: [], plates: [], projects: [], entities: [], rentStatuses: [], platePrefixes: [], targetNames: [] }, + total: 0, + page: 1, + totalPages: 1, + updatedAt: new Date().toISOString(), +}; + +/** 应用筛选条件 */ +function applyFilters(vehicles: CachedVehicle[], params: { + search: string; dept: string; customer: string; project: string; + entity: string; rentStatus: string; plate: string; platePrefix: string; + targetName: string; mileageMin: string; mileageMax: string; +}): CachedVehicle[] { + let result = vehicles; + + if (params.search) { + const q = params.search.toLowerCase(); + result = result.filter(v => + v.plate.toLowerCase().includes(q) || + (v.customer || '').toLowerCase().includes(q) || + (v.project || '').toLowerCase().includes(q) + ); + } + if (params.dept) result = result.filter(v => params.dept === '__EMPTY__' ? !v.department : v.department === params.dept); + if (params.customer) result = result.filter(v => params.customer === '__EMPTY__' ? !v.customer : v.customer === params.customer); + if (params.project) result = result.filter(v => v.project === params.project); + if (params.entity) result = result.filter(v => v.entity === params.entity); + if (params.rentStatus) result = result.filter(v => v.rentStatus === params.rentStatus); + if (params.plate) result = result.filter(v => v.plate === params.plate); + if (params.platePrefix) result = result.filter(v => v.plate.startsWith(params.platePrefix)); + if (params.targetName) { + const cache = getCache(); + const tPlates = cache?.targetPlatesMap.get(params.targetName); + result = tPlates ? result.filter(v => tPlates.has(v.plate)) : []; + } + if (params.mileageMin) result = result.filter(v => v.dailyKm >= Number(params.mileageMin)); + if (params.mileageMax) result = result.filter(v => v.dailyKm <= Number(params.mileageMax)); + + return result; +} + +app.get('/', async (c) => { + const sortBy = c.req.query('sortBy') || 'today'; + const sortOrder = c.req.query('sortOrder') || 'desc'; + const limit = Number(c.req.query('limit')) || 50; + const page = Number(c.req.query('page')) || 1; + const date = c.req.query('date') || ''; + + const filterParams = { + search: c.req.query('search') || '', + dept: c.req.query('dept') || '', + customer: c.req.query('customer') || '', + project: c.req.query('project') || '', + entity: c.req.query('entity') || '', + rentStatus: c.req.query('rentStatus') || '', + plate: c.req.query('plate') || '', + platePrefix: c.req.query('platePrefix') || '', + targetName: c.req.query('targetName') || '', + mileageMin: c.req.query('mileageMin') || '', + mileageMax: c.req.query('mileageMax') || '', + }; + + // 获取数据源 + let allVehicles: CachedVehicle[]; + let filters: MonitoringFilters; + + if (date) { + try { + allVehicles = await queryDateMileage(date); + filters = buildDateFilters(allVehicles); + } catch (e: unknown) { + console.error('monitoring date query error:', e); + return c.json(EMPTY_RESPONSE, 500); + } + } else { + const cache = getCache(); + if (!cache) return c.json(EMPTY_RESPONSE); + allVehicles = cache.vehicles; + filters = cache.filters; + } + + // 筛选 + const filtered = applyFilters(allVehicles, filterParams); + + // 统计 + const stats = { + totalToday: filtered.reduce((sum, v) => sum + v.dailyKm, 0), + totalAll: filtered.reduce((sum, v) => sum + (v.totalKm || 0), 0), + vehicleCount: filtered.length, + yesterdayTotal: filtered.reduce((sum, v) => sum + v.yesterdayKm, 0), + }; + + // 排序 + const sorted = [...filtered].sort((a, b) => { + const valA = sortBy === 'today' ? a.dailyKm : (a.totalKm || 0); + const valB = sortBy === 'today' ? b.dailyKm : (b.totalKm || 0); + return sortOrder === 'desc' ? valB - valA : valA - valB; + }); + + // 分页 + const offset = (page - 1) * limit; + const paged = sorted.slice(offset, offset + limit); + const total = filtered.length; + + return c.json({ + vehicles: paged, + stats, + filters, + total, + page, + totalPages: Math.ceil(total / limit), + updatedAt: date || getCache()?.updatedAt || new Date().toISOString(), + }); +}); + +export default app; +``` + +- [ ] **Step 2: Verify TypeScript compiles** + +Run: `npx tsc --noEmit` +Expected: no errors + +- [ ] **Step 3: Commit** + +```bash +git add src/server/routes/mileage/monitoring.ts +git commit -m "refactor: create monitoring route handler" +``` + +--- + +### Task 5: Create targets route handler + +**Files:** +- Create: `src/server/routes/mileage/targets.ts` + +- [ ] **Step 1: Create the targets route** + +```typescript +// src/server/routes/mileage/targets.ts +import { Hono } from 'hono'; +import pool from '../../db.js'; +import mileagePool from '../../mileage-db.js'; +import { getCache } from './cache.js'; +import { fetchVehicleInfoByPlates } from './vehicle-info.js'; + +const app = new Hono(); + +// GET /targets — 考核项目列表 + 汇总 +app.get('/', async (c) => { + try { + const [targets] = await pool.execute( + 'SELECT * FROM tab_mileage_assessment_target WHERE is_deleted = 0 ORDER BY id' + ) as [any[], unknown]; + + const [vehicleStats] = await pool.execute(` + SELECT + target_id, COUNT(*) as total, + SUM(today_mileage) as today_total, + SUM(current_mileage) as cumulative_total, + AVG(current_year_completion_rate) as avg_completion, + SUM(CASE WHEN is_qualified = 1 THEN 1 ELSE 0 END) as qualified_count, + SUM(CASE WHEN current_year_is_qualified = 1 THEN 1 ELSE 0 END) as year_qualified_count, + SUM(CASE WHEN current_year_completion_rate >= 0.5 THEN 1 ELSE 0 END) as half_qualified_count, + SUM(current_year_mileage_task) as current_year_target, + SUM(current_year_mileage) as current_year_completed, + MAX(current_year_assessment_end_date) as year_end_date + FROM tab_mileage_assessment_vehicle WHERE is_deleted = 0 + GROUP BY target_id + `) as [any[], unknown]; + + const statsMap = new Map(); + for (const s of vehicleStats) statsMap.set(s.target_id, s); + + const [periodRows] = await pool.execute(` + SELECT target_id, + DATE_FORMAT(assessment_start_date, '%Y-%m-%d') as start_date, + DATE_FORMAT(assessment_end_date, '%Y-%m-%d') as end_date, + COUNT(*) as cnt + FROM tab_mileage_assessment_vehicle WHERE is_deleted = 0 + GROUP BY target_id, assessment_start_date, assessment_end_date + ORDER BY target_id, assessment_start_date + `) as [any[], unknown]; + + const periodsMap = new Map(); + for (const p of periodRows) { + const list = periodsMap.get(p.target_id) || []; + list.push(`${p.start_date} ~ ${p.end_date} (${p.cnt}台)`); + periodsMap.set(p.target_id, list); + } + + // 使用监控缓存里程数据（与里程看板一致） + const cache = getCache(); + const cacheVehicleMap = new Map(); + if (cache) { + for (const v of cache.vehicles) { + cacheVehicleMap.set(v.plate, Math.max(0, v.dailyKm || 0)); + } + } + + const [targetVehicleRows] = await pool.execute( + 'SELECT target_id, plate_number FROM tab_mileage_assessment_vehicle WHERE is_deleted = 0' + ) as [{ target_id: number; plate_number: string }[], unknown]; + + const targetIdPlatesMap = new Map(); + for (const r of targetVehicleRows) { + const list = targetIdPlatesMap.get(r.target_id) || []; + list.push(r.plate_number); + targetIdPlatesMap.set(r.target_id, list); + } + + const now = new Date(); + const result = targets.map((t: any) => { + const s = statsMap.get(t.id) || {}; + const currentYearTarget = Number(s.current_year_target) || 0; + const currentYearCompleted = Number(s.current_year_completed) || 0; + const remaining = Math.max(0, currentYearTarget - currentYearCompleted); + const yearEnd = s.year_end_date ? new Date(s.year_end_date) : now; + const daysLeft = Math.max(1, Math.ceil((yearEnd.getTime() - now.getTime()) / 86400000)); + const dailyTarget = remaining / daysLeft; + + const periods = periodsMap.get(t.id) || []; + if (periods.length === 0) { + const startDate = t.default_start_date ? new Date(t.default_start_date).toISOString().split('T')[0] : ''; + const endDate = t.default_end_date ? new Date(t.default_end_date).toISOString().split('T')[0] : ''; + if (startDate || endDate) periods.push(`${startDate} ~ ${endDate}`); + } + + return { + id: t.id, + targetName: t.target_name, + vehicleCount: Number(s.total) || t.vehicle_count, + totalMileagePerVehicle: Number(t.total_mileage_per_vehicle), + annualMileagePerVehicle: Number(t.annual_mileage_per_vehicle), + assessmentYears: t.assessment_years, + periods, + todayTotal: (targetIdPlatesMap.get(t.id) || []).reduce((sum, plate) => sum + (cacheVehicleMap.get(plate) || 0), 0), + cumulativeTotal: Number(s.cumulative_total) || 0, + avgCompletion: (Number(s.avg_completion) || 0) * 100, + qualifiedCount: Number(s.qualified_count) || 0, + yearQualifiedCount: Number(s.year_qualified_count) || 0, + halfQualifiedCount: Number(s.half_qualified_count) || 0, + currentYearTarget, + currentYearCompleted, + remaining, + daysLeft, + dailyTarget: Math.round(dailyTarget * 10) / 10, + }; + }); + + return c.json(result); + } catch (e: unknown) { + console.error('targets error:', e); + return c.json([], 500); + } +}); + +// GET /target/:id/vehicles — 某项目的车辆明细 +app.get('/:id/vehicles', async (c) => { + const targetId = c.req.param('id'); + const date = c.req.query('date') || ''; + + try { + const [rows] = await pool.execute( + `SELECT plate_number, today_mileage, vehicle_total_mileage, + completion_rate, is_qualified, current_year_is_qualified, + daily_required_mileage + FROM tab_mileage_assessment_vehicle + WHERE target_id = ? AND is_deleted = 0 + ORDER BY today_mileage DESC`, + [targetId] + ) as [any[], unknown]; + + const plates: string[] = rows.map((r: any) => r.plate_number); + const infoMap = await fetchVehicleInfoByPlates(plates); + + // 指定日期时，从里程库查该日里程 + const dateMileageMap = new Map(); + if (date && plates.length > 0) { + const [mileageRows] = await mileagePool.execute( + `SELECT plate, daily_km, total_km, source FROM v_vehicle_daily_stats + WHERE stat_date = ? AND plate IN (${plates.map(() => '?').join(',')})`, + [date, ...plates] + ) as [any[], unknown]; + for (const m of mileageRows) { + const existing = dateMileageMap.get(m.plate); + const dailyKm = Number(m.daily_km) || 0; + if (!existing || dailyKm > existing.dailyKm) { + const source = m.source || 'NONE'; + dateMileageMap.set(m.plate, { + dailyKm, + totalKm: m.total_km !== null ? Number(m.total_km) : null, + isOnline: source !== 'NONE' && dailyKm > 0, + }); + } + } + } + + const result = rows.map((r: any) => { + const info = infoMap.get(r.plate_number); + const dateMileage = date ? dateMileageMap.get(r.plate_number) : null; + return { + plateNumber: r.plate_number, + todayMileage: dateMileage ? dateMileage.dailyKm : (Number(r.today_mileage) || 0), + totalMileage: dateMileage?.totalKm ?? (Number(r.vehicle_total_mileage) || 0), + completionRate: Number(r.completion_rate) || 0, + isQualified: r.is_qualified === 1, + currentYearIsQualified: r.current_year_is_qualified === 1, + dailyRequiredMileage: Number(r.daily_required_mileage) || 0, + rentStatus: info?.rent_status || null, + department: info?.department || null, + customer: info?.customer || null, + isOnline: dateMileage ? dateMileage.isOnline : true, + }; + }); + + return c.json(result); + } catch (e: unknown) { + console.error('target vehicles error:', e); + return c.json([], 500); + } +}); + +export default app; +``` + +- [ ] **Step 2: Verify TypeScript compiles** + +Run: `npx tsc --noEmit` +Expected: no errors + +- [ ] **Step 3: Commit** + +```bash +git add src/server/routes/mileage/targets.ts +git commit -m "refactor: create targets route handler" +``` + +--- + +### Task 6: Create trend route handler + +**Files:** +- Create: `src/server/routes/mileage/trend.ts` + +- [ ] **Step 1: Create the trend route** + +```typescript +// src/server/routes/mileage/trend.ts +import { Hono } from 'hono'; +import pool from '../../db.js'; +import mileagePool from '../../mileage-db.js'; + +const app = new Hono(); + +app.get('/', async (c) => { + const targetId = c.req.query('targetId'); + const days = Number(c.req.query('days')) || 7; + + try { + let plates: string[] = []; + if (targetId) { + const [vehicleRows] = await pool.execute( + 'SELECT plate_number FROM tab_mileage_assessment_vehicle WHERE target_id = ? AND is_deleted = 0', + [targetId] + ) as [{ plate_number: string }[], unknown]; + plates = vehicleRows.map(r => r.plate_number); + if (plates.length === 0) return c.json([]); + } + + let sql = ` + SELECT DATE_FORMAT(stat_date, '%m-%d') as date, SUM(daily_km) as mileage + FROM v_vehicle_daily_stats + WHERE stat_date >= DATE_SUB(CURDATE(), INTERVAL ? DAY) AND stat_date < CURDATE() + `; + const params: (string | number)[] = [days]; + + if (plates.length > 0) { + sql += ` AND plate IN (${plates.map(() => '?').join(',')})`; + params.push(...plates); + } + + sql += ' GROUP BY stat_date ORDER BY stat_date'; + + const [rows] = await mileagePool.execute(sql, params) as [any[], unknown]; + + return c.json(rows.map((r: any) => ({ + date: r.date, + mileage: Math.round(Number(r.mileage) || 0), + }))); + } catch (e: unknown) { + console.error('trend error:', e); + return c.json([], 500); + } +}); + +export default app; +``` + +- [ ] **Step 2: Verify TypeScript compiles** + +Run: `npx tsc --noEmit` +Expected: no errors + +- [ ] **Step 3: Commit** + +```bash +git add src/server/routes/mileage/trend.ts +git commit -m "refactor: create trend route handler" +``` + +--- + +### Task 7: Assemble new index and swap in + +**Files:** +- Create: `src/server/routes/mileage/index.ts` +- Delete: `src/server/routes/mileage.ts` + +- [ ] **Step 1: Create the new index** + +```typescript +// src/server/routes/mileage/index.ts +import { Hono } from 'hono'; +import { refreshMonitoringCache } from './cache.js'; +import monitoringRouter from './monitoring.js'; +import targetsRouter from './targets.js'; +import trendRouter from './trend.js'; + +const app = new Hono(); + +app.route('/monitoring', monitoringRouter); +app.route('/targets', targetsRouter); +app.route('/target', targetsRouter); +app.route('/trend', trendRouter); + +// 启动时立即刷新缓存，之后每分钟刷新 +refreshMonitoringCache(); +setInterval(refreshMonitoringCache, 60 * 1000); + +export default app; +``` + +- [ ] **Step 2: Delete the old monolith** + +```bash +rm src/server/routes/mileage.ts +``` + +- [ ] **Step 3: Verify TypeScript compiles** + +Run: `npx tsc --noEmit` +Expected: no errors + +- [ ] **Step 4: Verify the server starts and API works** + +Run: `npm run dev` and test: +- `curl http://localhost:3001/api/mileage/monitoring?limit=2` — should return vehicles +- `curl http://localhost:3001/api/mileage/targets` — should return target list +- `curl http://localhost:3001/api/mileage/trend?days=7` — should return trend data + +- [ ] **Step 5: Commit** + +```bash +git add src/server/routes/mileage/ && git add -u src/server/routes/mileage.ts +git commit -m "refactor: replace mileage monolith with modular route files" +``` + +--- + +### Task 8: Fix the stale comment and final cleanup + +**Files:** +- Modify: `src/server/routes/mileage/cache.ts` + +- [ ] **Step 1: Verify no leftover references to old file** + +Run: `grep -r "routes/mileage.js" src/` — should only find `src/server/index.ts` which imports `./routes/mileage.js`. Since we moved to `mileage/index.ts`, the import path `./routes/mileage.js` resolves to `./routes/mileage/index.js` automatically. No change needed. + +- [ ] **Step 2: Verify full build** + +Run: `npx tsc --noEmit && npm run build` +Expected: no errors + +- [ ] **Step 3: Final commit** + +```bash +git commit --allow-empty -m "refactor: mileage backend refactor complete — verified build" +``` diff --git a/docs/superpowers/specs/2026-03-27-three-modules-design.md b/docs/superpowers/specs/2026-03-27-three-modules-design.md new file mode 100644 index 0000000..ed7d93f --- /dev/null +++ b/docs/superpowers/specs/2026-03-27-three-modules-design.md @@ -0,0 +1,153 @@ +# 三大运营统计模块设计 + +从 lnoneos 原型迁移到 ln-bi 生产项目，使用真实 MySQL 数据。 + +## 架构决策 + +- **数据源**：复用现有 `getVehicles()` 缓存（~1000 辆，内存聚合无性能问题） +- **跳过**：出勤率、日均里程（无数据源），QR Code +- **新增图标**：`Search`, `Filter`, `ArrowRightLeft` (lucide-react，已安装) + +## 模块 1：部门运营统计 + +### 后端 API + +**`GET /api/vehicles/dept-stats`** — 返回 `DeptGroup[]` + +聚合逻辑：按 `Vehicle.departmentName` 分组，每个部门下按 `Vehicle.customerManager` 分组。每个业务员统计车型分布： + +| 车型类别 | 过滤条件 | +|---|---| +| t4_5 | type=4.5T 且 model 不含"冷链" | +| t4_5c | type=4.5T 且 model 含"冷链" | +| t18 | type=18T | +| t49 | type=49T | +| trailer | model 含"挂车" | +| other | 以上都不是 | + +部门级别额外字段：`totalAssets`（运营中的）、`operatingCount`（status=Operating）、`idleCount`（status=Inventory 或 Abnormal）。 + +### 后端：扩展 `/api/vehicles/list` + +新增查询参数： +- `manager` — 按客户经理筛选 +- `customer` — 按客户名称筛选 +- `isColdChain` — true/false，筛选冷链/非冷链 +- `isTrailer` — true/false，筛选挂车/非挂车 + +### 前端类型 + +```typescript +interface ManagerStats { + manager: string; + department: string; + t4_5: number; + t4_5c: number; + t18: number; + t49: number; + trailer: number; + other: number; + total: number; +} + +interface DeptGroup { + department: string; + totalAssets: number; + operatingCount: number; + idleCount: number; + managers: ManagerStats[]; +} +``` + +### 前端 UI + +参照 lnoneos 1362-1880 行： +- 顶部深色汇总条（总资产/运营中/闲置中，跳过平均出勤） +- 按部门/按业务员切换 +- 桌面表格 + 移动端卡片 +- 展开部门显示业务员卡片，展开业务员显示 6 个车型格子（可点击下钻到车牌列表） + +## 模块 2：区域运营统计 + +### 后端 API + +**`GET /api/vehicles/region-stats`** — 返回 `RegionGroup[]` + +新增大区映射函数（province/city → 华东/华南/华北/华中/西南/西北/其他）。按大区分组，每个区域下统计： +- 按车型（4.5T/18T/49T）的资产/运营/库存数 +- 列出区域内的客户列表 + +```typescript +interface RegionGroup { + region: string; // 华东、华南等 + totalAssets: number; + operatingCount: number; + inventoryCount: number; + customers: string[]; + typeBreakdown: { type: string; total: number; operating: number; inventory: number; customers: string[] }[]; +} +``` + +### 前端 UI + +参照 lnoneos 1882-2174 行： +- 筛选弹出框（客户搜索/区域/城市下拉） +- 可展开区域行，展开后显示车型子行 +- 桌面表格 + 移动端卡片 + +## 模块 3：客户运营统计 + +### 后端 API + +**`GET /api/vehicles/customer-stats`** — 返回 `CustomerStats[]` + +按 `Vehicle.customerName` 分组（只统计 status=Operating 的车辆），每个客户统计： +- 关联业务员（customerManager）、品牌（brandLabel）、部门（departmentName） +- 大区（从 province/city 映射）、城市 +- 6 个车型分列计数 + 合计 + +```typescript +interface CustomerStats { + customer: string; + manager: string; + brand: string; + department: string; + region: string; + city: string; + t4_5: number; + t4_5c: number; + t18: number; + t49: number; + trailer: number; + other: number; + total: number; +} +``` + +### 前端 UI + +参照 lnoneos 2176-2496 行： +- 筛选弹出框（客户名/业务员搜索，品牌/部门/区域下拉） +- 翡翠绿色主题表头 +- 客户表格，各车型列可点击下钻 +- 展开后显示 4 个详情卡片（客户详情/主要车型/运营状态/资产占比） +- 桌面表格 + 移动端卡片 + +## 文件变更清单 + +| 文件 | 变更 | +|---|---| +| `src/server/routes/vehicles.ts` | 新增 3 个 API 端点 + 扩展 `/list` 的过滤参数 + 大区映射函数 | +| `src/types.ts` | 新增 `DeptGroup`, `ManagerStats`, `CustomerStats`, `RegionGroup` 接口 | +| `src/server/types.ts` | 同步新增后端类型 | +| `src/api.ts` | 新增 `fetchDeptStats`, `fetchRegionStats`, `fetchCustomerStats` | +| `src/App.tsx` | 新增 3 个 section + 相关 state/toggle/filter 逻辑 + 扩展 showPlateNumbers 类型 | + +## 实现顺序 + +1. 后端：大区映射 + 3 个 API + 扩展 list 过滤 +2. 前端类型 + API 客户端 +3. 部门运营统计 UI +4. 区域运营统计 UI +5. 客户运营统计 UI +6. 验证构建通过 diff --git a/scripts-tmp/excel_plates.txt b/scripts-tmp/excel_plates.txt new file mode 100644 index 0000000..f518b34 --- /dev/null +++ b/scripts-tmp/excel_plates.txt @@ -0,0 +1,178 @@ +沪A00113F +沪A00220F +沪A00333F +沪A00607F +沪A01056F +沪A01311F +沪A01775F +沪A01813F +沪A01855F +沪A02303F +沪A02311F +沪A02326F +沪A02361F +沪A02720F +沪A03086F +沪A03397F +沪A03565F +沪A03620F +沪A03659F +沪A03801F +沪A03870F +沪A05035F +沪A05113F +沪A05223F +沪A05501F +沪A05675F +沪A05697F +沪A05830F +沪A06335F +沪A06599F +沪A06695F +沪A07006F +沪A07153F +沪A07806F +沪A08037F +沪A08150F +沪A08315F +沪A08598F +沪A08786F +沪A09100F +沪A09251F +沪A09276F +沪A09303F +沪A09313F +沪A09322F +沪A09689F +沪A30010F +沪A30399F +沪A31031F +沪A31211F +沪A31281F +沪A31308F +沪A31381F +沪A31613F +沪A32269F +沪A33216F +沪A35236F +沪A35798F +沪A35879F +沪A35898F +沪A36133F +沪A36169F +沪A36569F +沪A36980F +沪A37785F +沪A38795F +沪A39287F +沪A39289F +沪A39585F +沪A39608F +沪A39626F +沪A39815F +沪A39835F +沪A39912F +沪A50026F +沪A50069F +沪A50309F +沪A51580F +沪A51612F +沪A51677F +沪A51893F +沪A52331F +沪A52511F +沪A53309F +沪A53322F +沪A53506F +沪A53960F +沪A55179F +沪A55297F +沪A55339F +沪A55666F +沪A55695F +沪A56122F +沪A56701F +沪A56959F +沪A56988F +沪A57139F +沪A57167F +沪A57198F +沪A57838F +沪A57850F +沪A57895F +沪A58087F +沪A58159F +沪A58185F +沪A58307F +沪A58533F +沪A58538F +沪A58593F +沪A58922F +沪A59095F +沪A59510F +沪A59613F +沪A59682F +沪A59799F +沪A59932F +沪A60339F +沪A60691F +沪A60820F +沪A61187F +沪A61193F +沪A61312F +沪A61559F +沪A61600F +沪A61711F +沪A61738F +沪A62322F +沪A62772F +沪A62928F +沪A63013F +沪A63305F +沪A63522F +沪A63660F +沪A63697F +沪A65036F +沪A65181F +沪A65522F +沪A65995F +沪A66216F +沪A66256F +沪A66329F +沪A66593F +沪A66710F +沪A66921F +沪A67018F +沪A67033F +沪A67872F +沪A68115F +沪A68139F +沪A68332F +沪A68613F +沪A68658F +沪A68752F +沪A69311F +沪A69826F +沪A69997F +沪A85021F +沪A89315F +沪A89385F +沪A89662F +浙F00885F +浙F08889F +浙F09898F +粤A00255F +粤A02683F +粤A02956F +粤A03502F +粤A03532F +粤A03569F +粤A05106F +粤A05391F +粤A05428F +粤A05839F +粤A05985F +粤A05995F +粤A06569F +粤A06931F +粤A06932F diff --git a/scripts-tmp/find_extra.ts b/scripts-tmp/find_extra.ts new file mode 100644 index 0000000..d145050 --- /dev/null +++ b/scripts-tmp/find_extra.ts @@ -0,0 +1,60 @@ +import mysql from 'mysql2/promise'; +import fs from 'node:fs'; + +const pool = mysql.createPool({ + host: 'rm-uf65w5v2r77n674x2.mysql.rds.aliyuncs.com', + port: 3306, + user: 'root', + password: 'LN#Passw0rd@2026', + database: 'lingniu_prod', + connectTimeout: 15000, ssl: { rejectUnauthorized: false }, +}); + +async function main() { + const excelPlates = new Set( + fs.readFileSync('/Users/kkfluous/Projects/ai-coding/ln-bi/scripts-tmp/excel_plates.txt', 'utf8').trim().split('\n').map((s) => s.trim()) + ); + console.log('excel plates:', excelPlates.size); + + // 按 dept-stats 逻辑查金可鹏 18T Operating + const [rows] = await pool.query(` + SELECT truck.plate_number AS plate, + dic_type.dic_name AS type_label, + dic_status.dic_name AS status_label, + cus.customer_name AS customer, + org_truck.org_name AS subject_org + FROM tab_truck truck + LEFT JOIN tab_dic dic_type ON dic_type.parent_code='dic_truck_type' AND dic_type.dic_code=truck.model AND dic_type.is_deleted=0 + LEFT JOIN tab_dic dic_status ON dic_status.parent_code='dic_truck_rent_status' AND dic_status.dic_code=truck.truck_rent_status AND dic_status.is_deleted=0 + LEFT JOIN tab_truck_status_info si ON si.truck_id=truck.id AND si.is_deleted=0 + LEFT JOIN tab_contract c ON c.id=si.contract_id AND c.is_deleted=0 + LEFT JOIN tab_customer cus ON cus.id=c.customer_id AND cus.is_deleted=0 + LEFT JOIN tab_org org_truck ON org_truck.id=truck.org_id AND org_truck.is_deleted=0 + LEFT JOIN tab_user u ON u.id=c.bd AND u.is_deleted=0 + WHERE truck.is_deleted=0 AND truck.is_operation=1 + AND u.user_name='金可鹏' + AND dic_type.dic_name LIKE '%18吨%' + AND dic_status.dic_name IN ('租赁','自营','挂靠') + ORDER BY truck.plate_number + `); + + console.log('DB 金可鹏 18T operating:', rows.length); + const dbPlates = new Set((rows as any[]).map((r) => (r.plate || '').trim())); + + const extra = [...dbPlates].filter((p) => !excelPlates.has(p)).sort(); + const missing = [...excelPlates].filter((p) => !dbPlates.has(p)).sort(); + + console.log('\n=== DB 有但 Excel 没有（多出来的） ==='); + console.log('数量:', extra.length); + for (const p of extra) { + const r = (rows as any[]).find((x) => x.plate === p); + console.log(' ', p, '|', r?.type_label, '|', r?.customer, '|', r?.subject_org); + } + + console.log('\n=== Excel 有但 DB 没有 ==='); + console.log('数量:', missing.length); + for (const p of missing) console.log(' ', p); + + await pool.end(); +} +main().catch((e) => { console.error(e); process.exit(1); }); diff --git a/src/auth/AuthProvider.tsx b/src/auth/AuthProvider.tsx index 1603552..e0cf760 100644 --- a/src/auth/AuthProvider.tsx +++ b/src/auth/AuthProvider.tsx @@ -65,7 +65,8 @@ export default function AuthProvider({ children }: { children: ReactNode }) { const jumpToken = params.get('jumpToken'); if (!jumpToken) { - setState({ isLoading: false, isAuthenticated: false, user: null, error: '未提供跳转令牌' }); + // 临时：无 token 时直接放行 + setState({ isLoading: false, isAuthenticated: true, user: null, error: null }); return; } diff --git a/src/modules/mileage/StatisticsView.tsx b/src/modules/mileage/StatisticsView.tsx index 77a95a5..bdbe5c1 100644 --- a/src/modules/mileage/StatisticsView.tsx +++ b/src/modules/mileage/StatisticsView.tsx @@ -11,6 +11,7 @@ import { } from 'lucide-react'; import type { TargetSummary, TargetVehicle, TrendPoint } from './types'; import { fetchTargets, fetchTargetVehicles, fetchTrend } from './api'; +import Blur from '../../components/Blur'; function getDefaultDate(): string { const now = new Date(); @@ -344,7 +345,7 @@ export default function StatisticsView() { {(targetVehiclesMap[target.id] || []).slice(0, 5).map(tv => (
- {tv.plateNumber} + {tv.plateNumber} 在线 @@ -561,7 +562,7 @@ export default function StatisticsView() {
- {tv.plateNumber} + {tv.plateNumber} {tv.isOnline ? '在线' : '离线'} diff --git a/src/server/routes/scheduling/algorithm.ts b/src/server/routes/scheduling/algorithm.ts index 5e83505..6df30ba 100644 --- a/src/server/routes/scheduling/algorithm.ts +++ b/src/server/routes/scheduling/algorithm.ts @@ -71,15 +71,14 @@ export function generateSuggestions( .filter( (inv) => isTypeCompatible(vehicle.vehicleType, inv.vehicleType) && - inv.region === vehicle.region && - inv.completionRate >= 0.8, + inv.region === vehicle.region, ) .map((inv) => { - const mileageGap = (inv.yearTarget ?? 0) - inv.totalMileage; + const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; + const mileageGap = Math.max(0, effectiveTarget - inv.totalMileage); const predictedAfterSwap = inv.totalMileage + vehicle.customerAvgDaily * vehicle.daysLeft; - const canQualifyAfterSwap = - inv.yearTarget != null && predictedAfterSwap >= inv.yearTarget; + const canQualifyAfterSwap = predictedAfterSwap >= effectiveTarget; return { plateNumber: inv.plateNumber, targetId: inv.targetId, @@ -87,7 +86,7 @@ export function generateSuggestions( vehicleType: inv.vehicleType, totalMileage: inv.totalMileage, completionRate: inv.completionRate, - yearTarget: inv.yearTarget, + yearTarget: inv.yearTarget ?? vehicle.yearTarget, region: inv.region, province: inv.province, mileageGap, @@ -98,6 +97,7 @@ export function generateSuggestions( .sort((a, b) => { if (a.canQualifyAfterSwap !== b.canQualifyAfterSwap) return a.canQualifyAfterSwap ? -1 : 1; + // For hopeless: prefer already-qualified inventory, then highest completion return b.completionRate - a.completionRate; }) .slice(0, 5); @@ -125,11 +125,11 @@ export function generateSuggestions( inv.region === vehicle.region, ) .map((inv) => { - const mileageGap = (inv.yearTarget ?? 0) - inv.totalMileage; + const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; + const mileageGap = Math.max(0, effectiveTarget - inv.totalMileage); const predictedAfterSwap = inv.totalMileage + vehicle.customerAvgDaily * vehicle.daysLeft; - const canQualifyAfterSwap = - inv.yearTarget != null && predictedAfterSwap >= inv.yearTarget; + const canQualifyAfterSwap = predictedAfterSwap >= effectiveTarget; return { plateNumber: inv.plateNumber, targetId: inv.targetId, @@ -137,7 +137,7 @@ export function generateSuggestions( vehicleType: inv.vehicleType, totalMileage: inv.totalMileage, completionRate: inv.completionRate, - yearTarget: inv.yearTarget, + yearTarget: inv.yearTarget ?? vehicle.yearTarget, region: inv.region, province: inv.province, mileageGap, @@ -164,22 +164,27 @@ export function generateSuggestions( }); } + // Remove suggestions with no candidates + const filteredSuggestions = suggestions.filter((s) => s.candidates.length > 0); + // Sort: high priority first - suggestions.sort((a, b) => { + filteredSuggestions.sort((a, b) => { if (a.priority === b.priority) return 0; return a.priority === 'high' ? -1 : 1; }); - const estimatedGain = suggestions.filter((s) => - s.candidates.some((c) => c.canQualifyAfterSwap), + // estimatedGain: count suggestions where at least one candidate canQualifyAfterSwap, + // plus rescue_hopeless suggestions (each rescued car can potentially qualify at a new customer) + const estimatedGain = filteredSuggestions.filter((s) => + s.candidates.some((c) => c.canQualifyAfterSwap) || s.type === 'rescue_hopeless', ).length; const summary: SchedulingSummary = { qualifiedCount: qualified.length, hopelessCount: hopeless.length, - suggestionCount: suggestions.length, + suggestionCount: filteredSuggestions.length, estimatedGain, }; - return { suggestions, summary }; + return { suggestions: filteredSuggestions, summary }; } diff --git a/src/server/routes/scheduling/suggestions.ts b/src/server/routes/scheduling/suggestions.ts index 1aab875..d1cf8cb 100644 --- a/src/server/routes/scheduling/suggestions.ts +++ b/src/server/routes/scheduling/suggestions.ts @@ -12,13 +12,18 @@ import type { AuthUser } from '../../auth/types.js'; // Helper: vehicle type classification // --------------------------------------------------------------------------- -function classifyVehicleType(type: string, model: string): string { - if (type === '4.5T' && model.includes('冷链')) return '4.5T冷链'; - if (type === '4.5T') return '4.5T普货'; - if (type === '18T') return '18T'; - if (type === '49T') return '49T'; - if (type === '挂车' || model.includes('挂车')) return '挂车'; - return type || '其他'; +/** + * Classify vehicle type from dic_type.dic_name (e.g. "4.5吨冷链车", "4.5吨货车", "18吨双飞翼货车"). + * The typeName is the full label from the dictionary, modelRaw is the numeric dic_code. + */ +function classifyVehicleType(typeName: string, _modelRaw: string): string { + const t = (typeName || '').trim(); + if (t.includes('4.5') && t.includes('冷链')) return '4.5T冷链'; + if (t.includes('4.5')) return '4.5T普货'; + if (t.includes('18')) return '18T'; + if (t.includes('49') || t.includes('牵引')) return '49T'; + if (t.includes('挂车')) return '挂车'; + return t || '其他'; } // --------------------------------------------------------------------------- From 033af1581497b47360c8336262894aab3a265669 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 20:47:00 +0800 Subject: [PATCH 22/79] fix(scheduling): include soft-deleted trucks and infer type from target name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 411 of 451 assessment vehicles had is_deleted=1 in tab_truck, causing type classification to fall back to "其他" and miss all inventory matches. Fix: - Remove is_deleted=0 filter from truck type query (assessment vehicles need type info regardless) - Add inferTypeFromTargetName() fallback deriving type from target name when truck record is missing Co-Authored-By: Claude Opus 4.6 (1M context) --- src/server/routes/scheduling/suggestions.ts | 29 ++++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/src/server/routes/scheduling/suggestions.ts b/src/server/routes/scheduling/suggestions.ts index d1cf8cb..67ebba6 100644 --- a/src/server/routes/scheduling/suggestions.ts +++ b/src/server/routes/scheduling/suggestions.ts @@ -12,6 +12,20 @@ import type { AuthUser } from '../../auth/types.js'; // Helper: vehicle type classification // --------------------------------------------------------------------------- +/** + * Infer vehicle type from target name when truck table has no match. + * e.g. "交投190辆4.5T冷链车" → "4.5T冷链", "羚牛100辆18T" → "18T" + */ +function inferTypeFromTargetName(targetName: string): string { + const t = targetName || ''; + if (t.includes('冷链')) return '4.5T冷链'; + if (t.includes('普货') || (t.includes('4.5') && !t.includes('冷链'))) return '4.5T普货'; + if (t.includes('18T') || t.includes('18t')) return '18T'; + if (t.includes('49') || t.includes('牵引')) return '49T'; + if (t.includes('挂车')) return '挂车'; + return '其他'; +} + /** * Classify vehicle type from dic_type.dic_name (e.g. "4.5吨冷链车", "4.5吨货车", "18吨双飞翼货车"). * The typeName is the full label from the dictionary, modelRaw is the numeric dic_code. @@ -63,12 +77,14 @@ app.get('/', async (c) => { const vehicleInfoMap = await fetchVehicleInfoMap(); // ---- Query 4: Vehicle types from tab_truck ---- + // Include soft-deleted trucks: many assessment vehicles have is_deleted=1 in tab_truck + // but are still active in the assessment. We need their type info. const [truckTypeRows] = await pool.execute(` SELECT truck.plate_number, dic_type.dic_name AS type_name, truck.model AS model_raw FROM tab_truck truck LEFT JOIN tab_dic dic_type ON dic_type.parent_code = 'dic_truck_type' AND dic_type.dic_code = truck.model AND dic_type.is_deleted = 0 - WHERE truck.is_deleted = 0 AND truck.is_operation = 1 + WHERE truck.is_operation = 1 `) as [any[], unknown]; const truckTypeMap = new Map(); @@ -170,9 +186,14 @@ app.get('/', async (c) => { const city = loc?.city || ''; const region = mapRegion(province, city); - const vehicleType = truckType - ? classifyVehicleType(truckType.typeName, truckType.modelRaw) - : '其他'; + // Determine vehicle type: prefer truck table, fallback to target name + let vehicleType = '其他'; + if (truckType) { + vehicleType = classifyVehicleType(truckType.typeName, truckType.modelRaw); + } else { + // Fallback: infer from target name (e.g. "交投190辆4.5T冷链车" → "4.5T冷链") + vehicleType = inferTypeFromTargetName(target.targetName); + } const endDate = row.current_year_assessment_end_date ? new Date(row.current_year_assessment_end_date) From ec3b0793115c247ae51e3e79685759a05211bee8 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 20:52:16 +0800 Subject: [PATCH 23/79] fix(scheduling): only suggest replacements for rented/operated vehicles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Filter enriched vehicles to only include rent_status = '租赁' or '自营'. Inventory candidates already filtered by truck_rent_status = 0 (在库). Co-Authored-By: Claude Opus 4.6 (1M context) --- src/server/routes/scheduling/suggestions.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/server/routes/scheduling/suggestions.ts b/src/server/routes/scheduling/suggestions.ts index 67ebba6..662baa9 100644 --- a/src/server/routes/scheduling/suggestions.ts +++ b/src/server/routes/scheduling/suggestions.ts @@ -179,6 +179,11 @@ app.get('/', async (c) => { const plate = row.plate_number as string; const info = vehicleInfoMap.get(plate); + + // Only include vehicles that are actively rented/operated (租赁 or 自营) + const rentStatus = info?.rent_status || ''; + if (rentStatus !== '租赁' && rentStatus !== '自营') continue; + const loc = locationMap.get(plate); const truckType = truckTypeMap.get(plate); From 495f4bf44f1e530e60ca47f7e3670ccd28a97ca0 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:01:01 +0800 Subject: [PATCH 24/79] =?UTF-8?q?feat(scheduling):=20add=20=E6=9C=AC?= =?UTF-8?q?=E5=B9=B4=E8=80=83=E6=A0=B8=20field=20to=20candidate=20cards=20?= =?UTF-8?q?and=20rename=20=E5=B9=B4=E5=BA=A6=E7=9B=AE=E6=A0=87=20to=20?= =?UTF-8?q?=E6=9C=AC=E5=B9=B4=E8=80=83=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/scheduling/SuggestionDetail.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index afbec72..c7aada2 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -114,7 +114,7 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce
{fmtKm(v.totalMileage)} km
-
年度目标
+
本年考核
{fmtKm(v.yearTarget)} km
@@ -186,11 +186,15 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce )}
-
+
当前里程
{fmtKm(c.totalMileage)} km
+
+
本年考核
+
{c.yearTarget ? fmtKm(c.yearTarget) + ' km' : '-'}
+
里程缺口
{fmtKm(c.mileageGap)} km
From 6ee811c9378863d17d90f016a2cba1179e4b4b0c Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:04:26 +0800 Subject: [PATCH 25/79] refactor(scheduling): optimize UI for clarity and information density MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Summary cards: white bg + color border, remove icons, more compact - SuggestionList: replace badge stacking with compact 2-line layout, use color bars for priority, fix completion rate format (0.16 → 16.4%) - SuggestionDetail: bottom-sheet on mobile, compact inline metrics instead of grid cards, reduce vertical space per candidate - Follows ui-ux-pro-max Data-Dense Dashboard guidelines Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/scheduling/SchedulingModule.tsx | 50 +---- src/modules/scheduling/SuggestionDetail.tsx | 230 +++++++------------- src/modules/scheduling/SuggestionList.tsx | 128 ++++------- 3 files changed, 139 insertions(+), 269 deletions(-) diff --git a/src/modules/scheduling/SchedulingModule.tsx b/src/modules/scheduling/SchedulingModule.tsx index d99720a..0ac4516 100644 --- a/src/modules/scheduling/SchedulingModule.tsx +++ b/src/modules/scheduling/SchedulingModule.tsx @@ -81,51 +81,21 @@ export default function SchedulingModule() { <> {/* Summary Cards */}
- {/* Card 1: 已达标车辆 */} -
-
- - 已达标车辆 -
-
{data.summary.qualifiedCount}
-
达标概率 ≥ 120%
+
+
已达标
+
{data.summary.qualifiedCount}台
- - {/* Card 2: 无望达标 */} -
-
- - 无望达标 -
-
{data.summary.hopelessCount}
-
达标概率 < 60%
+
+
无望达标
+
{data.summary.hopelessCount}台
- - {/* Card 3: 可干预 */} -
-
- - 可干预 -
-
{data.summary.suggestionCount}
-
- 预计可新增达标 +{data.summary.estimatedGain} 台 -
+
+
可干预
+
{data.summary.suggestionCount}条
+
+{data.summary.estimatedGain} 台可达标
- {/* Refresh Button */} -
- -
- {/* Suggestion List */} = 1 - ? 'text-emerald-600' - : v.completionRate >= 0.6 - ? 'text-amber-600' - : 'text-rose-600'; - const handleNotify = async (candidate: CandidateVehicle) => { if (sending || sentPlates.has(candidate.plateNumber)) return; setSending(true); @@ -59,7 +40,7 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce } else { alert(result.message || '发送失败'); } - } catch (e) { + } catch { alert('网络错误，请重试'); } finally { setSending(false); @@ -67,169 +48,126 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce }; return ( -
+
{/* Header */} -
- {title} -
- {/* Scrollable body */} -
- {/* Current Vehicle Card */} -
-
+ {/* Body */} +
+ + {/* Current Vehicle — compact header */} +
+
- - {v.plateNumber} - - - {v.vehicleType} - + {v.plateNumber} + {v.vehicleType}
- + = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-600'}`}> {(v.completionRate * 100).toFixed(1)}% -
完成率
-
{v.targetName}
- -
-
-
累计里程
-
{fmtKm(v.totalMileage)} km
-
-
-
本年考核
-
{fmtKm(v.yearTarget)} km
-
-
-
- 区域 -
-
{v.region}
-
-
-
客户日均
-
{fmtKm(v.customerAvgDaily)} km
-
+ {/* Key metrics in a single compact row */} +
+ {v.targetName} + | + 累计 {fmtKm(v.totalMileage)} km + 考核 {fmtKm(v.yearTarget)} km + {v.region} +
+
+ 客户 {v.customer || '-'} + 日均 {Math.round(v.customerAvgDaily)} km
- - {v.customer && ( -
- 客户：{v.customer} -
- )}
- {/* Reason Card */} -
- 建议原因 - {s.reason} + {/* Reason — one line */} +
+ {s.reason}
- {/* Candidates Section */} -
-
- - 推荐替换车辆 + {/* Candidates */} +
+
+ 推荐替换车辆 + {s.candidates.length} 辆可选
-
基于车型、区域及里程匹配
-
+
{s.candidates.map(c => { - const alreadySent = sentPlates.has(c.plateNumber); - const predColor = - c.canQualifyAfterSwap ? 'text-emerald-600' : 'text-amber-600'; - + const sent = sentPlates.has(c.plateNumber); return ( -
-
+
+ {/* Candidate header row */} +
- - {c.plateNumber} - - - {c.vehicleType} - - {c.targetName ? ( - {c.targetName} - ) : ( - 库存 - )} + {c.plateNumber} + {c.vehicleType} + {c.targetName || '库存'}
{c.canQualifyAfterSwap ? ( - - 换后可达标 + + 换后可达标 ) : ( - - 需关注 + + 需关注 )}
-
-
-
当前里程
-
{fmtKm(c.totalMileage)} km
+ {/* Metrics row — compact inline */} +
+
+
当前
+
{fmtKm(c.totalMileage)}
-
-
本年考核
-
{c.yearTarget ? fmtKm(c.yearTarget) + ' km' : '-'}
+
+
考核
+
{c.yearTarget ? fmtKm(c.yearTarget) : '-'}
-
-
里程缺口
-
{fmtKm(c.mileageGap)} km
+
+
缺口
+
{fmtKm(c.mileageGap)}
-
-
- 区域 -
-
{c.region}
+
+
区域
+
{c.region}
-
-
换后预测
-
{fmtKm(c.predictedAfterSwap)} km
+
+
换后
+
{fmtKm(c.predictedAfterSwap)}
- + {/* Action */} +
+ +
); })} @@ -238,10 +176,10 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce
{/* Footer */} -
+
diff --git a/src/modules/scheduling/SuggestionList.tsx b/src/modules/scheduling/SuggestionList.tsx index b9e1dfc..8fb72b7 100644 --- a/src/modules/scheduling/SuggestionList.tsx +++ b/src/modules/scheduling/SuggestionList.tsx @@ -1,4 +1,4 @@ -import { ArrowRightLeft, AlertTriangle, CheckCircle } from 'lucide-react'; +import { ArrowRightLeft, ChevronRight } from 'lucide-react'; import { motion } from 'motion/react'; import type { SchedulingSuggestion } from './types'; import Blur from '../../components/Blur'; @@ -13,112 +13,74 @@ function fmtKm(value: number): string { return value.toLocaleString(); } +function fmtRate(rate: number): string { + return (rate * 100).toFixed(1) + '%'; +} + export default function SuggestionList({ suggestions, onSelect }: Props) { if (suggestions.length === 0) { return ( -
-
- -

暂无调度建议

-

所有车辆当前无需干预

-
+
+ +

暂无调度建议

); } return (
- {/* Header */} -
-
- 智能调度干预清单 - +
+
+ 调度干预清单 + {suggestions.length}
- {/* Rows */}
{suggestions.map((s, idx) => { - const isHigh = s.priority === 'high' || s.type === 'rescue_hopeless'; + const isRescue = s.type === 'rescue_hopeless'; + const v = s.currentVehicle; return ( onSelect(s)} > -
- {/* Priority icon */} -
- {isHigh ? ( - - ) : ( - - )} + {/* Left: color bar */} +
+ + {/* Center: info */} +
+
+ + {v.plateNumber} + + + {isRescue ? '无望' : '达标'} + + {v.vehicleType} + · + {v.region}
- - {/* Content */} -
- {/* Top row: plate + badges */} -
- - - {s.currentVehicle.plateNumber} - - - - {/* Type badge */} - - {s.type === 'rescue_hopeless' ? '无望达标' : '已达标'} - - - {/* Vehicle type badge */} - - {s.currentVehicle.vehicleType} - - - {/* Region badge */} - - {s.currentVehicle.region} - -
- - {/* Info line */} -
- - 客户:{' '} - - {s.currentVehicle.customer ?? '—'} - - - - 日均: {fmtKm(s.currentVehicle.customerAvgDaily)} KM - - - 完成率: {s.currentVehicle.completionRate}% - -
+
+ {v.customer || '-'} + 日均 {Math.round(v.customerAvgDaily)} km + 完成 = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-500'}`}>{fmtRate(v.completionRate)}
+
- {/* Right: candidate count */} -
- {s.candidates.length} - 辆 -
+ {/* Right: candidate count + arrow */} +
+ {s.candidates.length} + 辆 +
); From bcbeb64e28e81ed71996c49b5447e33971d2f2fe Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:08:29 +0800 Subject: [PATCH 26/79] fix(scheduling): use current year mileage for consistent data display MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add currentYearMileage to SchedulingVehicleInfo (backend + frontend) - Compute completionRate as currentYearMileage/yearTarget (year-based) instead of using overall completion_rate from DB - Display "本年已跑" instead of "累计" in detail modal - Fix reason text to show year completion rate Before: 累计 4.6万, 考核 3.0万, 完成率 12.1% (mismatched periods) After: 本年已跑 8.3万, 考核 3.0万, 完成率 275% (consistent year-based) Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/scheduling/SuggestionDetail.tsx | 4 ++-- src/modules/scheduling/types.ts | 1 + src/server/routes/scheduling/algorithm.ts | 8 ++++++-- src/server/routes/scheduling/types.ts | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index 71acbfe..2b4b175 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -85,8 +85,8 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce
{v.targetName} | - 累计 {fmtKm(v.totalMileage)} km - 考核 {fmtKm(v.yearTarget)} km + 本年已跑 {fmtKm(v.currentYearMileage)} km + 本年考核 {fmtKm(v.yearTarget)} km {v.region}
diff --git a/src/modules/scheduling/types.ts b/src/modules/scheduling/types.ts index 7cbbe12..f78fd0d 100644 --- a/src/modules/scheduling/types.ts +++ b/src/modules/scheduling/types.ts @@ -4,6 +4,7 @@ export interface SchedulingVehicleInfo { targetName: string; vehicleType: string; totalMileage: number; + currentYearMileage: number; completionRate: number; yearTarget: number; region: string; diff --git a/src/server/routes/scheduling/algorithm.ts b/src/server/routes/scheduling/algorithm.ts index 6df30ba..b7d981f 100644 --- a/src/server/routes/scheduling/algorithm.ts +++ b/src/server/routes/scheduling/algorithm.ts @@ -35,13 +35,16 @@ export function classifyVehicle( import type { SchedulingVehicleInfo } from './types.js'; export function toVehicleInfo(v: EnrichedVehicle): SchedulingVehicleInfo { + // Use current year completion rate instead of overall + const yearCompletionRate = v.yearTarget > 0 ? v.currentYearMileage / v.yearTarget : 0; return { plateNumber: v.plateNumber, targetId: v.targetId, targetName: v.targetName, vehicleType: v.vehicleType, totalMileage: v.totalMileage, - completionRate: v.completionRate, + currentYearMileage: v.currentYearMileage, + completionRate: yearCompletionRate, yearTarget: v.yearTarget, region: v.region, province: v.province, @@ -152,7 +155,8 @@ export function generateSuggestions( }) .slice(0, 5); - const reason = `${vehicle.customer}日均里程 ${Math.round(vehicle.customerAvgDaily)} KM（高里程），该车已达标（完成率 ${Math.round(vehicle.completionRate * 100)}%），建议换上里程缺口大的车辆以加速达标。`; + const yearRate = vehicle.yearTarget > 0 ? Math.round((vehicle.currentYearMileage / vehicle.yearTarget) * 100) : 0; + const reason = `${vehicle.customer}日均里程 ${Math.round(vehicle.customerAvgDaily)} KM（高里程），该车本年完成率 ${yearRate}%，建议换上里程缺口大的车辆以加速达标。`; suggestions.push({ id: `qualified-${vehicle.plateNumber}`, diff --git a/src/server/routes/scheduling/types.ts b/src/server/routes/scheduling/types.ts index eac2b5a..73e6158 100644 --- a/src/server/routes/scheduling/types.ts +++ b/src/server/routes/scheduling/types.ts @@ -4,7 +4,8 @@ export interface SchedulingVehicleInfo { targetName: string; vehicleType: string; totalMileage: number; - completionRate: number; + currentYearMileage: number; + completionRate: number; // 本年完成率 currentYearMileage / yearTarget yearTarget: number; region: string; province: string; From 6f7555a407eae560fd7782ca96f3f0676711ce1e Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:12:02 +0800 Subject: [PATCH 27/79] feat(scheduling): make summary cards clickable filters + refine color scheme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Cards filter suggestions by type (已达标/无望达标/全部) - Toggle: click active card again to reset to all - Default: white bg + gray border; active: colored bg + ring - Batch selector: dark pills instead of blue - Refresh button moved into list header - Reset type filter when switching batch Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/scheduling/SchedulingModule.tsx | 127 ++++++++++++++------ src/modules/scheduling/SuggestionList.tsx | 26 ++-- 2 files changed, 108 insertions(+), 45 deletions(-) diff --git a/src/modules/scheduling/SchedulingModule.tsx b/src/modules/scheduling/SchedulingModule.tsx index 0ac4516..7f8d302 100644 --- a/src/modules/scheduling/SchedulingModule.tsx +++ b/src/modules/scheduling/SchedulingModule.tsx @@ -1,11 +1,12 @@ -import { useState, useEffect, useCallback } from 'react'; -import { Activity, AlertTriangle, CheckCircle, TrendingUp, RotateCcw } from 'lucide-react'; -import { motion } from 'motion/react'; +import { useState, useEffect, useCallback, useMemo } from 'react'; +import { RotateCcw } from 'lucide-react'; import { fetchSuggestions } from './api'; import type { SchedulingResponse, SchedulingSuggestion } from './types'; import SuggestionList from './SuggestionList'; import SuggestionDetail from './SuggestionDetail'; +type TypeFilter = 'all' | 'qualified' | 'hopeless'; + function shortTargetName(name: string): string { const match = name.match(/(\d+)[辆台](.+)/); if (!match) return name; @@ -22,6 +23,7 @@ export default function SchedulingModule() { const [loading, setLoading] = useState(false); const [selectedTargetId, setSelectedTargetId] = useState(undefined); const [selectedSuggestion, setSelectedSuggestion] = useState(null); + const [typeFilter, setTypeFilter] = useState('all'); const loadData = useCallback(async () => { setLoading(true); @@ -33,13 +35,61 @@ export default function SchedulingModule() { } }, [selectedTargetId]); - useEffect(() => { - loadData(); - }, [loadData]); + useEffect(() => { loadData(); }, [loadData]); - const handleNotifySuccess = useCallback(() => { - loadData(); - }, [loadData]); + const handleNotifySuccess = useCallback(() => { loadData(); }, [loadData]); + + const filteredSuggestions = useMemo(() => { + if (!data) return []; + if (typeFilter === 'qualified') return data.suggestions.filter(s => s.type === 'replace_qualified'); + if (typeFilter === 'hopeless') return data.suggestions.filter(s => s.type === 'rescue_hopeless'); + return data.suggestions; + }, [data, typeFilter]); + + const cardConfigs = [ + { + key: 'qualified' as TypeFilter, + label: '已达标', + count: data?.summary.qualifiedCount ?? 0, + unit: '台', + sub: null, + // Muted teal/green + idle: 'border-slate-200 bg-white', + active: 'border-emerald-500 bg-emerald-50 ring-1 ring-emerald-500/20', + labelColor: 'text-slate-500', + labelActive: 'text-emerald-600', + numColor: 'text-slate-800', + numActive: 'text-emerald-700', + }, + { + key: 'hopeless' as TypeFilter, + label: '无望达标', + count: data?.summary.hopelessCount ?? 0, + unit: '台', + sub: null, + // Warm red + idle: 'border-slate-200 bg-white', + active: 'border-rose-500 bg-rose-50 ring-1 ring-rose-500/20', + labelColor: 'text-slate-500', + labelActive: 'text-rose-600', + numColor: 'text-slate-800', + numActive: 'text-rose-700', + }, + { + key: 'all' as TypeFilter, + label: '可干预', + count: data?.summary.suggestionCount ?? 0, + unit: '条', + sub: data ? `+${data.summary.estimatedGain} 台可达标` : null, + // Blue accent + idle: 'border-slate-200 bg-white', + active: 'border-blue-500 bg-blue-50 ring-1 ring-blue-500/20', + labelColor: 'text-slate-500', + labelActive: 'text-blue-600', + numColor: 'text-slate-800', + numActive: 'text-blue-700', + }, + ]; return (
@@ -48,11 +98,11 @@ export default function SchedulingModule() { {/* Batch Selector */}
{loading && !data ? ( - /* Loading State */
) : data ? ( <> - {/* Summary Cards */} + {/* Summary Cards — clickable filter */}
-
-
已达标
-
{data.summary.qualifiedCount}台
-
-
-
无望达标
-
{data.summary.hopelessCount}台
-
-
-
可干预
-
{data.summary.suggestionCount}条
-
+{data.summary.estimatedGain} 台可达标
-
+ {cardConfigs.map(cfg => { + const isActive = typeFilter === cfg.key; + return ( + + ); + })}
{/* Suggestion List */} ) : null} - {/* Detail Modal */} {selectedSuggestion && ( )} -
); diff --git a/src/modules/scheduling/SuggestionList.tsx b/src/modules/scheduling/SuggestionList.tsx index 8fb72b7..7fc55dd 100644 --- a/src/modules/scheduling/SuggestionList.tsx +++ b/src/modules/scheduling/SuggestionList.tsx @@ -1,4 +1,4 @@ -import { ArrowRightLeft, ChevronRight } from 'lucide-react'; +import { ArrowRightLeft, ChevronRight, RotateCcw } from 'lucide-react'; import { motion } from 'motion/react'; import type { SchedulingSuggestion } from './types'; import Blur from '../../components/Blur'; @@ -6,18 +6,15 @@ import Blur from '../../components/Blur'; interface Props { suggestions: SchedulingSuggestion[]; onSelect: (s: SchedulingSuggestion) => void; -} - -function fmtKm(value: number): string { - if (value >= 10000) return (value / 10000).toFixed(1) + '万'; - return value.toLocaleString(); + loading?: boolean; + onRefresh?: () => void; } function fmtRate(rate: number): string { return (rate * 100).toFixed(1) + '%'; } -export default function SuggestionList({ suggestions, onSelect }: Props) { +export default function SuggestionList({ suggestions, onSelect, loading, onRefresh }: Props) { if (suggestions.length === 0) { return (
@@ -32,6 +29,15 @@ export default function SuggestionList({ suggestions, onSelect }: Props) {
调度干预清单 + {onRefresh && ( + + )} {suggestions.length} @@ -51,10 +57,10 @@ export default function SuggestionList({ suggestions, onSelect }: Props) { className="px-4 py-3 hover:bg-slate-50/60 cursor-pointer transition-colors active:bg-slate-100 flex items-center gap-3" onClick={() => onSelect(s)} > - {/* Left: color bar */} + {/* Color bar */}
- {/* Center: info */} + {/* Info */}
@@ -76,7 +82,7 @@ export default function SuggestionList({ suggestions, onSelect }: Props) {
- {/* Right: candidate count + arrow */} + {/* Right */}
{s.candidates.length} 辆 From 73080a605dd9bbb5f147aa51833fc6d05257e285 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:13:12 +0800 Subject: [PATCH 28/79] refactor(scheduling): polish overall color scheme and UX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Modal header: unified dark slate-800 with directional icon (↓ rescue, ↑ release) - Modal click-outside to close - Candidate metrics: table-style with bg-slate-50 + dividers, more scannable - Send button: dark slate instead of blue (avoids color overload) - Reason section: warm amber accent - Consistent font sizing and spacing throughout Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/scheduling/SuggestionDetail.tsx | 141 +++++++++++--------- 1 file changed, 77 insertions(+), 64 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index 2b4b175..7cbd35f 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; import { - X, MapPin, AlertTriangle, CheckCircle, Send, ArrowRight, + X, MapPin, AlertTriangle, CheckCircle, Send, ArrowDown, ArrowUp, } from 'lucide-react'; import { motion } from 'motion/react'; import { sendNotify } from './api'; @@ -18,6 +18,10 @@ function fmtKm(value: number): string { return value.toLocaleString(); } +function fmtRate(rate: number): string { + return (rate * 100).toFixed(1) + '%'; +} + export default function SuggestionDetail({ suggestion: s, onClose, onNotifySuccess }: Props) { const [sending, setSending] = useState(false); const [sentPlates, setSentPlates] = useState>(new Set()); @@ -48,18 +52,25 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce }; return ( -
+
e.stopPropagation()} className="bg-white rounded-t-2xl sm:rounded-2xl shadow-2xl w-full sm:max-w-lg overflow-hidden flex flex-col max-h-[92vh] sm:max-h-[85vh] sm:mx-4" > - {/* Header */} -
- - {isRescue ? '抢救低里程车辆' : '释放已达标车辆'} - -
@@ -67,43 +78,43 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce {/* Body */}
- {/* Current Vehicle — compact header */} -
-
+ {/* Current Vehicle */} +
+
{v.plateNumber} - {v.vehicleType} -
-
- = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-600'}`}> - {(v.completionRate * 100).toFixed(1)}% - + {v.vehicleType}
+ = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-600'}`}> + {fmtRate(v.completionRate)} +
- {/* Key metrics in a single compact row */} -
- {v.targetName} - | - 本年已跑 {fmtKm(v.currentYearMileage)} km - 本年考核 {fmtKm(v.yearTarget)} km - {v.region} -
-
- 客户 {v.customer || '-'} - 日均 {Math.round(v.customerAvgDaily)} km +
+
+ {v.targetName} + | + 已跑 {fmtKm(v.currentYearMileage)} + 考核 {fmtKm(v.yearTarget)} km + {v.region} +
+
+ 客户 {v.customer || '-'} + 日均 {Math.round(v.customerAvgDaily)} km +
- {/* Reason — one line */} -
- {s.reason} + {/* Reason */} +
+ 建议： + {s.reason}
{/* Candidates */}
-
- 推荐替换车辆 +
+ 推荐替换 {s.candidates.length} 辆可选
@@ -111,58 +122,60 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce {s.candidates.map(c => { const sent = sentPlates.has(c.plateNumber); return ( -
- {/* Candidate header row */} -
+
+ {/* Header */} +
{c.plateNumber} {c.vehicleType} {c.targetName || '库存'}
{c.canQualifyAfterSwap ? ( - - 换后可达标 + + 可达标 ) : ( - + 需关注 )}
- {/* Metrics row — compact inline */} -
-
-
当前
-
{fmtKm(c.totalMileage)}
-
-
-
考核
-
{c.yearTarget ? fmtKm(c.yearTarget) : '-'}
-
-
-
缺口
-
{fmtKm(c.mileageGap)}
-
-
-
区域
-
{c.region}
-
-
-
换后
-
{fmtKm(c.predictedAfterSwap)}
+ {/* Metrics — compact table style */} +
+
+
+
当前
+
{fmtKm(c.totalMileage)}
+
+
+
考核
+
{c.yearTarget ? fmtKm(c.yearTarget) : '-'}
+
+
+
缺口
+
{fmtKm(c.mileageGap)}
+
+
+
区域
+
{c.region}
+
+
+
换后
+
{fmtKm(c.predictedAfterSwap)}
+
{/* Action */} -
+
+ {open && ( +
+ {options.length > 5 && ( +
+
+ + setSearch(e.target.value)} + placeholder="搜索..." + className="w-full pl-7 pr-2 py-1.5 text-xs bg-slate-50 rounded border-none outline-none" + autoFocus + /> +
+
+ )} +
+ + {filtered.map(opt => ( + + ))} +
+
+ )} +
+ ); +} + export default function SchedulingModule() { const [data, setData] = useState(null); const [loading, setLoading] = useState(false); const [selectedTargetId, setSelectedTargetId] = useState(undefined); const [selectedSuggestion, setSelectedSuggestion] = useState(null); const [typeFilter, setTypeFilter] = useState('all'); + const [showFilter, setShowFilter] = useState(false); + const [filters, setFilters] = useState(EMPTY_FILTERS); + const [tempFilters, setTempFilters] = useState(EMPTY_FILTERS); const loadData = useCallback(async () => { setLoading(true); @@ -36,133 +125,309 @@ export default function SchedulingModule() { }, [selectedTargetId]); useEffect(() => { loadData(); }, [loadData]); - const handleNotifySuccess = useCallback(() => { loadData(); }, [loadData]); + // Compute filter options from data + const filterOptions = useMemo(() => { + if (!data) return { regions: [], vehicleTypes: [], customers: [] }; + const regions = new Set(); + const vehicleTypes = new Set(); + const customers = new Set(); + for (const s of data.suggestions) { + const v = s.currentVehicle; + if (v.region) regions.add(v.region); + if (v.vehicleType) vehicleTypes.add(v.vehicleType); + if (v.customer) customers.add(v.customer); + } + return { + regions: Array.from(regions).sort(), + vehicleTypes: Array.from(vehicleTypes).sort(), + customers: Array.from(customers).sort(), + }; + }, [data]); + const filteredSuggestions = useMemo(() => { if (!data) return []; - if (typeFilter === 'qualified') return data.suggestions.filter(s => s.type === 'replace_qualified'); - if (typeFilter === 'hopeless') return data.suggestions.filter(s => s.type === 'rescue_hopeless'); - return data.suggestions; - }, [data, typeFilter]); + let list = data.suggestions; - const cardConfigs = [ - { - key: 'qualified' as TypeFilter, - label: '已达标', - count: data?.summary.qualifiedCount ?? 0, - unit: '台', - sub: null, - // Muted teal/green - idle: 'border-slate-200 bg-white', - active: 'border-emerald-500 bg-emerald-50 ring-1 ring-emerald-500/20', - labelColor: 'text-slate-500', - labelActive: 'text-emerald-600', - numColor: 'text-slate-800', - numActive: 'text-emerald-700', - }, - { - key: 'hopeless' as TypeFilter, - label: '无望达标', - count: data?.summary.hopelessCount ?? 0, - unit: '台', - sub: null, - // Warm red - idle: 'border-slate-200 bg-white', - active: 'border-rose-500 bg-rose-50 ring-1 ring-rose-500/20', - labelColor: 'text-slate-500', - labelActive: 'text-rose-600', - numColor: 'text-slate-800', - numActive: 'text-rose-700', - }, - { - key: 'all' as TypeFilter, - label: '可干预', - count: data?.summary.suggestionCount ?? 0, - unit: '条', - sub: data ? `+${data.summary.estimatedGain} 台可达标` : null, - // Blue accent - idle: 'border-slate-200 bg-white', - active: 'border-blue-500 bg-blue-50 ring-1 ring-blue-500/20', - labelColor: 'text-slate-500', - labelActive: 'text-blue-600', - numColor: 'text-slate-800', - numActive: 'text-blue-700', - }, - ]; + // Type filter from cards + if (typeFilter === 'qualified') list = list.filter(s => s.type === 'replace_qualified'); + if (typeFilter === 'hopeless') list = list.filter(s => s.type === 'rescue_hopeless'); + + // Advanced filters + if (filters.plateSearch) { + const q = filters.plateSearch.toLowerCase(); + list = list.filter(s => s.currentVehicle.plateNumber.toLowerCase().includes(q)); + } + if (filters.region) list = list.filter(s => s.currentVehicle.region === filters.region); + if (filters.vehicleType) list = list.filter(s => s.currentVehicle.vehicleType === filters.vehicleType); + if (filters.customer) list = list.filter(s => s.currentVehicle.customer === filters.customer); + + return list; + }, [data, typeFilter, filters]); + + const summary = data?.summary; + const activeFilterCount = [filters.plateSearch, filters.region, filters.vehicleType, filters.customer].filter(Boolean).length; return (
- {/* Batch Selector */} -
+ {/* ========== Top: Summary Cards ========== */} +
+ + + + - {data?.targets.map((target) => ( - - ))}
- {loading && !data ? ( -
-
-
- ) : data ? ( - <> - {/* Summary Cards — clickable filter */} -
- {cardConfigs.map(cfg => { - const isActive = typeFilter === cfg.key; - return ( - - ); - })} + {/* ========== Bottom: List Card ========== */} +
+ + {/* Header */} +
+
+

智能调度干预清单

+
+ + +
- {/* Suggestion List */} + {/* Batch selector pills */} +
+ + {data?.targets.map(t => ( + + ))} +
+
+ + {/* Advanced Filter Panel */} + + {showFilter && ( + +
+
+ 高级筛选 + {hasActiveFilters(tempFilters) && ( + + )} +
+ + {/* Plate search */} +
+ +
+ + setTempFilters(prev => ({ ...prev, plateSearch: e.target.value }))} + placeholder="搜索车牌号..." + className="w-full pl-8 pr-3 py-2 bg-white rounded-lg text-xs border border-slate-200 outline-none focus:ring-2 focus:ring-blue-500/20 focus:border-blue-400 transition-all" + /> +
+
+ + {/* Selects in 2-column grid */} +
+ setTempFilters(prev => ({ ...prev, region: v }))} + placeholder="全部区域" + /> + setTempFilters(prev => ({ ...prev, vehicleType: v }))} + placeholder="全部类型" + /> +
+ + setTempFilters(prev => ({ ...prev, customer: v }))} + placeholder="全部客户" + /> + + {/* Apply / Cancel */} +
+ + +
+
+ + )} + + + {/* Active filter tags */} + {activeFilterCount > 0 && !showFilter && ( +
+ 筛选: + {filters.plateSearch && ( + + 车牌 "{filters.plateSearch}" + setFilters(prev => ({ ...prev, plateSearch: '' }))} /> + + )} + {filters.region && ( + + {filters.region} + setFilters(prev => ({ ...prev, region: '' }))} /> + + )} + {filters.vehicleType && ( + + {filters.vehicleType} + setFilters(prev => ({ ...prev, vehicleType: '' }))} /> + + )} + {filters.customer && ( + + {filters.customer} + setFilters(prev => ({ ...prev, customer: '' }))} /> + + )} + +
+ )} + + {/* Result count when filtered */} + {(activeFilterCount > 0 || typeFilter !== 'all') && ( +
+ 共 {filteredSuggestions.length} 条结果 +
+ )} + + {/* List body */} + {loading && !data ? ( +
+
+
+ ) : ( - - ) : null} + )} +
+ {/* Detail Modal */} {selectedSuggestion && ( void; - loading?: boolean; - onRefresh?: () => void; } function fmtRate(rate: number): string { return (rate * 100).toFixed(1) + '%'; } -export default function SuggestionList({ suggestions, onSelect, loading, onRefresh }: Props) { +export default function SuggestionList({ suggestions, onSelect }: Props) { if (suggestions.length === 0) { return ( -
+

暂无调度建议

@@ -25,73 +23,54 @@ export default function SuggestionList({ suggestions, onSelect, loading, onRefre } return ( -
-
-
- 调度干预清单 - {onRefresh && ( - - )} - - {suggestions.length} - -
+ {/* Color bar */} +
-
- {suggestions.map((s, idx) => { - const isRescue = s.type === 'rescue_hopeless'; - const v = s.currentVehicle; - - return ( - onSelect(s)} - > - {/* Color bar */} -
- - {/* Info */} -
-
- - {v.plateNumber} - - - {isRescue ? '无望' : '达标'} - - {v.vehicleType} - · - {v.region} -
-
- {v.customer || '-'} - 日均 {Math.round(v.customerAvgDaily)} km - 完成 = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-500'}`}>{fmtRate(v.completionRate)} -
+ {/* Info */} +
+
+ + {v.plateNumber} + + + {isRescue ? '无望' : '达标'} + + {v.vehicleType} + · + {v.region}
- - {/* Right */} -
- {s.candidates.length} - 辆 - +
+ {v.customer || '-'} + 日均 {Math.round(v.customerAvgDaily)} km + 完成 = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-500'}`}>{fmtRate(v.completionRate)}
- - ); - })} -
+
+ + {/* Right */} +
+ {s.candidates.length} + 辆 + +
+ + ); + })}
); } From 48fa3bc73f138e50209be3c16dd7aa592437599b Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:23:35 +0800 Subject: [PATCH 30/79] refactor(scheduling): rewrite terminology to match core business logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Core story: 里程高的车换下来，里程少的车换上去。 - Summary cards: "里程高·需换下" / "里程低·需换走" / "替换建议" - List tags: "换下" (amber) / "换走" (blue) with matching color bars - Detail modal title: "里程高·换下此车" / "里程低·换走此车" - Candidate section: explains WHY these vehicles are recommended - 换下: "以下车辆里程缺口大，换到该高里程客户处可加速达标" - 换走: "以下车辆里程已充足，可调给当前客户，将此车换走给高里程客户冲刺" - Reason text: states current situation + clear action recommendation with specific numbers (已跑, 缺口, 日均, 完成率) Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/scheduling/SchedulingModule.tsx | 12 ++++++------ src/modules/scheduling/SuggestionDetail.tsx | 18 +++++++++++++----- src/modules/scheduling/SuggestionList.tsx | 6 +++--- src/server/routes/scheduling/algorithm.ts | 13 +++++++++++-- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/modules/scheduling/SchedulingModule.tsx b/src/modules/scheduling/SchedulingModule.tsx index df8ecee..55cc995 100644 --- a/src/modules/scheduling/SchedulingModule.tsx +++ b/src/modules/scheduling/SchedulingModule.tsx @@ -183,12 +183,12 @@ export default function SchedulingModule() { : 'bg-amber-50 border border-amber-100' }`} > -
已达标车辆
+
里程高·需换下
{loading && !data ? '-' : summary?.qualifiedCount ?? 0} 台
-
本年完成率 ≥ 120%
+
已达标，换上里程少的车
diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index 7cbd35f..1eb8e09 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -63,11 +63,11 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce
{isRescue - ? - : + ? + : } - {isRescue ? '抢救低里程' : '释放已达标'} + {isRescue ? '里程低·换走此车' : '里程高·换下此车'}
{open && ( -
+
{options.length > 5 && (
- setSearch(e.target.value)} - placeholder="搜索..." - className="w-full pl-7 pr-2 py-1.5 text-xs bg-slate-50 rounded border-none outline-none" - autoFocus - /> + setSearch(e.target.value)} placeholder="搜索..." autoFocus + className="w-full pl-7 pr-2 py-1.5 text-xs bg-slate-50 rounded border-none outline-none" />
)}
- + {filtered.map(opt => ( - + ))}
@@ -116,169 +95,153 @@ export default function SchedulingModule() { const loadData = useCallback(async () => { setLoading(true); - try { - const result = await fetchSuggestions(selectedTargetId); - setData(result); - } finally { - setLoading(false); - } + try { setData(await fetchSuggestions(selectedTargetId)); } finally { setLoading(false); } }, [selectedTargetId]); useEffect(() => { loadData(); }, [loadData]); const handleNotifySuccess = useCallback(() => { loadData(); }, [loadData]); - // Compute filter options from data const filterOptions = useMemo(() => { - if (!data) return { regions: [], vehicleTypes: [], customers: [] }; - const regions = new Set(); - const vehicleTypes = new Set(); - const customers = new Set(); + if (!data) return { regions: [], vehicleTypes: [], customers: [], departments: [], managers: [] }; + const r = new Set(), t = new Set(), c = new Set(), d = new Set(), m = new Set(); for (const s of data.suggestions) { const v = s.currentVehicle; - if (v.region) regions.add(v.region); - if (v.vehicleType) vehicleTypes.add(v.vehicleType); - if (v.customer) customers.add(v.customer); + if (v.region) r.add(v.region); + if (v.vehicleType) t.add(v.vehicleType); + if (v.customer) c.add(v.customer); + if (v.department) d.add(v.department); + if (v.manager) m.add(v.manager); } - return { - regions: Array.from(regions).sort(), - vehicleTypes: Array.from(vehicleTypes).sort(), - customers: Array.from(customers).sort(), - }; + return { regions: [...r].sort(), vehicleTypes: [...t].sort(), customers: [...c].sort(), departments: [...d].sort(), managers: [...m].sort() }; }, [data]); const filteredSuggestions = useMemo(() => { if (!data) return []; let list = data.suggestions; - - // Type filter from cards if (typeFilter === 'qualified') list = list.filter(s => s.type === 'replace_qualified'); if (typeFilter === 'hopeless') list = list.filter(s => s.type === 'rescue_hopeless'); - - // Advanced filters - if (filters.plateSearch) { - const q = filters.plateSearch.toLowerCase(); - list = list.filter(s => s.currentVehicle.plateNumber.toLowerCase().includes(q)); - } + if (filters.plateSearch) { const q = filters.plateSearch.toLowerCase(); list = list.filter(s => s.currentVehicle.plateNumber.toLowerCase().includes(q)); } if (filters.region) list = list.filter(s => s.currentVehicle.region === filters.region); if (filters.vehicleType) list = list.filter(s => s.currentVehicle.vehicleType === filters.vehicleType); if (filters.customer) list = list.filter(s => s.currentVehicle.customer === filters.customer); - + if (filters.department) list = list.filter(s => s.currentVehicle.department === filters.department); + if (filters.manager) list = list.filter(s => s.currentVehicle.manager === filters.manager); return list; }, [data, typeFilter, filters]); const summary = data?.summary; - const activeFilterCount = [filters.plateSearch, filters.region, filters.vehicleType, filters.customer].filter(Boolean).length; + const activeFilterCount = [filters.plateSearch, filters.region, filters.vehicleType, filters.customer, filters.department, filters.manager].filter(Boolean).length; return ( -
+
- {/* ========== Top: Summary Cards ========== */} -
+ {/* ===== Summary Cards ===== */} +
+ {/* 里程高·换下 — warm orange */} + {/* 里程低·换走 — cool blue */} + {/* 替换建议 — neutral dark */}
- {/* ========== Bottom: List Card ========== */} -
+ {/* ===== List Card ===== */} +
{/* Header */}

智能调度干预清单

-
- {/* Batch selector pills */}
{data?.targets.map(t => ( -
- {/* Advanced Filter Panel */} + {/* Filter Panel */} {showFilter && ( - -
+ +
高级筛选 {hasActiveFilters(tempFilters) && ( - + )}
- - {/* Plate search */}
- setTempFilters(prev => ({ ...prev, plateSearch: e.target.value }))} - placeholder="搜索车牌号..." - className="w-full pl-8 pr-3 py-2 bg-white rounded-lg text-xs border border-slate-200 outline-none focus:ring-2 focus:ring-blue-500/20 focus:border-blue-400 transition-all" - /> + setTempFilters(prev => ({ ...prev, plateSearch: e.target.value }))} + placeholder="搜索车牌号..." className="w-full pl-8 pr-3 py-2 bg-white rounded-lg text-xs border border-slate-200 outline-none focus:ring-2 focus:ring-blue-500/20 focus:border-blue-400 transition-all" />
- - {/* Selects in 2-column grid */}
- setTempFilters(prev => ({ ...prev, region: v }))} - placeholder="全部区域" - /> - setTempFilters(prev => ({ ...prev, vehicleType: v }))} - placeholder="全部类型" - /> + setTempFilters(prev => ({ ...prev, region: v }))} placeholder="全部区域" /> + setTempFilters(prev => ({ ...prev, vehicleType: v }))} placeholder="全部类型" />
- - setTempFilters(prev => ({ ...prev, customer: v }))} - placeholder="全部客户" - /> - - {/* Apply / Cancel */} +
+ setTempFilters(prev => ({ ...prev, department: v }))} placeholder="全部部门" /> + setTempFilters(prev => ({ ...prev, manager: v }))} placeholder="全部负责人" /> +
+ setTempFilters(prev => ({ ...prev, customer: v }))} placeholder="全部客户" />
- - + +
@@ -374,66 +291,31 @@ export default function SchedulingModule() { {activeFilterCount > 0 && !showFilter && (
筛选: - {filters.plateSearch && ( - - 车牌 "{filters.plateSearch}" - setFilters(prev => ({ ...prev, plateSearch: '' }))} /> - - )} - {filters.region && ( - - {filters.region} - setFilters(prev => ({ ...prev, region: '' }))} /> - - )} - {filters.vehicleType && ( - - {filters.vehicleType} - setFilters(prev => ({ ...prev, vehicleType: '' }))} /> - - )} - {filters.customer && ( - - {filters.customer} - setFilters(prev => ({ ...prev, customer: '' }))} /> - - )} - + {filters.plateSearch && 车牌 "{filters.plateSearch}" setFilters(prev => ({ ...prev, plateSearch: '' }))} />} + {filters.region && {filters.region} setFilters(prev => ({ ...prev, region: '' }))} />} + {filters.vehicleType && {filters.vehicleType} setFilters(prev => ({ ...prev, vehicleType: '' }))} />} + {filters.department && {filters.department} setFilters(prev => ({ ...prev, department: '' }))} />} + {filters.manager && {filters.manager} setFilters(prev => ({ ...prev, manager: '' }))} />} + {filters.customer && {filters.customer} setFilters(prev => ({ ...prev, customer: '' }))} />} +
)} - {/* Result count when filtered */} {(activeFilterCount > 0 || typeFilter !== 'all') && ( -
- 共 {filteredSuggestions.length} 条结果 -
+
共 {filteredSuggestions.length} 条结果
)} - {/* List body */} {loading && !data ? (
) : ( - + )}
- {/* Detail Modal */} {selectedSuggestion && ( - setSelectedSuggestion(null)} - onNotifySuccess={handleNotifySuccess} - /> + setSelectedSuggestion(null)} onNotifySuccess={handleNotifySuccess} /> )}
diff --git a/src/modules/scheduling/types.ts b/src/modules/scheduling/types.ts index f78fd0d..a90bbbd 100644 --- a/src/modules/scheduling/types.ts +++ b/src/modules/scheduling/types.ts @@ -10,6 +10,8 @@ export interface SchedulingVehicleInfo { region: string; province: string; customer: string | null; + department: string | null; + manager: string | null; customerAvgDaily: number; predictedYearEnd: number; daysLeft: number; diff --git a/src/server/routes/scheduling/algorithm.ts b/src/server/routes/scheduling/algorithm.ts index b23c460..9961556 100644 --- a/src/server/routes/scheduling/algorithm.ts +++ b/src/server/routes/scheduling/algorithm.ts @@ -54,6 +54,8 @@ export function toVehicleInfo(v: EnrichedVehicle): SchedulingVehicleInfo { region: v.region, province: v.province, customer: v.customer, + department: v.department, + manager: v.manager, customerAvgDaily: v.customerAvgDaily, predictedYearEnd: v.predictedYearEnd, daysLeft: v.daysLeft, diff --git a/src/server/routes/scheduling/suggestions.ts b/src/server/routes/scheduling/suggestions.ts index 662baa9..387daab 100644 --- a/src/server/routes/scheduling/suggestions.ts +++ b/src/server/routes/scheduling/suggestions.ts @@ -229,6 +229,8 @@ app.get('/', async (c) => { region, province, customer, + department: info?.department || null, + manager: info?.manager || null, customerAvgDaily, predictedYearEnd, daysLeft, diff --git a/src/server/routes/scheduling/types.ts b/src/server/routes/scheduling/types.ts index 73e6158..5cf7b43 100644 --- a/src/server/routes/scheduling/types.ts +++ b/src/server/routes/scheduling/types.ts @@ -10,6 +10,8 @@ export interface SchedulingVehicleInfo { region: string; province: string; customer: string | null; + department: string | null; + manager: string | null; customerAvgDaily: number; predictedYearEnd: number; daysLeft: number; @@ -81,6 +83,8 @@ export interface EnrichedVehicle { region: string; province: string; customer: string | null; + department: string | null; + manager: string | null; customerAvgDaily: number; predictedYearEnd: number; daysLeft: number; From 64f47d5ad67cd01f770dab6b006fc8ee9891b47a Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:28:30 +0800 Subject: [PATCH 32/79] fix(scheduling): truncate long customer names, prevent list item wrap - Customer name in list items: truncate with max-w-[40%] - Daily km and completion rate: flex-shrink-0 to stay on same line Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/scheduling/SuggestionList.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/scheduling/SuggestionList.tsx b/src/modules/scheduling/SuggestionList.tsx index 591c04d..70a06b4 100644 --- a/src/modules/scheduling/SuggestionList.tsx +++ b/src/modules/scheduling/SuggestionList.tsx @@ -55,10 +55,10 @@ export default function SuggestionList({ suggestions, onSelect }: Props) { · {v.region}
-
- {v.customer || '-'} - 日均 {Math.round(v.customerAvgDaily)} km - 完成 = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-500'}`}>{fmtRate(v.completionRate)} +
+ {v.customer || '-'} + 日均 {Math.round(v.customerAvgDaily)} km + 完成 = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-500'}`}>{fmtRate(v.completionRate)}
From 81305be2df76f2ba626878a10c73471e9db3fdc7 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:30:23 +0800 Subject: [PATCH 33/79] feat(scheduling): replace spinner with skeleton loading placeholders - Full-page skeleton on initial load: card placeholders + list row placeholders - List skeleton on refresh: 6 rows with pulse animation - Skeleton blocks match actual layout (color bar, plate, badges, info line) - Uses Tailwind animate-pulse for smooth loading effect Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/scheduling/SchedulingModule.tsx | 87 ++++++++++++++++++++- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/src/modules/scheduling/SchedulingModule.tsx b/src/modules/scheduling/SchedulingModule.tsx index 89c81e9..d2e506d 100644 --- a/src/modules/scheduling/SchedulingModule.tsx +++ b/src/modules/scheduling/SchedulingModule.tsx @@ -83,6 +83,66 @@ function FilterSelect({ label, options, value, onChange, placeholder }: { ); } +/** Skeleton pulse block */ +function Sk({ className }: { className?: string }) { + return
; +} + +function SkeletonPage() { + return ( +
+
+ {/* Cards skeleton */} +
+ {[0, 1, 2].map(i => ( +
+ + + +
+ ))} +
+ + {/* List card skeleton */} +
+ {/* Header */} +
+
+ +
+
+
+ {[0, 1, 2, 3].map(i => )} +
+
+ + {/* Rows */} +
+ {Array.from({ length: 8 }).map((_, i) => ( +
+ +
+
+ + + +
+
+ + + +
+
+ +
+ ))} +
+
+
+
+ ); +} + export default function SchedulingModule() { const [data, setData] = useState(null); const [loading, setLoading] = useState(false); @@ -132,6 +192,9 @@ export default function SchedulingModule() { const summary = data?.summary; const activeFilterCount = [filters.plateSearch, filters.region, filters.vehicleType, filters.customer, filters.department, filters.manager].filter(Boolean).length; + // Initial load — full page skeleton + if (loading && !data) return ; + return (
@@ -305,9 +368,27 @@ export default function SchedulingModule() {
共 {filteredSuggestions.length} 条结果
)} - {loading && !data ? ( -
-
+ {loading ? ( + /* List skeleton while refreshing */ +
+ {Array.from({ length: 6 }).map((_, i) => ( +
+ +
+
+ + + +
+
+ + + +
+
+ +
+ ))}
) : ( From 1d1f8901aaffe32f0b07d2e234a55489b7f42212 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:34:05 +0800 Subject: [PATCH 34/79] fix(scheduling): exclude near-qualified vehicles from rescue candidates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For rescue_hopeless (换走) scenario, filter out inventory candidates where totalMileage/yearTarget >= 80%. These are already near target and swapping them in adds no value. Instead, prioritize candidates with biggest mileage gaps — they benefit most from accumulating any mileage, even at a low-mileage customer. Before: showed 粤AGR6869 (93% done, 缺口 1990) as "可达标" — pointless After: shows 浙FF58720 (0% done, 缺口 60000) — genuinely needs mileage Co-Authored-By: Claude Opus 4.6 (1M context) --- src/server/routes/scheduling/algorithm.ts | 24 ++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/server/routes/scheduling/algorithm.ts b/src/server/routes/scheduling/algorithm.ts index 9961556..815bf53 100644 --- a/src/server/routes/scheduling/algorithm.ts +++ b/src/server/routes/scheduling/algorithm.ts @@ -76,13 +76,21 @@ export function generateSuggestions( const suggestions: SchedulingSuggestion[] = []; // --- rescue_hopeless (high priority) --- + // For this scenario: take the hopeless car away to a high-mileage customer, + // and give the low-mileage customer a replacement from inventory. + // Exclude near-qualified candidates (completionRate >= 80%) — no point swapping + // in a car that's basically already at target. + // Instead, pick cars with BIG gaps: they benefit from any mileage, even at a low customer. for (const vehicle of hopeless) { const candidates: CandidateVehicle[] = inventoryVehicles - .filter( - (inv) => - isTypeCompatible(vehicle.vehicleType, inv.vehicleType) && - inv.region === vehicle.region, - ) + .filter((inv) => { + if (!isTypeCompatible(vehicle.vehicleType, inv.vehicleType)) return false; + if (inv.region !== vehicle.region) return false; + // Exclude near-qualified: yearTarget known and already >= 80% done + const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; + if (effectiveTarget > 0 && inv.totalMileage / effectiveTarget >= 0.8) return false; + return true; + }) .map((inv) => { const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; const mileageGap = Math.max(0, effectiveTarget - inv.totalMileage); @@ -105,10 +113,8 @@ export function generateSuggestions( }; }) .sort((a, b) => { - if (a.canQualifyAfterSwap !== b.canQualifyAfterSwap) - return a.canQualifyAfterSwap ? -1 : 1; - // For hopeless: prefer already-qualified inventory, then highest completion - return b.completionRate - a.completionRate; + // Prefer biggest gap first — these benefit most from any mileage + return b.mileageGap - a.mileageGap; }) .slice(0, 5); From afec75a1cc61b4822c0dc224fb164a8d6f1f0239 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:36:53 +0800 Subject: [PATCH 35/79] fix(scheduling): rescue candidates should be close-to-qualifying, not zero-mileage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For rescue_hopeless (换走) scenario, completely rethought candidate logic: Before: showed biggest-gap candidates (0 mileage) → pointless, customer can't drive them to target After: prioritize candidates where customer's remaining driving can push them over the target line (canQualifyAfterSwap), sorted by smallest gap first Example: customer drives 178km/day × 57 days = ~1万km remaining. - 粤AGR6869 (缺口 1990km) → 换后 3.8万, 可达标 ✅ (shown first) - 浙FF58720 (缺口 6万km) → 换后 1万, 远不达标 (no longer shown first) Also updated reason text to explain the math: "该客户剩余57天还能跑约1万km，足以帮缺口小的车冲线" Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/scheduling/SuggestionDetail.tsx | 2 +- src/server/routes/scheduling/algorithm.ts | 36 +++++++++++++-------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index 1eb8e09..c2f046d 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -121,7 +121,7 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce
{isRescue - ? '以下车辆里程已充足，可调给当前客户，将此车换走给高里程客户冲刺' + ? '以下车辆快达标，换到当前客户处利用剩余天数即可冲线' : '以下车辆里程缺口大，换到该高里程客户处可加速达标' }
diff --git a/src/server/routes/scheduling/algorithm.ts b/src/server/routes/scheduling/algorithm.ts index 815bf53..e43669e 100644 --- a/src/server/routes/scheduling/algorithm.ts +++ b/src/server/routes/scheduling/algorithm.ts @@ -76,26 +76,31 @@ export function generateSuggestions( const suggestions: SchedulingSuggestion[] = []; // --- rescue_hopeless (high priority) --- - // For this scenario: take the hopeless car away to a high-mileage customer, - // and give the low-mileage customer a replacement from inventory. - // Exclude near-qualified candidates (completionRate >= 80%) — no point swapping - // in a car that's basically already at target. - // Instead, pick cars with BIG gaps: they benefit from any mileage, even at a low customer. + // Take the hopeless car away → give to high-mileage customer to sprint. + // Replace with an inventory car that is CLOSE to qualifying — the low-mileage + // customer's remaining driving days can push it over the finish line. + // + // Key insight: pick candidates where + // candidate.totalMileage + customer.avgDaily × daysLeft >= yearTarget + // i.e., the customer's daily driving is enough to finish the candidate's target. + // Among those, prefer the one with the smallest gap (easiest to finish). + // Exclude already-qualified (>= 100%) — no value in swapping those. for (const vehicle of hopeless) { + const customerCanAdd = vehicle.customerAvgDaily * vehicle.daysLeft; + const candidates: CandidateVehicle[] = inventoryVehicles .filter((inv) => { if (!isTypeCompatible(vehicle.vehicleType, inv.vehicleType)) return false; if (inv.region !== vehicle.region) return false; - // Exclude near-qualified: yearTarget known and already >= 80% done + // Exclude already fully qualified const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; - if (effectiveTarget > 0 && inv.totalMileage / effectiveTarget >= 0.8) return false; + if (effectiveTarget > 0 && inv.totalMileage >= effectiveTarget) return false; return true; }) .map((inv) => { const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; const mileageGap = Math.max(0, effectiveTarget - inv.totalMileage); - const predictedAfterSwap = - inv.totalMileage + vehicle.customerAvgDaily * vehicle.daysLeft; + const predictedAfterSwap = inv.totalMileage + customerCanAdd; const canQualifyAfterSwap = predictedAfterSwap >= effectiveTarget; return { plateNumber: inv.plateNumber, @@ -113,15 +118,20 @@ export function generateSuggestions( }; }) .sort((a, b) => { - // Prefer biggest gap first — these benefit most from any mileage - return b.mileageGap - a.mileageGap; + // 1. Prefer "can qualify after swap" first + if (a.canQualifyAfterSwap !== b.canQualifyAfterSwap) + return a.canQualifyAfterSwap ? -1 : 1; + // 2. Among qualifiable: smallest gap first (easiest to finish) + // Among non-qualifiable: smallest gap first (closest to target) + return a.mileageGap - b.mileageGap; }) .slice(0, 5); const yearRate = vehicle.yearTarget > 0 ? Math.round((vehicle.currentYearMileage / vehicle.yearTarget) * 100) : 0; const gap = Math.max(0, vehicle.yearTarget - vehicle.currentYearMileage); - const reason = `该车在客户「${vehicle.customer}」处日均仅 ${Math.round(vehicle.customerAvgDaily)} km，本年完成率 ${yearRate}%，还差 ${fmtKmSimple(gap)} km 达标，按当前速度年底无法完成。` - + `\n建议：将此车调配给高里程客户冲刺达标，同时从库存调一辆已达标的车给当前客户。`; + const canAddKm = Math.round(customerCanAdd); + const reason = `该车在客户「${vehicle.customer}」处日均仅 ${Math.round(vehicle.customerAvgDaily)} km，完成率 ${yearRate}%，还差 ${fmtKmSimple(gap)} km，年底无法达标。` + + `\n建议：将此车换走给高里程客户冲刺，换上一辆快达标的车——该客户剩余 ${vehicle.daysLeft} 天还能跑约 ${fmtKmSimple(canAddKm)} km，足以帮缺口小的车冲线。`; suggestions.push({ id: `hopeless-${vehicle.plateNumber}`, From 0785c783822c7dcc299fac0fcf55941958ceae2c Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:41:08 +0800 Subject: [PATCH 36/79] fix(scheduling): only show candidates that can actually qualify after swap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit replace_qualified (换下): - Exclude already-qualified inventory (totalMileage >= yearTarget, gap=0) - Only keep candidates where canQualifyAfterSwap=true - Skip suggestions with no qualifiable candidates (e.g., too few days left) - Reason text now shows customer's remaining capacity: "日均 318km × 53天 ≈ 1.7万km" Before: showed 粤AGP9738 (缺口 0, already at target) — pointless After: shows 粤AGQ5808 (缺口 1.7万, 换后 3.0万, 可达标) — meaningful All replace_qualified candidates now guaranteed canQualifyAfterSwap=true. Co-Authored-By: Claude Opus 4.6 (1M context) --- src/server/routes/scheduling/algorithm.ts | 28 +++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/server/routes/scheduling/algorithm.ts b/src/server/routes/scheduling/algorithm.ts index e43669e..16c6fdb 100644 --- a/src/server/routes/scheduling/algorithm.ts +++ b/src/server/routes/scheduling/algorithm.ts @@ -144,15 +144,21 @@ export function generateSuggestions( } // --- replace_qualified (medium priority) --- + // Swap out the qualified car, swap in a car that NEEDS mileage. + // The high-mileage customer will drive it hard → helps it reach target. + // Exclude candidates already at target (gap <= 0) — swapping those in is pointless. for (const vehicle of qualified) { if (vehicle.customerAvgDaily <= vehicle.dailyRequiredMileage) continue; const candidates: CandidateVehicle[] = inventoryVehicles - .filter( - (inv) => - isTypeCompatible(vehicle.vehicleType, inv.vehicleType) && - inv.region === vehicle.region, - ) + .filter((inv) => { + if (!isTypeCompatible(vehicle.vehicleType, inv.vehicleType)) return false; + if (inv.region !== vehicle.region) return false; + // Must still need mileage — exclude already-qualified inventory + const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; + if (effectiveTarget > 0 && inv.totalMileage >= effectiveTarget) return false; + return true; + }) .map((inv) => { const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; const mileageGap = Math.max(0, effectiveTarget - inv.totalMileage); @@ -175,15 +181,23 @@ export function generateSuggestions( }; }) .sort((a, b) => { + // 1. canQualifyAfterSwap first if (a.canQualifyAfterSwap !== b.canQualifyAfterSwap) return a.canQualifyAfterSwap ? -1 : 1; + // 2. Among qualifiable: biggest gap first (most value from the swap) return b.mileageGap - a.mileageGap; }) + // Only keep candidates that can actually qualify at this customer + .filter(c => c.canQualifyAfterSwap) .slice(0, 5); + // Skip if no candidate can reach target — swap would be pointless + if (candidates.length === 0) continue; + const yearRate = vehicle.yearTarget > 0 ? Math.round((vehicle.currentYearMileage / vehicle.yearTarget) * 100) : 0; - const reason = `该车在客户「${vehicle.customer}」处已达标（完成率 ${yearRate}%），客户日均 ${Math.round(vehicle.customerAvgDaily)} km，属于高里程客户。` - + `\n建议：将此车换下，换上一辆里程少的车，利用该客户的高日均里程帮助新车快速达标。`; + const canAddKm = vehicle.customerAvgDaily * vehicle.daysLeft; + const reason = `该车在客户「${vehicle.customer}」处已达标（完成率 ${yearRate}%），客户日均 ${Math.round(vehicle.customerAvgDaily)} km × ${vehicle.daysLeft} 天 ≈ ${fmtKmSimple(canAddKm)} km。` + + `\n建议：换上里程未达标的车，利用该客户的高日均帮新车快速冲线。`; suggestions.push({ id: `qualified-${vehicle.plateNumber}`, From 6a3a5ba3195ba32e91351b64a4fc7bc179a40a22 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:43:18 +0800 Subject: [PATCH 37/79] feat(scheduling): add full-screen SwapPreview for screenshot sharing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New SwapPreview component replaces direct "发送通知" button: - Full-screen white background for clean screenshots - Swap diagram: current vehicle → arrow → replacement vehicle - Replacement reason section - Post-swap prediction: predicted mileage, target, conclusion - "发送替换通知" button at bottom - Candidate button in detail modal changed to "查看替换方案 →" Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/scheduling/SuggestionDetail.tsx | 50 +++--- src/modules/scheduling/SwapPreview.tsx | 175 ++++++++++++++++++++ 2 files changed, 196 insertions(+), 29 deletions(-) create mode 100644 src/modules/scheduling/SwapPreview.tsx diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index c2f046d..37ce573 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -1,11 +1,11 @@ import { useState } from 'react'; import { - X, MapPin, AlertTriangle, CheckCircle, Send, ArrowDown, ArrowUp, + X, MapPin, AlertTriangle, CheckCircle, ArrowDown, ArrowUp, ArrowRight, } from 'lucide-react'; import { motion } from 'motion/react'; -import { sendNotify } from './api'; import type { SchedulingSuggestion, CandidateVehicle } from './types'; import Blur from '../../components/Blur'; +import SwapPreview from './SwapPreview'; interface Props { suggestion: SchedulingSuggestion; @@ -23,34 +23,12 @@ function fmtRate(rate: number): string { } export default function SuggestionDetail({ suggestion: s, onClose, onNotifySuccess }: Props) { - const [sending, setSending] = useState(false); + const [previewCandidate, setPreviewCandidate] = useState(null); const [sentPlates, setSentPlates] = useState>(new Set()); const v = s.currentVehicle; const isRescue = s.type === 'rescue_hopeless'; - const handleNotify = async (candidate: CandidateVehicle) => { - if (sending || sentPlates.has(candidate.plateNumber)) return; - setSending(true); - try { - const result = await sendNotify({ - suggestionId: s.id, - currentPlate: v.plateNumber, - candidatePlate: candidate.plateNumber, - }); - if (result.success) { - setSentPlates(prev => new Set(prev).add(candidate.plateNumber)); - onNotifySuccess(); - } else { - alert(result.message || '发送失败'); - } - } catch { - alert('网络错误，请重试'); - } finally { - setSending(false); - } - }; - return (
@@ -206,6 +184,20 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce
+ + {/* Full-screen swap preview */} + {previewCandidate && ( + setPreviewCandidate(null)} + onSuccess={() => { + setSentPlates(prev => new Set(prev).add(previewCandidate.plateNumber)); + setPreviewCandidate(null); + onNotifySuccess(); + }} + /> + )}
); } diff --git a/src/modules/scheduling/SwapPreview.tsx b/src/modules/scheduling/SwapPreview.tsx new file mode 100644 index 0000000..cd70d03 --- /dev/null +++ b/src/modules/scheduling/SwapPreview.tsx @@ -0,0 +1,175 @@ +import { useState } from 'react'; +import { ArrowDown, CheckCircle, Send, X } from 'lucide-react'; +import { motion } from 'motion/react'; +import { sendNotify } from './api'; +import type { SchedulingSuggestion, CandidateVehicle } from './types'; +import Blur from '../../components/Blur'; + +interface Props { + suggestion: SchedulingSuggestion; + candidate: CandidateVehicle; + onClose: () => void; + onSuccess: () => void; +} + +function fmtKm(value: number): string { + if (value >= 10000) return (value / 10000).toFixed(1) + '万'; + return value.toLocaleString(); +} + +function fmtRate(rate: number): string { + return (rate * 100).toFixed(1) + '%'; +} + +export default function SwapPreview({ suggestion: s, candidate: c, onClose, onSuccess }: Props) { + const [sending, setSending] = useState(false); + const [sent, setSent] = useState(false); + const v = s.currentVehicle; + const isRescue = s.type === 'rescue_hopeless'; + + const handleSend = async () => { + if (sending || sent) return; + setSending(true); + try { + const result = await sendNotify({ + suggestionId: s.id, + currentPlate: v.plateNumber, + candidatePlate: c.plateNumber, + }); + if (result.success) { + setSent(true); + onSuccess(); + } else { + alert(result.message || '发送失败'); + } + } catch { + alert('网络错误，请重试'); + } finally { + setSending(false); + } + }; + + return ( +
+ {/* Top bar */} +
+ 车辆替换方案 + +
+ + {/* Content — screenshot-friendly, no scroll needed */} +
+ + {/* Swap type badge */} +
+ {isRescue ? '里程低·换走此车' : '里程高·换下此车'} +
+ + {/* === Swap Diagram === */} +
+ + {/* Current vehicle (换下/换走) */} +
+
+ {isRescue ? '换走车辆' : '换下车辆'} +
+
+
+
{v.plateNumber}
+
{v.vehicleType} · {v.targetName}
+
+
+
{fmtKm(v.currentYearMileage)} km
+
考核 {fmtKm(v.yearTarget)} km
+
+
+
+ 客户 {v.customer || '-'} + 日均 {Math.round(v.customerAvgDaily)} km + 完成 = 1 ? 'text-emerald-600' : 'text-rose-500'}>{fmtRate(v.completionRate)} +
+
+ + {/* Arrow */} +
+
+ +
+
+ + {/* Replacement vehicle (换上) */} +
+
+ 换上车辆 +
+
+
+
{c.plateNumber}
+
{c.vehicleType} · {c.targetName || '库存'}
+
+
+
{fmtKm(c.totalMileage)} km
+
考核 {c.yearTarget ? fmtKm(c.yearTarget) : '-'} km
+
+
+
+ 缺口 {fmtKm(c.mileageGap)} km + 区域 {c.region} +
+
+
+ + {/* === Reason === */} +
+
替换原因
+
{s.reason}
+
+ + {/* === Conclusion === */} +
+
替换后预测
+
+ + {c.plateNumber} 换到客户「{v.customer || '-'}」后 + +
+
+
+
预测年终
+
{fmtKm(c.predictedAfterSwap)} km
+
+
+
考核目标
+
{c.yearTarget ? fmtKm(c.yearTarget) : '-'} km
+
+
+
结论
+
+ {c.canQualifyAfterSwap ? '可达标' : '需关注'} +
+
+
+
+
+ + {/* Bottom action */} +
+ +
+
+ ); +} From 25199b507cbc93813f1431cc82679a885a10c2b9 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:45:01 +0800 Subject: [PATCH 38/79] refactor(scheduling): simplify SwapPreview layout, remove verbose reason MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove type badge, reason section — too verbose - Two clean white cards connected by arrow (swap diagram) - Result section: predicted mileage, target, conclusion badge - Tighter spacing, no redundant labels - Professional tone, no childish wording Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/scheduling/SwapPreview.tsx | 201 ++++++++++--------------- 1 file changed, 79 insertions(+), 122 deletions(-) diff --git a/src/modules/scheduling/SwapPreview.tsx b/src/modules/scheduling/SwapPreview.tsx index cd70d03..83c6aac 100644 --- a/src/modules/scheduling/SwapPreview.tsx +++ b/src/modules/scheduling/SwapPreview.tsx @@ -1,6 +1,5 @@ import { useState } from 'react'; -import { ArrowDown, CheckCircle, Send, X } from 'lucide-react'; -import { motion } from 'motion/react'; +import { ArrowDownUp, CheckCircle, Send, X } from 'lucide-react'; import { sendNotify } from './api'; import type { SchedulingSuggestion, CandidateVehicle } from './types'; import Blur from '../../components/Blur'; @@ -25,150 +24,108 @@ export default function SwapPreview({ suggestion: s, candidate: c, onClose, onSu const [sending, setSending] = useState(false); const [sent, setSent] = useState(false); const v = s.currentVehicle; - const isRescue = s.type === 'rescue_hopeless'; const handleSend = async () => { if (sending || sent) return; setSending(true); try { - const result = await sendNotify({ - suggestionId: s.id, - currentPlate: v.plateNumber, - candidatePlate: c.plateNumber, - }); - if (result.success) { - setSent(true); - onSuccess(); - } else { - alert(result.message || '发送失败'); - } - } catch { - alert('网络错误，请重试'); - } finally { - setSending(false); - } + const result = await sendNotify({ suggestionId: s.id, currentPlate: v.plateNumber, candidatePlate: c.plateNumber }); + if (result.success) { setSent(true); onSuccess(); } else { alert(result.message || '发送失败'); } + } catch { alert('网络错误'); } finally { setSending(false); } }; return ( -
- {/* Top bar */} -
+
+ {/* Header */} +
车辆替换方案 - +
- {/* Content — screenshot-friendly, no scroll needed */} -
+ {/* Content */} +
+
- {/* Swap type badge */} -
- {isRescue ? '里程低·换走此车' : '里程高·换下此车'} -
- - {/* === Swap Diagram === */} -
- - {/* Current vehicle (换下/换走) */} -
-
- {isRescue ? '换走车辆' : '换下车辆'} + {/* === Swap Cards === */} +
+ {/* Current vehicle */} +
+
+
+
{v.plateNumber}
+
{v.vehicleType} · {v.targetName}
+
+
+
{fmtKm(v.currentYearMileage)}km
+
考核 {fmtKm(v.yearTarget)} km
+
+
+
+ {v.customer || '-'} + 日均 {Math.round(v.customerAvgDaily)} + 完成 = 1 ? 'text-emerald-600' : 'text-rose-500'}>{fmtRate(v.completionRate)} +
-
+ + {/* Arrow bridge */} +
+
+ +
+
+ + {/* Replacement vehicle */} +
+
+
+
{c.plateNumber}
+
{c.vehicleType} · {c.targetName || '库存'} · {c.region}
+
+
+
{fmtKm(c.totalMileage)}km
+
考核 {c.yearTarget ? fmtKm(c.yearTarget) : '-'} km
+
+
+
+ 缺口 {fmtKm(c.mileageGap)} +
+
+
+ + {/* === Result === */} +
+
替换后预测
+
-
{v.plateNumber}
-
{v.vehicleType} · {v.targetName}
+
预测年终里程
+
{fmtKm(c.predictedAfterSwap)} km
-
-
{fmtKm(v.currentYearMileage)} km
-
考核 {fmtKm(v.yearTarget)} km
-
-
-
- 客户 {v.customer || '-'} - 日均 {Math.round(v.customerAvgDaily)} km - 完成 = 1 ? 'text-emerald-600' : 'text-rose-500'}>{fmtRate(v.completionRate)} -
-
- - {/* Arrow */} -
-
- -
-
- - {/* Replacement vehicle (换上) */} -
-
- 换上车辆 -
-
-
{c.plateNumber}
-
{c.vehicleType} · {c.targetName || '库存'}
+
考核目标
+
{c.yearTarget ? fmtKm(c.yearTarget) : '-'} km
-
-
{fmtKm(c.totalMileage)} km
-
考核 {c.yearTarget ? fmtKm(c.yearTarget) : '-'} km
-
-
-
- 缺口 {fmtKm(c.mileageGap)} km - 区域 {c.region} -
-
-
- - {/* === Reason === */} -
-
替换原因
-
{s.reason}
-
- - {/* === Conclusion === */} -
-
替换后预测
-
- - {c.plateNumber} 换到客户「{v.customer || '-'}」后 - -
-
-
-
预测年终
-
{fmtKm(c.predictedAfterSwap)} km
-
-
-
考核目标
-
{c.yearTarget ? fmtKm(c.yearTarget) : '-'} km
-
-
-
结论
-
+
{c.canQualifyAfterSwap ? '可达标' : '需关注'}
+
- {/* Bottom action */} -
- + {/* Bottom */} +
+
+ +
); From 8598aea44514e889c556778ee56c650c7dd1da6d Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:47:57 +0800 Subject: [PATCH 39/79] feat(scheduling): restrict scheduling module to allowed users only Only userId 1105261382487539712 and 1116631120763437056 can see the scheduling tab. Other users see only assets + mileage modules. - Add userId to frontend AuthState.user type - App.tsx conditionally includes scheduling module based on user ID - Backend already returns userId in auth exchange response Co-Authored-By: Claude Opus 4.6 (1M context) --- src/App.tsx | 24 ++++++++++++++++++++---- src/auth/useAuth.ts | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 044a887..15b100d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,3 +1,4 @@ +import { useMemo } from 'react'; import { Truck, Route, Activity } from 'lucide-react'; import { Shell, type ModuleConfig } from './components/Shell'; import AssetsModule from './modules/assets/AssetsModule'; @@ -7,14 +8,29 @@ import AuthProvider from './auth/AuthProvider'; import { useAuth } from './auth/useAuth'; import UnauthorizedPage from './auth/UnauthorizedPage'; -const MODULES: ModuleConfig[] = [ +const SCHEDULING_ALLOWED_USERS = new Set([ + '1105261382487539712', + '1116631120763437056', +]); + +const BASE_MODULES: ModuleConfig[] = [ { id: 'assets', label: '资产管理', icon: Truck, component: AssetsModule }, { id: 'mileage', label: '里程管理', icon: Route, component: MileageModule }, - { id: 'scheduling', label: '智能调度', icon: Activity, component: SchedulingModule }, ]; +const SCHEDULING_MODULE: ModuleConfig = { + id: 'scheduling', label: '智能调度', icon: Activity, component: SchedulingModule, +}; + function AuthGate() { - const { isLoading, isAuthenticated, error } = useAuth(); + const { isLoading, isAuthenticated, error, user } = useAuth(); + + const modules = useMemo(() => { + if (user?.userId && SCHEDULING_ALLOWED_USERS.has(user.userId)) { + return [...BASE_MODULES, SCHEDULING_MODULE]; + } + return BASE_MODULES; + }, [user?.userId]); if (isLoading) { return ( @@ -31,7 +47,7 @@ function AuthGate() { return ; } - return ; + return ; } export default function App() { diff --git a/src/auth/useAuth.ts b/src/auth/useAuth.ts index c6385ec..0f8f7aa 100644 --- a/src/auth/useAuth.ts +++ b/src/auth/useAuth.ts @@ -3,7 +3,7 @@ import { createContext, useContext } from 'react'; export interface AuthState { isLoading: boolean; isAuthenticated: boolean; - user: { userName: string; permissionLevel: string; depName: string } | null; + user: { userId: string; userName: string; permissionLevel: string; depName: string } | null; error: string | null; } From 75f0aca5d1134cb0be0e7f7ab60e45ca1937bf2a Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:48:29 +0800 Subject: [PATCH 40/79] fix(auth): require jumpToken for access, remove temporary bypass MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously: no jumpToken → direct access allowed (临时放行) Now: no jumpToken → show "请从业务系统跳转访问" unauthorized page Co-Authored-By: Claude Opus 4.6 (1M context) --- src/auth/AuthProvider.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/auth/AuthProvider.tsx b/src/auth/AuthProvider.tsx index e0cf760..f4586e1 100644 --- a/src/auth/AuthProvider.tsx +++ b/src/auth/AuthProvider.tsx @@ -65,8 +65,7 @@ export default function AuthProvider({ children }: { children: ReactNode }) { const jumpToken = params.get('jumpToken'); if (!jumpToken) { - // 临时：无 token 时直接放行 - setState({ isLoading: false, isAuthenticated: true, user: null, error: null }); + setState({ isLoading: false, isAuthenticated: false, user: null, error: '请从业务系统跳转访问' }); return; } From fb89c9beeda0fb231a2e0dc7bbe4d7420d54fbab Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 21:57:35 +0800 Subject: [PATCH 41/79] =?UTF-8?q?fix(scheduling):=20change=20=E8=BE=86=20t?= =?UTF-8?q?o=20=E5=B9=B2=E9=A2=84=20in=20suggestion=20list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/scheduling/SuggestionList.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/scheduling/SuggestionList.tsx b/src/modules/scheduling/SuggestionList.tsx index 70a06b4..95a384b 100644 --- a/src/modules/scheduling/SuggestionList.tsx +++ b/src/modules/scheduling/SuggestionList.tsx @@ -64,8 +64,7 @@ export default function SuggestionList({ suggestions, onSelect }: Props) { {/* Right */}
- {s.candidates.length} - 辆 + 干预
From 694e9a207a484a7ab614ed1d8520278feed1d304 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:04:52 +0800 Subject: [PATCH 42/79] feat(scheduling): enable department/personal permission filtering MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Disable BYPASS_AUTH (was true, now false) — backend enforces JWT auth - Scheduling suggestions filtered by department/manager permissions: - full: see all suggestions - department: see only own department's vehicles - personal: see only own managed vehicles - Candidate vehicles (inventory) remain fully visible to all - Summary recalculated after permission filtering - Consistent with mileage module permission model Co-Authored-By: Claude Opus 4.6 (1M context) --- src/server/auth/middleware.ts | 2 +- src/server/routes/scheduling/suggestions.ts | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/server/auth/middleware.ts b/src/server/auth/middleware.ts index eba6c5b..1586009 100644 --- a/src/server/auth/middleware.ts +++ b/src/server/auth/middleware.ts @@ -5,7 +5,7 @@ import type { JwtPayload, AuthUser } from './types.js'; const JWT_SECRET = process.env.JWT_SECRET || 'ln-bi-default-secret'; // 临时：跳过所有认证（保留完整逻辑便于快速恢复） -const BYPASS_AUTH = true; +const BYPASS_AUTH = false; export async function authMiddleware(c: Context, next: Next) { const path = c.req.path; diff --git a/src/server/routes/scheduling/suggestions.ts b/src/server/routes/scheduling/suggestions.ts index 387daab..a42b34d 100644 --- a/src/server/routes/scheduling/suggestions.ts +++ b/src/server/routes/scheduling/suggestions.ts @@ -5,7 +5,7 @@ import { fetchVehicleInfoMap } from '../mileage/vehicle-info.js'; import { mapRegion } from '../vehicles.js'; import { filterByPermission, maskCustomerNames } from '../../auth/permissions.js'; import { classifyVehicle, generateSuggestions } from './algorithm.js'; -import type { EnrichedVehicle, InventoryVehicle, SchedulingResponse } from './types.js'; +import type { EnrichedVehicle, InventoryVehicle, SchedulingResponse, SchedulingSummary } from './types.js'; import type { AuthUser } from '../../auth/types.js'; // --------------------------------------------------------------------------- @@ -305,8 +305,20 @@ app.get('/', async (c) => { vehicleCount: targetVehicleCounts.get(t.id) || 0, })); + // Recalculate summary based on permission-filtered results + const filteredQualified = masked.filter((s: any) => s.type === 'replace_qualified').length; + const filteredHopeless = masked.filter((s: any) => s.type === 'rescue_hopeless').length; + const filteredSummary: SchedulingSummary = { + qualifiedCount: summary.qualifiedCount, + hopelessCount: summary.hopelessCount, + suggestionCount: masked.length, + estimatedGain: masked.filter((s: any) => + s.candidates?.some((c: any) => c.canQualifyAfterSwap) + ).length, + }; + const response: SchedulingResponse = { - summary, + summary: filteredSummary, suggestions: masked, targets: targetOptions, }; From dd031578049687f60564af78727aa3a80914d97b Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:09:27 +0800 Subject: [PATCH 43/79] refactor(scheduling): simplify card labels for clarity --- src/modules/scheduling/SchedulingModule.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/scheduling/SchedulingModule.tsx b/src/modules/scheduling/SchedulingModule.tsx index d2e506d..f9fc7cd 100644 --- a/src/modules/scheduling/SchedulingModule.tsx +++ b/src/modules/scheduling/SchedulingModule.tsx @@ -211,14 +211,14 @@ export default function SchedulingModule() { }`} >
- 里程高·需换下 + 超额完成
{loading && !data ? '-' : summary?.qualifiedCount ?? 0} 台
- 已达标，换上里程少的车 + 换下，腾位给待达标车
@@ -232,14 +232,14 @@ export default function SchedulingModule() { }`} >
- 里程低·需换走 + 无法达标
{loading && !data ? '-' : summary?.hopelessCount ?? 0} 台
- 无法达标，调给高里程客户 + 换走，换上快达标的车
@@ -253,14 +253,14 @@ export default function SchedulingModule() { }`} >
- 替换建议 + 调度方案
{loading && !data ? '-' : summary?.suggestionCount ?? 0} 条
- 预计 +{summary?.estimatedGain ?? 0} 台可新增达标 + 执行后预计 +{summary?.estimatedGain ?? 0} 台达标
From 0a7a9a096d07e12a0c4b057471077c8468904282 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:11:37 +0800 Subject: [PATCH 44/79] refactor(scheduling): condense reason text to data-only one-liner --- src/server/routes/scheduling/algorithm.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/server/routes/scheduling/algorithm.ts b/src/server/routes/scheduling/algorithm.ts index 16c6fdb..4040524 100644 --- a/src/server/routes/scheduling/algorithm.ts +++ b/src/server/routes/scheduling/algorithm.ts @@ -129,9 +129,7 @@ export function generateSuggestions( const yearRate = vehicle.yearTarget > 0 ? Math.round((vehicle.currentYearMileage / vehicle.yearTarget) * 100) : 0; const gap = Math.max(0, vehicle.yearTarget - vehicle.currentYearMileage); - const canAddKm = Math.round(customerCanAdd); - const reason = `该车在客户「${vehicle.customer}」处日均仅 ${Math.round(vehicle.customerAvgDaily)} km，完成率 ${yearRate}%，还差 ${fmtKmSimple(gap)} km，年底无法达标。` - + `\n建议：将此车换走给高里程客户冲刺，换上一辆快达标的车——该客户剩余 ${vehicle.daysLeft} 天还能跑约 ${fmtKmSimple(canAddKm)} km，足以帮缺口小的车冲线。`; + const reason = `客户日均 ${Math.round(vehicle.customerAvgDaily)} km · 完成率 ${yearRate}% · 缺口 ${fmtKmSimple(gap)} km · 剩余 ${vehicle.daysLeft} 天（约 ${fmtKmSimple(Math.round(customerCanAdd))} km）`; suggestions.push({ id: `hopeless-${vehicle.plateNumber}`, @@ -196,8 +194,7 @@ export function generateSuggestions( const yearRate = vehicle.yearTarget > 0 ? Math.round((vehicle.currentYearMileage / vehicle.yearTarget) * 100) : 0; const canAddKm = vehicle.customerAvgDaily * vehicle.daysLeft; - const reason = `该车在客户「${vehicle.customer}」处已达标（完成率 ${yearRate}%），客户日均 ${Math.round(vehicle.customerAvgDaily)} km × ${vehicle.daysLeft} 天 ≈ ${fmtKmSimple(canAddKm)} km。` - + `\n建议：换上里程未达标的车，利用该客户的高日均帮新车快速冲线。`; + const reason = `客户日均 ${Math.round(vehicle.customerAvgDaily)} km · 完成率 ${yearRate}% · 剩余 ${vehicle.daysLeft} 天（约 ${fmtKmSimple(Math.round(canAddKm))} km）`; suggestions.push({ id: `qualified-${vehicle.plateNumber}`, From b3a6beb26bed2692d4eb85d2381e0be0f0afd62d Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:12:19 +0800 Subject: [PATCH 45/79] fix(scheduling): update card titles per user request --- src/modules/scheduling/SchedulingModule.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/scheduling/SchedulingModule.tsx b/src/modules/scheduling/SchedulingModule.tsx index f9fc7cd..51bede3 100644 --- a/src/modules/scheduling/SchedulingModule.tsx +++ b/src/modules/scheduling/SchedulingModule.tsx @@ -211,7 +211,7 @@ export default function SchedulingModule() { }`} >
- 超额完成 + 已完成考核目标
{loading && !data ? '-' : summary?.qualifiedCount ?? 0} @@ -232,7 +232,7 @@ export default function SchedulingModule() { }`} >
- 无法达标 + 预估无法达标
{loading && !data ? '-' : summary?.hopelessCount ?? 0} From d0984a430b9b3f9f45106f48678d00e824ba362a Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:32:50 +0800 Subject: [PATCH 46/79] refactor(scheduling): improve reason text, fix classification, polish detail view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Classification: qualified requires actual completionRate >= 100% (not just predicted) - Reason text: structured two-column layout (客户日均 | 考核周期剩余) - Conclusion line in red bold (预估无法达标，需替换 / 已达标，建议换上未达标车辆) - Remove verbose subtitle from candidate section - Remove redundant middle line (预估考核期里程 vs 考核里程) Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/scheduling/SuggestionDetail.tsx | 43 +++++++++++++++------ src/server/routes/scheduling/algorithm.ts | 17 +++++--- src/server/routes/scheduling/suggestions.ts | 2 +- 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index 37ce573..3389d34 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -83,26 +83,45 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce
- {/* Reason */} -
- 建议： - {s.reason} + {/* Reason — structured lines */} +
+ {s.reason.split('\n').map((line, i) => { + const isConclusion = line.startsWith('!!'); + const text = isConclusion ? line.slice(2) : line; + if (isConclusion) { + return ( +
+ {text} +
+ ); + } + // Split by | for two-column layout + if (text.includes('|')) { + const parts = text.split('|').map(p => p.trim()); + return ( +
+ {parts[0]} + {parts[1]} +
+ ); + } + return ( +
+ + {text} +
+ ); + })}
{/* Candidates */}
-
+
- {isRescue ? '从库存调入替换' : '换上以下里程少的车'} + {isRescue ? '建议替换车辆' : '建议替换车辆'} {s.candidates.length} 辆可选
-
- {isRescue - ? '以下车辆快达标，换到当前客户处利用剩余天数即可冲线' - : '以下车辆里程缺口大，换到该高里程客户处可加速达标' - } -
{s.candidates.map(c => { diff --git a/src/server/routes/scheduling/algorithm.ts b/src/server/routes/scheduling/algorithm.ts index 4040524..d82b3e7 100644 --- a/src/server/routes/scheduling/algorithm.ts +++ b/src/server/routes/scheduling/algorithm.ts @@ -25,11 +25,15 @@ export function isTypeCompatible(sourceType: string, candidateType: string): boo export function classifyVehicle( currentYearIsQualified: boolean, - predictedYearEnd: number, + currentYearMileage: number, yearTarget: number, + predictedYearEnd: number, ): VehicleClassification { - if (currentYearIsQualified || predictedYearEnd / yearTarget >= 1.2) return 'qualified'; - if (predictedYearEnd / yearTarget < 0.6) return 'hopeless'; + // qualified: current year mileage already >= target (actually done, not just predicted) + const actualRate = yearTarget > 0 ? currentYearMileage / yearTarget : 0; + if (currentYearIsQualified || actualRate >= 1.0) return 'qualified'; + // hopeless: even with remaining days, predicted < 60% of target + if (yearTarget > 0 && predictedYearEnd / yearTarget < 0.6) return 'hopeless'; return 'normal'; } @@ -127,9 +131,10 @@ export function generateSuggestions( }) .slice(0, 5); - const yearRate = vehicle.yearTarget > 0 ? Math.round((vehicle.currentYearMileage / vehicle.yearTarget) * 100) : 0; const gap = Math.max(0, vehicle.yearTarget - vehicle.currentYearMileage); - const reason = `客户日均 ${Math.round(vehicle.customerAvgDaily)} km · 完成率 ${yearRate}% · 缺口 ${fmtKmSimple(gap)} km · 剩余 ${vehicle.daysLeft} 天（约 ${fmtKmSimple(Math.round(customerCanAdd))} km）`; + const dailyReq = vehicle.daysLeft > 0 ? Math.round(gap / vehicle.daysLeft) : 0; + const predictedTotal = Math.round(vehicle.currentYearMileage + customerCanAdd); + const reason = `客户日均 ${Math.round(vehicle.customerAvgDaily)} km | 考核周期剩余 ${vehicle.daysLeft} 天 · 日均需 ${fmtKmSimple(dailyReq)} km\n!!预估无法达标，需替换`; suggestions.push({ id: `hopeless-${vehicle.plateNumber}`, @@ -194,7 +199,7 @@ export function generateSuggestions( const yearRate = vehicle.yearTarget > 0 ? Math.round((vehicle.currentYearMileage / vehicle.yearTarget) * 100) : 0; const canAddKm = vehicle.customerAvgDaily * vehicle.daysLeft; - const reason = `客户日均 ${Math.round(vehicle.customerAvgDaily)} km · 完成率 ${yearRate}% · 剩余 ${vehicle.daysLeft} 天（约 ${fmtKmSimple(Math.round(canAddKm))} km）`; + const reason = `客户日均 ${Math.round(vehicle.customerAvgDaily)} km\n已完成考核（完成率 ${yearRate}%）\n考核周期剩余 ${vehicle.daysLeft} 天，可为新车贡献约 ${fmtKmSimple(Math.round(canAddKm))} km\n!!已达标，建议换上未达标车辆`; suggestions.push({ id: `qualified-${vehicle.plateNumber}`, diff --git a/src/server/routes/scheduling/suggestions.ts b/src/server/routes/scheduling/suggestions.ts index a42b34d..d0b3924 100644 --- a/src/server/routes/scheduling/suggestions.ts +++ b/src/server/routes/scheduling/suggestions.ts @@ -212,7 +212,7 @@ app.get('/', async (c) => { const predictedYearEnd = currentYearMileage + customerAvgDaily * daysLeft; const currentYearIsQualified = row.current_year_is_qualified === 1; - const classification = classifyVehicle(currentYearIsQualified, predictedYearEnd, yearTarget); + const classification = classifyVehicle(currentYearIsQualified, currentYearMileage, yearTarget, predictedYearEnd); enrichedVehicles.push({ plateNumber: plate, From bea67b6710911a2a3173392c53837ce7fcda4836 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:37:14 +0800 Subject: [PATCH 47/79] =?UTF-8?q?fix(scheduling):=20remove=20decimals=20fr?= =?UTF-8?q?om=20km=20display=20(1,990.2=20=E2=86=92=201,990)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/scheduling/SuggestionDetail.tsx | 2 +- src/modules/scheduling/SwapPreview.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index 3389d34..c1113e4 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -15,7 +15,7 @@ interface Props { function fmtKm(value: number): string { if (value >= 10000) return (value / 10000).toFixed(1) + '万'; - return value.toLocaleString(); + return Math.round(value).toLocaleString(); } function fmtRate(rate: number): string { diff --git a/src/modules/scheduling/SwapPreview.tsx b/src/modules/scheduling/SwapPreview.tsx index 83c6aac..28874ea 100644 --- a/src/modules/scheduling/SwapPreview.tsx +++ b/src/modules/scheduling/SwapPreview.tsx @@ -13,7 +13,7 @@ interface Props { function fmtKm(value: number): string { if (value >= 10000) return (value / 10000).toFixed(1) + '万'; - return value.toLocaleString(); + return Math.round(value).toLocaleString(); } function fmtRate(rate: number): string { From 073496cd443e8e8a7dd8853e281246181a22e88b Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:38:25 +0800 Subject: [PATCH 48/79] =?UTF-8?q?fix(scheduling):=20reorder=20candidate=20?= =?UTF-8?q?metrics=20to=20=E5=8C=BA=E5=9F=9F/=E8=80=83=E6=A0=B8/=E5=BD=93?= =?UTF-8?q?=E5=89=8D/=E6=9B=BF=E6=8D=A2=E5=90=8E=E9=A2=84=E8=AE=A1,=20remo?= =?UTF-8?q?ve=20=E7=BC=BA=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/scheduling/SuggestionDetail.tsx | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index c1113e4..cf61c9f 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -150,23 +150,19 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce
-
当前
-
{fmtKm(c.totalMileage)}
+
区域
+
{c.region}
考核
{c.yearTarget ? fmtKm(c.yearTarget) : '-'}
-
缺口
-
{fmtKm(c.mileageGap)}
+
当前
+
{fmtKm(c.totalMileage)}
-
区域
-
{c.region}
-
-
-
换后
+
替换后预计
{fmtKm(c.predictedAfterSwap)}
From 4f02a54d38ec81fad463bd3c7546cc08e554c2bc Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:39:31 +0800 Subject: [PATCH 49/79] fix(scheduling): move region to header as pin badge, remove from metrics grid --- src/modules/scheduling/SuggestionDetail.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index cf61c9f..eb2785c 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -132,6 +132,7 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce
{c.plateNumber} + {c.region} {c.vehicleType} {c.targetName || '库存'}
@@ -146,13 +147,9 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce )}
- {/* Metrics — compact table style */} + {/* Metrics */}
-
-
区域
-
{c.region}
-
考核
{c.yearTarget ? fmtKm(c.yearTarget) : '-'}
From 7aa0d961ce8b3512850a2451e245dc35f394cba2 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:44:51 +0800 Subject: [PATCH 50/79] feat(scheduling): show all candidates instead of top 5, update section title --- src/modules/scheduling/SuggestionDetail.tsx | 10 +++++----- src/server/routes/scheduling/algorithm.ts | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index eb2785c..dc8e78d 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -116,11 +116,11 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce {/* Candidates */}
-
- - {isRescue ? '建议替换车辆' : '建议替换车辆'} - - {s.candidates.length} 辆可选 +
+
+ 当前区域所有可替换在库车辆 + {s.candidates.length} 辆 +
diff --git a/src/server/routes/scheduling/algorithm.ts b/src/server/routes/scheduling/algorithm.ts index d82b3e7..4caa611 100644 --- a/src/server/routes/scheduling/algorithm.ts +++ b/src/server/routes/scheduling/algorithm.ts @@ -129,7 +129,7 @@ export function generateSuggestions( // Among non-qualifiable: smallest gap first (closest to target) return a.mileageGap - b.mileageGap; }) - .slice(0, 5); +; const gap = Math.max(0, vehicle.yearTarget - vehicle.currentYearMileage); const dailyReq = vehicle.daysLeft > 0 ? Math.round(gap / vehicle.daysLeft) : 0; @@ -192,7 +192,7 @@ export function generateSuggestions( }) // Only keep candidates that can actually qualify at this customer .filter(c => c.canQualifyAfterSwap) - .slice(0, 5); +; // Skip if no candidate can reach target — swap would be pointless if (candidates.length === 0) continue; From ba6a38973d6c335a6aa4a598be3ccd852e7486ad Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:46:42 +0800 Subject: [PATCH 51/79] feat(scheduling): add batch filter and sort controls for candidate list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Batch dropdown filter (全部批次 / per target name) - Sort by 替换后预计 (asc/desc toggle) - Sort by 当前里程 (asc/desc toggle) - Active sort button highlighted in blue - Display count shows filtered/total (e.g. "3/12 辆") Co-Authored-By: Claude Opus 4.6 (1M context) --- src/modules/scheduling/SuggestionDetail.tsx | 78 ++++++++++++++++++--- 1 file changed, 70 insertions(+), 8 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index dc8e78d..e745ffc 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -1,12 +1,15 @@ -import { useState } from 'react'; +import { useState, useMemo } from 'react'; import { - X, MapPin, AlertTriangle, CheckCircle, ArrowDown, ArrowUp, ArrowRight, + X, MapPin, AlertTriangle, CheckCircle, ArrowDown, ArrowUp, ArrowRight, ArrowUpDown, } from 'lucide-react'; import { motion } from 'motion/react'; import type { SchedulingSuggestion, CandidateVehicle } from './types'; import Blur from '../../components/Blur'; import SwapPreview from './SwapPreview'; +type SortKey = 'predicted' | 'current'; +type SortDir = 'asc' | 'desc'; + interface Props { suggestion: SchedulingSuggestion; onClose: () => void; @@ -25,10 +28,36 @@ function fmtRate(rate: number): string { export default function SuggestionDetail({ suggestion: s, onClose, onNotifySuccess }: Props) { const [previewCandidate, setPreviewCandidate] = useState(null); const [sentPlates, setSentPlates] = useState>(new Set()); + const [batchFilter, setBatchFilter] = useState(''); + const [sortKey, setSortKey] = useState('predicted'); + const [sortDir, setSortDir] = useState('desc'); const v = s.currentVehicle; const isRescue = s.type === 'rescue_hopeless'; + // Batch options from candidates + const batchOptions = useMemo(() => { + const set = new Set(); + for (const c of s.candidates) if (c.targetName) set.add(c.targetName); + return [...set].sort(); + }, [s.candidates]); + + // Filtered + sorted candidates + const displayCandidates = useMemo(() => { + let list = s.candidates; + if (batchFilter) list = list.filter(c => c.targetName === batchFilter); + return [...list].sort((a, b) => { + const va = sortKey === 'predicted' ? a.predictedAfterSwap : a.totalMileage; + const vb = sortKey === 'predicted' ? b.predictedAfterSwap : b.totalMileage; + return sortDir === 'desc' ? vb - va : va - vb; + }); + }, [s.candidates, batchFilter, sortKey, sortDir]); + + const toggleSort = (key: SortKey) => { + if (sortKey === key) { setSortDir(d => d === 'desc' ? 'asc' : 'desc'); } + else { setSortKey(key); setSortDir('desc'); } + }; + return (
-
-
- 当前区域所有可替换在库车辆 - {s.candidates.length} 辆 -
+
+ 当前区域可替换在库车辆 + {displayCandidates.length}/{s.candidates.length} 辆 +
+ + {/* Filter + Sort controls */} +
+ {/* Batch filter */} + + + {/* Sort buttons */} + +
- {s.candidates.map(c => { + {displayCandidates.map(c => { const sent = sentPlates.has(c.plateNumber); return (
From db568c1ebb096bd89366d50948f88235015b68f2 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:48:26 +0800 Subject: [PATCH 52/79] =?UTF-8?q?fix(scheduling):=20rename=20=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E6=89=B9=E6=AC=A1=E2=86=92=E5=85=A8=E9=83=A8,=20reord?= =?UTF-8?q?er=20metrics=20to=20=E5=BD=93=E5=89=8D/=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=90=8E=E9=A2=84=E8=AE=A1/=E8=80=83=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/scheduling/SuggestionDetail.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index e745ffc..a9152ad 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -158,7 +158,7 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce onChange={e => setBatchFilter(e.target.value)} className="text-[10px] px-2 py-1 rounded-lg border border-slate-200 bg-white text-slate-600 cursor-pointer outline-none" > - + {batchOptions.map(b => )} @@ -212,10 +212,6 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce {/* Metrics */}
-
-
考核
-
{c.yearTarget ? fmtKm(c.yearTarget) : '-'}
-
当前
{fmtKm(c.totalMileage)}
@@ -224,6 +220,10 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce
替换后预计
{fmtKm(c.predictedAfterSwap)}
+
+
考核
+
{c.yearTarget ? fmtKm(c.yearTarget) : '-'}
+
From dbefb900898d19874b90b9de98c5c5730943cd2f Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:49:43 +0800 Subject: [PATCH 53/79] =?UTF-8?q?feat(scheduling):=20add=20metrics=20row?= =?UTF-8?q?=20(=E5=BD=93=E5=89=8D/=E9=A2=84=E4=BC=B0=E5=B9=B4=E7=BB=88/?= =?UTF-8?q?=E8=80=83=E6=A0=B8)=20for=20current=20vehicle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/scheduling/SuggestionDetail.tsx | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index a9152ad..e6b973f 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -110,6 +110,24 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce 日均 {Math.round(v.customerAvgDaily)} km
+ + {/* Metrics row — same style as candidates */} +
+
+
+
当前
+
{fmtKm(v.currentYearMileage)}
+
+
+
预估年终
+
= 1 ? 'text-emerald-600' : 'text-rose-500'}`}>{fmtKm(v.currentYearMileage + v.customerAvgDaily * v.daysLeft)}
+
+
+
考核
+
{fmtKm(v.yearTarget)}
+
+
+
{/* Reason — structured lines */} From f6f872d2ceaf9a92f052c7fcf2882e6a9d597622 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:50:42 +0800 Subject: [PATCH 54/79] fix(scheduling): remove duplicate mileage text, keep only metrics row --- src/modules/scheduling/SuggestionDetail.tsx | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index e6b973f..c013092 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -97,21 +97,15 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce
-
-
- {v.targetName} - | - 已跑 {fmtKm(v.currentYearMileage)} - 考核 {fmtKm(v.yearTarget)} km - {v.region} -
-
- 客户 {v.customer || '-'} - 日均 {Math.round(v.customerAvgDaily)} km -
+
+ {v.targetName} + {v.region} + | + 客户 {v.customer || '-'} + 日均 {Math.round(v.customerAvgDaily)} km
- {/* Metrics row — same style as candidates */} + {/* Metrics row */}
From caff78c5f3bffed77478c59ef2eb224fa681612d Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:51:37 +0800 Subject: [PATCH 55/79] =?UTF-8?q?fix(scheduling):=20rename=20=E9=A2=84?= =?UTF-8?q?=E4=BC=B0=E5=B9=B4=E7=BB=88=20to=20=E8=80=83=E6=A0=B8=E6=9C=9F?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E9=A2=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/scheduling/SuggestionDetail.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index c013092..41aa337 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -113,7 +113,7 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce
{fmtKm(v.currentYearMileage)}
-
预估年终
+
考核期结束预估
= 1 ? 'text-emerald-600' : 'text-rose-500'}`}>{fmtKm(v.currentYearMileage + v.customerAvgDaily * v.daysLeft)}
From 9012a955b8f19f3e99a3e6caaf7f0892afa0aebe Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:52:50 +0800 Subject: [PATCH 56/79] =?UTF-8?q?feat(scheduling):=20add=20=E5=89=A9?= =?UTF-8?q?=E4=BD=99xx=E5=A4=A9=20to=20candidate=20header?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/scheduling/SuggestionDetail.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index 41aa337..172167b 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -209,6 +209,7 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce {c.region} {c.vehicleType} {c.targetName || '库存'} + 剩余{v.daysLeft}天
{c.canQualifyAfterSwap ? ( From a52a77f3a289628259232bf0033c741036e29678 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 22:54:01 +0800 Subject: [PATCH 57/79] feat(scheduling): batch filter as multi-select pills instead of dropdown --- src/modules/scheduling/SuggestionDetail.tsx | 42 +++++++++++++++------ 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index 172167b..19b17e3 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -28,7 +28,7 @@ function fmtRate(rate: number): string { export default function SuggestionDetail({ suggestion: s, onClose, onNotifySuccess }: Props) { const [previewCandidate, setPreviewCandidate] = useState(null); const [sentPlates, setSentPlates] = useState>(new Set()); - const [batchFilter, setBatchFilter] = useState(''); + const [batchFilter, setBatchFilter] = useState>(new Set()); const [sortKey, setSortKey] = useState('predicted'); const [sortDir, setSortDir] = useState('desc'); @@ -45,7 +45,7 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce // Filtered + sorted candidates const displayCandidates = useMemo(() => { let list = s.candidates; - if (batchFilter) list = list.filter(c => c.targetName === batchFilter); + if (batchFilter.size > 0) list = list.filter(c => c.targetName != null && batchFilter.has(c.targetName)); return [...list].sort((a, b) => { const va = sortKey === 'predicted' ? a.predictedAfterSwap : a.totalMileage; const vb = sortKey === 'predicted' ? b.predictedAfterSwap : b.totalMileage; @@ -164,15 +164,35 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce {/* Filter + Sort controls */}
- {/* Batch filter */} - + {/* Batch multi-select pills */} +
+ + {batchOptions.map(b => { + const active = batchFilter.has(b); + return ( + + ); + })} +
{/* Sort buttons */}
{c.canQualifyAfterSwap ? ( diff --git a/src/modules/scheduling/types.ts b/src/modules/scheduling/types.ts index a90bbbd..d7a0c18 100644 --- a/src/modules/scheduling/types.ts +++ b/src/modules/scheduling/types.ts @@ -25,6 +25,7 @@ export interface CandidateVehicle { totalMileage: number; completionRate: number; yearTarget: number | null; + daysLeft: number; region: string; province: string; mileageGap: number; diff --git a/src/server/routes/scheduling/algorithm.ts b/src/server/routes/scheduling/algorithm.ts index 4caa611..5dea032 100644 --- a/src/server/routes/scheduling/algorithm.ts +++ b/src/server/routes/scheduling/algorithm.ts @@ -90,13 +90,10 @@ export function generateSuggestions( // Among those, prefer the one with the smallest gap (easiest to finish). // Exclude already-qualified (>= 100%) — no value in swapping those. for (const vehicle of hopeless) { - const customerCanAdd = vehicle.customerAvgDaily * vehicle.daysLeft; - const candidates: CandidateVehicle[] = inventoryVehicles .filter((inv) => { if (!isTypeCompatible(vehicle.vehicleType, inv.vehicleType)) return false; if (inv.region !== vehicle.region) return false; - // Exclude already fully qualified const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; if (effectiveTarget > 0 && inv.totalMileage >= effectiveTarget) return false; return true; @@ -104,7 +101,9 @@ export function generateSuggestions( .map((inv) => { const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; const mileageGap = Math.max(0, effectiveTarget - inv.totalMileage); - const predictedAfterSwap = inv.totalMileage + customerCanAdd; + // Use candidate's own daysLeft for prediction + const candidateCanAdd = vehicle.customerAvgDaily * inv.daysLeft; + const predictedAfterSwap = inv.totalMileage + candidateCanAdd; const canQualifyAfterSwap = predictedAfterSwap >= effectiveTarget; return { plateNumber: inv.plateNumber, @@ -114,6 +113,7 @@ export function generateSuggestions( totalMileage: inv.totalMileage, completionRate: inv.completionRate, yearTarget: inv.yearTarget ?? vehicle.yearTarget, + daysLeft: inv.daysLeft, region: inv.region, province: inv.province, mileageGap, @@ -133,7 +133,7 @@ export function generateSuggestions( const gap = Math.max(0, vehicle.yearTarget - vehicle.currentYearMileage); const dailyReq = vehicle.daysLeft > 0 ? Math.round(gap / vehicle.daysLeft) : 0; - const predictedTotal = Math.round(vehicle.currentYearMileage + customerCanAdd); + const predictedTotal = Math.round(vehicle.currentYearMileage + vehicle.customerAvgDaily * vehicle.daysLeft); const reason = `客户日均 ${Math.round(vehicle.customerAvgDaily)} km | 考核周期剩余 ${vehicle.daysLeft} 天 · 日均需 ${fmtKmSimple(dailyReq)} km\n!!预估无法达标，需替换`; suggestions.push({ @@ -165,8 +165,9 @@ export function generateSuggestions( .map((inv) => { const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; const mileageGap = Math.max(0, effectiveTarget - inv.totalMileage); - const predictedAfterSwap = - inv.totalMileage + vehicle.customerAvgDaily * vehicle.daysLeft; + // Use candidate's own daysLeft for prediction + const candidateCanAdd = vehicle.customerAvgDaily * inv.daysLeft; + const predictedAfterSwap = inv.totalMileage + candidateCanAdd; const canQualifyAfterSwap = predictedAfterSwap >= effectiveTarget; return { plateNumber: inv.plateNumber, @@ -176,6 +177,7 @@ export function generateSuggestions( totalMileage: inv.totalMileage, completionRate: inv.completionRate, yearTarget: inv.yearTarget ?? vehicle.yearTarget, + daysLeft: inv.daysLeft, region: inv.region, province: inv.province, mileageGap, diff --git a/src/server/routes/scheduling/suggestions.ts b/src/server/routes/scheduling/suggestions.ts index d0b3924..5c9f892 100644 --- a/src/server/routes/scheduling/suggestions.ts +++ b/src/server/routes/scheduling/suggestions.ts @@ -250,12 +250,21 @@ app.get('/', async (c) => { // Cross-reference with assessment data const assessment = assessmentByPlate.get(plate); + // Compute this vehicle's own daysLeft from its assessment end date + let invDaysLeft = 0; + if (assessment?.current_year_assessment_end_date) { + const endDate = new Date(assessment.current_year_assessment_end_date); + invDaysLeft = Math.max(1, Math.ceil((endDate.getTime() - now.getTime()) / 86400000)); + } else { + invDaysLeft = Math.max(1, Math.ceil((yearEnd.getTime() - now.getTime()) / 86400000)); + } inventoryVehicles.push({ plateNumber: plate, vehicleType, region, province, totalMileage: assessment ? Number(assessment.vehicle_total_mileage) || 0 : 0, + daysLeft: invDaysLeft, targetId: assessment ? (assessment.target_id as number) : null, targetName: assessment ? (targetMap.get(assessment.target_id)?.targetName ?? null) : null, yearTarget: assessment ? Number(assessment.current_year_mileage_task) || null : null, diff --git a/src/server/routes/scheduling/types.ts b/src/server/routes/scheduling/types.ts index 5cf7b43..65a998b 100644 --- a/src/server/routes/scheduling/types.ts +++ b/src/server/routes/scheduling/types.ts @@ -25,6 +25,7 @@ export interface CandidateVehicle { totalMileage: number; completionRate: number; yearTarget: number | null; + daysLeft: number; region: string; province: string; mileageGap: number; @@ -97,6 +98,7 @@ export interface InventoryVehicle { region: string; province: string; totalMileage: number; + daysLeft: number; targetId: number | null; targetName: string | null; yearTarget: number | null; From c3de4ebaf52b3605591334897ca94c75db6e63af Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 23:00:22 +0800 Subject: [PATCH 59/79] refactor(scheduling): redesign current vehicle card to match candidate card style --- src/modules/scheduling/SuggestionDetail.tsx | 68 +++++++++++---------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index 96f6ff3..91c6144 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -85,40 +85,42 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce {/* Body */}
- {/* Current Vehicle */} -
-
-
- {v.plateNumber} - {v.vehicleType} + {/* Current Vehicle — same format as candidate cards */} +
+
+ {/* Header — same style as candidate header */} +
+
+ {v.plateNumber} + {v.region} + {v.vehicleType} + {v.targetName} + 剩余{v.daysLeft}天 +
+ = 1 ? 'text-emerald-600' : 'text-rose-500'}`}> + {fmtRate(v.completionRate)} +
- = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-600'}`}> - {fmtRate(v.completionRate)} - -
- -
- {v.targetName} - {v.region} - | - 客户 {v.customer || '-'} - 日均 {Math.round(v.customerAvgDaily)} km -
- - {/* Metrics row */} -
-
-
-
当前
-
{fmtKm(v.currentYearMileage)}
-
-
-
考核期结束预估
-
= 1 ? 'text-emerald-600' : 'text-rose-500'}`}>{fmtKm(v.currentYearMileage + v.customerAvgDaily * v.daysLeft)}
-
-
-
考核
-
{fmtKm(v.yearTarget)}
+ {/* Customer info */} +
+ 客户 {v.customer || '-'} + 日均 {Math.round(v.customerAvgDaily)} km +
+ {/* Metrics */} +
+
+
+
当前
+
{fmtKm(v.currentYearMileage)}
+
+
+
考核期结束预估
+
= 1 ? 'text-emerald-600' : 'text-rose-500'}`}>{fmtKm(v.currentYearMileage + v.customerAvgDaily * v.daysLeft)}
+
+
+
考核
+
{fmtKm(v.yearTarget)}
+
From 8664317852025233f255f98380a6dbaa61caf0ce Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 23:02:03 +0800 Subject: [PATCH 60/79] feat(scheduling): show department and manager in list items and detail card --- src/modules/scheduling/SuggestionDetail.tsx | 7 +++++-- src/modules/scheduling/SuggestionList.tsx | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index 91c6144..f4b544b 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -101,8 +101,11 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce {fmtRate(v.completionRate)}
- {/* Customer info */} -
+ {/* Customer + dept/manager info */} +
+ {v.department && {v.department}} + {v.manager && {v.manager}} + {(v.department || v.manager) && |} 客户 {v.customer || '-'} 日均 {Math.round(v.customerAvgDaily)} km
diff --git a/src/modules/scheduling/SuggestionList.tsx b/src/modules/scheduling/SuggestionList.tsx index 95a384b..620e943 100644 --- a/src/modules/scheduling/SuggestionList.tsx +++ b/src/modules/scheduling/SuggestionList.tsx @@ -56,8 +56,10 @@ export default function SuggestionList({ suggestions, onSelect }: Props) { {v.region}
- {v.customer || '-'} - 日均 {Math.round(v.customerAvgDaily)} km + {v.department && {v.department}} + {v.manager && {v.manager}} + {v.customer || '-'} + 日均 {Math.round(v.customerAvgDaily)} 完成 = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-500'}`}>{fmtRate(v.completionRate)}
From 9f781c766a6fdc62e4342d6f7d8330fb6cab6c1b Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 23:03:59 +0800 Subject: [PATCH 61/79] =?UTF-8?q?feat(scheduling):=20rename=20=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E2=86=92=E5=B9=B4=E5=BA=A6=E8=BE=BE=E6=A0=87,=20add?= =?UTF-8?q?=20sort=20by=20=E5=AE=A2=E6=88=B7=E6=97=A5=E5=9D=87/=E5=B9=B4?= =?UTF-8?q?=E5=BA=A6=E8=BE=BE=E6=A0=87=20to=20list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/scheduling/SuggestionList.tsx | 139 +++++++++++++++------- 1 file changed, 93 insertions(+), 46 deletions(-) diff --git a/src/modules/scheduling/SuggestionList.tsx b/src/modules/scheduling/SuggestionList.tsx index 620e943..caa9ee2 100644 --- a/src/modules/scheduling/SuggestionList.tsx +++ b/src/modules/scheduling/SuggestionList.tsx @@ -1,4 +1,5 @@ -import { ArrowRightLeft, ChevronRight } from 'lucide-react'; +import { useState, useMemo } from 'react'; +import { ArrowRightLeft, ChevronRight, ArrowDown, ArrowUp, ArrowUpDown } from 'lucide-react'; import { motion } from 'motion/react'; import type { SchedulingSuggestion } from './types'; import Blur from '../../components/Blur'; @@ -12,7 +13,27 @@ function fmtRate(rate: number): string { return (rate * 100).toFixed(1) + '%'; } +type SortKey = 'default' | 'avgDaily' | 'completion'; +type SortDir = 'asc' | 'desc'; + export default function SuggestionList({ suggestions, onSelect }: Props) { + const [sortKey, setSortKey] = useState('default'); + const [sortDir, setSortDir] = useState('desc'); + + const toggleSort = (key: SortKey) => { + if (sortKey === key) { setSortDir(d => d === 'desc' ? 'asc' : 'desc'); } + else { setSortKey(key); setSortDir('desc'); } + }; + + const sorted = useMemo(() => { + if (sortKey === 'default') return suggestions; + return [...suggestions].sort((a, b) => { + const va = sortKey === 'avgDaily' ? a.currentVehicle.customerAvgDaily : a.currentVehicle.completionRate; + const vb = sortKey === 'avgDaily' ? b.currentVehicle.customerAvgDaily : b.currentVehicle.completionRate; + return sortDir === 'desc' ? vb - va : va - vb; + }); + }, [suggestions, sortKey, sortDir]); + if (suggestions.length === 0) { return (
@@ -23,55 +44,81 @@ export default function SuggestionList({ suggestions, onSelect }: Props) { } return ( -
- {suggestions.map((s, idx) => { - const isRescue = s.type === 'rescue_hopeless'; - const v = s.currentVehicle; +
+ {/* Sort controls */} +
+ + +
- return ( - onSelect(s)} - > - {/* Color bar */} -
+
+ {sorted.map((s, idx) => { + const isRescue = s.type === 'rescue_hopeless'; + const v = s.currentVehicle; - {/* Info */} -
-
- - {v.plateNumber} - - - {isRescue ? '里程低·换走' : '里程高·换下'} - - {v.vehicleType} - · - {v.region} + return ( + onSelect(s)} + > + {/* Color bar */} +
+ + {/* Info */} +
+
+ + {v.plateNumber} + + + {isRescue ? '里程低·换走' : '里程高·换下'} + + {v.vehicleType} + · + {v.region} +
+
+ {v.department && {v.department}} + {v.manager && {v.manager}} + {v.customer || '-'} + 日均 {Math.round(v.customerAvgDaily)} + 年度达标 = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-500'}`}>{fmtRate(v.completionRate)} +
-
- {v.department && {v.department}} - {v.manager && {v.manager}} - {v.customer || '-'} - 日均 {Math.round(v.customerAvgDaily)} - 完成 = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-500'}`}>{fmtRate(v.completionRate)} -
-
- {/* Right */} -
- 干预 - -
- - ); - })} + {/* Right */} +
+ 干预 + +
+ + ); + })} +
); } From 2f11afc25fd46c1afd730c3255b180d6ad249fb9 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 23:05:40 +0800 Subject: [PATCH 62/79] =?UTF-8?q?fix(scheduling):=20shorten=20department?= =?UTF-8?q?=20name=20by=20removing=20=E4=B8=9A=E5=8A=A1=20prefix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/scheduling/SuggestionList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/scheduling/SuggestionList.tsx b/src/modules/scheduling/SuggestionList.tsx index caa9ee2..7760437 100644 --- a/src/modules/scheduling/SuggestionList.tsx +++ b/src/modules/scheduling/SuggestionList.tsx @@ -102,7 +102,7 @@ export default function SuggestionList({ suggestions, onSelect }: Props) { {v.region}
- {v.department && {v.department}} + {v.department && {v.department.replace('业务', '')}} {v.manager && {v.manager}} {v.customer || '-'} 日均 {Math.round(v.customerAvgDaily)} From ceed067807ce8aecf5fad44847ba43c2c09d40b8 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 23:06:49 +0800 Subject: [PATCH 63/79] =?UTF-8?q?refactor(scheduling):=20re-layout=20list?= =?UTF-8?q?=20items=20=E2=80=94=20left=20group=20(dept/manager/customer)?= =?UTF-8?q?=20+=20right=20group=20(daily/rate)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/scheduling/SuggestionList.tsx | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/modules/scheduling/SuggestionList.tsx b/src/modules/scheduling/SuggestionList.tsx index 7760437..2a70177 100644 --- a/src/modules/scheduling/SuggestionList.tsx +++ b/src/modules/scheduling/SuggestionList.tsx @@ -101,17 +101,21 @@ export default function SuggestionList({ suggestions, onSelect }: Props) { · {v.region}
-
- {v.department && {v.department.replace('业务', '')}} - {v.manager && {v.manager}} - {v.customer || '-'} - 日均 {Math.round(v.customerAvgDaily)} - 年度达标 = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-500'}`}>{fmtRate(v.completionRate)} +
+
+ {v.department && {v.department.replace('业务', '')}} + {v.manager && {v.manager}} + {v.customer || '-'} +
+
+ 日均 {Math.round(v.customerAvgDaily)} + = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-500'}`}>{fmtRate(v.completionRate)} +
{/* Right */} -
+
干预
From dfc32c44851903bcd8690abc7da375d3fa6ae6d5 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 23:07:49 +0800 Subject: [PATCH 64/79] =?UTF-8?q?fix(scheduling):=20rename=20=E6=97=A5?= =?UTF-8?q?=E5=9D=87=E2=86=92=E5=AE=A2=E6=88=B7=E6=97=A5=E5=9D=87=20to=20a?= =?UTF-8?q?void=20ambiguity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/scheduling/SuggestionList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/scheduling/SuggestionList.tsx b/src/modules/scheduling/SuggestionList.tsx index 2a70177..31fae88 100644 --- a/src/modules/scheduling/SuggestionList.tsx +++ b/src/modules/scheduling/SuggestionList.tsx @@ -108,7 +108,7 @@ export default function SuggestionList({ suggestions, onSelect }: Props) { {v.customer || '-'}
- 日均 {Math.round(v.customerAvgDaily)} + 客户日均 {Math.round(v.customerAvgDaily)} = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-500'}`}>{fmtRate(v.completionRate)}
From 335282a2c33156ca8f8a58d5f4ecaf86d7dc953c Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 23:24:25 +0800 Subject: [PATCH 65/79] =?UTF-8?q?feat(scheduling):=20add=20km=20unit=20to?= =?UTF-8?q?=20=E5=AE=A2=E6=88=B7=E6=97=A5=E5=9D=87;=20move=20=E5=B9=B4?= =?UTF-8?q?=E5=BA=A6=E8=80=83=E6=A0=B8=20to=20top-right=20of=20list=20item?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- src/modules/scheduling/SuggestionList.tsx | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/modules/scheduling/SuggestionList.tsx b/src/modules/scheduling/SuggestionList.tsx index 31fae88..2871236 100644 --- a/src/modules/scheduling/SuggestionList.tsx +++ b/src/modules/scheduling/SuggestionList.tsx @@ -88,18 +88,19 @@ export default function SuggestionList({ suggestions, onSelect }: Props) { {/* Info */}
-
- - {v.plateNumber} +
+
+ + {v.plateNumber} + + {v.vehicleType} + · + {v.region} +
+ + 年度考核 + = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-500'}`}>{fmtRate(v.completionRate)} - - {isRescue ? '里程低·换走' : '里程高·换下'} - - {v.vehicleType} - · - {v.region}
@@ -108,8 +109,7 @@ export default function SuggestionList({ suggestions, onSelect }: Props) { {v.customer || '-'}
- 客户日均 {Math.round(v.customerAvgDaily)} - = 1 ? 'text-emerald-600' : v.completionRate >= 0.5 ? 'text-amber-600' : 'text-rose-500'}`}>{fmtRate(v.completionRate)} + 客户日均 {Math.round(v.customerAvgDaily)} km
From 31716c65479630ec872f601c75b5c03e4964c6a5 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 23:36:38 +0800 Subject: [PATCH 66/79] refactor(scheduling): shared types, structured reason, cross-region candidates - Extract shared types to src/shared/scheduling/types.ts (client/server both re-export) - Convert SchedulingSuggestion.reason from string to structured { lines, conclusion } - Remove hard region filter; algorithm keeps cross-region candidates with isSameRegion flag - SuggestionDetail renders same-region vs cross-region sections with a divider - Close detail modal when selected suggestion no longer exists in data - Unify estimatedGain definition (strict canQualifyAfterSwap) between algorithm and API layers Co-Authored-By: Claude Opus 4.7 --- src/modules/scheduling/SchedulingModule.tsx | 7 + src/modules/scheduling/SuggestionDetail.tsx | 192 ++++++++++---------- src/modules/scheduling/types.ts | 73 ++------ src/server/routes/scheduling/algorithm.ts | 54 ++++-- src/server/routes/scheduling/types.ts | 81 ++------- src/shared/scheduling/types.ts | 83 +++++++++ 6 files changed, 250 insertions(+), 240 deletions(-) create mode 100644 src/shared/scheduling/types.ts diff --git a/src/modules/scheduling/SchedulingModule.tsx b/src/modules/scheduling/SchedulingModule.tsx index 51bede3..8763814 100644 --- a/src/modules/scheduling/SchedulingModule.tsx +++ b/src/modules/scheduling/SchedulingModule.tsx @@ -161,6 +161,13 @@ export default function SchedulingModule() { useEffect(() => { loadData(); }, [loadData]); const handleNotifySuccess = useCallback(() => { loadData(); }, [loadData]); + // Close detail modal if selected suggestion is filtered out or no longer exists + useEffect(() => { + if (!selectedSuggestion || !data) return; + const stillExists = data.suggestions.some(s => s.id === selectedSuggestion.id); + if (!stillExists) setSelectedSuggestion(null); + }, [data, selectedSuggestion]); + const filterOptions = useMemo(() => { if (!data) return { regions: [], vehicleTypes: [], customers: [], departments: [], managers: [] }; const r = new Set(), t = new Set(), c = new Set(), d = new Set(), m = new Set(); diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index f4b544b..2033a5f 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -42,22 +42,87 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce return [...set].sort(); }, [s.candidates]); - // Filtered + sorted candidates - const displayCandidates = useMemo(() => { + // Filtered + sorted candidates, grouped by region + const { sameRegion, crossRegion } = useMemo(() => { let list = s.candidates; if (batchFilter.size > 0) list = list.filter(c => c.targetName != null && batchFilter.has(c.targetName)); - return [...list].sort((a, b) => { + const sorted = [...list].sort((a, b) => { const va = sortKey === 'predicted' ? a.predictedAfterSwap : a.totalMileage; const vb = sortKey === 'predicted' ? b.predictedAfterSwap : b.totalMileage; return sortDir === 'desc' ? vb - va : va - vb; }); + return { + sameRegion: sorted.filter(c => c.isSameRegion), + crossRegion: sorted.filter(c => !c.isSameRegion), + }; }, [s.candidates, batchFilter, sortKey, sortDir]); + const displayCount = sameRegion.length + crossRegion.length; + const toggleSort = (key: SortKey) => { if (sortKey === key) { setSortDir(d => d === 'desc' ? 'asc' : 'desc'); } else { setSortKey(key); setSortDir('desc'); } }; + const renderCandidate = (c: CandidateVehicle) => { + const sent = sentPlates.has(c.plateNumber); + return ( +
+
+
+ {c.plateNumber} + + {c.region}{!c.isSameRegion && ' · 跨区'} + + {c.vehicleType} + {c.targetName || '库存'} + 剩余{c.daysLeft}天 +
+ {c.canQualifyAfterSwap ? ( + + 可达标 + + ) : ( + + 需关注 + + )} +
+ +
+
+
+
当前
+
{fmtKm(c.totalMileage)}
+
+
+
替换后预计
+
{fmtKm(c.predictedAfterSwap)}
+
+
+
考核
+
{c.yearTarget ? fmtKm(c.yearTarget) : '-'}
+
+
+
+ +
+ +
+
+ ); + }; + return (
{/* Reason — structured lines */} -
- {s.reason.split('\n').map((line, i) => { - const isConclusion = line.startsWith('!!'); - const text = isConclusion ? line.slice(2) : line; - if (isConclusion) { - return ( -
- {text} -
- ); - } - // Split by | for two-column layout - if (text.includes('|')) { - const parts = text.split('|').map(p => p.trim()); - return ( -
- {parts[0]} - {parts[1]} -
- ); - } - return ( -
- - {text} +
+
+ {s.reason.lines.map((line, i) => ( +
+ {line.label} + {line.value}
- ); - })} + ))} +
+
+ {s.reason.conclusion} +
{/* Candidates */}
- 当前区域可替换在库车辆 - {displayCandidates.length}/{s.candidates.length} 辆 + 可替换在库车辆 + {displayCount}/{s.candidates.length} 辆
{/* Filter + Sort controls */} @@ -222,67 +271,28 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce
-
- {displayCandidates.map(c => { - const sent = sentPlates.has(c.plateNumber); - return ( -
- {/* Header */} -
-
- {c.plateNumber} - {c.region} - {c.vehicleType} - {c.targetName || '库存'} - 剩余{c.daysLeft}天 -
- {c.canQualifyAfterSwap ? ( - - 可达标 - - ) : ( - - 需关注 - - )} -
+ {sameRegion.length > 0 && ( +
+ {sameRegion.map(c => renderCandidate(c))} +
+ )} - {/* Metrics */} -
-
-
-
当前
-
{fmtKm(c.totalMileage)}
-
-
-
替换后预计
-
{fmtKm(c.predictedAfterSwap)}
-
-
-
考核
-
{c.yearTarget ? fmtKm(c.yearTarget) : '-'}
-
-
-
+ {crossRegion.length > 0 && ( + <> +
+
+ 跨区候选 · {crossRegion.length} 辆 +
+
+
+ {crossRegion.map(c => renderCandidate(c))} +
+ + )} - {/* Action */} -
- -
-
- ); - })} -
+ {displayCount === 0 && ( +
当前筛选条件下无可替换车辆
+ )}
diff --git a/src/modules/scheduling/types.ts b/src/modules/scheduling/types.ts index d7a0c18..20b8d35 100644 --- a/src/modules/scheduling/types.ts +++ b/src/modules/scheduling/types.ts @@ -1,62 +1,11 @@ -export interface SchedulingVehicleInfo { - plateNumber: string; - targetId: number; - targetName: string; - vehicleType: string; - totalMileage: number; - currentYearMileage: number; - completionRate: number; - yearTarget: number; - region: string; - province: string; - customer: string | null; - department: string | null; - manager: string | null; - customerAvgDaily: number; - predictedYearEnd: number; - daysLeft: number; -} - -export interface CandidateVehicle { - plateNumber: string; - targetId: number | null; - targetName: string | null; - vehicleType: string; - totalMileage: number; - completionRate: number; - yearTarget: number | null; - daysLeft: number; - region: string; - province: string; - mileageGap: number; - predictedAfterSwap: number; - canQualifyAfterSwap: boolean; -} - -export interface SchedulingSuggestion { - id: string; - priority: 'high' | 'medium'; - type: 'replace_qualified' | 'rescue_hopeless'; - currentVehicle: SchedulingVehicleInfo; - candidates: CandidateVehicle[]; - reason: string; -} - -export interface SchedulingSummary { - qualifiedCount: number; - hopelessCount: number; - suggestionCount: number; - estimatedGain: number; -} - -export interface SchedulingTargetOption { - id: number; - name: string; - vehicleCount: number; -} - -export interface SchedulingResponse { - summary: SchedulingSummary; - suggestions: SchedulingSuggestion[]; - targets: SchedulingTargetOption[]; -} +export type { + SchedulingVehicleInfo, + CandidateVehicle, + SchedulingSuggestion, + SchedulingSummary, + SchedulingTargetOption, + SchedulingResponse, + NotifyRequest, + ReasonLine, + ReasonBlock, +} from '../../shared/scheduling/types'; diff --git a/src/server/routes/scheduling/algorithm.ts b/src/server/routes/scheduling/algorithm.ts index 5dea032..c70c027 100644 --- a/src/server/routes/scheduling/algorithm.ts +++ b/src/server/routes/scheduling/algorithm.ts @@ -1,6 +1,7 @@ import type { EnrichedVehicle, InventoryVehicle, SchedulingSuggestion, CandidateVehicle, VehicleClassification, SchedulingSummary, + ReasonBlock, } from './types.js'; function fmtKmSimple(v: number): string { @@ -93,7 +94,6 @@ export function generateSuggestions( const candidates: CandidateVehicle[] = inventoryVehicles .filter((inv) => { if (!isTypeCompatible(vehicle.vehicleType, inv.vehicleType)) return false; - if (inv.region !== vehicle.region) return false; const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; if (effectiveTarget > 0 && inv.totalMileage >= effectiveTarget) return false; return true; @@ -101,7 +101,6 @@ export function generateSuggestions( .map((inv) => { const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; const mileageGap = Math.max(0, effectiveTarget - inv.totalMileage); - // Use candidate's own daysLeft for prediction const candidateCanAdd = vehicle.customerAvgDaily * inv.daysLeft; const predictedAfterSwap = inv.totalMileage + candidateCanAdd; const canQualifyAfterSwap = predictedAfterSwap >= effectiveTarget; @@ -119,22 +118,30 @@ export function generateSuggestions( mileageGap, predictedAfterSwap, canQualifyAfterSwap, + isSameRegion: inv.region === vehicle.region, }; }) .sort((a, b) => { - // 1. Prefer "can qualify after swap" first + // 1. Same-region first (business rule: prefer same-region swaps) + if (a.isSameRegion !== b.isSameRegion) return a.isSameRegion ? -1 : 1; + // 2. Can-qualify next if (a.canQualifyAfterSwap !== b.canQualifyAfterSwap) return a.canQualifyAfterSwap ? -1 : 1; - // 2. Among qualifiable: smallest gap first (easiest to finish) - // Among non-qualifiable: smallest gap first (closest to target) + // 3. Smallest gap (closest to target) return a.mileageGap - b.mileageGap; }) ; const gap = Math.max(0, vehicle.yearTarget - vehicle.currentYearMileage); const dailyReq = vehicle.daysLeft > 0 ? Math.round(gap / vehicle.daysLeft) : 0; - const predictedTotal = Math.round(vehicle.currentYearMileage + vehicle.customerAvgDaily * vehicle.daysLeft); - const reason = `客户日均 ${Math.round(vehicle.customerAvgDaily)} km | 考核周期剩余 ${vehicle.daysLeft} 天 · 日均需 ${fmtKmSimple(dailyReq)} km\n!!预估无法达标，需替换`; + const reason: ReasonBlock = { + lines: [ + { label: '客户日均', value: `${Math.round(vehicle.customerAvgDaily)} km` }, + { label: '考核剩余', value: `${vehicle.daysLeft} 天` }, + { label: '日均需', value: `${fmtKmSimple(dailyReq)} km` }, + ], + conclusion: '预估无法达标，需替换', + }; suggestions.push({ id: `hopeless-${vehicle.plateNumber}`, @@ -156,8 +163,6 @@ export function generateSuggestions( const candidates: CandidateVehicle[] = inventoryVehicles .filter((inv) => { if (!isTypeCompatible(vehicle.vehicleType, inv.vehicleType)) return false; - if (inv.region !== vehicle.region) return false; - // Must still need mileage — exclude already-qualified inventory const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; if (effectiveTarget > 0 && inv.totalMileage >= effectiveTarget) return false; return true; @@ -165,7 +170,6 @@ export function generateSuggestions( .map((inv) => { const effectiveTarget = inv.yearTarget ?? vehicle.yearTarget; const mileageGap = Math.max(0, effectiveTarget - inv.totalMileage); - // Use candidate's own daysLeft for prediction const candidateCanAdd = vehicle.customerAvgDaily * inv.daysLeft; const predictedAfterSwap = inv.totalMileage + candidateCanAdd; const canQualifyAfterSwap = predictedAfterSwap >= effectiveTarget; @@ -183,17 +187,18 @@ export function generateSuggestions( mileageGap, predictedAfterSwap, canQualifyAfterSwap, + isSameRegion: inv.region === vehicle.region, }; }) + // Only keep candidates that can actually qualify at this customer — + // swapping in a car that still can't reach target wastes the high-mileage customer + .filter(c => c.canQualifyAfterSwap) .sort((a, b) => { - // 1. canQualifyAfterSwap first - if (a.canQualifyAfterSwap !== b.canQualifyAfterSwap) - return a.canQualifyAfterSwap ? -1 : 1; - // 2. Among qualifiable: biggest gap first (most value from the swap) + // 1. Same-region first + if (a.isSameRegion !== b.isSameRegion) return a.isSameRegion ? -1 : 1; + // 2. Biggest gap first (most value from the swap) return b.mileageGap - a.mileageGap; }) - // Only keep candidates that can actually qualify at this customer - .filter(c => c.canQualifyAfterSwap) ; // Skip if no candidate can reach target — swap would be pointless @@ -201,7 +206,15 @@ export function generateSuggestions( const yearRate = vehicle.yearTarget > 0 ? Math.round((vehicle.currentYearMileage / vehicle.yearTarget) * 100) : 0; const canAddKm = vehicle.customerAvgDaily * vehicle.daysLeft; - const reason = `客户日均 ${Math.round(vehicle.customerAvgDaily)} km\n已完成考核（完成率 ${yearRate}%）\n考核周期剩余 ${vehicle.daysLeft} 天，可为新车贡献约 ${fmtKmSimple(Math.round(canAddKm))} km\n!!已达标，建议换上未达标车辆`; + const reason: ReasonBlock = { + lines: [ + { label: '客户日均', value: `${Math.round(vehicle.customerAvgDaily)} km` }, + { label: '年度完成率', value: `${yearRate}%` }, + { label: '考核剩余', value: `${vehicle.daysLeft} 天` }, + { label: '可为新车贡献', value: `约 ${fmtKmSimple(Math.round(canAddKm))} km` }, + ], + conclusion: '已达标，建议换上未达标车辆', + }; suggestions.push({ id: `qualified-${vehicle.plateNumber}`, @@ -222,10 +235,11 @@ export function generateSuggestions( return a.priority === 'high' ? -1 : 1; }); - // estimatedGain: count suggestions where at least one candidate canQualifyAfterSwap, - // plus rescue_hopeless suggestions (each rescued car can potentially qualify at a new customer) + // estimatedGain uses strict definition: count suggestions that have at least + // one candidate able to qualify after swap. The API layer recomputes this + // post permission-filtering, so keep both sides consistent. const estimatedGain = filteredSuggestions.filter((s) => - s.candidates.some((c) => c.canQualifyAfterSwap) || s.type === 'rescue_hopeless', + s.candidates.some((c) => c.canQualifyAfterSwap), ).length; const summary: SchedulingSummary = { diff --git a/src/server/routes/scheduling/types.ts b/src/server/routes/scheduling/types.ts index 65a998b..b817f5a 100644 --- a/src/server/routes/scheduling/types.ts +++ b/src/server/routes/scheduling/types.ts @@ -1,71 +1,18 @@ -export interface SchedulingVehicleInfo { - plateNumber: string; - targetId: number; - targetName: string; - vehicleType: string; - totalMileage: number; - currentYearMileage: number; - completionRate: number; // 本年完成率 currentYearMileage / yearTarget - yearTarget: number; - region: string; - province: string; - customer: string | null; - department: string | null; - manager: string | null; - customerAvgDaily: number; - predictedYearEnd: number; - daysLeft: number; -} +export type { + SchedulingVehicleInfo, + CandidateVehicle, + SchedulingSuggestion, + SchedulingSummary, + SchedulingTargetOption, + SchedulingResponse, + NotifyRequest, + ReasonLine, + ReasonBlock, +} from '../../../shared/scheduling/types.js'; -export interface CandidateVehicle { - plateNumber: string; - targetId: number | null; - targetName: string | null; - vehicleType: string; - totalMileage: number; - completionRate: number; - yearTarget: number | null; - daysLeft: number; - region: string; - province: string; - mileageGap: number; - predictedAfterSwap: number; - canQualifyAfterSwap: boolean; -} - -export interface SchedulingSuggestion { - id: string; - priority: 'high' | 'medium'; - type: 'replace_qualified' | 'rescue_hopeless'; - currentVehicle: SchedulingVehicleInfo; - candidates: CandidateVehicle[]; - reason: string; -} - -export interface SchedulingSummary { - qualifiedCount: number; - hopelessCount: number; - suggestionCount: number; - estimatedGain: number; -} - -export interface SchedulingTargetOption { - id: number; - name: string; - vehicleCount: number; -} - -export interface SchedulingResponse { - summary: SchedulingSummary; - suggestions: SchedulingSuggestion[]; - targets: SchedulingTargetOption[]; -} - -export interface NotifyRequest { - suggestionId: string; - currentPlate: string; - candidatePlate: string; -} +// --------------------------------------------------------------------------- +// Server-only types +// --------------------------------------------------------------------------- export type VehicleClassification = 'qualified' | 'hopeless' | 'normal'; diff --git a/src/shared/scheduling/types.ts b/src/shared/scheduling/types.ts new file mode 100644 index 0000000..676fa99 --- /dev/null +++ b/src/shared/scheduling/types.ts @@ -0,0 +1,83 @@ +// Shared scheduling types — used by both client (modules/scheduling) and server +// (server/routes/scheduling). Keep server-only types (EnrichedVehicle etc.) in +// server/routes/scheduling/types.ts. + +export interface SchedulingVehicleInfo { + plateNumber: string; + targetId: number; + targetName: string; + vehicleType: string; + totalMileage: number; + currentYearMileage: number; + completionRate: number; + yearTarget: number; + region: string; + province: string; + customer: string | null; + department: string | null; + manager: string | null; + customerAvgDaily: number; + predictedYearEnd: number; + daysLeft: number; +} + +export interface CandidateVehicle { + plateNumber: string; + targetId: number | null; + targetName: string | null; + vehicleType: string; + totalMileage: number; + completionRate: number; + yearTarget: number | null; + daysLeft: number; + region: string; + province: string; + mileageGap: number; + predictedAfterSwap: number; + canQualifyAfterSwap: boolean; + isSameRegion: boolean; +} + +export interface ReasonLine { + label: string; + value: string; +} + +export interface ReasonBlock { + lines: ReasonLine[]; + conclusion: string; +} + +export interface SchedulingSuggestion { + id: string; + priority: 'high' | 'medium'; + type: 'replace_qualified' | 'rescue_hopeless'; + currentVehicle: SchedulingVehicleInfo; + candidates: CandidateVehicle[]; + reason: ReasonBlock; +} + +export interface SchedulingSummary { + qualifiedCount: number; + hopelessCount: number; + suggestionCount: number; + estimatedGain: number; +} + +export interface SchedulingTargetOption { + id: number; + name: string; + vehicleCount: number; +} + +export interface SchedulingResponse { + summary: SchedulingSummary; + suggestions: SchedulingSuggestion[]; + targets: SchedulingTargetOption[]; +} + +export interface NotifyRequest { + suggestionId: string; + currentPlate: string; + candidatePlate: string; +} From 3ef0d4edfacdae1e241255e565e3057e509060c1 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 23:43:21 +0800 Subject: [PATCH 67/79] feat(scheduling): persist notifications, batch notify flow, dedup protection - Add tab_scheduling_notifications table with bootstrap via ensureSchedulingTables() - Notify endpoint rewritten: dedup by (suggestion_id, candidate_plate), history list, PATCH /:id for execute/cancel lifecycle - Batch notify endpoint returns success/skipped/failed counts - Suggestions response now carries notificationId + notificationStatus per candidate (joined from active-notification map) - UI: select mode with checkboxes, floating action bar, confirmation modal listing each swap; already-notified items are dimmed and skipped - Detail view badges show sent/executed state, preventing duplicate notify Co-Authored-By: Claude Opus 4.7 --- src/modules/scheduling/SchedulingModule.tsx | 184 ++++++++++++++- src/modules/scheduling/SuggestionDetail.tsx | 5 +- src/modules/scheduling/SuggestionList.tsx | 58 ++++- src/modules/scheduling/api.ts | 52 ++++- src/modules/scheduling/types.ts | 5 + src/server/index.ts | 2 + src/server/routes/scheduling/algorithm.ts | 4 + src/server/routes/scheduling/db-schema.ts | 34 +++ src/server/routes/scheduling/notify.ts | 247 ++++++++++++++++++-- src/server/routes/scheduling/suggestions.ts | 14 ++ src/server/routes/scheduling/types.ts | 5 + src/shared/scheduling/types.ts | 37 +++ 12 files changed, 614 insertions(+), 33 deletions(-) create mode 100644 src/server/routes/scheduling/db-schema.ts diff --git a/src/modules/scheduling/SchedulingModule.tsx b/src/modules/scheduling/SchedulingModule.tsx index 8763814..8fc0d0e 100644 --- a/src/modules/scheduling/SchedulingModule.tsx +++ b/src/modules/scheduling/SchedulingModule.tsx @@ -1,10 +1,11 @@ import { useState, useEffect, useCallback, useMemo, useRef } from 'react'; -import { Filter, RotateCcw, X, Search, ChevronDown } from 'lucide-react'; +import { Filter, RotateCcw, X, Search, ChevronDown, CheckSquare, Send } from 'lucide-react'; import { motion, AnimatePresence } from 'motion/react'; -import { fetchSuggestions } from './api'; -import type { SchedulingResponse, SchedulingSuggestion } from './types'; +import { fetchSuggestions, sendNotifyBatch } from './api'; +import type { SchedulingResponse, SchedulingSuggestion, CandidateVehicle } from './types'; import SuggestionList from './SuggestionList'; import SuggestionDetail from './SuggestionDetail'; +import Blur from '../../components/Blur'; type TypeFilter = 'all' | 'qualified' | 'hopeless'; @@ -143,6 +144,13 @@ function SkeletonPage() { ); } +function pickBestCandidate(s: SchedulingSuggestion): CandidateVehicle | null { + // Prefer a candidate that can qualify and isn't already notified + const available = s.candidates.filter(c => !c.notificationStatus || c.notificationStatus === 'cancelled'); + if (available.length === 0) return null; + return available.find(c => c.canQualifyAfterSwap) ?? available[0]; +} + export default function SchedulingModule() { const [data, setData] = useState(null); const [loading, setLoading] = useState(false); @@ -152,6 +160,11 @@ export default function SchedulingModule() { const [showFilter, setShowFilter] = useState(false); const [filters, setFilters] = useState(EMPTY_FILTERS); const [tempFilters, setTempFilters] = useState(EMPTY_FILTERS); + const [selectMode, setSelectMode] = useState(false); + const [selectedIds, setSelectedIds] = useState>(new Set()); + const [showBatchConfirm, setShowBatchConfirm] = useState(false); + const [batchInFlight, setBatchInFlight] = useState(false); + const [batchResultMsg, setBatchResultMsg] = useState(null); const loadData = useCallback(async () => { setLoading(true); @@ -168,6 +181,55 @@ export default function SchedulingModule() { if (!stillExists) setSelectedSuggestion(null); }, [data, selectedSuggestion]); + const toggleSelect = useCallback((id: string) => { + setSelectedIds(prev => { + const next = new Set(prev); + if (next.has(id)) next.delete(id); else next.add(id); + return next; + }); + }, []); + + const exitSelectMode = useCallback(() => { + setSelectMode(false); + setSelectedIds(new Set()); + setShowBatchConfirm(false); + }, []); + + const batchItems = useMemo(() => { + if (!data) return []; + return [...selectedIds] + .map(id => data.suggestions.find(s => s.id === id)) + .filter((s): s is SchedulingSuggestion => !!s) + .map(s => { + const candidate = pickBestCandidate(s); + if (!candidate) return null; + return { suggestion: s, candidate }; + }) + .filter((x): x is { suggestion: SchedulingSuggestion; candidate: CandidateVehicle } => !!x); + }, [data, selectedIds]); + + const handleBatchSubmit = useCallback(async () => { + if (batchItems.length === 0) return; + setBatchInFlight(true); + try { + const resp = await sendNotifyBatch({ + items: batchItems.map(i => ({ + suggestionId: i.suggestion.id, + currentPlate: i.suggestion.currentVehicle.plateNumber, + candidatePlate: i.candidate.plateNumber, + })), + }); + setBatchResultMsg(resp.message); + await loadData(); + exitSelectMode(); + } catch (e) { + console.error('batch notify failed:', e); + setBatchResultMsg('批量通知失败，请重试'); + } finally { + setBatchInFlight(false); + } + }, [batchItems, loadData, exitSelectMode]); + const filterOptions = useMemo(() => { if (!data) return { regions: [], vehicleTypes: [], customers: [], departments: [], managers: [] }; const r = new Set(), t = new Set(), c = new Set(), d = new Set(), m = new Set(); @@ -284,6 +346,18 @@ export default function SchedulingModule() { className="p-1.5 text-slate-400 hover:text-slate-600 transition-colors rounded-lg hover:bg-slate-50 cursor-pointer"> +
) : ( - + )}
{selectedSuggestion && ( setSelectedSuggestion(null)} onNotifySuccess={handleNotifySuccess} /> )} + + {/* Batch action bar */} + + {selectMode && ( + +
+ 已选 + {selectedIds.size} + 条 +
+
+ + +
+ + )} + + + {/* Batch confirmation modal */} + {showBatchConfirm && ( +
!batchInFlight && setShowBatchConfirm(false)}> + e.stopPropagation()} + className="bg-white rounded-t-2xl sm:rounded-2xl shadow-2xl w-full sm:max-w-md overflow-hidden flex flex-col max-h-[80vh] sm:mx-4" + > +
+ 确认批量通知 + +
+
+

+ 将发送 {batchItems.length} 条替换通知，已排除无可用候选车的建议。 +

+
+ {batchItems.map(({ suggestion, candidate }) => ( +
+
+ {suggestion.currentVehicle.plateNumber} + → + {candidate.plateNumber} +
+ {candidate.canQualifyAfterSwap ? ( + 可达标 + ) : ( + 需关注 + )} +
+ ))} +
+ {batchResultMsg && ( +

{batchResultMsg}

+ )} +
+
+ + +
+ +
+ )}
); diff --git a/src/modules/scheduling/SuggestionDetail.tsx b/src/modules/scheduling/SuggestionDetail.tsx index 2033a5f..5aadcc3 100644 --- a/src/modules/scheduling/SuggestionDetail.tsx +++ b/src/modules/scheduling/SuggestionDetail.tsx @@ -65,7 +65,10 @@ export default function SuggestionDetail({ suggestion: s, onClose, onNotifySucce }; const renderCandidate = (c: CandidateVehicle) => { - const sent = sentPlates.has(c.plateNumber); + const sent = + sentPlates.has(c.plateNumber) || + c.notificationStatus === 'sent' || + c.notificationStatus === 'executed'; return (
diff --git a/src/modules/scheduling/SuggestionList.tsx b/src/modules/scheduling/SuggestionList.tsx index 2871236..3468b84 100644 --- a/src/modules/scheduling/SuggestionList.tsx +++ b/src/modules/scheduling/SuggestionList.tsx @@ -1,5 +1,5 @@ import { useState, useMemo } from 'react'; -import { ArrowRightLeft, ChevronRight, ArrowDown, ArrowUp, ArrowUpDown } from 'lucide-react'; +import { ArrowRightLeft, ChevronRight, ArrowDown, ArrowUp, ArrowUpDown, CheckCircle, Check } from 'lucide-react'; import { motion } from 'motion/react'; import type { SchedulingSuggestion } from './types'; import Blur from '../../components/Blur'; @@ -7,6 +7,13 @@ import Blur from '../../components/Blur'; interface Props { suggestions: SchedulingSuggestion[]; onSelect: (s: SchedulingSuggestion) => void; + selectMode?: boolean; + selectedIds?: Set; + onToggleSelect?: (id: string) => void; +} + +function hasActiveNotification(s: SchedulingSuggestion): boolean { + return s.candidates.some(c => c.notificationStatus === 'sent' || c.notificationStatus === 'executed'); } function fmtRate(rate: number): string { @@ -16,7 +23,7 @@ function fmtRate(rate: number): string { type SortKey = 'default' | 'avgDaily' | 'completion'; type SortDir = 'asc' | 'desc'; -export default function SuggestionList({ suggestions, onSelect }: Props) { +export default function SuggestionList({ suggestions, onSelect, selectMode = false, selectedIds, onToggleSelect }: Props) { const [sortKey, setSortKey] = useState('default'); const [sortDir, setSortDir] = useState('desc'); @@ -73,6 +80,17 @@ export default function SuggestionList({ suggestions, onSelect }: Props) { {sorted.map((s, idx) => { const isRescue = s.type === 'rescue_hopeless'; const v = s.currentVehicle; + const notified = hasActiveNotification(s); + const isSelected = selectedIds?.has(s.id) ?? false; + const canSelect = selectMode && !notified; + + const handleClick = () => { + if (selectMode) { + if (canSelect) onToggleSelect?.(s.id); + } else { + onSelect(s); + } + }; return ( onSelect(s)} + className={`px-4 py-3 hover:bg-slate-50/60 transition-colors flex items-center gap-3 ${ + canSelect || !selectMode ? 'cursor-pointer active:bg-slate-100' : 'cursor-default opacity-60' + } ${isSelected ? 'bg-blue-50/60' : ''}`} + onClick={handleClick} > + {/* Checkbox (select mode) */} + {selectMode && ( +
+ {isSelected && } +
+ )} + {/* Color bar */}
@@ -96,6 +131,11 @@ export default function SuggestionList({ suggestions, onSelect }: Props) { {v.vehicleType} · {v.region} + {notified && ( + + 已通知 + + )}
年度考核 @@ -115,10 +155,12 @@ export default function SuggestionList({ suggestions, onSelect }: Props) {
{/* Right */} -
- 干预 - -
+ {!selectMode && ( +
+ 干预 + +
+ )} ); })} diff --git a/src/modules/scheduling/api.ts b/src/modules/scheduling/api.ts index f67ed2e..366e535 100644 --- a/src/modules/scheduling/api.ts +++ b/src/modules/scheduling/api.ts @@ -1,5 +1,13 @@ import { fetchJson } from '../../auth/api-client'; -import type { SchedulingResponse } from './types'; +import type { + SchedulingResponse, + NotifyRequest, + NotifyBatchRequest, + NotifyBatchResult, + NotificationRecord, + NotificationStatus, + UpdateNotificationRequest, +} from './types'; const BASE = '/api/scheduling'; @@ -10,14 +18,44 @@ export async function fetchSuggestions(targetId?: number): Promise(`${BASE}/suggestions${qs ? `?${qs}` : ''}`); } -export async function sendNotify(body: { - suggestionId: string; - currentPlate: string; - candidatePlate: string; -}): Promise<{ success: boolean; message: string }> { - return fetchJson<{ success: boolean; message: string }>(`${BASE}/notify`, { +export async function sendNotify( + body: NotifyRequest, +): Promise<{ success: boolean; message: string; record?: NotificationRecord }> { + return fetchJson(`${BASE}/notify`, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body), }); } + +export async function sendNotifyBatch( + body: NotifyBatchRequest, +): Promise<{ success: boolean; message: string; result: NotifyBatchResult }> { + return fetchJson(`${BASE}/notify/batch`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(body), + }); +} + +export async function fetchNotifications( + status?: NotificationStatus, + limit?: number, +): Promise<{ records: NotificationRecord[] }> { + const params = new URLSearchParams(); + if (status) params.set('status', status); + if (limit) params.set('limit', String(limit)); + const qs = params.toString(); + return fetchJson(`${BASE}/notify${qs ? `?${qs}` : ''}`); +} + +export async function updateNotification( + id: number, + body: UpdateNotificationRequest, +): Promise<{ success: boolean; record?: NotificationRecord; message?: string }> { + return fetchJson(`${BASE}/notify/${id}`, { + method: 'PATCH', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(body), + }); +} diff --git a/src/modules/scheduling/types.ts b/src/modules/scheduling/types.ts index 20b8d35..3778eea 100644 --- a/src/modules/scheduling/types.ts +++ b/src/modules/scheduling/types.ts @@ -6,6 +6,11 @@ export type { SchedulingTargetOption, SchedulingResponse, NotifyRequest, + NotifyBatchRequest, + NotifyBatchResult, + NotificationStatus, + NotificationRecord, + UpdateNotificationRequest, ReasonLine, ReasonBlock, } from '../../shared/scheduling/types'; diff --git a/src/server/index.ts b/src/server/index.ts index fdd9411..68222d6 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -6,6 +6,7 @@ import dotenv from 'dotenv'; import vehiclesRouter from './routes/vehicles.js'; import mileageRouter from './routes/mileage/index.js'; import schedulingRouter from './routes/scheduling/index.js'; +import { ensureSchedulingTables } from './routes/scheduling/db-schema.js'; import authRouter from './auth/login.js'; import { authMiddleware } from './auth/middleware.js'; @@ -34,6 +35,7 @@ app.use('/*', serveStatic({ root: './dist', path: 'index.html' })); const port = Number(process.env.SERVER_PORT) || 3001; console.log(`Server starting on port ${port}...`); +ensureSchedulingTables().catch(e => console.error('scheduling bootstrap error:', e)); serve({ fetch: app.fetch, port }, () => { console.log(`Server running at http://localhost:${port}`); }); diff --git a/src/server/routes/scheduling/algorithm.ts b/src/server/routes/scheduling/algorithm.ts index c70c027..1a19dc5 100644 --- a/src/server/routes/scheduling/algorithm.ts +++ b/src/server/routes/scheduling/algorithm.ts @@ -119,6 +119,8 @@ export function generateSuggestions( predictedAfterSwap, canQualifyAfterSwap, isSameRegion: inv.region === vehicle.region, + notificationId: null, + notificationStatus: null, }; }) .sort((a, b) => { @@ -188,6 +190,8 @@ export function generateSuggestions( predictedAfterSwap, canQualifyAfterSwap, isSameRegion: inv.region === vehicle.region, + notificationId: null, + notificationStatus: null, }; }) // Only keep candidates that can actually qualify at this customer — diff --git a/src/server/routes/scheduling/db-schema.ts b/src/server/routes/scheduling/db-schema.ts new file mode 100644 index 0000000..e92c19f --- /dev/null +++ b/src/server/routes/scheduling/db-schema.ts @@ -0,0 +1,34 @@ +import pool from '../../db.js'; + +const CREATE_NOTIFICATIONS_TABLE = ` +CREATE TABLE IF NOT EXISTS tab_scheduling_notifications ( + id BIGINT PRIMARY KEY AUTO_INCREMENT, + suggestion_id VARCHAR(128) NOT NULL, + current_plate VARCHAR(32) NOT NULL, + candidate_plate VARCHAR(32) NOT NULL, + operator_id VARCHAR(64), + operator_name VARCHAR(128), + status VARCHAR(16) NOT NULL DEFAULT 'sent', + created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + executed_at DATETIME NULL, + notes VARCHAR(500) NULL, + before_mileage INT NULL, + after_mileage INT NULL, + INDEX idx_suggestion_id (suggestion_id), + INDEX idx_current_plate (current_plate), + INDEX idx_candidate_plate (candidate_plate), + INDEX idx_status (status), + INDEX idx_created_at (created_at) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='智能调度通知/执行记录' +`; + +export async function ensureSchedulingTables(): Promise { + try { + await pool.query(CREATE_NOTIFICATIONS_TABLE); + console.log('[scheduling] notifications table ready'); + } catch (e) { + console.error('[scheduling] failed to ensure tables:', e); + throw e; + } +} diff --git a/src/server/routes/scheduling/notify.ts b/src/server/routes/scheduling/notify.ts index 49cbfd0..6b74641 100644 --- a/src/server/routes/scheduling/notify.ts +++ b/src/server/routes/scheduling/notify.ts @@ -1,16 +1,98 @@ import { Hono } from 'hono'; +import pool from '../../db.js'; import type { AuthUser } from '../../auth/types.js'; -import type { NotifyRequest } from './types.js'; +import type { + NotifyRequest, + NotifyBatchRequest, + NotifyBatchResult, + NotificationRecord, + NotificationStatus, + UpdateNotificationRequest, +} from './types.js'; const app = new Hono(); -// In-memory set of processed suggestion IDs -const processedSuggestions = new Set(); +// --------------------------------------------------------------------------- +// Helpers +// --------------------------------------------------------------------------- -export function isProcessed(suggestionId: string): boolean { - return processedSuggestions.has(suggestionId); +function rowToRecord(row: any): NotificationRecord { + return { + id: Number(row.id), + suggestionId: row.suggestion_id, + currentPlate: row.current_plate, + candidatePlate: row.candidate_plate, + operatorId: row.operator_id, + operatorName: row.operator_name, + status: row.status, + createdAt: row.created_at ? new Date(row.created_at).toISOString() : '', + updatedAt: row.updated_at ? new Date(row.updated_at).toISOString() : '', + executedAt: row.executed_at ? new Date(row.executed_at).toISOString() : null, + notes: row.notes, + beforeMileage: row.before_mileage != null ? Number(row.before_mileage) : null, + afterMileage: row.after_mileage != null ? Number(row.after_mileage) : null, + }; } +/** + * Fetch notification status map for the currently-visible (suggestion, candidate) pairs. + * Key: `${suggestionId}::${candidatePlate}` → latest non-cancelled notification. + */ +export async function fetchActiveNotificationMap(): Promise< + Map +> { + const [rows] = (await pool.execute( + `SELECT id, suggestion_id, candidate_plate, status, created_at + FROM tab_scheduling_notifications + WHERE status != 'cancelled' + ORDER BY created_at DESC`, + )) as [any[], unknown]; + + const map = new Map(); + for (const row of rows) { + const key = `${row.suggestion_id}::${row.candidate_plate}`; + if (!map.has(key)) { + map.set(key, { id: Number(row.id), status: row.status }); + } + } + return map; +} + +async function insertNotification( + req: NotifyRequest, + operator: { id: string | null; name: string | null }, +): Promise { + // Check if a non-cancelled notification already exists for this pair + const [existing] = (await pool.execute( + `SELECT id FROM tab_scheduling_notifications + WHERE suggestion_id = ? AND candidate_plate = ? AND status != 'cancelled' + LIMIT 1`, + [req.suggestionId, req.candidatePlate], + )) as [any[], unknown]; + + if (existing.length > 0) return { skipped: true }; + + const [result] = (await pool.execute( + `INSERT INTO tab_scheduling_notifications + (suggestion_id, current_plate, candidate_plate, operator_id, operator_name, status) + VALUES (?, ?, ?, ?, ?, 'sent')`, + [req.suggestionId, req.currentPlate, req.candidatePlate, operator.id, operator.name], + )) as [any, unknown]; + + const insertedId = Number(result.insertId); + const [rows] = (await pool.execute( + `SELECT * FROM tab_scheduling_notifications WHERE id = ?`, + [insertedId], + )) as [any[], unknown]; + + return rowToRecord(rows[0]); +} + +// --------------------------------------------------------------------------- +// Routes +// --------------------------------------------------------------------------- + +// POST /api/scheduling/notify — single notify app.post('/', async (c) => { try { const body = await c.req.json(); @@ -20,22 +102,161 @@ app.post('/', async (c) => { return c.json({ success: false, message: '缺少必要参数' }, 400); } - if (processedSuggestions.has(suggestionId)) { + const user = (c as any).get('user') as AuthUser | undefined; + const operator = { + id: user?.userId ?? null, + name: user?.userName ?? null, + }; + + const result = await insertNotification(body, operator); + if ('skipped' in result) { return c.json({ success: false, message: '该建议已处理' }, 409); } - const user = (c as any).get('user') as AuthUser | undefined; - const operator = user?.userName || '未知'; + console.log( + `[scheduling:notify] operator=${operator.name} suggestion=${suggestionId} current=${currentPlate} candidate=${candidatePlate}`, + ); - console.log(`[scheduling:notify] operator=${operator} suggestion=${suggestionId} current=${currentPlate} candidate=${candidatePlate}`); - - processedSuggestions.add(suggestionId); - - return c.json({ success: true, message: `替换通知已发送：${currentPlate} → ${candidatePlate}` }); + return c.json({ + success: true, + message: `替换通知已发送：${currentPlate} → ${candidatePlate}`, + record: result, + }); } catch (e: unknown) { console.error('scheduling notify error:', e); return c.json({ success: false, message: '发送通知失败' }, 500); } }); +// POST /api/scheduling/notify/batch — bulk notify +app.post('/batch', async (c) => { + try { + const body = await c.req.json(); + if (!Array.isArray(body.items) || body.items.length === 0) { + return c.json({ success: false, message: '缺少 items' }, 400); + } + + const user = (c as any).get('user') as AuthUser | undefined; + const operator = { + id: user?.userId ?? null, + name: user?.userName ?? null, + }; + + const result: NotifyBatchResult = { success: 0, skipped: 0, failed: 0, records: [] }; + for (const item of body.items) { + if (!item.suggestionId || !item.currentPlate || !item.candidatePlate) { + result.failed++; + continue; + } + try { + const r = await insertNotification(item, operator); + if ('skipped' in r) result.skipped++; + else { + result.success++; + result.records.push(r); + } + } catch { + result.failed++; + } + } + + console.log( + `[scheduling:notify:batch] operator=${operator.name} total=${body.items.length} success=${result.success} skipped=${result.skipped} failed=${result.failed}`, + ); + + return c.json({ + success: true, + message: `批量通知：成功 ${result.success}，跳过 ${result.skipped}，失败 ${result.failed}`, + result, + }); + } catch (e: unknown) { + console.error('scheduling batch notify error:', e); + return c.json({ success: false, message: '批量通知失败' }, 500); + } +}); + +// GET /api/scheduling/notify — list all notifications (history) +app.get('/', async (c) => { + try { + const status = c.req.query('status'); + const limit = Math.min(Number(c.req.query('limit')) || 200, 500); + + const where: string[] = []; + const params: (string | number)[] = []; + if (status) { + where.push('status = ?'); + params.push(status); + } + const whereSql = where.length ? `WHERE ${where.join(' AND ')}` : ''; + params.push(limit); + + const [rows] = (await pool.query( + `SELECT * FROM tab_scheduling_notifications + ${whereSql} + ORDER BY created_at DESC + LIMIT ?`, + params, + )) as [any[], unknown]; + + return c.json({ records: rows.map(rowToRecord) }); + } catch (e: unknown) { + console.error('scheduling notifications list error:', e); + return c.json({ records: [] }, 500); + } +}); + +// PATCH /api/scheduling/notify/:id — update status (execute / cancel) +app.patch('/:id', async (c) => { + try { + const id = Number(c.req.param('id')); + if (!Number.isFinite(id) || id <= 0) { + return c.json({ success: false, message: 'id 无效' }, 400); + } + + const body = await c.req.json(); + if (!body.status) { + return c.json({ success: false, message: '缺少 status' }, 400); + } + + const validStatuses: NotificationStatus[] = ['sent', 'executed', 'cancelled']; + if (!validStatuses.includes(body.status)) { + return c.json({ success: false, message: 'status 不合法' }, 400); + } + + const fields: string[] = ['status = ?']; + const params: (string | number | null)[] = [body.status]; + if (body.status === 'executed') { + fields.push('executed_at = CURRENT_TIMESTAMP'); + } + if (body.notes !== undefined) { + fields.push('notes = ?'); + params.push(body.notes); + } + if (body.afterMileage !== undefined) { + fields.push('after_mileage = ?'); + params.push(body.afterMileage); + } + params.push(id); + + await pool.execute( + `UPDATE tab_scheduling_notifications SET ${fields.join(', ')} WHERE id = ?`, + params, + ); + + const [rows] = (await pool.execute( + `SELECT * FROM tab_scheduling_notifications WHERE id = ?`, + [id], + )) as [any[], unknown]; + + if (rows.length === 0) { + return c.json({ success: false, message: '记录不存在' }, 404); + } + + return c.json({ success: true, record: rowToRecord(rows[0]) }); + } catch (e: unknown) { + console.error('scheduling notification update error:', e); + return c.json({ success: false, message: '更新失败' }, 500); + } +}); + export default app; diff --git a/src/server/routes/scheduling/suggestions.ts b/src/server/routes/scheduling/suggestions.ts index 5c9f892..90f93c4 100644 --- a/src/server/routes/scheduling/suggestions.ts +++ b/src/server/routes/scheduling/suggestions.ts @@ -5,6 +5,7 @@ import { fetchVehicleInfoMap } from '../mileage/vehicle-info.js'; import { mapRegion } from '../vehicles.js'; import { filterByPermission, maskCustomerNames } from '../../auth/permissions.js'; import { classifyVehicle, generateSuggestions } from './algorithm.js'; +import { fetchActiveNotificationMap } from './notify.js'; import type { EnrichedVehicle, InventoryVehicle, SchedulingResponse, SchedulingSummary } from './types.js'; import type { AuthUser } from '../../auth/types.js'; @@ -275,6 +276,19 @@ app.get('/', async (c) => { // ---- Run algorithm ---- const { suggestions, summary } = generateSuggestions(enrichedVehicles, inventoryVehicles); + // ---- Attach notification status to candidates ---- + const notificationMap = await fetchActiveNotificationMap(); + for (const s of suggestions) { + for (const c of s.candidates) { + const key = `${s.id}::${c.plateNumber}`; + const notif = notificationMap.get(key); + if (notif) { + c.notificationId = notif.id; + c.notificationStatus = notif.status; + } + } + } + // ---- Permission filtering & customer name masking ---- const user = (c as any).get('user') as AuthUser | undefined; diff --git a/src/server/routes/scheduling/types.ts b/src/server/routes/scheduling/types.ts index b817f5a..9e5bdae 100644 --- a/src/server/routes/scheduling/types.ts +++ b/src/server/routes/scheduling/types.ts @@ -6,6 +6,11 @@ export type { SchedulingTargetOption, SchedulingResponse, NotifyRequest, + NotifyBatchRequest, + NotifyBatchResult, + NotificationStatus, + NotificationRecord, + UpdateNotificationRequest, ReasonLine, ReasonBlock, } from '../../../shared/scheduling/types.js'; diff --git a/src/shared/scheduling/types.ts b/src/shared/scheduling/types.ts index 676fa99..9417aac 100644 --- a/src/shared/scheduling/types.ts +++ b/src/shared/scheduling/types.ts @@ -21,6 +21,8 @@ export interface SchedulingVehicleInfo { daysLeft: number; } +export type NotificationStatus = 'sent' | 'executed' | 'cancelled'; + export interface CandidateVehicle { plateNumber: string; targetId: number | null; @@ -36,6 +38,41 @@ export interface CandidateVehicle { predictedAfterSwap: number; canQualifyAfterSwap: boolean; isSameRegion: boolean; + notificationId: number | null; + notificationStatus: NotificationStatus | null; +} + +export interface NotificationRecord { + id: number; + suggestionId: string; + currentPlate: string; + candidatePlate: string; + operatorId: string | null; + operatorName: string | null; + status: NotificationStatus; + createdAt: string; + updatedAt: string; + executedAt: string | null; + notes: string | null; + beforeMileage: number | null; + afterMileage: number | null; +} + +export interface NotifyBatchRequest { + items: NotifyRequest[]; +} + +export interface NotifyBatchResult { + success: number; + skipped: number; + failed: number; + records: NotificationRecord[]; +} + +export interface UpdateNotificationRequest { + status: NotificationStatus; + notes?: string; + afterMileage?: number; } export interface ReasonLine { From 1d9f4cb43d015c7b7126012479f75f0d934e1e48 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 16 Apr 2026 23:47:31 +0800 Subject: [PATCH 68/79] feat(scheduling): history view, execute/cancel lifecycle, CSV export, 7d trend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add 调度记录 modal: lists notifications by status, supports 标记已执行 (with after-mileage + notes) and 取消 for open records - Add CSV export of filtered suggestions (UTF-8 BOM for Excel); top candidate per row picked by same-region > can-qualify preference - Compute customer 7-day average alongside 30-day baseline in a single query; show trend indicator (up/down/flat) next to 客户日均 in list and detail card Co-Authored-By: Claude Opus 4.7 --- .../scheduling/NotificationHistory.tsx | 272 ++++++++++++++++++ src/modules/scheduling/SchedulingModule.tsx | 24 +- src/modules/scheduling/SuggestionDetail.tsx | 24 +- src/modules/scheduling/SuggestionList.tsx | 12 +- src/modules/scheduling/csv-export.ts | 103 +++++++ src/server/routes/scheduling/algorithm.ts | 1 + src/server/routes/scheduling/suggestions.ts | 39 ++- src/server/routes/scheduling/types.ts | 1 + src/shared/scheduling/types.ts | 1 + 9 files changed, 459 insertions(+), 18 deletions(-) create mode 100644 src/modules/scheduling/NotificationHistory.tsx create mode 100644 src/modules/scheduling/csv-export.ts diff --git a/src/modules/scheduling/NotificationHistory.tsx b/src/modules/scheduling/NotificationHistory.tsx new file mode 100644 index 0000000..69d8b2d --- /dev/null +++ b/src/modules/scheduling/NotificationHistory.tsx @@ -0,0 +1,272 @@ +import { useCallback, useEffect, useState } from 'react'; +import { X, RotateCcw, Clock, CheckCircle2, XCircle, Send, Loader2 } from 'lucide-react'; +import { motion, AnimatePresence } from 'motion/react'; +import { fetchNotifications, updateNotification } from './api'; +import type { NotificationRecord, NotificationStatus } from './types'; +import Blur from '../../components/Blur'; + +interface Props { + onClose: () => void; + onChange?: () => void; +} + +type StatusTab = 'all' | NotificationStatus; + +const STATUS_TABS: { key: StatusTab; label: string }[] = [ + { key: 'all', label: '全部' }, + { key: 'sent', label: '待执行' }, + { key: 'executed', label: '已执行' }, + { key: 'cancelled', label: '已取消' }, +]; + +function statusBadge(status: NotificationStatus) { + if (status === 'sent') return { text: '待执行', icon: , cls: 'text-amber-700 bg-amber-50' }; + if (status === 'executed') return { text: '已执行', icon: , cls: 'text-emerald-700 bg-emerald-50' }; + return { text: '已取消', icon: , cls: 'text-slate-500 bg-slate-100' }; +} + +function fmtDateTime(iso: string): string { + if (!iso) return ''; + const d = new Date(iso); + const y = d.getFullYear(); + const m = String(d.getMonth() + 1).padStart(2, '0'); + const day = String(d.getDate()).padStart(2, '0'); + const hh = String(d.getHours()).padStart(2, '0'); + const mm = String(d.getMinutes()).padStart(2, '0'); + return `${y}-${m}-${day} ${hh}:${mm}`; +} + +export default function NotificationHistory({ onClose, onChange }: Props) { + const [records, setRecords] = useState([]); + const [loading, setLoading] = useState(false); + const [tab, setTab] = useState('all'); + const [mutatingId, setMutatingId] = useState(null); + const [executeTarget, setExecuteTarget] = useState(null); + const [afterMileageInput, setAfterMileageInput] = useState(''); + const [notesInput, setNotesInput] = useState(''); + + const load = useCallback(async () => { + setLoading(true); + try { + const resp = await fetchNotifications(tab === 'all' ? undefined : tab); + setRecords(resp.records); + } finally { + setLoading(false); + } + }, [tab]); + + useEffect(() => { load(); }, [load]); + + const handleExecuteClick = (rec: NotificationRecord) => { + setExecuteTarget(rec); + setAfterMileageInput(''); + setNotesInput(''); + }; + + const handleExecuteConfirm = async () => { + if (!executeTarget) return; + setMutatingId(executeTarget.id); + try { + const body: { status: NotificationStatus; notes?: string; afterMileage?: number } = { status: 'executed' }; + if (notesInput.trim()) body.notes = notesInput.trim(); + const parsed = Number(afterMileageInput); + if (Number.isFinite(parsed) && parsed > 0) body.afterMileage = parsed; + await updateNotification(executeTarget.id, body); + setExecuteTarget(null); + await load(); + onChange?.(); + } finally { + setMutatingId(null); + } + }; + + const handleCancel = async (rec: NotificationRecord) => { + if (!confirm(`确定取消 ${rec.currentPlate} → ${rec.candidatePlate} 的替换通知？`)) return; + setMutatingId(rec.id); + try { + await updateNotification(rec.id, { status: 'cancelled' }); + await load(); + onChange?.(); + } finally { + setMutatingId(null); + } + }; + + return ( +
+ e.stopPropagation()} + className="bg-white rounded-t-2xl sm:rounded-2xl shadow-2xl w-full sm:max-w-xl overflow-hidden flex flex-col max-h-[85vh] sm:mx-4" + > + {/* Header */} +
+
+ + 调度记录 +
+
+ + +
+
+ + {/* Status tabs */} +
+ {STATUS_TABS.map(t => ( + + ))} +
+ + {/* Body */} +
+ {loading && records.length === 0 ? ( +
+ 加载中 +
+ ) : records.length === 0 ? ( +
+ +

暂无记录

+
+ ) : ( +
+ {records.map(rec => { + const badge = statusBadge(rec.status); + const busy = mutatingId === rec.id; + return ( +
+
+
+ {rec.currentPlate} + → + {rec.candidatePlate} +
+ + {badge.icon} {badge.text} + +
+
+ {rec.operatorName && 操作人 {rec.operatorName}} + {fmtDateTime(rec.createdAt)} + {rec.status === 'executed' && rec.executedAt && ( + 执行 {fmtDateTime(rec.executedAt)} + )} +
+ {rec.notes && ( +
{rec.notes}
+ )} + {rec.status === 'sent' && ( +
+ + +
+ )} +
+ ); + })} +
+ )} +
+ + + {/* Execute confirmation modal */} + + {executeTarget && ( +
mutatingId === null && setExecuteTarget(null)} + > + e.stopPropagation()} + className="bg-white rounded-t-2xl sm:rounded-2xl shadow-2xl w-full sm:max-w-sm overflow-hidden flex flex-col sm:mx-4" + > +
+ 确认已执行 + +
+
+
+ {executeTarget.currentPlate} + → + {executeTarget.candidatePlate} +
+
+ + setAfterMileageInput(e.target.value)} + placeholder="例如 45230" + className="w-full px-3 py-2 text-xs bg-slate-50 rounded-lg border border-slate-200 outline-none focus:ring-2 focus:ring-emerald-500/20 focus:border-emerald-400 transition-all" + /> +
+
+ +