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
+14 -2
View File
@@ -1,4 +1,4 @@
import { useMemo } from 'react';
import { useEffect, useMemo, useRef } from 'react';
import { AiMarkdown } from './AiMarkdown';
import { AnalysisVisuals } from './AnalysisVisuals';
import { buildAnalysisNarrative, useCompactRateComparison, type NarrativeSection } from './analysisReportModel';
@@ -28,8 +28,20 @@ export function RateComparisonReadout({ visual }: { visual: AnalysisVisual }) {
}
export function NarrativeEvidence({ model, prefix }: { model: ReturnType<typeof buildAnalysisNarrative>; prefix: string }) {
const details = useRef<HTMLDetailsElement>(null);
useEffect(() => {
const revealLinkedEvidence = () => {
const target = window.location.hash.slice(1);
if (target.startsWith(prefix) && model.evidence.some(item => `${prefix}${item.ref}` === target) && details.current) {
details.current.open = true;
}
};
revealLinkedEvidence();
window.addEventListener('hashchange', revealLinkedEvidence);
return () => window.removeEventListener('hashchange', revealLinkedEvidence);
}, [model.evidence, prefix]);
if (!model.evidence.length) return null;
return <footer className="analysis-narrative-evidence"><h3>数据依据</h3><ol>{model.evidence.map(item => <li id={`${prefix}${item.ref}`} key={item.ref}><strong>{item.label}</strong><span>{item.context}</span><code>{item.ref}</code></li>)}</ol></footer>;
return <footer className="analysis-narrative-evidence"><details ref={details}><summary>数据依据</summary><ol>{model.evidence.map(item => <li id={`${prefix}${item.ref}`} key={item.ref}><strong>{item.label}</strong><span>{item.context}</span><code>{item.ref}</code></li>)}</ol></details></footer>;
}
/** 聊天、HTML 和图片报告共用同一套章节与图表关联。 */
+2 -2
View File
@@ -1,5 +1,5 @@
import { useEffect, useMemo, useRef, useState } from 'react';
import { parseAnalysisVisuals, renderVisualPng, visualPeriodSummary, visualScopeSummary, visualCategoryLabel } from './analysisVisualsModel';
import { parseAnalysisVisuals, combineStageDefectVisuals, renderVisualPng, visualPeriodSummary, visualScopeSummary, visualCategoryLabel } from './analysisVisualsModel';
import { analysisSnapshotResult, authorizeAnalysisSnapshot, reportSnapshotIdentity } from './analysisSnapshot';
import type { AnalysisVisual } from './analysisVisualsModel';
import { useCompactRateComparison } from './analysisReportModel';
@@ -10,7 +10,7 @@ export type ReportVisualImage = { id: string; png?: string; failed?: boolean };
export function reportVisuals(turn: Row) {
const result = analysisSnapshotResult(turn);
return result.visualSchemaVersion === 1 ? parseAnalysisVisuals(result.visuals, 1).visuals : [];
return result.visualSchemaVersion === 1 ? combineStageDefectVisuals(parseAnalysisVisuals(result.visuals, 1).visuals) : [];
}
export function useReportVisualImages(turn: Row, open: boolean) {
+5 -1
View File
@@ -8,6 +8,7 @@ import {
isVisualCellInvalid,
loadAnalysisVisualECharts,
parseAnalysisVisuals,
combineStageDefectVisuals,
renderVisualPng,
visualCategoryLabel,
visualPeriodSummary,
@@ -315,7 +316,10 @@ function AnalysisVisualCard({ visual, beforeExport }: { visual: AnalysisVisual;
/** A bad or old visual payload is confined to this module; it never interrupts the answer text. */
export function AnalysisVisuals({ visuals, visualState, beforeExport, embedded = false }: AnalysisVisualsProps) {
const parsed = useMemo(() => parseAnalysisVisuals(visuals), [visuals]);
const parsed = useMemo(() => {
const result = parseAnalysisVisuals(visuals);
return { ...result, visuals: combineStageDefectVisuals(result.visuals) };
}, [visuals]);
if (!parsed.visuals.length) {
const state = visualStateName(visualState);
if (state === 'building') return <div className="analysis-visual-state" role="status">图表整理中</div>;
+2 -1
View File
@@ -48,7 +48,8 @@
.q-report .q-report-contents a:hover,.q-report-detail-link a:hover{text-decoration:underline}
.q-report .q-report-detail-link{font-size:11px}
.q-report .analysis-narrative-evidence{padding-top:14px!important;margin-top:22px!important}
.q-report .analysis-narrative-evidence h3{font-size:13px!important;margin:0 0 8px!important}
.analysis-narrative-evidence summary{cursor:pointer;font-weight:600;color:var(--muted-ink,#65748b);padding:6px 0}
.q-report .analysis-narrative-evidence summary{font-size:13px!important}
.q-report .analysis-rate-grid{grid-template-columns:repeat(2,minmax(0,1fr))}
.q-report .analysis-rate-grid:has(>.analysis-rate-readout:only-child){grid-template-columns:1fr}
.q-report .analysis-rate-readout{--surface-subtle:#f4f7fb}
+2 -2
View File
@@ -1,5 +1,5 @@
import { sanitizeAnalysisDisplayText } from './analysisDisplayText.ts';
import { parseAnalysisVisuals, visualPeriodSummary, visualScopeSummary, type AnalysisVisual } from './analysisVisualsModel.ts';
import { parseAnalysisVisuals, combineStageDefectVisuals, visualPeriodSummary, visualScopeSummary, type AnalysisVisual } from './analysisVisualsModel.ts';
export type NarrativeKind = 'overview' | 'stage' | 'department' | 'group' | 'product' | 'category' | 'defect' | 'trend' | 'composition' | 'crosscheck' | 'action' | 'other';
export interface NarrativeSection {
@@ -119,7 +119,7 @@ function sectionScore(section: NarrativeSection, visual: AnalysisVisual, primary
export function buildAnalysisNarrative(answer: string, rawVisuals: unknown, question = ''): AnalysisNarrativeModel {
const safe = sanitizeAnalysisDisplayText(answer).replaceAll('\r\n', '\n').replaceAll('\r', '\n');
const visuals = parseAnalysisVisuals(rawVisuals).visuals;
const visuals = combineStageDefectVisuals(parseAnalysisVisuals(rawVisuals).visuals);
const scopeDepth = (visual: AnalysisVisual) => ['department','group','product','category','defect'].filter(key => visual.scope[key]).length;
const main = [...visuals].filter(visual => visual.metric === 'composite_rate').sort((a,b) => scopeDepth(a)-scopeDepth(b))[0] || visuals[0];
const primaryScope = main?.scope || {};
+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 '无效值';
@@ -3,6 +3,7 @@ import assert from 'node:assert/strict';
import {
buildAnalysisVisualOption,
buildAnalysisVisualExportOption,
combineStageDefectVisuals,
formatVisualValue,
parseAnalysisVisuals,
renderVisualTableHtml,
@@ -93,6 +94,31 @@ test('parser preserves zero and null as different values', () => {
assert.equal(option.animation, false);
});
test('same-scope black and bright defect changes become one stage-colored chart', () => {
const defect = (stage, values, product = '规格 A') => visual({
id: `defect-${stage}-${product}`, type: 'bar', title: `${stage}具体缺陷`, subtitle: '来源字段',
unit: 'kg', metric: 'source_defect_delta_weight', sectionKey: `defect_${stage}`, dimension: 'defect', stage,
scope: { product, stage }, period: { year: 2026, month: 9 }, comparisonPeriod: { year: 2026, month: 8 },
categories: values.map((_, index) => ({ key: `field-${index}`, label: `缺陷 ${index}` })),
series: [{ key: 'delta', label: '增减', values }], evidenceRefs: [`ref-${stage}`],
requiredFields: values.map((_, index) => `field-${index}`),
coverage: { totalRows: values.length, returnedRows: values.length, truncated: false },
});
const [black, bright, other] = parseAnalysisVisuals([
defect('black', [265.85, 0, -12]), defect('bright', [123.42, 0, 39.25]), defect('bright', [9], '规格 B'),
]).visuals;
const combined = combineStageDefectVisuals([black, bright, other]);
assert.equal(combined.length, 2);
assert.equal(combined[0].sectionKey, 'defect_combined');
assert.deepEqual(combined[0].evidenceRefs, ['ref-black', 'ref-bright']);
assert.deepEqual(combined[0].categories.map(item => item.label), ['黑片 · 缺陷 0', '亮片 · 缺陷 0', '亮片 · 缺陷 2', '黑片 · 缺陷 2']);
assert.deepEqual(combined[0].series[0].values, [265.85, null, null, -12]);
assert.deepEqual(combined[0].series[1].values, [null, 123.42, 39.25, null]);
assert.equal(combined[0].chartable, true);
assert.equal(combined[1].scope.product, '规格 B');
assert.equal(combineStageDefectVisuals(combined).length, 2);
});
test('ratio charts use 0 to 100 percent and convert raw ratios only for plotting', () => {
const parsed = parseAnalysisVisuals([visual()]);
const option = buildAnalysisVisualOption(parsed.visuals[0]);