修复:纠正证据不足误判并同步产品下钻顶部指标
This commit is contained in:
+20
-15
@@ -453,7 +453,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
setTrendObjectMetricsLoading(true);
|
||||
setTrendObjectMetricsError('');
|
||||
api.metrics({ ...defectQueryParams, trendGranularity: 'month' }, controller.signal)
|
||||
.then(result => setTrendObjectMetrics({ key: defectQueryKey, data: result }))
|
||||
.then(result => { if (!controller.signal.aborted) setTrendObjectMetrics({ key: defectQueryKey, data: result }); })
|
||||
.catch(errorValue => {
|
||||
if (controller.signal.aborted) return;
|
||||
if (!onUnauthorized(errorValue)) setTrendObjectMetricsError(chooseError(errorValue));
|
||||
@@ -620,8 +620,12 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
const activeDefectData = trendObject
|
||||
? defectQueryKey === queryKey ? currentMetricsData : trendObjectMetrics?.key === defectQueryKey ? trendObjectMetrics.data : null
|
||||
: currentMetricsData;
|
||||
const rowForSummary = currentMetricsData?.summary;
|
||||
const rawFormulaDescriptions = currentMetricsData?.context.metricFormulaDescriptions;
|
||||
// 产品月度下钻复用当前对象的服务端指标,汇总表仍保留父层结果供返回。
|
||||
const summaryMetricsData = drilledProduct ? activeDefectData : currentMetricsData;
|
||||
const summaryMetricsError = drilledProduct ? trendObjectMetricsError : currentMetricsError;
|
||||
const summaryBusy = drilledProduct ? trendObjectMetricsLoading || !summaryMetricsData && !summaryMetricsError : queryBusy;
|
||||
const rowForSummary = summaryMetricsData?.summary;
|
||||
const rawFormulaDescriptions = summaryMetricsData?.context.metricFormulaDescriptions;
|
||||
const formulaDescriptions = rawFormulaDescriptions && typeof rawFormulaDescriptions === 'object' && !Array.isArray(rawFormulaDescriptions) ? rawFormulaDescriptions as Record<string, unknown> : {};
|
||||
const compositeFormula = formulaDescriptions[rateBasis === 'original' ? 'compositeRate' : 'compositeRateWithoutHeadquartersScrap'];
|
||||
const brightFormula = formulaDescriptions[rateBasis === 'original' ? 'brightRate' : 'brightRateWithoutHeadquartersScrap'];
|
||||
@@ -702,7 +706,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
<ExtraQueryFilters key={queryRevision} projectGroup={projectGroup} projectGroups={options?.projectGroupStatus === 'READY' ? options.projectGroups : undefined} onProjectGroup={setProjectGroup} value={extraFilters} onChange={setExtraFilters} onUnauthorized={onUnauthorized} />
|
||||
<Checkbox className="query-unassigned" checked={includeUnassigned} onChange={event => setIncludeUnassigned(event.target.checked)}>包含未分类行</Checkbox>
|
||||
<div className="query-toolbar-tail">
|
||||
<span className={`query-status ${queryBusy ? 'busy' : currentMetricsError ? 'failed' : ''}`}><i />{queryBusy ? '正在查询' : currentMetricsError ? '查询失败' : '查询完成'}</span>
|
||||
<span className={`query-status ${queryBusy || summaryBusy ? 'busy' : currentMetricsError || summaryMetricsError ? 'failed' : ''}`}><i />{queryBusy || summaryBusy ? '正在查询' : currentMetricsError || summaryMetricsError ? '查询失败' : '查询完成'}</span>
|
||||
<Button type="text" onClick={() => { const previous = previousCompleteMonth(); const previousQuarter = previousCompleteQuarter(); setDepartment([]); setGroup([]); setProduct([]); setProjectGroup([]); setExtraFilters({}); setIncludeUnassigned(false); setSearch(''); setAppliedSearch(''); setTrendObject(''); setYear(page === 'overall' ? new Date().getFullYear() : previous.year); setMonth(previous.month); setQuarter(previousQuarter.quarter); setPeriod(page === 'overall' ? 'year' : 'month'); setTrendGranularity('month'); }}>重置</Button>
|
||||
</div>
|
||||
{organizationSummary.length > 0 && <div className="organization-breadcrumb" aria-label="当前组织路径">
|
||||
@@ -712,17 +716,18 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
</section>
|
||||
|
||||
{currentMetricsError && <Alert showIcon type="error" message="质量指标查询失败" description={currentMetricsError} action={<Button size="small" icon={<ReloadOutlined />} onClick={() => setQueryRevision(value => value + 1)}>重试</Button>} />}
|
||||
<section className={`metric-strip ${!currentMetricsData ? 'query-awaiting-data' : ''}`} aria-label="质量指标" aria-busy={queryBusy} inert={!currentMetricsData}>
|
||||
{drilledProduct && summaryMetricsError && <Alert showIcon type="error" message="当前产品指标查询失败" description={summaryMetricsError} action={<Button size="small" onClick={() => setQueryRevision(value => value + 1)}>重试</Button>} />}
|
||||
<section className={`metric-strip ${!summaryMetricsData ? 'query-awaiting-data' : ''}`} aria-label="质量指标" aria-busy={summaryBusy} inert={!summaryMetricsData}>
|
||||
<div className="rate-basis-control"><span>亮片本部报废调整</span><Segmented size="small" value={rateBasis} options={[{ label: '原口径', value: 'original' }, { label: '去本部报废', value: 'withoutHeadquartersScrap' }]} onChange={value => setRateBasis(value as typeof rateBasis)} aria-label="合格率口径" /></div>
|
||||
<MetricCard primary label={rateBasis === 'original' ? '综合合格率' : '综合调整率'} value={rateText(visibleCompositeRate(rowForSummary, rateBasis))} onClick={() => setBasisOpen(true)} />
|
||||
<MetricCard label="黑片合格率" value={rateText(visibleStageRate(rowForSummary, 'black'))} note={!currentMetricsData ? (queryBusy ? '正在更新…' : '指标暂不可用') : hasStageRows(rowForSummary, 'black') ? hasValidRateDenominator(rowForSummary, 'black') ? `合格重量 ${numberText(rowForSummary?.black?.qualifiedWeight)} kg` : '按当前启用规则及空值策略计算' : '缺少黑片来源'} stage="black" onClick={() => openRecords(null, 'black')} />
|
||||
<MetricCard label={rateBasis === 'original' ? '亮片合格率' : '亮片调整率'} value={rateText(visibleStageRate(rowForSummary, 'bright', rateBasis))} note={!currentMetricsData ? (queryBusy ? '正在更新…' : '指标暂不可用') : hasStageRows(rowForSummary, 'bright') ? hasValidRateDenominator(rowForSummary, 'bright') ? `合格重量 ${numberText(rowForSummary?.bright?.qualifiedWeight)} kg` : '按当前启用规则及空值策略计算' : '缺少亮片来源'} stage="bright" onClick={() => openRecords(null, 'bright')} />
|
||||
<MetricCard label="报废总重" value={rowForSummary && (hasStageRows(rowForSummary, 'black') || hasStageRows(rowForSummary, 'bright')) ? `${numberText((rowForSummary.black.scrapWeight ?? 0) + (rowForSummary.bright.scrapWeight ?? 0))} kg` : '—'} note={!currentMetricsData ? (queryBusy ? '正在更新…' : '指标暂不可用') : hasStageRows(rowForSummary, 'black') || hasStageRows(rowForSummary, 'bright') ? `黑片 ${numberText(rowForSummary?.black?.scrapWeight)} kg · 亮片 ${numberText(rowForSummary?.bright?.scrapWeight)} kg` : '缺少阶段来源'} onClick={() => openRecords(null, 'black')} />
|
||||
<MetricCard label="黑片合格率" value={rateText(visibleStageRate(rowForSummary, 'black'))} note={!summaryMetricsData ? (summaryBusy ? '正在更新…' : '指标暂不可用') : hasStageRows(rowForSummary, 'black') ? hasValidRateDenominator(rowForSummary, 'black') ? `合格重量 ${numberText(rowForSummary?.black?.qualifiedWeight)} kg` : '按当前启用规则及空值策略计算' : '缺少黑片来源'} stage="black" onClick={() => openRecords(null, 'black')} />
|
||||
<MetricCard label={rateBasis === 'original' ? '亮片合格率' : '亮片调整率'} value={rateText(visibleStageRate(rowForSummary, 'bright', rateBasis))} note={!summaryMetricsData ? (summaryBusy ? '正在更新…' : '指标暂不可用') : hasStageRows(rowForSummary, 'bright') ? hasValidRateDenominator(rowForSummary, 'bright') ? `合格重量 ${numberText(rowForSummary?.bright?.qualifiedWeight)} kg` : '按当前启用规则及空值策略计算' : '缺少亮片来源'} stage="bright" onClick={() => openRecords(null, 'bright')} />
|
||||
<MetricCard label="报废总重" value={rowForSummary && (hasStageRows(rowForSummary, 'black') || hasStageRows(rowForSummary, 'bright')) ? `${numberText((rowForSummary.black.scrapWeight ?? 0) + (rowForSummary.bright.scrapWeight ?? 0))} kg` : '—'} note={!summaryMetricsData ? (summaryBusy ? '正在更新…' : '指标暂不可用') : hasStageRows(rowForSummary, 'black') || hasStageRows(rowForSummary, 'bright') ? `黑片 ${numberText(rowForSummary?.black?.scrapWeight)} kg · 亮片 ${numberText(rowForSummary?.bright?.scrapWeight)} kg` : '缺少阶段来源'} onClick={() => openRecords(null, 'black')} />
|
||||
</section>
|
||||
|
||||
<div className="query-quality-summary" aria-label="数据覆盖摘要">
|
||||
<span>{currentMetricsData ? <>来源覆盖 {currentMetricsData.coverage.sourceMonths.filter(item => item.blackRows > 0 || item.brightRows > 0).length} 个月 · 参与计算 {currentMetricsData.coverage.includedRows.toLocaleString('zh-CN')} / 原始 {currentMetricsData.coverage.rawRows.toLocaleString('zh-CN')} 行 · 未分类 {currentMetricsData.coverage.excludedBlankRows.toLocaleString('zh-CN')} 行({includeUnassigned ? '已包含' : '本次排除'})</> : queryBusy ? '正在更新来源覆盖…' : '来源覆盖暂不可用'}</span>
|
||||
<Button type="link" size="small" disabled={!currentMetricsData} onClick={() => setBasisOpen(true)}>质量范围说明</Button>
|
||||
<span>{drilledProduct && <>{drilledProduct} · </>}{summaryMetricsData ? <>来源覆盖 {summaryMetricsData.coverage.sourceMonths.filter(item => item.blackRows > 0 || item.brightRows > 0).length} 个月 · 参与计算 {summaryMetricsData.coverage.includedRows.toLocaleString('zh-CN')} / 原始 {summaryMetricsData.coverage.rawRows.toLocaleString('zh-CN')} 行 · 未分类 {summaryMetricsData.coverage.excludedBlankRows.toLocaleString('zh-CN')} 行({includeUnassigned ? '已包含' : '本次排除'})</> : summaryBusy ? '正在更新来源覆盖…' : '来源覆盖暂不可用'}</span>
|
||||
<Button type="link" size="small" disabled={!summaryMetricsData} onClick={() => setBasisOpen(true)}>质量范围说明</Button>
|
||||
</div>
|
||||
|
||||
{['department', 'group', 'product'].includes(page) && <>
|
||||
@@ -844,12 +849,12 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
<dt>综合公式</dt><dd>{formulaText(compositeFormula)}</dd>
|
||||
<dt>黑片公式</dt><dd>{formulaText(formulaDescriptions.blackRate)}</dd>
|
||||
<dt>{rateBasis === 'original' ? '亮片公式' : '亮片调整公式'}</dt><dd>{formulaText(brightFormula)}</dd>
|
||||
<dt>统计范围</dt><dd>{year}年{period === 'month' ? ` ${MONTHS[month - 1]}` : period === 'quarter' ? ` 第${quarter}季度` : '度'} · {scopeName}</dd>
|
||||
<dt>统计范围</dt><dd>{year}年{period === 'month' ? ` ${MONTHS[month - 1]}` : period === 'quarter' ? ` 第${quarter}季度` : '度'} · {drilledProduct || scopeName}</dd>
|
||||
<dt>适用总重量</dt><dd>黑片 {numberText(rowForSummary?.black?.totalWeight)} kg · 亮片 {numberText(rowForSummary?.bright?.totalWeight)} kg</dd>
|
||||
<dt>覆盖行数</dt><dd>黑片 {rowForSummary?.coverage.blackRows ?? '—'} · 亮片 {rowForSummary?.coverage.brightRows ?? '—'}</dd>
|
||||
<dt>来源行覆盖</dt><dd>原始 {currentMetricsData?.coverage.rawRows ?? '—'} · 参与 {currentMetricsData?.coverage.includedRows ?? '—'} · 未分类行 {includeUnassigned ? '(已选择包含)' : '(本次排除)'} {currentMetricsData?.coverage.excludedBlankRows ?? '—'}</dd>
|
||||
<dt>业务分类映射</dt><dd>未映射 {currentMetricsData?.coverage.unmappedRows ?? '—'} 行</dd>
|
||||
<dt>项目组维度</dt><dd>{currentMetricsData?.coverage.projectGroupUnconfiguredRows ?? '—'} 行未配置项目组归属。该计数不等于排除行数;是否参与指标由当前筛选及规则决定。</dd>
|
||||
<dt>来源行覆盖</dt><dd>原始 {summaryMetricsData?.coverage.rawRows ?? '—'} · 参与 {summaryMetricsData?.coverage.includedRows ?? '—'} · 未分类行 {includeUnassigned ? '(已选择包含)' : '(本次排除)'} {summaryMetricsData?.coverage.excludedBlankRows ?? '—'}</dd>
|
||||
<dt>业务分类映射</dt><dd>未映射 {summaryMetricsData?.coverage.unmappedRows ?? '—'} 行</dd>
|
||||
<dt>项目组维度</dt><dd>{summaryMetricsData?.coverage.projectGroupUnconfiguredRows ?? '—'} 行未配置项目组归属。该计数不等于排除行数;是否参与指标由当前筛选及规则决定。</dd>
|
||||
</dl>
|
||||
<details><summary>查看服务返回的公式原文</summary><pre>{JSON.stringify(formulaDescriptions, null, 2)}</pre></details>
|
||||
</Modal>
|
||||
@@ -860,7 +865,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
stage={recordStage}
|
||||
onStage={setRecordStage}
|
||||
onClose={() => { setSelectedRecord(null); setRecordMonth(undefined); setRecordsOpen(false); }}
|
||||
query={queryParams}
|
||||
query={drilledProduct ? defectQueryParams : queryParams}
|
||||
view={view}
|
||||
month={recordMonth}
|
||||
onUnauthorized={onUnauthorized}
|
||||
|
||||
@@ -87,7 +87,7 @@ export function partialAnalysisNotice(reason: unknown): string {
|
||||
if (value === 'mcp_error') return '部分数据查询未成功,已保留其余分析结果。可以重试或继续追问。';
|
||||
if (value === 'length') return '回答达到输出长度上限,已保存现有内容。可以重试或继续追问。';
|
||||
if (/timeout|超时/.test(value)) return '本轮分析达到处理时限,已保存现有结果。可以重试或继续追问。';
|
||||
if (value === 'evidence_incomplete') return '所需数据尚未齐全,已展示现有结果。可以继续追问。';
|
||||
if (value === 'evidence_incomplete') return '本轮分析被标记为部分完成,已展示现有结果。可以继续追问。';
|
||||
return '本轮分析未完整结束,已保存现有结果。可以重试或继续追问。';
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user