Combine black and bright defect charts in analysis reports

This commit is contained in:
2026-10-24 10:23:31 +08:00
parent ec71609343
commit e2fb128911
10 changed files with 221 additions and 11 deletions
+65 -2
View File
@@ -2,7 +2,7 @@ import type { EChartsCoreOption } from 'echarts/core';
export type AnalysisVisualUnit = 'ratio' | 'kg' | 'pp' | 'count';
export type AnalysisVisualStage = 'black' | 'bright';
export type AnalysisVisualSectionKey = 'overview' | 'stage' | 'department' | 'group' | 'product' | 'category_black' | 'category_bright' | 'defect_black' | 'defect_bright' | 'trend' | 'composition';
export type AnalysisVisualSectionKey = 'overview' | 'stage' | 'department' | 'group' | 'product' | 'category_black' | 'category_bright' | 'defect_black' | 'defect_bright' | 'defect_combined' | 'trend' | 'composition';
export type AnalysisVisualDimension = 'department' | 'group' | 'product' | 'category' | 'defect';
export type AnalysisVisualContextValue = string | number | boolean | Array<string | number | boolean> | Record<string, string[]>;
export type AnalysisVisualContext = Record<string, AnalysisVisualContextValue>;
@@ -63,7 +63,7 @@ export const MAX_VISUAL_SERIES = 4;
const UNIT_VALUES = new Set<AnalysisVisualUnit>(['ratio', 'kg', 'pp', 'count']);
const CHART_TYPES = new Set(['bar', 'line', 'column', 'area', 'heatmap', 'donut', 'pareto', 'waterfall']);
const SECTION_KEYS = new Set<AnalysisVisualSectionKey>(['overview', 'stage', 'department', 'group', 'product', 'category_black', 'category_bright', 'defect_black', 'defect_bright', 'trend', 'composition']);
const SECTION_KEYS = new Set<AnalysisVisualSectionKey>(['overview', 'stage', 'department', 'group', 'product', 'category_black', 'category_bright', 'defect_black', 'defect_bright', 'defect_combined', 'trend', 'composition']);
const DIMENSIONS = new Set<AnalysisVisualDimension>(['department', 'group', 'product', 'category', 'defect']);
const VISUAL_KEYS = new Set(['id', 'type', 'title', 'subtitle', 'unit', 'categories', 'series', 'evidenceRefs', 'requiredFields', 'scope', 'period', 'comparisonPeriod', 'stage', 'metric', 'coverage', 'note', 'originTurnId', 'sectionKey', 'dimension']);
const CATEGORY_KEYS = new Set(['key', 'label']);
@@ -389,6 +389,69 @@ export function parseAnalysisVisuals(input: unknown, schemaVersion?: unknown): P
return { visuals: result, issues };
}
/** Combine only comparable, already-validated stage defect views. Saved reports remain unchanged. */
export function combineStageDefectVisuals(visuals: AnalysisVisual[]): AnalysisVisual[] {
const used = new Set<string>();
const comparableScope = (visual: AnalysisVisual) => {
const { stage: _stage, ...scope } = visual.scope;
return JSON.stringify(Object.entries(scope).sort(([a], [b]) => a.localeCompare(b)));
};
const canPair = (a: AnalysisVisual, b: AnalysisVisual) =>
a.type === 'bar' && b.type === 'bar' && a.unit === 'kg' && b.unit === 'kg'
&& a.metric === b.metric && ['source_defect_delta_weight', 'source_defect_weight'].includes(a.metric)
&& a.sectionKey === `defect_${a.stage}` && b.sectionKey === `defect_${b.stage}`
&& a.stage === 'black' && b.stage === 'bright' && a.chartable && b.chartable
&& a.originTurnId === b.originTurnId && comparableScope(a) === comparableScope(b)
&& JSON.stringify(a.period) === JSON.stringify(b.period)
&& JSON.stringify(a.comparisonPeriod) === JSON.stringify(b.comparisonPeriod);
const selectedRows = (visual: AnalysisVisual) => visual.categories
.map((category, index) => ({ category, value: visual.series[0]?.values[index] ?? null, index }))
.filter(row => row.value !== null && Number.isFinite(row.value) && row.value !== 0)
.sort((a, b) => Math.abs(b.value!) - Math.abs(a.value!) || a.index - b.index)
.slice(0, 5);
const result: AnalysisVisual[] = [];
for (const visual of visuals) {
if (used.has(visual.id)) continue;
const black = visual.stage === 'black' ? visual : visuals.find(candidate => canPair(candidate, visual));
const bright = visual.stage === 'bright' ? visual : visuals.find(candidate => black !== undefined && canPair(black, candidate));
if (!black || !bright || !canPair(black, bright) || used.has(black.id) || used.has(bright.id)) {
result.push(visual);
continue;
}
const rows = [
...selectedRows(black).map(row => ({ ...row, stage: 'black' as const })),
...selectedRows(bright).map(row => ({ ...row, stage: 'bright' as const })),
].sort((a, b) => Math.abs(b.value!) - Math.abs(a.value!) || (a.stage === 'black' ? -1 : 1));
if (!rows.some(row => row.stage === 'black') || !rows.some(row => row.stage === 'bright')) {
result.push(visual);
continue;
}
const { stage: _stage, ...scope } = black.scope;
const delta = black.metric === 'source_defect_delta_weight';
const combined = parseAnalysisVisuals([{
id: `combined-${black.id}-${bright.id}`, type: 'bar', title: `黑片与亮片来源具体缺陷${delta ? '报废增减' : '报废重量'}`,
subtitle: `按缺陷${delta ? '报废重量增减' : '报废重量'}比较,颜色区分阶段;各阶段最多展示${delta ? '变化较大' : '重量较高'}的 5 项。`,
unit: 'kg',
categories: rows.map(row => ({ key: `${row.stage}:${row.category.key}`, label: `${row.stage === 'black' ? '黑片' : '亮片'} · ${row.category.label}` })),
series: [
{ key: 'black', label: '黑片', values: rows.map(row => row.stage === 'black' ? row.value : null) },
{ key: 'bright', label: '亮片', values: rows.map(row => row.stage === 'bright' ? row.value : null) },
],
evidenceRefs: [...new Set([...black.evidenceRefs, ...bright.evidenceRefs])],
requiredFields: [...new Set([...black.requiredFields, ...bright.requiredFields])],
scope, period: black.period, ...(black.comparisonPeriod ? { comparisonPeriod: black.comparisonPeriod } : {}),
metric: black.metric, originTurnId: black.originTurnId, sectionKey: 'defect_combined', dimension: 'defect',
coverage: { totalRows: black.coverage.totalRows + bright.coverage.totalRows, returnedRows: rows.length,
truncated: black.coverage.truncated || bright.coverage.truncated || rows.length < black.coverage.totalRows + bright.coverage.totalRows },
note: `具体缺陷按来源字段统计,仅作核查线索;${delta ? '零变化' : '零重量'}项不占图表空间,完整数据保留在原始依据中。`,
}], 1).visuals[0];
if (!combined) { result.push(visual); continue; }
used.add(black.id); used.add(bright.id);
result.push(combined);
}
return result;
}
export function formatVisualValue(value: number | null, unit: AnalysisVisualUnit): string {
if (value === null) return '—';
if (!Number.isFinite(value)) return '无效值';