feat(首页/订单): 实时看板 + 待支付订单 2 小时自动失效
- 首页改成深色实时看板:今日/昨日维度、每 30 秒静默刷新(后台标签页跳过)、 切维度/切回前台立刻刷;工作台榜按「占比」出条并同时给条数与百分比; 支持原生全屏,`AppLayout :immersive` 隐藏左侧菜单与顶栏占满整屏 - 待支付订单 2 小时自动失效(`config.pay.orderTtl` / `PAY_ORDER_TTL`,默认 7200 秒): 定时任务 `app/schedule/subject_order_expire.js` 每分钟扫一次, 详情/列表/平台订单列表读到超时订单就地关单,支付回调入口再兜一层; 超时后的渠道回调与手工确认一律 409;`present()` 下发 `payExpireAt / expired / pending`, 前端展示支付截止时间、超时后停止轮询、平台端隐藏「确认订单」按钮 - 文档同步:根 README 与 backend/README(订单 TTL、看板刷新策略、全屏降级) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
parent
9027857303
commit
4704e10777
13
README.md
13
README.md
@ -78,6 +78,9 @@ packService/
|
||||
- [x] **平台管理员 + 平台管理台(2026-10-29)**:新表 `admin_members`(平台管理员名单,`INTERNAL_ADMIN_IDS` 为内置/救急入口);
|
||||
平台管理员登录后左侧菜单多出「平台管理」:**主体管理**(所有主体 + 直接改授权到期时间:选时间或顺延)、
|
||||
**订单管理**(所有订单 + 确认订单 = 支付回调的同一套后续动作)、**管理员**(成员列表 + 按账号添加/移除)
|
||||
- [x] **待支付订单 2 小时自动失效(2026-10-29)**:下单后 2 小时(`PAY_ORDER_TTL`,默认 7200 秒)内未支付,
|
||||
订单自动关闭(`status=2`);之后的支付回调 / 手工确认一律 409。与微信扫码支付二维码有效期对齐,
|
||||
定时任务每分钟扫一次,详情 / 列表 / 回调读路径也会顺手收口(详见 [`backend/README.md`](backend/README.md))
|
||||
- [x] **顶栏下载入口(2026-10-29)**:所有页面右上角都有「桌面端 / Android 扫码台」下载按钮(**不看权限**),
|
||||
版本号读 `/download/version.json` 与 `/download/android_client/version.json`,没发布过安装包时按钮置灰
|
||||
- [ ] 扩展:目标地址换成真实打包视频页(现在指向百度占位)—— 在扩展「设置」里改「目标地址模板」即可,需要真实地址
|
||||
@ -100,6 +103,16 @@ packService/
|
||||
- **列表页**(设备管理 / 扫码记录)用 `<AppLayout fill>`:内容区不滚动、卡片吃掉剩余高度、只有 `.table-wrap` 内部滚动(表头 `position: sticky` 吸顶、分页条贴在卡片底部);表单/详情页不传 `fill`,滚动落在内容区,侧边栏底部始终可见;
|
||||
- **接口调用**一律走 `api/client.ts`(自动带 `Authorization: Bearer`、401 自动清令牌)+ `api/web.ts`;**不用 cookie/session,也就不需要 CSRF**;
|
||||
- **扫码头像期**:前端要自己设客户端超时(服务端挂 60s,客户端 70s),切走面板 / 离开页面(`pagehide`)时要 `abort()` 长轮询 —— 后端会立刻停止等待(见 `backend/README.md` 长轮询一节)。
|
||||
- **首页是「实时看板」**:深色科技风(海军蓝底 + 青色 `#24bbcd`/`#39d6ff` 描边与发光,参考 `D:\WMS_ANDROID_TV` 的看板),
|
||||
主题变量集中在 `HomeView.vue` 的 `.dashboard { --tech-* }` 里,图表组件本身保持中性、只在看板内 `:deep()` 染成青色;
|
||||
- **刷新策略**:每 **30 秒**静默刷新一次(`REFRESH_SECONDS`,不闪 loading、失败保留旧数据),
|
||||
切维度 / 切回前台(`visibilitychange`)立刻刷;页面在后台(`document.hidden`)时跳过;
|
||||
头部显示「刷新于 hh:mm:ss · 每 30 秒自动刷新」;
|
||||
- **工作台榜**:条长 = 该工作台打包数 / 该时间段总扫码数(**占比**,右侧同时给条数与百分比),
|
||||
没关联工作台的那部分单独一行;工作台只显示名称,`WS-xxxx` 编码只进 hover 提示(别再挤占名称列);
|
||||
- **全屏按钮**:优先调浏览器原生 `requestFullscreen()`(Esc 可退),不支持/被拒时降级成「只隐藏菜单与顶栏」;
|
||||
`<AppLayout :immersive="true">` 会隐藏左侧菜单与顶栏、内容占满整屏(`is-immersive` 类);
|
||||
- 大屏模式下数值字号加大(`.dashboard.is-immersive .kpi-value`),离开首页会自动退出原生全屏。
|
||||
|
||||
### 前端常用命令
|
||||
|
||||
|
||||
@ -416,6 +416,9 @@ npm run cov
|
||||
| `WX_GATEWAY_APP_SECRET` | 空 | 网关应用的 appSecret(`gws_…`),**只放服务端**(验证回调签名) |
|
||||
| `WX_GATEWAY_POLL_WAIT` / `WX_GATEWAY_SCENE_TTL` / `WX_GATEWAY_NOTIFY_SKEW` | `55` / `660` / `300` | 网关扫码的长轮询上限(秒)/ 本地会话有效期(秒)/ 通知时间戳容差(秒) |
|
||||
| `WECHAT_QR_CELL` / `WECHAT_QR_MARGIN` | `6` / `4` | 二维码 SVG 的单元格像素 / 静默区格数(⚠️ 库的 margin 参数单位是像素,代码里已按格×单元格换算;<4 格会影响扫码) |
|
||||
| `PAY_MOCK` / `PAY_CALLBACK_SECRET` | 开发默认开 / 空 | 模拟支付回调(免签名)/ 回调签名密钥(`X-Pay-Sign`) |
|
||||
| `PAY_AMOUNT_PER_DAY` | `0` | 每天默认价格(0 = 不校验金额,内部测试用) |
|
||||
| `PAY_ORDER_TTL` | `7200` | **待支付订单有效期(秒)**:超时自动关闭,之后的回调/手工确认一律 409(与微信扫码支付二维码 2 小时有效期对齐) |
|
||||
| `WECHAT_STATE_TTL` | `600` | 扫码串码(二维码)有效期(秒)——设备扫码登录用 |
|
||||
| `WECHAT_CODE_LENGTH` | `6` | 扫码串码长度(数字 + 大写字母,去掉了 0/O/1/I 等易混字符) |
|
||||
| `WECHAT_SPM_PATTERN` | `1.0.{code}.1` | 二维码地址里的 spm 格式(`{code}` 会被替换成串码) |
|
||||
@ -1051,11 +1054,23 @@ await this.ctx.service.cache.remember('user:1', 60, () => loadFromMysql());
|
||||
|---|---|---|
|
||||
| GET | `/api/web/subject-plans` | 上架套餐 `{ list: [{ id, code, name, days, price, originalPrice, tag, description, pricePerDay }] }`(任何登录用户可读) |
|
||||
| GET | `/api/web/subjects/:id/orders` | 订单列表(成员可见,`{ total, page, pageSize, list }`) |
|
||||
| POST | `/api/web/subjects/:id/orders` | **选套餐下单** `{ planId, remark? }`(仅管理员)→ `{ orderNo, planId, planName, days, amount, status:0待支付, pending:true, … }`;**金额只认套餐价**,前端传的 `amount/days` 一律忽略 |
|
||||
| GET | `/api/web/subjects/:id/orders/:orderNo` | 单笔订单(续期弹窗每 2s 轮询支付状态,`pending=false` 即停止) |
|
||||
| POST | `/api/web/subjects/:id/orders` | **选套餐下单** `{ planId, remark? }`(仅管理员)→ `{ orderNo, planId, planName, days, amount, status:0待支付, pending:true, payExpireAt, expired:false, … }`;**金额只认套餐价**,前端传的 `amount/days` 一律忽略 |
|
||||
| GET | `/api/web/subjects/:id/orders/:orderNo` | 单笔订单(续期弹窗每 2s 轮询支付状态,`pending=false` 即停止;超时会被就地关闭成 `status=2`) |
|
||||
| POST | `/api/web/subjects/:id/orders/:orderNo/close` | 关闭待支付订单(仅管理员;已支付 → 409) |
|
||||
| POST | `/api/pay/notify` | **公开的渠道回调** `{ orderNo, transactionId?, amount?, channel?, paidAt? }` → `{ duplicated, order }`;订单不存在 404、金额不符 422、签名错 400 |
|
||||
| POST | `/api/internal/subject-orders/:orderNo/pay` | **内部令牌**:模拟支付成功(不需要签名),方便联调/补单 |
|
||||
| POST | `/api/pay/notify` | **公开的渠道回调** `{ orderNo, transactionId?, amount?, channel?, paidAt? }` → `{ duplicated, order }`;订单不存在 404、金额不符 422、签名错 400、**超时失效 409** |
|
||||
| POST | `/api/internal/subject-orders/:orderNo/pay` | **内部令牌**:模拟支付成功(不需要签名),方便联调/补单;超时订单同样 409 |
|
||||
|
||||
**待支付订单 2 小时自动失效**(`config.pay.orderTtl`,env `PAY_ORDER_TTL`,默认 `7200` 秒):
|
||||
支付截止时间 = `created_at + TTL`,响应里的 `payExpireAt` / `expired` / `pending` 就是给前端做倒计时和停止轮询用的
|
||||
(`pending=false` 表示不用再轮询;`expired` 只在「还是待支付但已过截止时间」时为 true,
|
||||
正常读一次就会被就地关成 `status=2`,这时看 `status` / `statusText` 即可)。超时订单会被置为 `status=2`(已关闭),
|
||||
**之后再到支付回调 / 手工确认,一律 409「订单已超时失效,请重新下单」**(与微信扫码支付二维码 2 小时有效期一致)。
|
||||
|
||||
关单有三个触发点,互相兜底:
|
||||
|
||||
1. 定时任务 `app/schedule/subject_order_expire.js`(每分钟一次,`type: worker`,逻辑幂等);
|
||||
2. 读路径(订单详情 / 订单列表 / 平台订单列表)读到超时订单随手关掉;
|
||||
3. `payNotify()` 进门先判一次(含事务内兜底),避免回调与关单并发时把已失效订单续期。
|
||||
|
||||
订单会快照 `plan_id / plan_code / plan_name`,套餐后续改价或下架都不影响历史订单对账。
|
||||
套餐表 `subject_plans`(迁移 `20261021180000-create-subject-plans` 内置三档,改价直接改库、不用发版):
|
||||
|
||||
@ -13,6 +13,7 @@ const { Controller } = require('egg');
|
||||
* **确认订单**:与支付渠道回调走**同一个** `service.subjectOrder.payNotify()`,
|
||||
* 所以「标记已支付 + 主体顺延 + 失效状态缓存 + 幂等」这些后续动作完全一致,
|
||||
* 只是渠道记成 `manual`、流水号记成 `ADMIN-<时间戳>`(便于和真实渠道对账区分)。
|
||||
* 待支付订单超过 2 小时(`config.pay.orderTtl`)会自动关闭,之后再确认会 409 —— 线下收款请及时补单。
|
||||
*/
|
||||
class WebAdminOrderController extends Controller {
|
||||
/** GET /api/web/admin/orders */
|
||||
|
||||
26
backend/app/schedule/subject_order_expire.js
Normal file
26
backend/app/schedule/subject_order_expire.js
Normal file
@ -0,0 +1,26 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 待支付订单超时关闭(每分钟一次)
|
||||
*
|
||||
* 规则:订单创建后 `config.pay.orderTtl` 秒(默认 2 小时)内未支付 → `status = 2`(已关闭)。
|
||||
* 与微信扫码支付二维码 2 小时有效期对齐:二维码失效后订单也不该还能付。
|
||||
*
|
||||
* 读路径(详情 / 列表 / 支付回调)也会顺手收口,所以这个任务只是让状态**按时**落库,
|
||||
* 不依赖有没有人访问。多进程/多实例时只由 worker 执行一次,逻辑本身幂等(只动 `status = 0`)。
|
||||
*/
|
||||
module.exports = app => {
|
||||
return {
|
||||
schedule: {
|
||||
cron: '0 * * * * *',
|
||||
type: 'worker',
|
||||
immediate: false,
|
||||
disable: app.config.env === 'unittest',
|
||||
},
|
||||
async task(ctx) {
|
||||
const closed = await ctx.service.subjectOrder.sweepExpired();
|
||||
if (closed) ctx.logger.info('[order] 自动关闭超时未支付订单 %d 笔', closed);
|
||||
return { closed };
|
||||
},
|
||||
};
|
||||
};
|
||||
@ -6,6 +6,8 @@ const { Op } = require('sequelize');
|
||||
|
||||
const DAY_MS = 24 * 3600 * 1000;
|
||||
const STATUS_TEXT = { 0: '待支付', 1: '已支付', 2: '已关闭' };
|
||||
/** 待支付订单默认有效期:2 小时(与微信扫码支付二维码有效期对齐) */
|
||||
const DEFAULT_ORDER_TTL_SECONDS = 2 * 3600;
|
||||
|
||||
/**
|
||||
* 主体续期订单 service
|
||||
@ -16,6 +18,8 @@ const STATUS_TEXT = { 0: '待支付', 1: '已支付', 2: '已关闭' };
|
||||
* - **支付靠回调驱动**:下单不改变期限,只有 `payNotify()` 成功才续期;
|
||||
* - **价格只认套餐**:下单只收 `planId`,金额取库里的 `subject_plans.price`,不信前端传的金额;
|
||||
* - **幂等**:同一订单重复回调只续期一次(第二次返回 `duplicated: true`);
|
||||
* - **2 小时自动失效**:待支付订单超过 `config.pay.orderTtl`(默认 7200 秒)未支付即关闭,
|
||||
* 之后再来的支付回调一律 409 —— 与微信扫码支付二维码 2 小时有效期保持一致;
|
||||
* - 续期基数与 `service.subject.update` 一致:未过期在原到期时间上顺延,已过期从当前时间起算。
|
||||
*/
|
||||
class SubjectOrderService extends Service {
|
||||
@ -27,6 +31,61 @@ class SubjectOrderService extends Service {
|
||||
return this.app.model.Subject;
|
||||
}
|
||||
|
||||
/** 待支付订单有效期(毫秒),`config.pay.orderTtl` 秒,默认 2 小时 */
|
||||
get orderTtlMs() {
|
||||
const seconds = Number(this.config.pay && this.config.pay.orderTtl);
|
||||
return (Number.isFinite(seconds) && seconds > 0 ? seconds : DEFAULT_ORDER_TTL_SECONDS) * 1000;
|
||||
}
|
||||
|
||||
/** 支付截止时间 = 下单时间 + 有效期 */
|
||||
payExpireAtOf(order) {
|
||||
const createdAt = order.createdAt || order.created_at;
|
||||
const baseMs = createdAt ? new Date(createdAt).getTime() : Date.now();
|
||||
return new Date(baseMs + this.orderTtlMs);
|
||||
}
|
||||
|
||||
/** 是否已过支付截止时间(只有待支付订单才谈得上超时) */
|
||||
isExpired(order, now = Date.now()) {
|
||||
const createdAt = order.createdAt || order.created_at;
|
||||
if (Number(order.status) !== 0 || !createdAt) return false;
|
||||
return this.payExpireAtOf(order).getTime() <= now;
|
||||
}
|
||||
|
||||
/**
|
||||
* 把已超时的待支付订单标记为已关闭(读路径顺手收口,不依赖定时任务)
|
||||
*
|
||||
* @param {Array} orders Sequelize 实例或普通行;关闭后实例的 `status` 会同步改成 2
|
||||
* @return {Promise<number>} 实际关闭的条数
|
||||
*/
|
||||
async closeExpired(orders = []) {
|
||||
const expired = orders.filter(row => this.isExpired(row));
|
||||
if (!expired.length) return 0;
|
||||
|
||||
const ids = expired.map(row => Number(row.id));
|
||||
const [ affected ] = await this.Order.update(
|
||||
{ status: 2 },
|
||||
{ where: { id: { [Op.in]: ids }, status: 0 } },
|
||||
);
|
||||
expired.forEach(row => { row.status = 2; });
|
||||
|
||||
this.ctx.logger.info('[order] 超时未支付,自动关闭订单 %d 笔:%s', ids.length, ids.join(','));
|
||||
return Number(affected) || 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 定时任务入口:批量关闭所有超时未支付的订单
|
||||
*
|
||||
* @return {Promise<number>} 关闭的订单数
|
||||
*/
|
||||
async sweepExpired() {
|
||||
const cutoff = new Date(Date.now() - this.orderTtlMs);
|
||||
const [ closed ] = await this.Order.update(
|
||||
{ status: 2 },
|
||||
{ where: { status: 0, createdAt: { [Op.lt]: cutoff } } },
|
||||
);
|
||||
return Number(closed) || 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建订单(管理员):选套餐 → 只建单,不动期限
|
||||
*
|
||||
@ -78,6 +137,7 @@ class SubjectOrderService extends Service {
|
||||
where: { orderNo: no, subjectId: Number(subjectId) },
|
||||
});
|
||||
if (!order) this.ctx.throw(404, '订单不存在');
|
||||
await this.closeExpired([ order ]);
|
||||
return this.present(order);
|
||||
}
|
||||
|
||||
@ -112,6 +172,7 @@ class SubjectOrderService extends Service {
|
||||
limit: size,
|
||||
offset: (current - 1) * size,
|
||||
});
|
||||
await this.closeExpired(result.rows);
|
||||
|
||||
return {
|
||||
total: result.count,
|
||||
@ -154,6 +215,7 @@ class SubjectOrderService extends Service {
|
||||
limit: size,
|
||||
offset: (current - 1) * size,
|
||||
});
|
||||
await this.closeExpired(rows);
|
||||
|
||||
const ids = [ ...new Set(rows.map(row => Number(row.subjectId))) ];
|
||||
const subjects = ids.length
|
||||
@ -194,6 +256,14 @@ class SubjectOrderService extends Service {
|
||||
if (!no) this.ctx.throw(422, 'orderNo 不能为空');
|
||||
if (no.length > 32) this.ctx.throw(422, 'orderNo 不合法');
|
||||
|
||||
// 超时未支付的订单先关掉:超过 2 小时的支付回调 / 手工确认都不该让它续期
|
||||
const stale = await this.Order.findOne({ where: { orderNo: no } });
|
||||
if (stale && this.isExpired(stale)) {
|
||||
await this.Order.update({ status: 2 }, { where: { id: stale.id, status: 0 } });
|
||||
this.ctx.logger.info('[order] 订单 %s 超过支付截止时间,已自动关闭', no);
|
||||
this.ctx.throw(409, '订单已超时失效,请重新下单');
|
||||
}
|
||||
|
||||
const transaction = await this.app.model.transaction();
|
||||
try {
|
||||
const order = await this.Order.findOne({
|
||||
@ -209,6 +279,8 @@ class SubjectOrderService extends Service {
|
||||
return { duplicated: true, order: this.present(order) };
|
||||
}
|
||||
if (Number(order.status) !== 0) this.ctx.throw(409, '订单状态不允许支付');
|
||||
// 兜底:与定时任务 / 其它实例的关单并发时,也不让超时订单续期
|
||||
if (this.isExpired(order)) this.ctx.throw(409, '订单已超时失效,请重新下单');
|
||||
|
||||
const paid = amount === undefined || amount === null || amount === '' ? null : Number(amount);
|
||||
if (paid !== null) {
|
||||
@ -259,6 +331,11 @@ class SubjectOrderService extends Service {
|
||||
}
|
||||
|
||||
present(order, extra = {}) {
|
||||
const status = Number(order.status);
|
||||
const payExpireAt = this.payExpireAtOf(order);
|
||||
// 只有待支付订单有「超时」概念;已支付 / 已关闭一律不算
|
||||
const expired = status === 0 && payExpireAt.getTime() <= Date.now();
|
||||
|
||||
return Object.assign({
|
||||
id: Number(order.id),
|
||||
orderNo: order.orderNo,
|
||||
@ -269,10 +346,14 @@ class SubjectOrderService extends Service {
|
||||
planName: order.planName || null,
|
||||
days: Number(order.days),
|
||||
amount: order.amount === null || order.amount === undefined ? null : Number(order.amount),
|
||||
status: Number(order.status),
|
||||
statusText: STATUS_TEXT[Number(order.status)] || '未知',
|
||||
/** 前端据此判断要不要继续轮询 */
|
||||
pending: Number(order.status) === 0,
|
||||
status,
|
||||
statusText: STATUS_TEXT[status] || '未知',
|
||||
/** 前端据此判断要不要继续轮询(超时后不再轮询,等下一次读取时订单会被关掉) */
|
||||
pending: status === 0 && !expired,
|
||||
/** 支付截止时间(下单时间 + config.pay.orderTtl,默认 2 小时) */
|
||||
payExpireAt,
|
||||
/** 是否已过支付截止时间(仅 status=0 时可能为 true;关单后看 status=2) */
|
||||
expired,
|
||||
channel: order.channel || null,
|
||||
transactionId: order.transactionId || null,
|
||||
paidAt: order.paidAt || null,
|
||||
|
||||
@ -198,6 +198,9 @@ module.exports = (appInfo) => {
|
||||
callbackSecret: env.PAY_CALLBACK_SECRET || '',
|
||||
// 每天默认价格(0 = 不校验金额,方便内部测试)
|
||||
amountPerDay: Number(env.PAY_AMOUNT_PER_DAY || 0),
|
||||
// 待支付订单有效期(秒,默认 2 小时):超时自动关闭(status=2),之后的回调/手工确认一律 409。
|
||||
// 与微信扫码支付二维码 2 小时有效期对齐:二维码失效了,订单也不该还能付。
|
||||
orderTtl: Number(env.PAY_ORDER_TTL || 7200),
|
||||
};
|
||||
|
||||
// ==================== 业务配置 ====================
|
||||
|
||||
@ -17,6 +17,7 @@ const instance = data => {
|
||||
|
||||
const USER = { id: 1, username: 'admin', nickname: '管理员', status: 1 };
|
||||
const SUBJECT_ID = 21;
|
||||
const ORDER_TTL_MS = 2 * 3600 * 1000;
|
||||
|
||||
/**
|
||||
* 续期订单 + 支付回调
|
||||
@ -31,6 +32,9 @@ describe('test/app/controller/subject-order.test.js', () => {
|
||||
const token = () => `Bearer ${app.createAnonymousContext().service.jwt.signUser(USER)}`;
|
||||
const auth = () => ({ Authorization: token() });
|
||||
|
||||
/** 记录 `SubjectOrder.update()` 的调用(超时关单) */
|
||||
let orderUpdates = [];
|
||||
|
||||
const subjectRow = expireAt => instance({
|
||||
id: SUBJECT_ID,
|
||||
name: '测试主体',
|
||||
@ -100,12 +104,17 @@ describe('test/app/controller/subject-order.test.js', () => {
|
||||
async create(fields) { return orderRow(Object.assign({ id: 101 }, fields)); },
|
||||
async findOne() { return typeof order === 'function' ? order() : order; },
|
||||
async findAndCountAll() { return { rows: [ orderRow() ], count: 1 }; },
|
||||
async update(fields, options) {
|
||||
orderUpdates.push({ fields, options });
|
||||
return [ 1 ];
|
||||
},
|
||||
},
|
||||
transaction: async () => fakeTransaction(log),
|
||||
});
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
orderUpdates = [];
|
||||
app.createAnonymousContext().service.subjectState.clearLocalCache();
|
||||
});
|
||||
|
||||
@ -180,6 +189,51 @@ describe('test/app/controller/subject-order.test.js', () => {
|
||||
.set(auth()).send({ planId: 7 }).expect(422);
|
||||
});
|
||||
|
||||
it('POST /api/web/subjects/:id/orders:返回 2 小时支付截止时间(payExpireAt)', async () => {
|
||||
mockModels({ subject: subjectRow(new Date(Date.now() + 86400000)) });
|
||||
|
||||
const res = await app.httpRequest().post(`/api/web/subjects/${SUBJECT_ID}/orders`)
|
||||
.set(auth()).send({ planId: 7 }).expect(201);
|
||||
|
||||
const data = res.body.data;
|
||||
const ttl = new Date(data.payExpireAt).getTime() - new Date(data.createdAt).getTime();
|
||||
assert(ttl === ORDER_TTL_MS, `支付截止时间应为下单后 2 小时,实际 ${ttl}ms`);
|
||||
assert(data.expired === false && data.pending === true, JSON.stringify(data));
|
||||
});
|
||||
|
||||
it('GET /api/web/subjects/:id/orders/:orderNo:超过 2 小时未支付 → 自动关闭', async () => {
|
||||
const order = orderRow({ createdAt: new Date(Date.now() - 3 * 3600 * 1000) });
|
||||
mockModels({ subject: subjectRow(new Date(Date.now() + 86400000)), order: () => order });
|
||||
|
||||
const res = await app.httpRequest()
|
||||
.get(`/api/web/subjects/${SUBJECT_ID}/orders/${order.orderNo}`)
|
||||
.set(auth()).expect(200);
|
||||
|
||||
assert(res.body.data.status === 2, JSON.stringify(res.body));
|
||||
assert(res.body.data.pending === false, JSON.stringify(res.body));
|
||||
assert(orderUpdates.some(item => item.fields.status === 2), JSON.stringify(orderUpdates));
|
||||
});
|
||||
|
||||
it('POST /api/pay/notify:超过 2 小时未支付 → 409,订单被关闭', async () => {
|
||||
const order = orderRow({ createdAt: new Date(Date.now() - 3 * 3600 * 1000) });
|
||||
mockModels({ subject: subjectRow(new Date(Date.now() + 86400000)), order: () => order });
|
||||
|
||||
await app.httpRequest().post('/api/pay/notify')
|
||||
.send({ orderNo: order.orderNo, amount: 99 })
|
||||
.expect(409);
|
||||
|
||||
assert(orderUpdates.some(item => item.fields.status === 2), JSON.stringify(orderUpdates));
|
||||
});
|
||||
|
||||
it('定时任务 sweepExpired():批量关闭超时未支付订单', async () => {
|
||||
mockModels({});
|
||||
|
||||
const closed = await app.createAnonymousContext().service.subjectOrder.sweepExpired();
|
||||
assert(closed === 1, `应关闭 1 笔,实际 ${closed}`);
|
||||
assert(orderUpdates.length === 1 && orderUpdates[0].fields.status === 2, JSON.stringify(orderUpdates));
|
||||
assert(orderUpdates[0].options.where.status === 0, JSON.stringify(orderUpdates[0].options));
|
||||
});
|
||||
|
||||
it('POST /api/pay/notify:支付成功后主体续期,且缓存失效(设备立刻看到新期限)', async () => {
|
||||
const log = [];
|
||||
const order = orderRow();
|
||||
|
||||
@ -64,6 +64,10 @@ export interface AdminOrderItem {
|
||||
status: number;
|
||||
statusText: string;
|
||||
pending: boolean;
|
||||
/** 支付截止时间(下单 + 2 小时,超时订单自动关闭) */
|
||||
payExpireAt?: string | null;
|
||||
/** 是否已超时失效(仅待支付订单可能为 true) */
|
||||
expired?: boolean;
|
||||
channel?: string | null;
|
||||
transactionId?: string | null;
|
||||
paidAt?: string | null;
|
||||
|
||||
@ -126,6 +126,10 @@ export interface SubjectOrder {
|
||||
statusText: string;
|
||||
/** 是否还在等支付(前端据此决定要不要继续轮询) */
|
||||
pending: boolean;
|
||||
/** 支付截止时间(下单 + 2 小时,超时订单自动关闭) */
|
||||
payExpireAt?: string | null;
|
||||
/** 是否已超时失效(仅待支付订单可能为 true) */
|
||||
expired?: boolean;
|
||||
channel?: string | null;
|
||||
transactionId?: string | null;
|
||||
paidAt?: string | null;
|
||||
|
||||
@ -19,7 +19,12 @@ import { fetchInstallerVersion, formatSize, type InstallerVersion } from '@/api/
|
||||
* fill = true:列表页用 —— 内容区不滚动,卡片吃掉剩余高度,只有表格内部滚动(表头吸顶、分页贴底)
|
||||
* 默认 false:表单/详情页 —— 滚动落在内容区
|
||||
*/
|
||||
withDefaults(defineProps<{ fill?: boolean }>(), { fill: false });
|
||||
/**
|
||||
* fill = true:列表页用 —— 内容区不滚动,卡片吃掉剩余高度,只有表格内部滚动(表头吸顶、分页贴底)
|
||||
* 默认 false:表单/详情页 —— 滚动落在内容区
|
||||
* immersive = true:看板/大屏模式 —— **隐藏左侧菜单与顶部状态栏**,内容占满整屏(首页全屏按钮用)
|
||||
*/
|
||||
withDefaults(defineProps<{ fill?: boolean; immersive?: boolean }>(), { fill: false, immersive: false });
|
||||
|
||||
const router = useRouter();
|
||||
|
||||
@ -136,7 +141,7 @@ onMounted(() => {
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="layout">
|
||||
<div class="layout" :class="{ 'is-immersive': immersive }">
|
||||
<aside class="sidebar">
|
||||
<div class="brand">云仓视频溯源系统</div>
|
||||
|
||||
@ -219,6 +224,21 @@ onMounted(() => {
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
/* 看板(全屏)模式:隐藏左侧菜单与顶部状态栏,内容区占满整屏 */
|
||||
.layout.is-immersive .sidebar,
|
||||
.layout.is-immersive .topbar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.layout.is-immersive,
|
||||
.layout.is-immersive .main {
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
.layout.is-immersive .content {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/* 菜单分组标题(平台管理) */
|
||||
.nav-group {
|
||||
margin: 12px 4px 4px;
|
||||
|
||||
@ -1,13 +1,22 @@
|
||||
<script setup lang="ts">
|
||||
/** 首页「每个工作台打包数量」排行榜(横向条形图,纯 CSS) */
|
||||
/**
|
||||
* 首页「每个工作台打包数量」横向进度条(纯 CSS)
|
||||
*
|
||||
* 条长 = **该工作台打包数 / 该时间段总扫码数**(占比),不是相对最大值 —— 一眼就能看出
|
||||
* 「这个工作台占了本期多少」。右侧同时给「条数 + 百分比」。
|
||||
*
|
||||
* 工作台名称就是名称(不再显示 `WS-xxxxx` 这种内部编码,编码只放在 hover 提示里)。
|
||||
*/
|
||||
import { computed } from 'vue';
|
||||
import type { WorkstationPackStat } from '@/api/types';
|
||||
|
||||
interface Row {
|
||||
key: string;
|
||||
label: string;
|
||||
/** 内部编码(只用于 hover 提示,不占版位) */
|
||||
code?: string;
|
||||
count: number;
|
||||
percent: number;
|
||||
deleted?: boolean;
|
||||
muted?: boolean;
|
||||
}
|
||||
@ -16,50 +25,77 @@ const props = withDefaults(defineProps<{
|
||||
items: WorkstationPackStat[];
|
||||
/** 区间内没有关联工作台的扫码数 */
|
||||
unassigned?: number;
|
||||
/** 该时间段的扫码总数(占比的分母);不传就用各项之和 */
|
||||
total?: number;
|
||||
/** 最多显示几个工作台,其余合并成「其他」 */
|
||||
limit?: number;
|
||||
}>(), { unassigned: 0, limit: 8 });
|
||||
}>(), { unassigned: 0, total: 0, limit: 8 });
|
||||
|
||||
/** 占比的分母:优先用后端给的时间段总数,没给就用各项之和 */
|
||||
const denominator = computed(() => {
|
||||
const sum = props.items.reduce((acc, item) => acc + Math.max(Number(item.count) || 0, 0), 0)
|
||||
+ Math.max(Number(props.unassigned) || 0, 0);
|
||||
const total = Number(props.total);
|
||||
return Math.max(Number.isFinite(total) && total > 0 ? total : 0, sum, 1);
|
||||
});
|
||||
|
||||
const rows = computed<Row[]>(() => {
|
||||
const list: Row[] = props.items.slice(0, props.limit).map(item => ({
|
||||
const toRow = (base: Omit<Row, 'percent'>): Row => ({
|
||||
...base,
|
||||
percent: Math.round((Math.max(base.count, 0) / denominator.value) * 1000) / 10,
|
||||
});
|
||||
|
||||
const list: Row[] = props.items.slice(0, props.limit).map(item => toRow({
|
||||
key: `ws-${item.id}`,
|
||||
label: item.name || item.code,
|
||||
code: item.name ? item.code : '',
|
||||
count: item.count,
|
||||
code: item.code,
|
||||
count: Math.max(Number(item.count) || 0, 0),
|
||||
deleted: item.deleted,
|
||||
}));
|
||||
|
||||
const rest = props.items.slice(props.limit);
|
||||
if (rest.length) {
|
||||
list.push({
|
||||
list.push(toRow({
|
||||
key: 'rest',
|
||||
label: `其他 ${rest.length} 个工作台`,
|
||||
count: rest.reduce((sum, item) => sum + item.count, 0),
|
||||
count: rest.reduce((sum, item) => sum + (Number(item.count) || 0), 0),
|
||||
muted: true,
|
||||
});
|
||||
}));
|
||||
}
|
||||
if (props.unassigned > 0) {
|
||||
list.push({ key: 'unassigned', label: '未关联工作台', count: props.unassigned, muted: true });
|
||||
list.push(toRow({ key: 'unassigned', label: '未关联工作台', count: props.unassigned, muted: true }));
|
||||
}
|
||||
return list;
|
||||
});
|
||||
|
||||
const max = computed(() => Math.max(1, ...rows.value.map(row => row.count)));
|
||||
const width = (count: number) => (count > 0 ? `${Math.max((count / max.value) * 100, 2)}%` : '0');
|
||||
/** 条长按占比算;非 0 的至少给 2% 让条能看见 */
|
||||
function barWidth(percent: number): string {
|
||||
if (percent <= 0) return '0';
|
||||
return `${Math.max(percent, 2)}%`;
|
||||
}
|
||||
|
||||
/** 百分比展示:很小但有数据时别显示成 0.0% */
|
||||
function percentText(percent: number, count: number): string {
|
||||
if (count <= 0) return '0%';
|
||||
if (percent > 0 && percent < 0.1) return '<0.1%';
|
||||
return `${percent.toFixed(percent >= 10 ? 0 : 1)}%`;
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<ul class="rank">
|
||||
<li v-for="row in rows" :key="row.key" class="row">
|
||||
<span class="label" :title="row.label">
|
||||
<li v-for="row in rows" :key="row.key" class="row" :title="row.code ? `${row.label}(${row.code})` : row.label">
|
||||
<span class="label">
|
||||
<span class="name">{{ row.label }}</span>
|
||||
<span v-if="row.code" class="code">{{ row.code }}</span>
|
||||
<span v-if="row.deleted" class="tag">已删除</span>
|
||||
</span>
|
||||
<span class="track">
|
||||
<span class="fill" :class="{ muted: row.muted }" :style="{ width: width(row.count) }" />
|
||||
<span class="fill" :class="{ muted: row.muted }" :style="{ width: barWidth(row.percent) }" />
|
||||
</span>
|
||||
<span class="value">
|
||||
<b class="count">{{ row.count }}</b>
|
||||
<span class="percent">{{ percentText(row.percent, row.count) }}</span>
|
||||
</span>
|
||||
<b class="count">{{ row.count }}</b>
|
||||
</li>
|
||||
</ul>
|
||||
</template>
|
||||
@ -73,29 +109,29 @@ const width = (count: number) => (count > 0 ? `${Math.max((count / max.value) *
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
/* 名称列给足宽度(名称优先显示完整),进度条自适应,右侧固定放「条数 + 占比」 */
|
||||
.row {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(96px, 150px) 1fr 48px;
|
||||
grid-template-columns: minmax(96px, 200px) 1fr 84px;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.label {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
min-width: 0;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.name {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.code {
|
||||
color: var(--text-muted);
|
||||
font-size: 11px;
|
||||
flex: none;
|
||||
}
|
||||
|
||||
.tag {
|
||||
flex: none;
|
||||
font-size: 10px;
|
||||
@ -105,12 +141,14 @@ const width = (count: number) => (count > 0 ? `${Math.max((count / max.value) *
|
||||
border-radius: 4px;
|
||||
padding: 0 4px;
|
||||
}
|
||||
|
||||
.track {
|
||||
height: 10px;
|
||||
border-radius: 999px;
|
||||
background: #eef1f6;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.fill {
|
||||
display: block;
|
||||
height: 100%;
|
||||
@ -118,12 +156,27 @@ const width = (count: number) => (count > 0 ? `${Math.max((count / max.value) *
|
||||
background: linear-gradient(to right, var(--brand), #60a5fa);
|
||||
transition: width 0.3s ease;
|
||||
}
|
||||
|
||||
.fill.muted {
|
||||
background: #c7ccd6;
|
||||
}
|
||||
|
||||
.value {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
justify-content: flex-end;
|
||||
gap: 6px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.count {
|
||||
text-align: right;
|
||||
font-size: 13px;
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
|
||||
.percent {
|
||||
font-size: 11px;
|
||||
color: var(--text-muted);
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -107,7 +107,7 @@ onMounted(() => load(1));
|
||||
<option :value="2">已关闭</option>
|
||||
</select>
|
||||
<button class="btn" :disabled="loading" @click="search">搜索</button>
|
||||
<span class="hint toolbar-tip">「确认订单」等于线下收款到账:标记已支付并立即给主体续期。</span>
|
||||
<span class="hint toolbar-tip">「确认订单」等于线下收款到账:标记已支付并立即给主体续期。待支付订单 2 小时内未支付会自动关闭。</span>
|
||||
</div>
|
||||
|
||||
<div class="table-wrap">
|
||||
@ -142,7 +142,10 @@ onMounted(() => load(1));
|
||||
<td>{{ row.amount === null || row.amount === undefined ? '—' : `¥${row.amount}` }}</td>
|
||||
<td>
|
||||
<span :class="['badge', statusClass(row)]">{{ row.statusText }}</span>
|
||||
<span v-if="row.channel === 'manual'" class="cell-sub">手工确认</span>
|
||||
<span v-if="row.status === 0 && !row.expired && row.payExpireAt" class="cell-sub">
|
||||
截止 {{ formatTime(row.payExpireAt) }}
|
||||
</span>
|
||||
<span v-else-if="row.channel === 'manual'" class="cell-sub">手工确认</span>
|
||||
</td>
|
||||
<td class="muted">
|
||||
<template v-if="row.status === 1 && row.expireAfter">
|
||||
@ -153,11 +156,12 @@ onMounted(() => load(1));
|
||||
</td>
|
||||
<td>
|
||||
<button
|
||||
v-if="row.status === 0"
|
||||
v-if="row.status === 0 && !row.expired"
|
||||
class="btn btn-sm"
|
||||
:disabled="confirming === row.orderNo"
|
||||
@click="confirmOrder(row)"
|
||||
>{{ confirming === row.orderNo ? '确认中…' : '确认订单' }}</button>
|
||||
<span v-else-if="row.status === 0" class="hint">已超时</span>
|
||||
<span v-else class="hint">—</span>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -1,13 +1,18 @@
|
||||
<script setup lang="ts">
|
||||
/**
|
||||
* 首页:只统计「当前主体」的数据
|
||||
* 首页(实时看板):只统计「当前主体」的数据
|
||||
*
|
||||
* - KPI:设备 / 通道 / 扫码记录 / **今日扫码** / **昨日扫码**(后两张固定显示,与所选维度无关)
|
||||
* - 图表:近 N 天扫码趋势 + 每个工作台打包数量;维度可切 **今日 / 昨日 / 7 / 14 / 30 天**
|
||||
* (今日 / 昨日 换成**按小时**的时段分布,工作台榜也只统计那一天)
|
||||
* - 最近一次扫码
|
||||
* - **全屏(看板模式)**:隐藏左侧菜单与顶栏,内容占满屏幕;优先用浏览器原生全屏,
|
||||
* 不支持/被拒时降级成「只隐藏菜单与顶栏」;Esc 或再点按钮退出
|
||||
*
|
||||
* 视觉参考 D:\WMS_ANDROID_TV 的看板:深海军蓝底 + 青色(#24bbcd / #39d6ff)描边与发光,
|
||||
* 面板四角切角线、数值用等宽数字、图表柱改青色渐变。
|
||||
*/
|
||||
import { computed, onMounted, ref } from 'vue';
|
||||
import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
|
||||
import { RouterLink, useRoute } from 'vue-router';
|
||||
import AppLayout from '@/components/AppLayout.vue';
|
||||
import ScanTrendChart from '@/components/ScanTrendChart.vue';
|
||||
@ -56,6 +61,15 @@ const hasScanTrend = computed(() => (stats.value?.scanTrendTotal ?? 0) > 0);
|
||||
const hasWorkstationStats = computed(() => Boolean(stats.value
|
||||
&& (stats.value.workstationStats.length > 0 || stats.value.workstationUnassigned > 0)));
|
||||
|
||||
/** 看板副标题:当前看的是哪个维度 */
|
||||
const headHint = computed(() => {
|
||||
const data = stats.value;
|
||||
if (!data) return '数据加载中…';
|
||||
if (data.period === 'today') return '今日时段分布(按小时)';
|
||||
if (data.period === 'yesterday') return '昨日时段分布(按小时)';
|
||||
return `近 ${data.scanTrendDays} 天 · 共 ${data.scanTrendTotal} 条`;
|
||||
});
|
||||
|
||||
/** 趋势图标题:跟着维度变(今日/昨日是按小时的时段分布) */
|
||||
const trendTitle = computed(() => {
|
||||
const current = stats.value?.period;
|
||||
@ -77,9 +91,9 @@ const trendHint = computed(() => {
|
||||
const stationHint = computed(() => {
|
||||
const data = stats.value;
|
||||
if (!data) return '';
|
||||
if (data.period === 'today') return '今天 0 点起,按扫码记录统计';
|
||||
if (data.period === 'yesterday') return '昨天 0~24 点,按扫码记录统计';
|
||||
return `近 ${data.scanTrendDays} 天,按扫码记录统计`;
|
||||
if (data.period === 'today') return '今天 0 点起,条长 = 该台打包数 / 今日总扫码数';
|
||||
if (data.period === 'yesterday') return '昨天 0~24 点,条长 = 该台打包数 / 昨日总扫码数';
|
||||
return `近 ${data.scanTrendDays} 天,条长 = 该台打包数 / 本期总扫码数`;
|
||||
});
|
||||
|
||||
/** 今日相对昨日的变化(昨日为 0 时只说条数,不算百分比) */
|
||||
@ -101,7 +115,92 @@ const emptyHint = import.meta.env.DEV
|
||||
/** 趋势图空态:今日 / 昨日 说的是「时段」,别提示去建设备 */
|
||||
const trendEmptyHint = computed(() => (isHourly.value ? '这个时段还没有扫码记录。' : emptyHint));
|
||||
|
||||
async function loadStats(): Promise<void> {
|
||||
// ---------------- 全屏(看板模式) ----------------
|
||||
/** 是否处于看板模式:隐藏左侧菜单与顶栏,内容占满屏幕 */
|
||||
const immersive = ref(false);
|
||||
/** 浏览器是否支持原生全屏(不支持/被拒时降级成「只隐藏菜单与顶栏」) */
|
||||
const canNativeFullscreen = typeof document !== 'undefined'
|
||||
&& typeof document.documentElement.requestFullscreen === 'function';
|
||||
|
||||
function onFullscreenChange() {
|
||||
// 用户按 Esc 退出原生全屏时,看板模式要跟着退
|
||||
immersive.value = Boolean(document.fullscreenElement);
|
||||
}
|
||||
|
||||
async function toggleImmersive() {
|
||||
if (document.fullscreenElement) {
|
||||
try {
|
||||
await document.exitFullscreen();
|
||||
} catch {
|
||||
// 忽略:个别浏览器在非全屏状态下会抛错
|
||||
}
|
||||
immersive.value = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if (canNativeFullscreen) {
|
||||
try {
|
||||
await document.documentElement.requestFullscreen();
|
||||
immersive.value = true;
|
||||
return;
|
||||
} catch {
|
||||
// 被浏览器拒绝(非用户手势 / iframe 限制)→ 走下面的降级
|
||||
}
|
||||
}
|
||||
immersive.value = !immersive.value;
|
||||
}
|
||||
|
||||
// ---------------- 自动刷新 ----------------
|
||||
/**
|
||||
* 看板自动刷新间隔(秒)
|
||||
*
|
||||
* 统计接口是聚合查询(近 30 天时最重),所以不跟着时钟每秒刷新:
|
||||
* - 每 30 秒静默刷新一次(不闪「加载中」,失败也保留上一次的数据);
|
||||
* - 页面在后台(`document.hidden`)或正在切维度(`busy`)时跳过;
|
||||
* - 切回前台立刻刷一次。
|
||||
*/
|
||||
const REFRESH_SECONDS = 30;
|
||||
/** 最近一次成功刷新的时间(展示在头部) */
|
||||
const updatedAt = ref<Date | null>(null);
|
||||
let refreshTimer: number | undefined;
|
||||
|
||||
/** 头部占位:最近刷新时间 + 刷新频率 */
|
||||
const updatedText = computed(() => {
|
||||
const at = updatedAt.value;
|
||||
if (!at) return `每 ${REFRESH_SECONDS} 秒自动刷新`;
|
||||
const pad = (num: number) => String(num).padStart(2, '0');
|
||||
return `刷新于 ${pad(at.getHours())}:${pad(at.getMinutes())}:${pad(at.getSeconds())} · 每 ${REFRESH_SECONDS} 秒自动刷新`;
|
||||
});
|
||||
|
||||
function onVisibilityChange() {
|
||||
if (!document.hidden) loadStats(true);
|
||||
}
|
||||
|
||||
/** 手动刷新(静默:失败保留旧数据,不把整块看板换成一屏红字) */
|
||||
function manualRefresh() {
|
||||
if (busy.value) return;
|
||||
busy.value = true;
|
||||
loadStats(true);
|
||||
}
|
||||
|
||||
// ---------------- 看板时钟 ----------------
|
||||
const clock = ref(new Date());
|
||||
let clockTimer: number | undefined;
|
||||
|
||||
const clockTime = computed(() => {
|
||||
const date = clock.value;
|
||||
const pad = (num: number) => String(num).padStart(2, '0');
|
||||
return `${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
|
||||
});
|
||||
|
||||
const clockDate = computed(() => {
|
||||
const date = clock.value;
|
||||
const pad = (num: number) => String(num).padStart(2, '0');
|
||||
const week = [ '周日', '周一', '周二', '周三', '周四', '周五', '周六' ][date.getDay()];
|
||||
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${week}`;
|
||||
});
|
||||
|
||||
async function loadStats(silent = false): Promise<void> {
|
||||
// 普通成员没有业务数据权限:不去请求(否则 403)
|
||||
if (noSubject.value || !isAdmin.value) {
|
||||
loading.value = false;
|
||||
@ -109,9 +208,11 @@ async function loadStats(): Promise<void> {
|
||||
}
|
||||
try {
|
||||
stats.value = await fetchStats({ days: days.value, period: period.value });
|
||||
updatedAt.value = new Date();
|
||||
error.value = '';
|
||||
} catch (err) {
|
||||
error.value = err instanceof ApiError ? err.message : '加载失败';
|
||||
// 静默刷新失败保留上一次的数据,只在首次/手动加载时才提示错误
|
||||
if (!silent) error.value = err instanceof ApiError ? err.message : '加载失败';
|
||||
} finally {
|
||||
loading.value = false;
|
||||
busy.value = false;
|
||||
@ -125,11 +226,32 @@ function switchRange(value: RangeKey): void {
|
||||
loadStats();
|
||||
}
|
||||
|
||||
onMounted(loadStats);
|
||||
onMounted(() => {
|
||||
loadStats();
|
||||
document.addEventListener('fullscreenchange', onFullscreenChange);
|
||||
document.addEventListener('visibilitychange', onVisibilityChange);
|
||||
clockTimer = window.setInterval(() => { clock.value = new Date(); }, 1000);
|
||||
refreshTimer = window.setInterval(() => {
|
||||
// 后台标签页不刷(省流量),正在切维度也不打断
|
||||
if (document.hidden || busy.value) return;
|
||||
loadStats(true);
|
||||
}, REFRESH_SECONDS * 1000);
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
document.removeEventListener('fullscreenchange', onFullscreenChange);
|
||||
document.removeEventListener('visibilitychange', onVisibilityChange);
|
||||
if (clockTimer) window.clearInterval(clockTimer);
|
||||
if (refreshTimer) window.clearInterval(refreshTimer);
|
||||
// 离开首页时退出原生全屏:否则别的页面会在「没有菜单的」全屏里显示
|
||||
if (typeof document !== 'undefined' && document.fullscreenElement) {
|
||||
document.exitFullscreen().catch(() => undefined);
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<AppLayout>
|
||||
<AppLayout :immersive="immersive">
|
||||
<template #title>首页</template>
|
||||
|
||||
<div v-if="error" class="alert alert-error">{{ error }}</div>
|
||||
@ -156,44 +278,71 @@ onMounted(loadStats);
|
||||
|
||||
<p v-else-if="loading" class="hint">加载中…</p>
|
||||
|
||||
<template v-else-if="stats">
|
||||
<div class="stat-grid">
|
||||
<RouterLink class="card stat" to="/devices">
|
||||
<span class="stat-label">我的设备</span>
|
||||
<b class="stat-value">{{ stats.deviceCount }}</b>
|
||||
<span class="stat-foot">台(中控)</span>
|
||||
</RouterLink>
|
||||
<div class="card stat">
|
||||
<span class="stat-label">已登记通道</span>
|
||||
<b class="stat-value">{{ stats.channelCount }}</b>
|
||||
<span class="stat-foot">个</span>
|
||||
<!-- ===== 实时看板(科技风) ===== -->
|
||||
<div v-else-if="stats" class="dashboard" :class="{ 'is-immersive': immersive }">
|
||||
<div class="dash-grid-bg" aria-hidden="true" />
|
||||
|
||||
<header class="dash-head">
|
||||
<div class="dash-title">
|
||||
<span class="dash-title__dot" aria-hidden="true" />
|
||||
<div class="dash-title__text">
|
||||
<h2>云仓视频溯源 · 实时看板</h2>
|
||||
<p>{{ currentSubjectName }} · {{ headHint }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<RouterLink class="card stat" to="/records">
|
||||
<span class="stat-label">扫码记录</span>
|
||||
<b class="stat-value">{{ stats.recordCount }}</b>
|
||||
<span class="stat-foot">条(全部)</span>
|
||||
|
||||
<div class="dash-tools">
|
||||
<span class="dash-updated">{{ updatedText }}</span>
|
||||
<div class="dash-clock">
|
||||
<b>{{ clockTime }}</b>
|
||||
<span>{{ clockDate }}</span>
|
||||
</div>
|
||||
<button class="tech-btn" type="button" :disabled="busy" @click="manualRefresh">
|
||||
{{ busy ? '刷新中…' : '刷新' }}
|
||||
</button>
|
||||
<button class="tech-btn" type="button" @click="toggleImmersive">
|
||||
{{ immersive ? '退出全屏' : '全屏' }}
|
||||
</button>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<section class="kpi-grid">
|
||||
<RouterLink class="kpi" to="/devices">
|
||||
<span class="kpi-label">我的设备</span>
|
||||
<b class="kpi-value">{{ stats.deviceCount }}</b>
|
||||
<span class="kpi-foot">台(中控)</span>
|
||||
</RouterLink>
|
||||
<RouterLink class="card stat" to="/records">
|
||||
<span class="stat-label">今日扫码</span>
|
||||
<b class="stat-value">{{ stats.todayCount }}</b>
|
||||
<span class="stat-foot">
|
||||
<div class="kpi">
|
||||
<span class="kpi-label">已登记通道</span>
|
||||
<b class="kpi-value">{{ stats.channelCount }}</b>
|
||||
<span class="kpi-foot">个</span>
|
||||
</div>
|
||||
<RouterLink class="kpi" to="/records">
|
||||
<span class="kpi-label">扫码记录</span>
|
||||
<b class="kpi-value">{{ stats.recordCount }}</b>
|
||||
<span class="kpi-foot">条(全部)</span>
|
||||
</RouterLink>
|
||||
<RouterLink class="kpi kpi--hot" to="/records">
|
||||
<span class="kpi-label">今日扫码</span>
|
||||
<b class="kpi-value">{{ stats.todayCount }}</b>
|
||||
<span class="kpi-foot">
|
||||
条(今天 0 点起)
|
||||
<em v-if="todayDelta" class="stat-delta" :class="`is-${todayDelta.trend}`">{{ todayDelta.text }}</em>
|
||||
<em v-if="todayDelta" class="kpi-delta" :class="`is-${todayDelta.trend}`">{{ todayDelta.text }}</em>
|
||||
</span>
|
||||
</RouterLink>
|
||||
<RouterLink class="card stat" to="/records">
|
||||
<span class="stat-label">昨日扫码</span>
|
||||
<b class="stat-value">{{ stats.yesterdayCount }}</b>
|
||||
<span class="stat-foot">条(昨天 0~24 点)</span>
|
||||
<RouterLink class="kpi" to="/records">
|
||||
<span class="kpi-label">昨日扫码</span>
|
||||
<b class="kpi-value">{{ stats.yesterdayCount }}</b>
|
||||
<span class="kpi-foot">条(昨天 0~24 点)</span>
|
||||
</RouterLink>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div class="charts" :class="{ 'is-busy': busy }">
|
||||
<div class="card chart-card">
|
||||
<div class="chart-head">
|
||||
<div>
|
||||
<section class="panel-grid" :class="{ 'is-busy': busy }">
|
||||
<article class="panel">
|
||||
<header class="panel-head">
|
||||
<div class="panel-title">
|
||||
<h3>{{ trendTitle }}</h3>
|
||||
<p class="hint">{{ trendHint }}</p>
|
||||
<p>{{ trendHint }}</p>
|
||||
</div>
|
||||
<div class="seg" role="group" aria-label="统计维度">
|
||||
<button
|
||||
@ -206,189 +355,570 @@ onMounted(loadStats);
|
||||
@click="switchRange(option.key)"
|
||||
>{{ option.label }}</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="chart-body">
|
||||
</header>
|
||||
<div class="panel-body">
|
||||
<ScanTrendChart v-if="hasScanTrend" :points="stats.scanTrend" />
|
||||
<p v-else class="hint chart-empty">{{ trendEmptyHint }}</p>
|
||||
<p v-else class="panel-empty">{{ trendEmptyHint }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
<div class="card chart-card">
|
||||
<div class="chart-head">
|
||||
<div>
|
||||
<article class="panel">
|
||||
<header class="panel-head">
|
||||
<div class="panel-title">
|
||||
<h3>每个工作台打包数量</h3>
|
||||
<p class="hint">{{ stationHint }}</p>
|
||||
<p>{{ stationHint }}</p>
|
||||
</div>
|
||||
<RouterLink class="chart-link" to="/workstations">管理工作台 →</RouterLink>
|
||||
</div>
|
||||
<div class="chart-body">
|
||||
<RouterLink class="panel-link" to="/workstations">管理工作台 →</RouterLink>
|
||||
</header>
|
||||
<div class="panel-body">
|
||||
<WorkstationRankChart
|
||||
v-if="hasWorkstationStats"
|
||||
:items="stats.workstationStats"
|
||||
:unassigned="stats.workstationUnassigned"
|
||||
:total="stats.scanTrendTotal"
|
||||
/>
|
||||
<p v-else class="hint chart-empty">
|
||||
<p v-else class="panel-empty">
|
||||
{{ isHourly ? '这个时段还没有打包记录。' : '还没有工作台。创建并绑定扫码通道后,这里会显示每个工作台的打包数量。' }}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
</section>
|
||||
|
||||
<div class="card">
|
||||
<h3>最近一次扫码</h3>
|
||||
<table v-if="stats.latestRecord" class="table">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th style="width: 120px">条码</th>
|
||||
<td><code>{{ stats.latestRecord.barcode }}</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>通道</th>
|
||||
<td>{{ stats.latestRecord.channelId }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>设备</th>
|
||||
<td>{{ stats.latestRecord.deviceSn || '—' }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>扫码时间</th>
|
||||
<td>{{ formatTime(stats.latestRecord.scanTime) }}({{ fromNow(stats.latestRecord.scanTime) }})</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<p v-else class="hint">{{ emptyHint }}</p>
|
||||
</div>
|
||||
</template>
|
||||
<section class="panel panel--latest">
|
||||
<header class="panel-head">
|
||||
<div class="panel-title">
|
||||
<h3>最近一次扫码</h3>
|
||||
<p>当前主体的最后一条扫码记录</p>
|
||||
</div>
|
||||
<RouterLink class="panel-link" to="/records">查看全部 →</RouterLink>
|
||||
</header>
|
||||
<div class="panel-body">
|
||||
<table v-if="stats.latestRecord" class="dash-table">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>条码</th>
|
||||
<td><code>{{ stats.latestRecord.barcode }}</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>通道</th>
|
||||
<td>{{ stats.latestRecord.channelId }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>设备</th>
|
||||
<td>{{ stats.latestRecord.deviceSn || '—' }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>扫码时间</th>
|
||||
<td>{{ formatTime(stats.latestRecord.scanTime) }}({{ fromNow(stats.latestRecord.scanTime) }})</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<p v-else class="panel-empty">{{ emptyHint }}</p>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</AppLayout>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.stat-grid {
|
||||
display: grid;
|
||||
/* auto-fit + 1fr 行高:一行放不下换行时,各行也保持同一高度 */
|
||||
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
|
||||
grid-auto-rows: 1fr;
|
||||
gap: 16px;
|
||||
}
|
||||
/*
|
||||
* ⚠️ 全局样式里有 `.card + .card { margin-top: 16px }`(给单列堆叠的卡片留间距),
|
||||
* 在网格里会把第 2 张之后的卡片整体往下推 16px,看起来就是「卡片高度/位置不一致」。
|
||||
* 网格内部靠 gap 排版,这里把那个外边距清掉。
|
||||
*/
|
||||
.stat-grid > .card,
|
||||
.charts > .card {
|
||||
margin-top: 0;
|
||||
}
|
||||
.charts {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(340px, 1fr));
|
||||
gap: 16px;
|
||||
margin: 16px 0;
|
||||
align-items: stretch;
|
||||
transition: opacity 0.15s ease;
|
||||
}
|
||||
.charts.is-busy {
|
||||
opacity: 0.55;
|
||||
}
|
||||
.chart-card {
|
||||
/* ==================== 看板主题变量(改这里即可整体换色) ==================== */
|
||||
.dashboard {
|
||||
--tech-panel: linear-gradient(180deg, rgba(17, 58, 93, 0.72) 0%, rgba(8, 24, 44, 0.86) 100%);
|
||||
--tech-border: rgba(36, 187, 205, 0.45);
|
||||
--tech-accent: #24bbcd;
|
||||
--tech-accent-2: #39d6ff;
|
||||
--tech-text: #eaf7ff;
|
||||
--tech-muted: rgba(160, 200, 235, 0.62);
|
||||
--tech-line: rgba(36, 187, 205, 0.18);
|
||||
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 16px;
|
||||
padding: 18px 20px 20px;
|
||||
border-radius: 14px;
|
||||
overflow: hidden;
|
||||
color: var(--tech-text);
|
||||
background: radial-gradient(circle at 50% 0%, #10365f 0%, #08182c 55%, #050d18 100%);
|
||||
box-shadow: 0 18px 48px rgba(3, 10, 20, 0.35);
|
||||
}
|
||||
/* 两张图的正文区等高(卡片本身由 grid 拉齐,这里让内容也从同一高度开始) */
|
||||
.chart-body {
|
||||
|
||||
/* 顶部一道青色光带,强调「屏幕/HUD」的观感 */
|
||||
.dashboard::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
top: 0;
|
||||
height: 1px;
|
||||
pointer-events: none;
|
||||
background: linear-gradient(90deg, transparent, rgba(57, 214, 255, 0.85), transparent);
|
||||
}
|
||||
|
||||
/* 全屏看板模式:占满整屏(顶栏与侧边菜单由 AppLayout 隐藏) */
|
||||
.dashboard.is-immersive {
|
||||
min-height: 100vh;
|
||||
border-radius: 0;
|
||||
padding: 22px 26px 26px;
|
||||
gap: 18px;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
/* 淡淡的网格底图:往上淡出,只做氛围,不抢内容 */
|
||||
.dash-grid-bg {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
pointer-events: none;
|
||||
opacity: 0.5;
|
||||
background-image:
|
||||
linear-gradient(var(--tech-line) 1px, transparent 1px),
|
||||
linear-gradient(90deg, var(--tech-line) 1px, transparent 1px);
|
||||
background-size: 48px 48px, 48px 48px;
|
||||
mask-image: radial-gradient(circle at 50% 0%, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.25) 55%, transparent 85%);
|
||||
-webkit-mask-image: radial-gradient(circle at 50% 0%, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.25) 55%, transparent 85%);
|
||||
}
|
||||
|
||||
/* ==================== 看板头部 ==================== */
|
||||
.dash-head {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 16px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.dash-title {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
/* 呼吸的青色小圆点,标示「实时」 */
|
||||
.dash-title__dot {
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
flex: 0 0 10px;
|
||||
border-radius: 50%;
|
||||
background: var(--tech-accent-2);
|
||||
box-shadow: 0 0 0 4px rgba(57, 214, 255, 0.12), 0 0 14px rgba(57, 214, 255, 0.75);
|
||||
animation: dash-pulse 2.4s ease-in-out infinite;
|
||||
}
|
||||
|
||||
@keyframes dash-pulse {
|
||||
0%, 100% { opacity: 1; }
|
||||
50% { opacity: 0.45; }
|
||||
}
|
||||
|
||||
.dash-title__text h2 {
|
||||
margin: 0;
|
||||
font-size: 19px;
|
||||
font-weight: 700;
|
||||
letter-spacing: 2px;
|
||||
color: var(--tech-text);
|
||||
}
|
||||
|
||||
.dash-title__text p {
|
||||
margin: 4px 0 0;
|
||||
font-size: 12px;
|
||||
letter-spacing: 0.4px;
|
||||
color: var(--tech-muted);
|
||||
}
|
||||
|
||||
.dash-tools {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
/* 最近刷新时间 + 刷新频率(静默,别抢时钟的注意力) */
|
||||
.dash-updated {
|
||||
font-size: 11px;
|
||||
color: var(--tech-muted);
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.dash-clock {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-end;
|
||||
line-height: 1.15;
|
||||
}
|
||||
|
||||
.dash-clock b {
|
||||
font-size: 20px;
|
||||
font-weight: 600;
|
||||
font-variant-numeric: tabular-nums;
|
||||
letter-spacing: 1px;
|
||||
color: var(--tech-accent-2);
|
||||
text-shadow: 0 0 16px rgba(57, 214, 255, 0.45);
|
||||
}
|
||||
|
||||
.dash-clock span {
|
||||
font-size: 11px;
|
||||
color: var(--tech-muted);
|
||||
}
|
||||
|
||||
.tech-btn {
|
||||
height: 30px;
|
||||
padding: 0 14px;
|
||||
border: 1px solid var(--tech-border);
|
||||
border-radius: 6px;
|
||||
background: rgba(36, 187, 205, 0.12);
|
||||
color: var(--tech-accent-2);
|
||||
font-size: 12px;
|
||||
letter-spacing: 1px;
|
||||
cursor: pointer;
|
||||
transition: background 0.15s ease, box-shadow 0.15s ease;
|
||||
}
|
||||
|
||||
.tech-btn:hover {
|
||||
background: rgba(36, 187, 205, 0.24);
|
||||
box-shadow: 0 0 14px rgba(57, 214, 255, 0.35);
|
||||
}
|
||||
|
||||
/* ==================== KPI 卡片:四角切角 + 青色描边 ==================== */
|
||||
.kpi-grid {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
|
||||
grid-auto-rows: 1fr;
|
||||
gap: 14px;
|
||||
}
|
||||
|
||||
.kpi {
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
padding: 16px 16px 14px;
|
||||
border: 1px solid var(--tech-border);
|
||||
border-radius: 8px;
|
||||
background:
|
||||
linear-gradient(var(--tech-accent-2), var(--tech-accent-2)) left top / 16px 2px no-repeat,
|
||||
linear-gradient(var(--tech-accent-2), var(--tech-accent-2)) left top / 2px 16px no-repeat,
|
||||
linear-gradient(var(--tech-accent-2), var(--tech-accent-2)) right top / 16px 2px no-repeat,
|
||||
linear-gradient(var(--tech-accent-2), var(--tech-accent-2)) right top / 2px 16px no-repeat,
|
||||
linear-gradient(var(--tech-accent), var(--tech-accent)) left bottom / 16px 2px no-repeat,
|
||||
linear-gradient(var(--tech-accent), var(--tech-accent)) left bottom / 2px 16px no-repeat,
|
||||
linear-gradient(var(--tech-accent), var(--tech-accent)) right bottom / 16px 2px no-repeat,
|
||||
linear-gradient(var(--tech-accent), var(--tech-accent)) right bottom / 2px 16px no-repeat,
|
||||
var(--tech-panel);
|
||||
box-shadow: inset 0 0 24px rgba(36, 187, 205, 0.08), 0 6px 18px rgba(3, 10, 20, 0.35);
|
||||
transition: border-color 0.18s ease, box-shadow 0.18s ease, transform 0.18s ease;
|
||||
}
|
||||
|
||||
a.kpi:hover {
|
||||
border-color: rgba(57, 214, 255, 0.85);
|
||||
box-shadow: inset 0 0 28px rgba(57, 214, 255, 0.14), 0 10px 26px rgba(3, 10, 20, 0.45);
|
||||
transform: translateY(-1px);
|
||||
}
|
||||
|
||||
/* 今日扫码:整张卡高亮 */
|
||||
.kpi--hot {
|
||||
border-color: rgba(57, 214, 255, 0.7);
|
||||
background:
|
||||
linear-gradient(var(--tech-accent-2), var(--tech-accent-2)) left top / 16px 2px no-repeat,
|
||||
linear-gradient(var(--tech-accent-2), var(--tech-accent-2)) left top / 2px 16px no-repeat,
|
||||
linear-gradient(var(--tech-accent-2), var(--tech-accent-2)) right top / 16px 2px no-repeat,
|
||||
linear-gradient(var(--tech-accent-2), var(--tech-accent-2)) right top / 2px 16px no-repeat,
|
||||
linear-gradient(var(--tech-accent-2), var(--tech-accent-2)) left bottom / 16px 2px no-repeat,
|
||||
linear-gradient(var(--tech-accent-2), var(--tech-accent-2)) left bottom / 2px 16px no-repeat,
|
||||
linear-gradient(var(--tech-accent-2), var(--tech-accent-2)) right bottom / 16px 2px no-repeat,
|
||||
linear-gradient(var(--tech-accent-2), var(--tech-accent-2)) right bottom / 2px 16px no-repeat,
|
||||
linear-gradient(180deg, rgba(24, 84, 122, 0.8) 0%, rgba(8, 30, 52, 0.9) 100%);
|
||||
}
|
||||
|
||||
.kpi-label {
|
||||
font-size: 12px;
|
||||
letter-spacing: 1.5px;
|
||||
color: var(--tech-muted);
|
||||
}
|
||||
|
||||
.kpi-value {
|
||||
font-size: 34px;
|
||||
line-height: 1.05;
|
||||
font-weight: 700;
|
||||
font-variant-numeric: tabular-nums;
|
||||
color: #fff;
|
||||
text-shadow: 0 0 18px rgba(57, 214, 255, 0.5);
|
||||
}
|
||||
|
||||
.dashboard.is-immersive .kpi-value {
|
||||
font-size: 40px;
|
||||
}
|
||||
|
||||
.kpi-foot {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
flex-wrap: wrap;
|
||||
font-size: 12px;
|
||||
color: var(--tech-muted);
|
||||
}
|
||||
|
||||
.kpi-delta {
|
||||
padding: 0 6px;
|
||||
border-radius: 999px;
|
||||
font-style: normal;
|
||||
font-size: 11px;
|
||||
line-height: 17px;
|
||||
border: 1px solid transparent;
|
||||
}
|
||||
|
||||
.kpi-delta.is-up {
|
||||
color: #7ff0c4;
|
||||
background: rgba(53, 208, 127, 0.12);
|
||||
border-color: rgba(53, 208, 127, 0.35);
|
||||
}
|
||||
|
||||
.kpi-delta.is-down {
|
||||
color: #ffb4a8;
|
||||
background: rgba(255, 107, 87, 0.12);
|
||||
border-color: rgba(255, 107, 87, 0.35);
|
||||
}
|
||||
|
||||
.kpi-delta.is-flat {
|
||||
color: var(--tech-muted);
|
||||
background: rgba(160, 200, 235, 0.1);
|
||||
border-color: rgba(160, 200, 235, 0.25);
|
||||
}
|
||||
|
||||
/* ==================== 面板(图表 / 最近扫码) ==================== */
|
||||
.panel-grid {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(340px, 1fr));
|
||||
gap: 14px;
|
||||
align-items: stretch;
|
||||
transition: opacity 0.15s ease;
|
||||
}
|
||||
|
||||
.panel-grid.is-busy {
|
||||
opacity: 0.55;
|
||||
}
|
||||
|
||||
.panel {
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 12px;
|
||||
padding: 14px 16px 16px;
|
||||
border: 1px solid var(--tech-border);
|
||||
border-radius: 8px;
|
||||
background: var(--tech-panel);
|
||||
box-shadow: inset 0 0 24px rgba(36, 187, 205, 0.07), 0 6px 18px rgba(3, 10, 20, 0.3);
|
||||
}
|
||||
|
||||
.panel--latest {
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.panel-head {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
flex-wrap: wrap;
|
||||
padding-bottom: 10px;
|
||||
border-bottom: 1px solid rgba(36, 187, 205, 0.22);
|
||||
}
|
||||
|
||||
.panel-title h3 {
|
||||
position: relative;
|
||||
margin: 0;
|
||||
padding-left: 12px;
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
letter-spacing: 1px;
|
||||
color: var(--tech-text);
|
||||
}
|
||||
|
||||
/* 标题左侧的青色竖条 */
|
||||
.panel-title h3::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 50%;
|
||||
width: 3px;
|
||||
height: 13px;
|
||||
margin-top: -6.5px;
|
||||
border-radius: 2px;
|
||||
background: var(--tech-accent-2);
|
||||
box-shadow: 0 0 10px rgba(57, 214, 255, 0.8);
|
||||
}
|
||||
|
||||
.panel-title p {
|
||||
margin: 5px 0 0;
|
||||
font-size: 12px;
|
||||
color: var(--tech-muted);
|
||||
}
|
||||
|
||||
.panel-link {
|
||||
font-size: 12px;
|
||||
color: var(--tech-accent-2);
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.panel-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.panel-body {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
flex: 1 1 auto;
|
||||
min-height: 212px;
|
||||
}
|
||||
.chart-head {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.chart-head h3 {
|
||||
margin: 0 0 4px;
|
||||
}
|
||||
.chart-head .hint {
|
||||
margin: 0;
|
||||
}
|
||||
.chart-empty {
|
||||
margin: 4px 0;
|
||||
}
|
||||
.chart-link {
|
||||
|
||||
.panel-empty {
|
||||
margin: 6px 0;
|
||||
font-size: 12px;
|
||||
white-space: nowrap;
|
||||
color: var(--tech-muted);
|
||||
}
|
||||
|
||||
/* 维度切换:暗底 + 青色选中 */
|
||||
.seg {
|
||||
display: inline-flex;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 8px;
|
||||
border: 1px solid var(--tech-border);
|
||||
border-radius: 6px;
|
||||
overflow: hidden;
|
||||
background: #fff;
|
||||
background: rgba(6, 18, 31, 0.7);
|
||||
}
|
||||
|
||||
.seg-btn {
|
||||
border: 0;
|
||||
background: transparent;
|
||||
padding: 5px 10px;
|
||||
font-size: 12px;
|
||||
color: var(--text-muted);
|
||||
color: var(--tech-muted);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.seg-btn + .seg-btn {
|
||||
border-left: 1px solid var(--border);
|
||||
border-left: 1px solid var(--tech-border);
|
||||
}
|
||||
|
||||
.seg-btn.is-active {
|
||||
background: var(--brand);
|
||||
color: #fff;
|
||||
background: linear-gradient(180deg, #39d6ff, #24bbcd);
|
||||
color: #04121e;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.seg-btn:disabled {
|
||||
cursor: progress;
|
||||
}
|
||||
.stat {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
|
||||
/* ==================== 最近一次扫码(暗色表格) ==================== */
|
||||
.dash-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
background: transparent;
|
||||
}
|
||||
.stat-label {
|
||||
color: var(--text-muted);
|
||||
|
||||
/* 覆盖全局表格样式(白底 / 灰表头 / 实线分隔在深色底上很突兀) */
|
||||
.dash-table th,
|
||||
.dash-table td {
|
||||
border-bottom: 1px dashed rgba(36, 187, 205, 0.16);
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.dash-table tr:last-child th,
|
||||
.dash-table tr:last-child td {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
.dash-table th {
|
||||
width: 120px;
|
||||
padding: 7px 0;
|
||||
text-align: left;
|
||||
font-size: 12px;
|
||||
font-weight: 500;
|
||||
color: var(--tech-muted);
|
||||
}
|
||||
|
||||
.dash-table td {
|
||||
padding: 7px 0;
|
||||
font-size: 13px;
|
||||
color: var(--tech-text);
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
.stat-value {
|
||||
font-size: 30px;
|
||||
line-height: 1.1;
|
||||
}
|
||||
.stat-foot {
|
||||
color: var(--text-muted);
|
||||
|
||||
.dash-table code {
|
||||
padding: 1px 7px;
|
||||
border-radius: 4px;
|
||||
background: rgba(36, 187, 205, 0.14);
|
||||
border: 1px solid rgba(36, 187, 205, 0.3);
|
||||
color: var(--tech-accent-2);
|
||||
font-size: 12px;
|
||||
}
|
||||
.stat-delta {
|
||||
display: inline-block;
|
||||
margin-left: 6px;
|
||||
padding: 0 5px;
|
||||
border-radius: 999px;
|
||||
font-style: normal;
|
||||
font-size: 11px;
|
||||
line-height: 16px;
|
||||
vertical-align: 1px;
|
||||
|
||||
/* ==================== 图表染成青色(组件本身保持中性,只在这个看板里染色) ==================== */
|
||||
.dashboard :deep(.trend) {
|
||||
border-bottom-color: rgba(36, 187, 205, 0.35);
|
||||
background-image: linear-gradient(to top, rgba(36, 187, 205, 0.14), transparent 72%);
|
||||
}
|
||||
.stat-delta.is-up {
|
||||
color: #15803d;
|
||||
background: #f0fdf4;
|
||||
|
||||
.dashboard :deep(.bar) {
|
||||
background: linear-gradient(to top, rgba(36, 187, 205, 0.45), rgba(57, 214, 255, 0.95));
|
||||
box-shadow: 0 0 12px rgba(57, 214, 255, 0.35);
|
||||
}
|
||||
.stat-delta.is-down {
|
||||
color: var(--danger);
|
||||
background: #fef2f2;
|
||||
|
||||
.dashboard :deep(.col:hover .bar) {
|
||||
background: linear-gradient(to top, #39d6ff, #b6f2ff);
|
||||
}
|
||||
.stat-delta.is-flat {
|
||||
color: var(--text-muted);
|
||||
background: #f3f4f6;
|
||||
|
||||
.dashboard :deep(.is-last .bar) {
|
||||
background: linear-gradient(to top, #24bbcd, #8ff2ff);
|
||||
box-shadow: 0 0 16px rgba(57, 214, 255, 0.6);
|
||||
}
|
||||
h3 {
|
||||
margin: 0 0 12px;
|
||||
font-size: 15px;
|
||||
|
||||
.dashboard :deep(.value) {
|
||||
color: var(--tech-muted);
|
||||
}
|
||||
|
||||
.dashboard :deep(.col.is-last .value) {
|
||||
color: var(--tech-accent-2);
|
||||
}
|
||||
|
||||
.dashboard :deep(.tick) {
|
||||
color: var(--tech-muted);
|
||||
}
|
||||
|
||||
.dashboard :deep(.row) {
|
||||
color: var(--tech-text);
|
||||
}
|
||||
|
||||
.dashboard :deep(.percent) {
|
||||
color: var(--tech-muted);
|
||||
}
|
||||
|
||||
.dashboard :deep(.tag) {
|
||||
color: #ffb4a8;
|
||||
background: rgba(255, 107, 87, 0.12);
|
||||
border-color: rgba(255, 107, 87, 0.35);
|
||||
}
|
||||
|
||||
.dashboard :deep(.track) {
|
||||
background: rgba(36, 187, 205, 0.14);
|
||||
}
|
||||
|
||||
.dashboard :deep(.fill) {
|
||||
background: linear-gradient(to right, rgba(36, 187, 205, 0.6), #39d6ff);
|
||||
box-shadow: 0 0 10px rgba(57, 214, 255, 0.35);
|
||||
}
|
||||
|
||||
.dashboard :deep(.fill.muted) {
|
||||
background: rgba(140, 180, 205, 0.45);
|
||||
}
|
||||
|
||||
.dashboard :deep(.count) {
|
||||
color: var(--tech-accent-2);
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -675,6 +675,7 @@ function isSelf(member: SubjectMemberItem) {
|
||||
<div class="order-row"><span>订单号</span><code>{{ order.orderNo }}</code></div>
|
||||
<div class="order-row"><span>套餐</span><b>{{ order.planName || `${order.days} 天` }}</b></div>
|
||||
<div class="order-row"><span>应付金额</span><b class="order-amount">¥{{ order.amount ?? '—' }}</b></div>
|
||||
<div class="order-row"><span>支付截止</span><span>{{ formatTime(order.payExpireAt) }}</span></div>
|
||||
<div class="order-row">
|
||||
<span>状态</span>
|
||||
<span :class="['badge', order.status === 1 ? 'badge-ok' : order.status === 2 ? 'badge-off' : 'badge-single']">
|
||||
@ -683,12 +684,13 @@ function isSelf(member: SubjectMemberItem) {
|
||||
</div>
|
||||
|
||||
<p v-if="order.status === 0" class="alert alert-info">
|
||||
订单已生成,<b>尚未续期</b>:支付确认(渠道回调)到账后才会计入期限,本窗口会自动刷新状态。
|
||||
订单已生成,<b>尚未续期</b>:支付确认(渠道回调)到账后才会计入期限,本窗口会自动刷新状态。<br />
|
||||
请在 <b>{{ formatTime(order.payExpireAt) }}</b> 前完成支付,逾期订单会自动关闭。
|
||||
</p>
|
||||
<p v-else-if="order.status === 1" class="alert alert-ok">
|
||||
支付已确认,主体已续期 {{ order.days }} 天,新到期时间:{{ formatTime(order.expireAfter) }}
|
||||
</p>
|
||||
<p v-else class="alert alert-error">订单已关闭,如需续期请重新下单。</p>
|
||||
<p v-else class="alert alert-error">订单已关闭(超过支付截止时间未支付会自动关闭),如需续期请重新下单。</p>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user