diff --git a/docs/进度条弹窗-使用清单.md b/docs/进度条弹窗-使用清单.md new file mode 100644 index 00000000..5b384a7f --- /dev/null +++ b/docs/进度条弹窗-使用清单.md @@ -0,0 +1,158 @@ +# 进度条类弹窗 / 表单使用清单 + +> 整理范围:`el-dialog` 内展示 `el-progress` 的“任务进度弹窗”,以及提交任务后在**弹窗表单内**原地展示进度的表单。 +> 不含页面内联进度(如库位容量、仪表盘统计、账号安全强度)。 +> +> 示例入口:`order/waveOrder?tab=sandanFallbackOrders` → 「不符合波次策略订单列表」→ 工具栏「快速扫描」→ 波次策略快速扫描进度弹窗。 + +## 总览 + +- 共 **9 个组件**、约 **55 处使用** +- 两种形态: + 1. **独立进度弹窗**:`el-dialog` + 任务 ID + `el-progress` + 状态/数量信息(6 个组件) + 2. **弹窗表单内嵌进度**:先做表单提交,任务开始后在同一个弹窗里显示进度(3 个组件) +- 只改这 9 个组件即可覆盖全部此类 UI + +--- + +## 一、通用复用组件(影响面最大) + +### 1. `src/components/AsyncExportProgressDialog.vue` +- 标题由调用方传入,默认形态:任务 ID、状态、进度百分比、更新时间、提示文案 +- 进度:`el-progress :stroke-width="16"`,宽 `min(520px, 92vw)` +- 使用位置(23 个文件 / 25 处): + +| 模块 | 文件 | +|---|---| +| 仓库 / 货主 | `views/warehouses/index.vue` | +| 商品 | `views/stock/stock/index.vue`、`views/stock/external_stock/index.vue` | +| 售后 | `views/afterSale/list/index.vue` | +| 数据 | `views/data/packingflow/index.vue` | +| 快递 | `views/express/waybill/index.vue`、`views/express/returnReceived/index.vue`、`views/express/returnUnpack/index.vue`、`views/express/returnUnpack/components/ExportDialog.vue` | +| 入库 | `views/storage/entry/index.vue`、`views/storage/entry_owner/index.vue` | +| 收货 | `views/storage/receiving/index.vue`、`views/storage/receiving_owner/index.vue` | +| 库存 | `views/storage/inventory/index.vue` | +| 盘点 | `views/storage/stockcheck/index.vue`(2 处) | +| 报表 | `views/storage/report/index.vue`、`views/storage/report/store.vue`、`views/storage/generalreport/pages/ExportReportDialog.vue` | +| 商品流水 | `views/storage/productflow/index.vue`、`views/storage/productflow/store/index.vue` | +| 货主店铺 | `views/store/stores/index.vue`(2 处)、`views/store/stores/component/ExportDialog.vue` | +| 基础管理 | `views/system/setting/basicManagement/newview/pages/ExportReportDialog.vue` | + +### 2. `src/components/TaskProgressDialog.vue` +- 通用异步任务进度:任务 ID、状态、进度、更新时间、错误/结果 +- 进度:`el-progress :stroke-width="16"`,执行中带条纹流动(`striped` / `striped-flow`) +- 使用位置: + - `views/order/orderManagement/pendingOrder.vue`(分配快递号进度) + - `views/order/orderManagement/exceptionOrder.vue`(分配快递号进度) + +### 3. `src/views/order/orderManagement/component/OrderExportProgressDialog.vue` +- 订单导出进度:任务状态、任务 ID、条纹流动进度条 +- 使用位置(8 个订单页面): + - `reviewOrder.vue`、`pendingOrder.vue`、`outboundOrder.vue`、`deliveryOrder.vue` + - `exceptionOrder.vue`、`deliveryException.vue`、`archiveOrder.vue`、`entrustWarehouse.vue` + +--- + +## 二、波次模块专用进度弹窗 + +### 4. `views/order/waveOrder/component/WaveStrategyQuickScanProgressDialog.vue` +- 标题:`波次策略快速扫描` +- 内容:任务 ID、扫描任务进度、提交状态/任务状态/仓库、处理数量、匹配/未匹配、受理时间 +- 使用位置(2 处): + - `views/order/waveOrder/FallbackOrderListPanel.vue` ← **`tab=sandanFallbackOrders` 不符合波次策略订单列表** + - `views/order/waveOrder/GroupWaveBatchListPanel.vue` ← `tab=groupWave` 团购波次 +- 触发:工具栏「快速扫描」(`wave-config.ts` 中 `label: '快速扫描'`) + +### 5. `views/order/waveOrder/component/WaveFetchTaskProgressDialog.vue` +- 标题:`抓取任务进度` +- 使用位置(2 处): + - `SandanWaveBatchListPanel.vue`(散单波次) + - `GroupWaveBatchListPanel.vue`(团购波次) + +### 6. `views/order/waveOrder/component/WaveBatchTaskProgressDialog.vue` +- 标题由调用方传入,同一组件复用 4 类任务 +- 使用位置(8 处,散单波次 / 团购波次各 4 处): + | 标题 | 所在文件 | + |---|---| + | `快递号分配任务进度` | `SandanWaveBatchListPanel.vue`、`GroupWaveBatchListPanel.vue` | + | `储位分配任务进度` | 同上 | + | `移除异常订单任务进度` | 同上 | + | `批量取消波次任务进度` | 同上 | + +--- + +## 三、弹窗表单内嵌进度(提交后原地显示进度) + +### 7. `views/order/orderManagement/form/SyncOrderIdsForm.vue` +- 表单:同步订单 ID(勾选数量 → 确认同步 → 任务 ID / 状态 / 处理进度 / 总数/已处理/成功/失败) +- 使用位置(3 处): + - `views/order/orderManagement/pendingOrder.vue` + - `views/order/orderManagement/exceptionOrder.vue` + - `views/order/waveOrder/component/PendingOrderListPanel.vue`(散单波次/团购波次的待处理订单列表) + +### 8. `views/order/orderManagement/form/StorageAllocateForm.vue` +- 表单:按订单批量分配 / 取消分配储位(允许存储储位开关 → 提交 → 进度) +- 使用位置(3 处):同上(pendingOrder、exceptionOrder、wave 的 PendingOrderListPanel) + +### 9. `views/order/orderManagement/form/BatchAsyncTaskForm.vue` +- 表单:订单批量异步任务(拦截 / 解除拦截 / 锁定 / 解锁,配置见 `order-common-config.ts` 的 `PENDING_BATCH_ASYNC_TASK_ACTIONS`) +- 使用位置(2 处): + - `views/order/orderManagement/pendingOrder.vue` + - `views/order/orderManagement/exceptionOrder.vue` + +--- + +## 四、页面内联进度(不是任务弹窗,改造时无需处理) + +| 文件 | 用途 | +|---|---| +| `views/warehouse/AreaRacksList.vue` | 库位容量占用条 | +| `views/dashboard/components/StatsCardsWarehouse.vue` | 仪表盘统计卡片进度 | +| `views/dashboard/components/StatsCardsStore.vue` | 仪表盘统计卡片进度 | +| `views/profile/components/AccountSecurity.vue` | 账号安全强度条 | +| `views/test/index.vue` | 独立测试页的豹子进度条演示 | + +--- + +## 五、若统一替换为「豹子进度条」的改造入口 + +按影响面排序,优先改: + +1. `src/components/AsyncExportProgressDialog.vue` → 覆盖 23 个页面 / 25 处 +2. `src/components/TaskProgressDialog.vue` → 2 处 +3. `src/views/order/orderManagement/component/OrderExportProgressDialog.vue` → 8 个订单页面 +4. 波次 3 个专用弹窗 → 12 处 +5. 3 个表单内嵌进度 → 8 处 + +> 说明:独立进度弹窗统一使用 `el-progress :stroke-width="16"`;表单内嵌同样使用 `stroke-width=16`,可将进度条部分抽成公共组件(如 `TaskProgressBar.vue`)后在一处替换。 + +--- + +## 六、「预计剩余时间」怎么显示 + +后端所有任务进度接口都**不返回**剩余时间,只有 `progress(_percent)` / `processed_count` / +`total_count` / `duration_ms` / `submitted_at` / `update_time`。所以只能前端估算: + +``` +预计剩余 ≈ 已用时长(duration_ms) × (100 - progress) / progress +``` + +组件用法:给 `TaskProgressPanel` / `UnifiedTaskProgressDialog` 传 `elapsed-ms`(已用毫秒, +取接口 `duration_ms`;没有该字段的接口可用 `Date.now() - 轮询开始时间`),组件会自动显示 +「预计剩余 12秒」: + +```vue + +``` + +规则(`src/components/task-progress/estimate.ts`): + +- `progress` 为 0、`elapsedMs` 为 0 时不显示(无法外推) +- `progress` 到 100 或状态为 `failed` 时不显示 +- 文案固定带「预计」前缀;`etaText` 仍可显式覆盖 + diff --git a/public/animation/animation.gif b/public/animation/animation.gif new file mode 100644 index 00000000..36fddef0 Binary files /dev/null and b/public/animation/animation.gif differ diff --git a/src/components/task-progress/CheetahProgressBar.vue b/src/components/task-progress/CheetahProgressBar.vue new file mode 100644 index 00000000..dcf1935e --- /dev/null +++ b/src/components/task-progress/CheetahProgressBar.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/components/task-progress/TaskProgressPanel.vue b/src/components/task-progress/TaskProgressPanel.vue new file mode 100644 index 00000000..06932929 --- /dev/null +++ b/src/components/task-progress/TaskProgressPanel.vue @@ -0,0 +1,494 @@ + + + + + diff --git a/src/components/task-progress/UnifiedTaskProgressDialog.vue b/src/components/task-progress/UnifiedTaskProgressDialog.vue new file mode 100644 index 00000000..6e4a85ce --- /dev/null +++ b/src/components/task-progress/UnifiedTaskProgressDialog.vue @@ -0,0 +1,160 @@ + + + + + + + diff --git a/src/components/task-progress/estimate.ts b/src/components/task-progress/estimate.ts new file mode 100644 index 00000000..5cfdcc6c --- /dev/null +++ b/src/components/task-progress/estimate.ts @@ -0,0 +1,44 @@ +/** + * 进度弹窗的「预估剩余时间」计算。 + * + * 后端所有异步任务进度接口都**不返回**剩余时间,只返回: + * status / progress(_percent) / current_count / total_count / duration_ms / submitted_at / update_time + * 因此这里只能按「当前速度线性外推」: + * 剩余 ≈ 已用时长 × (100 - 进度) / 进度 + * + * 约束: + * - 进度为 0 时无法外推(除零 / 无样本),返回空串 + * - 进度已到 100 或任务失败时也不再展示 + * - 只是估算,文案必须带「预计」,避免被当成后端承诺 + */ + +/** 把毫秒格式化成「12秒」「1分20秒」 */ +export function formatDuration(ms: number): string { + if (!Number.isFinite(ms) || ms <= 0) return '0秒' + const totalSeconds = Math.max(1, Math.round(ms / 1000)) + if (totalSeconds < 60) return `${totalSeconds}秒` + const minutes = Math.floor(totalSeconds / 60) + const seconds = totalSeconds % 60 + return seconds ? `${minutes}分${seconds}秒` : `${minutes}分` +} + +/** + * 预估剩余时间文案。 + * @param progress 当前进度(0-100) + * @param elapsedMs 已用时长(毫秒,一般取接口的 duration_ms 或本地轮询起点) + * @param state 任务状态,failed/success 时不展示 + */ +export function estimateRemainingText( + progress: number, + elapsedMs: number, + state?: 'running' | 'success' | 'failed' +): string { + if (state === 'failed') return '' + const p = Number(progress) + const elapsed = Number(elapsedMs) + if (!Number.isFinite(p) || !Number.isFinite(elapsed)) return '' + if (p <= 0 || p >= 100 || elapsed <= 0) return '' + const remainingMs = (elapsed * (100 - p)) / p + if (!Number.isFinite(remainingMs) || remainingMs <= 0) return '' + return `预计剩余 ${formatDuration(remainingMs)}` +} diff --git a/src/components/task-progress/types.ts b/src/components/task-progress/types.ts new file mode 100644 index 00000000..d1563bf4 --- /dev/null +++ b/src/components/task-progress/types.ts @@ -0,0 +1,25 @@ +/** 统一进度弹窗的公共类型 */ + +export type ProgressState = 'running' | 'success' | 'failed' + +/** 参数摘要:仓库 / 波次策略 / 订单范围 等 */ +export interface ProgressSummaryItem { + label: string + value: string +} + +/** 统计指标:匹配订单 / 未匹配 / 耗时 等 */ +export interface ProgressMetricItem { + label: string + value: string | number + unit?: string +} + +/** 表单字段(提交前的参数展示) */ +export interface ProgressFormField { + label: string + value?: string | number + type?: 'text' | 'switch' + /** type=switch 时是否开启 */ + active?: boolean +} diff --git a/src/views/test/components/CheetahRunner.vue b/src/views/test/components/CheetahRunner.vue deleted file mode 100644 index 0e036756..00000000 --- a/src/views/test/components/CheetahRunner.vue +++ /dev/null @@ -1,407 +0,0 @@ - - - - - diff --git a/src/views/test/components/VariantA.vue b/src/views/test/components/VariantA.vue deleted file mode 100644 index fd293146..00000000 --- a/src/views/test/components/VariantA.vue +++ /dev/null @@ -1,336 +0,0 @@ - - - - - diff --git a/src/views/test/components/VariantB.vue b/src/views/test/components/VariantB.vue deleted file mode 100644 index 5baa6be3..00000000 --- a/src/views/test/components/VariantB.vue +++ /dev/null @@ -1,329 +0,0 @@ - - - - - diff --git a/src/views/test/components/VariantC.vue b/src/views/test/components/VariantC.vue deleted file mode 100644 index 4a18556b..00000000 --- a/src/views/test/components/VariantC.vue +++ /dev/null @@ -1,261 +0,0 @@ - - - - - diff --git a/src/views/test/components/VariantD.vue b/src/views/test/components/VariantD.vue deleted file mode 100644 index ecc6b514..00000000 --- a/src/views/test/components/VariantD.vue +++ /dev/null @@ -1,400 +0,0 @@ - - - - - diff --git a/src/views/test/index.vue b/src/views/test/index.vue index 0884f31b..5195628f 100644 --- a/src/views/test/index.vue +++ b/src/views/test/index.vue @@ -1,163 +1,1027 @@