统一「连不上本机软件」提示窗覆盖 /local;团购不再写「最大录制时长」
前端
- LocalServiceGate 新增 probe 属性(ws / http):/local 查件页用 HTTP 17300 根路径探活,
兼容没有 WebSocket 的老版本软件;ws 用于预览/拉通道/大屏
- LocalServiceView:offline 状态改为弹该组件(启动 / 下载),卡片内只留简短提示 +
「启动 / 下载本机软件」「重新连接」,删除自带的 DOWNLOAD_URL / launch() / launchFailed /
APP_PROTOCOL 文案与 launchApp 依赖
后端
- 团购工作台(ws_type = 2)的 record_max_sec 不再写 before + after 的派生值,统一存 0(不限制)
· web 本来就没有「最大时长」配置项(只有散单有),库里出现 20 + 10 = 30 会被误读成
「被多加 30 秒限制、实际只录 30 秒」
· 团购的录制区间一直是 扫码时间 - before ~ 扫码时间 + after(buildPlan 团购分支不使用 max)
- 迁移 20261020010000-group-workstation-max-zero:把现有团购行 record_max_sec 改为 0,
down 时恢复为 before + after;scan_records.workstation_snapshot 属于历史快照,不动
验证
- 库:1号工作台(团购)20 / 20 / max=0;团购计划区间 = 扫码时间 ±20 = 40 秒
- 单测:pack.test.js 7 passing(含「团购:以扫码时间为基准,前后各留配置的秒数」)
- 前端 vue-tsc 通过
This commit is contained in:
parent
1786d9430a
commit
f07e8da021
@ -20,7 +20,7 @@ module.exports = (app) => {
|
||||
/** 录制范围(团购以扫码时间为基准,散单以任务结束时间为基准) */
|
||||
recordBeforeSec: { type: INTEGER.UNSIGNED, allowNull: false, defaultValue: 60, comment: '录制范围:触发点之前秒数' },
|
||||
recordAfterSec: { type: INTEGER.UNSIGNED, allowNull: false, defaultValue: 60, comment: '录制范围:触发点之后秒数' },
|
||||
recordMaxSec: { type: INTEGER.UNSIGNED, allowNull: false, defaultValue: 240, comment: '最大录制时长(秒)' }, status: { type: TINYINT.UNSIGNED, allowNull: false, defaultValue: 1, comment: '状态:1启用 0停用' },
|
||||
recordMaxSec: { type: INTEGER.UNSIGNED, allowNull: false, defaultValue: 240, comment: '最大录制时长(秒);团购无此限制,固定存 0' }, status: { type: TINYINT.UNSIGNED, allowNull: false, defaultValue: 1, comment: '状态:1启用 0停用' },
|
||||
remark: { type: STRING(255), comment: '备注' },
|
||||
|
||||
// ↓ 合成画面画布(默认 1920×1080)
|
||||
|
||||
@ -201,10 +201,12 @@ class WorkstationService extends Service {
|
||||
* 最大录制时长
|
||||
*
|
||||
* - 散单:用户可设(不传则沿用旧值 / 默认 240)
|
||||
* - 团购:以扫码时间为基准,前 + 后就是总时长,没有额外上限(不返回/忽略前端传的值)
|
||||
* - 团购:**没有**最大时长(web 也不提供配置),总时长就是 前 + 后;
|
||||
* 这里落库为 0(= 不限制),不再写成 before+after 的派生值,
|
||||
* 避免库里出现一个像“限制 30 秒”的数字被误读
|
||||
*/
|
||||
_maxSec(wsType, before, after, incoming, fallback) {
|
||||
if (Number(wsType) === 2) return Number(before) + Number(after);
|
||||
if (Number(wsType) === 2) return 0;
|
||||
if (incoming !== undefined && incoming !== null) return incoming;
|
||||
return Number(fallback ?? 240);
|
||||
}
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 团购工作台不再写「最大录制时长」
|
||||
*
|
||||
* 团购的录制区间 = 扫码时间 - record_before_sec ~ 扫码时间 + record_after_sec,
|
||||
* web 上也没有「最大时长」这个配置项(只有散单有)。
|
||||
*
|
||||
* 之前按 before + after 派生写进 record_max_sec(例如 20 + 10 = 30),
|
||||
* 在库里看起来就像一个「30 秒的限制」,容易被误读成「被多加了限制、实际只录 30 秒」。
|
||||
* 现在统一写成 0 = 不限制(服务层 `_maxSec()` 对 ws_type=2 返回 0)。
|
||||
*
|
||||
* 只改工作台的当前配置;scan_records.workstation_snapshot 是历史快照,保持原样。
|
||||
*/
|
||||
module.exports = {
|
||||
async up(queryInterface) {
|
||||
await queryInterface.sequelize.query(
|
||||
'UPDATE workstations SET record_max_sec = 0 WHERE ws_type = 2'
|
||||
);
|
||||
},
|
||||
|
||||
async down(queryInterface) {
|
||||
await queryInterface.sequelize.query(
|
||||
'UPDATE workstations SET record_max_sec = record_before_sec + record_after_sec WHERE ws_type = 2'
|
||||
);
|
||||
},
|
||||
};
|
||||
@ -14,6 +14,7 @@
|
||||
*/
|
||||
import { computed, ref, watch } from 'vue';
|
||||
import ModalBox from '@/components/ModalBox.vue';
|
||||
import { LOCAL_BASE } from '@/api/local';
|
||||
import { waitForLocalWs, wakeLocalSoftware } from '@/api/localWs';
|
||||
import { fetchSoftwareRelease, softwareDownloadUrl, type SoftwareRelease } from '@/utils/localSoftware';
|
||||
|
||||
@ -24,10 +25,13 @@ const props = withDefaults(defineProps<{
|
||||
message?: string;
|
||||
/** 唤起后最多等多久(毫秒) */
|
||||
waitMs?: number;
|
||||
/** 探活方式:ws = WebSocket 17301(预览类);http = HTTP 17300 根路径(查件页,兼容老版本) */
|
||||
probe?: 'ws' | 'http';
|
||||
}>(), {
|
||||
title: '连接不上本机软件',
|
||||
message: '',
|
||||
waitMs: 12000,
|
||||
probe: 'ws',
|
||||
});
|
||||
|
||||
const emit = defineEmits<{ (e: 'close'): void; (e: 'ready'): void }>();
|
||||
@ -50,6 +54,24 @@ watch(() => props.open, async open => {
|
||||
release.value = await fetchSoftwareRelease();
|
||||
});
|
||||
|
||||
async function probeReady(): Promise<boolean> {
|
||||
if (props.probe === 'http') {
|
||||
// 查件页走 HTTP 17300(老版本软件也有这个端口,但不一定有 WS)
|
||||
const deadline = Date.now() + props.waitMs;
|
||||
while (Date.now() < deadline) {
|
||||
try {
|
||||
await fetch(`${LOCAL_BASE}/`, { cache: 'no-store' });
|
||||
return true;
|
||||
} catch {
|
||||
await new Promise(resolve => setTimeout(resolve, 700));
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
return waitForLocalWs(props.waitMs);
|
||||
}
|
||||
|
||||
async function launch() {
|
||||
if (launching.value) return;
|
||||
|
||||
@ -59,7 +81,7 @@ async function launch() {
|
||||
// 必须在用户点击的调用栈里触发协议(浏览器会拦自动唤起)
|
||||
wakeLocalSoftware();
|
||||
|
||||
const ok = await waitForLocalWs(props.waitMs);
|
||||
const ok = await probeReady();
|
||||
launching.value = false;
|
||||
|
||||
if (ok) {
|
||||
|
||||
@ -18,8 +18,6 @@
|
||||
import { computed, onMounted, ref } from 'vue';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import {
|
||||
APP_PROTOCOL,
|
||||
launchApp,
|
||||
requestLocalLogin,
|
||||
queryLocal,
|
||||
waitForQuery,
|
||||
@ -27,12 +25,7 @@ import {
|
||||
LOCAL_BASE,
|
||||
type LocalQueryResult,
|
||||
} from '@/api/local';
|
||||
|
||||
/**
|
||||
* 安装包下载地址:换成真实地址,或用环境变量 `VITE_SOFTWARE_DOWNLOAD_URL` 覆盖
|
||||
* (没配时按钮点不动,只作为提示)
|
||||
*/
|
||||
const DOWNLOAD_URL = (import.meta.env.VITE_SOFTWARE_DOWNLOAD_URL as string | undefined) || '#';
|
||||
import LocalServiceGate from '@/components/LocalServiceGate.vue';
|
||||
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
@ -44,7 +37,8 @@ const code = ref(String(route.query.code || '').trim());
|
||||
const info = ref<Record<string, unknown> | null>(null);
|
||||
const querying = ref(false);
|
||||
const error = ref('');
|
||||
const launchFailed = ref(false);
|
||||
/** 连不上本机软件:弹统一提示窗(启动 / 下载) */
|
||||
const gateOpen = ref(false);
|
||||
|
||||
/** 本机软件当前登录用户(查询接口一起带回来的) */
|
||||
const loggedUser = ref<string | null>(null);
|
||||
@ -90,14 +84,15 @@ async function load() {
|
||||
status.value = 'checking';
|
||||
error.value = '';
|
||||
info.value = null;
|
||||
launchFailed.value = false;
|
||||
gateOpen.value = false;
|
||||
|
||||
try {
|
||||
const res = await queryLocal(code.value.trim());
|
||||
await apply(res);
|
||||
} catch {
|
||||
// 连不上 = 软件没启动(或刚被用户退掉)→ 直接给下载 / 唤起入口
|
||||
// 连不上 = 软件没启动(或刚被用户退掉)→ 弹统一提示窗
|
||||
status.value = 'offline';
|
||||
gateOpen.value = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -116,23 +111,7 @@ async function askLogin() {
|
||||
|
||||
if (outcome.offline) {
|
||||
status.value = 'offline';
|
||||
return;
|
||||
}
|
||||
if (outcome.result) await apply(outcome.result);
|
||||
}
|
||||
|
||||
/** 「启动本机软件」:协议叫醒(带 code)→ 轮询查询接口等它起来 */
|
||||
async function launch() {
|
||||
launchFailed.value = false;
|
||||
status.value = 'launching';
|
||||
|
||||
launchApp(code.value.trim() || undefined);
|
||||
|
||||
const outcome = await waitForQuery(code.value.trim(), 15000);
|
||||
|
||||
if (outcome.offline) {
|
||||
launchFailed.value = true;
|
||||
status.value = 'offline';
|
||||
gateOpen.value = true;
|
||||
return;
|
||||
}
|
||||
if (outcome.result) await apply(outcome.result);
|
||||
@ -146,9 +125,10 @@ async function runQuery() { querying.value = true;
|
||||
const res = await queryLocal(code.value.trim());
|
||||
await apply(res);
|
||||
} catch {
|
||||
// 中途退出了软件 / 服务停了:直接切到「可以唤起」的提示,不用用户再踩坑
|
||||
// 中途退出了软件 / 服务停了:弹统一提示窗
|
||||
status.value = 'offline';
|
||||
info.value = null;
|
||||
gateOpen.value = true;
|
||||
} finally {
|
||||
querying.value = false;
|
||||
}
|
||||
@ -243,20 +223,14 @@ onMounted(load);
|
||||
<p class="center hint tiny">等它启动完成后本页会自动继续</p>
|
||||
</template>
|
||||
|
||||
<!-- ② 本机软件没启动 / 连不上 -->
|
||||
<!-- ② 本机软件没启动 / 连不上:交互全在统一提示窗里 -->
|
||||
<template v-else-if="status === 'offline'">
|
||||
<div class="alert alert-error center-block">
|
||||
<b>服务暂不可用</b>
|
||||
</div>
|
||||
<p class="center hint">本地打印服务未启动,请下载安装后再试</p>
|
||||
<p class="center hint">本机软件没在运行,网页查不了运单。</p>
|
||||
<p class="center">
|
||||
<a class="btn download" :href="DOWNLOAD_URL" target="_blank" rel="noopener">下载 云仓视频溯源软件</a>
|
||||
</p>
|
||||
<p class="center">
|
||||
<button class="btn btn-ghost" type="button" @click="launch">已安装,启动本机软件</button>
|
||||
</p>
|
||||
<p v-if="launchFailed" class="center hint tiny">
|
||||
没有反应?可能是没安装、或安装时没注册启动协议({{ APP_PROTOCOL }}://),先下载安装吧。
|
||||
<button class="btn" type="button" @click="gateOpen = true">启动 / 下载本机软件</button>
|
||||
</p>
|
||||
<p class="center hint tiny">
|
||||
再点 <a href="#" @click.prevent="load">重新连接</a>
|
||||
@ -337,6 +311,16 @@ onMounted(load);
|
||||
</template>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- 连不上本机软件:统一提示窗(启动 / 下载);查件页用 HTTP 17300 探活,兼容老版本 -->
|
||||
<LocalServiceGate
|
||||
:open="gateOpen"
|
||||
title="服务暂不可用"
|
||||
message="查运单、下载录像都需要本机软件在运行(网页无法直接访问本机服务)。"
|
||||
probe="http"
|
||||
@close="gateOpen = false"
|
||||
@ready="load"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user