diff --git a/DESIGN.md b/DESIGN.md
index aefef76..3a2eafc 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -109,3 +109,9 @@
- 钻取时保留上次成功的趋势及目标线,新数据返回后使用同一图表实例进行 520ms 更新动画;减少动态效果时直接更新。
- 旧范围图表在更新或失败时禁止交互;加载失败保留原图并允许重试。已取消的请求不能覆盖后续相同范围的新请求。
- 本地复现原钻取存在 23 帧空白,修复后三级钻取与六主题均为零空白帧;快速返回重入、失败保留、实际筛选框尺寸及相关检查通过,未发布。
+
+## 2026-11-01:查询操作强调与底部精简
+
+- 各级返回按钮统一为带左箭头的“返回上一级”,沿用原有父级路径,使用主题色描边与浅底;Excel 导出使用实色主按钮,两者统一加粗。
+- 趋势数据表取消底部分页统计与月份汇总链接,直接展示已返回的期间;保留月份行的筛选操作。各查询页删除“点击期间筛选”类提示。
+- 本地实测三级返回、月份行筛选及六主题按钮效果;主汇总表分页和 Excel 导出行为保持原有方式。
diff --git a/web/src/QueryPage.tsx b/web/src/QueryPage.tsx
index c2c8d7a..03702f8 100644
--- a/web/src/QueryPage.tsx
+++ b/web/src/QueryPage.tsx
@@ -25,7 +25,7 @@ import {
Tooltip,
} from 'antd';
import type { ColumnsType } from 'antd/es/table';
-import { DownloadOutlined, InfoCircleOutlined, ReloadOutlined, SearchOutlined } from '@ant-design/icons';
+import { ArrowLeftOutlined, DownloadOutlined, InfoCircleOutlined, ReloadOutlined, SearchOutlined } from '@ant-design/icons';
import { ApiError, api, decodeQueryValueList, encodeQueryValueList } from './api';
import type {
DefectMetric,
@@ -813,7 +813,6 @@ export default function QueryPage({ page, onUnauthorized }: {
: }
{trendRefreshing && 正在更新趋势}
-
点击期间筛选,再次点击可取消
@@ -826,9 +825,9 @@ export default function QueryPage({ page, onUnauthorized }: {
setFullFields(value === 'full')} aria-label="字段显示" />
setDefectDisplay(value as typeof defectDisplay)} aria-label="不良显示方式" />
- {!drilledProduct && (view === 'group' || view === 'product' && (group.length > 0 || department.length > 0)) && }
- {drilledProduct && }
- } aria-label="Excel导出" loading={summaryExporting} disabled={queryBusy || summaryBusy || !summaryMetricsData || Boolean(drilledProduct && trendLoading) || !(drilledProduct ? drilledTrendData : visibleRows).length} onClick={async () => {
+ {!drilledProduct && (view === 'group' || view === 'product' && (group.length > 0 || department.length > 0)) && } onClick={() => { setSearch(''); setAppliedSearch(''); setTrendObject(''); if (view === 'product') { setProduct([]); setGroup([]); setViewOverride('group'); } else { setGroup([]); setDepartment([]); setViewOverride('department'); } }}>返回上一级}
+ {drilledProduct && } onClick={() => { setDrilledProduct(''); setTrendObject(''); setTrendMode('production'); }}>返回上一级}
+ } aria-label="Excel导出" loading={summaryExporting} disabled={queryBusy || summaryBusy || !summaryMetricsData || Boolean(drilledProduct && trendLoading) || !(drilledProduct ? drilledTrendData : visibleRows).length} onClick={async () => {
setSummaryExporting(true);
try { await summaryExport.current?.exportExcel(); }
catch (error) { message.error(`导出失败:${chooseError(error)}`); }
@@ -1427,11 +1426,8 @@ export function TrendChart({ rows, mode, stage, rateBasis, targetRate, selectedP
;
}
-function TrendTable({ rows, rateBasis, onMonth, defectDisplay = 'weight', showMonthLinks = true }: { rows: TrendMetricRow[]; rateBasis: 'original' | 'withoutHeadquartersScrap'; onMonth: (value: number | string) => void; defectDisplay?: 'weight'|'rate'; showMonthLinks?: boolean }) {
+function TrendTable({ rows, rateBasis, onMonth, defectDisplay = 'weight' }: { rows: TrendMetricRow[]; rateBasis: 'original' | 'withoutHeadquartersScrap'; onMonth: (value: number | string) => void; defectDisplay?: 'weight'|'rate' }) {
const compact = useCompactTable();
- const [currentPage, setCurrentPage] = useState(1);
- const [pageSize, setPageSize] = useState(SUMMARY_PAGE_SIZE);
- useEffect(() => setCurrentPage(1), [rows]);
const columns: ColumnsType = [
{ title: '统计期间', dataIndex: 'month', key: 'month', align: 'center', fixed: 'left', width: 130, render: (_: unknown, row) => },
{ title: totalWeightTitle('黑片总重量 / kg'), dataIndex: ['black', 'totalWeight'], key: 'blackTotal', align: 'center', width: 160, render: value => numberText(value) },
@@ -1444,8 +1440,7 @@ function TrendTable({ rows, rateBasis, onMonth, defectDisplay = 'weight', showMo
{ title: rateBasisTitle('亮片合格率', rateBasis, 'bright'), dataIndex: ['bright', 'rate'], key: 'brightRate', align: 'center', width: rateBasis === 'original' ? 180 : 194, className: 'rate-cell bright', render: (_: number | null, row: TrendMetricRow) => rateText(visibleStageRate(row, 'bright', rateBasis)) },
{ title: rateBasisTitle('综合合格率', rateBasis, 'composite'), dataIndex: 'compositeRate', key: 'compositeRate', align: 'center', width: 120, fixed: compact ? undefined : 'right', className: 'combined-column', render: (_: number | null, row: MetricRow) => rateText(visibleCompositeRate(row, rateBasis)) },
];
- return rows.length ? String(row.month)} pagination={{ current: currentPage, pageSize, showSizeChanger: rows.length > SUMMARY_PAGE_SIZE, pageSizeOptions: SUMMARY_PAGE_SIZE_OPTIONS, showTotal: (total, range) => `显示 ${range[0]}–${range[1]} 行,共 ${total} 个月`, onChange: (nextPage, nextPageSize) => { setPageSize(nextPageSize); setCurrentPage(nextPageSize === pageSize ? nextPage : 1); } }} scroll={{ x: columns.reduce((total, column) => total + Number(column.width || 0), 0) }} />
- {showMonthLinks && {rows.map(row => )}
}
+ return rows.length ? String(row.month)} pagination={false} scroll={{ x: columns.reduce((total, column) => total + Number(column.width || 0), 0) }} />
: ;
}
diff --git a/web/src/StageProductPage.tsx b/web/src/StageProductPage.tsx
index c334629..e317783 100644
--- a/web/src/StageProductPage.tsx
+++ b/web/src/StageProductPage.tsx
@@ -102,8 +102,8 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
openDetail(null,stage)}/>
openDetail(null,stage)}/>
- setTrendMode(v as typeof trendMode)}/>
{trendMode==='data'&&setDefectDisplay(v as typeof defectDisplay)}/>}
{trendError&&}{trendMode==='data'?setBasisOpen(true)} onDrilldown={()=>{}}/>:}{trendLoading&&正在更新趋势}
指标由来源分量汇总,使用当前生效公式。点击期间筛选
-
+ setTrendMode(v as typeof trendMode)}/>
{trendMode==='data'&&setDefectDisplay(v as typeof defectDisplay)}/>}
{trendError&&}{trendMode==='data'?setBasisOpen(true)} onDrilldown={()=>{}}/>:}{trendLoading&&正在更新趋势}
{trendMode!=='data'&&指标由来源分量汇总,使用当前生效公式。
}
+
setBasisOpen(true)} onDrilldown={row=>{setProduct([row.product||'__UNASSIGNED__']);setSearch('');setApplied({...applied!,product:row.product||'__UNASSIGNED__',productSearch:undefined});setRevision(v=>v+1);}}/>
diff --git a/web/src/workspace-finish.css b/web/src/workspace-finish.css
index 711968f..8119350 100644
--- a/web/src/workspace-finish.css
+++ b/web/src/workspace-finish.css
@@ -37,6 +37,13 @@ body, .app-shell, .main-column { color: var(--ink); background: var(--background
.ant-segmented .ant-segmented-item-selected { color: var(--blue-dark); background: var(--blue-soft); box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--blue) 22%, transparent); }
.ant-segmented .ant-segmented-item, .ant-segmented .ant-segmented-thumb { border-radius: calc(var(--control-radius) - 1px); }
.ant-btn-primary { box-shadow: 0 1px 2px #101b3010; }
+.table-tools :is(.query-return-button, .query-export-button) { font-weight: 600; }
+.table-tools .query-return-button:not(:disabled) {
+ border-color: var(--blue);
+ color: var(--blue-dark);
+ background: var(--blue-soft);
+}
+.table-tools .query-return-button:not(:disabled):hover { background: var(--hover); }
.ant-btn:focus-visible, .nav-item:focus-visible, .metric-card:focus-visible { outline: 2px solid var(--blue); outline-offset: 2px; }
.workspace-theme-dropdown .ant-dropdown-menu { border-radius: var(--panel-radius); }
.workspace-theme-dropdown .ant-dropdown-menu-item { border-radius: calc(var(--control-radius) - 1px); }