From fd433ee0fc6b87f58b2ea255060cf94d5cc6c68c Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sun, 1 Nov 2026 03:16:30 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9C=AC=E5=9C=B0=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E6=94=B9=E5=8A=A8=EF=BC=88EXE=20=E5=AE=89=E8=A3=85=E5=8C=85?= =?UTF-8?q?=E3=80=81=E7=BB=9F=E8=AE=A1=E5=8F=A3=E5=BE=84=E3=80=81=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E4=B8=8E=E5=B7=A5=E4=BD=9C=E5=8F=B0=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - desktop/installer:新增 Inno Setup 的 EXE 安装包定义(YuncangTrace.iss)与 build.ps1 的 MSI/EXE 双产物支持 - backend:统计口径排除已删除/未绑定工作台的记录;扫码相关调整 - frontend:首页/工作台排行/本机软件下载等视图微调 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- README.md | 2 +- backend/app/controller/web/stats.js | 15 +- backend/app/service/scan.js | 109 +++++---- backend/test/app/controller/web.data.test.js | 32 ++- desktop/installer/YuncangTrace.iss | 152 ++++++++++++ desktop/installer/build.ps1 | 223 +++++++++++++----- desktop/installer/package.config.json | 4 +- desktop/installer/test-update.ps1 | 4 +- frontend/src/api/download.ts | 16 +- frontend/src/api/types.ts | 7 +- .../src/components/WorkstationRankChart.vue | 23 +- frontend/src/utils/localSoftware.ts | 8 +- frontend/src/views/HomeView.vue | 10 +- 13 files changed, 457 insertions(+), 148 deletions(-) create mode 100644 desktop/installer/YuncangTrace.iss diff --git a/README.md b/README.md index ce30027..a225459 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ packService/ - 前端调接口走**同源代理**:Vite 把 `/api`、`/health` 反代到后端(默认 `127.0.0.1:7300`,用 `VITE_BACKEND` 覆盖)。 - 联调更方便的做法:直接开后端 `:7300`,由后端(dev)把 `/` 反代到前端 dev server(`FRONTEND_DEV_SERVER`,默认 `http://127.0.0.1:7301`)。 - **上线**:前端构建产物发布到 `deployRoot/frontend`,由 **nginx 直接托管**(静态资源 + SPA fallback);`/api/*`、`/health` 由 nginx 反代到 Egg,`/download/*` 由 nginx 直接托管安装包目录。发布走 `cd backend && npm run deploy`(双实例蓝绿发布,详见 [`backend/README.md`](backend/README.md)「发布到服务器」)。 -- **安装包分发**(`/download/` 由 nginx 直接托管):桌面端 MSI 在 `/download/desktop/`、Android APK 在 `/download/android_client/`, +- **安装包分发**(`/download/` 由 nginx 直接托管):桌面端安装包(MSI / EXE)在 `/download/desktop/`、Android APK 在 `/download/android_client/`, 版本信息分别是 `/download/version.json`(桌面端自动更新读这个地址,不能改)和 `/download/android_client/version.json`。 单独发版:`cd backend && npm run desktop:publish` / `npm run android:publish`(都只构建+上传,不动后端)。 - **生产强制 HTTPS**:站点 vhost 对 HTTP 一律 `301` 到 HTTPS,HSTS 由 `front.conf` 各 location 声明;后端 `config.proxy = true`,`SITE_URL` / `desktopBaseUrl` 均为 `https://`,桌面端安装包内嵌地址也是 HTTPS。 diff --git a/backend/app/controller/web/stats.js b/backend/app/controller/web/stats.js index 30b7528..51fe76b 100644 --- a/backend/app/controller/web/stats.js +++ b/backend/app/controller/web/stats.js @@ -21,6 +21,9 @@ function parsePeriod(value) { * - `workstationStats`:同一维度内每个工作台的打包数量(按数量倒序) * - `todayCount` / `yesterdayCount`:今日(0 点起)/ 昨日(昨天 0~24 点)的扫码数,与维度无关,KPI 直接用 * + * 统计口径:只算**绑定到未删除工作台**的扫码记录 —— 未绑定工作台的扫码、 + * 挂在已删除工作台上的历史记录都不计入;已删除的工作台也不出现在工作台榜里。 + * * 与运维视角的统计(`service.user.count()` 那种全站数字)区分开。 */ class WebStatsController extends Controller { @@ -37,14 +40,17 @@ class WebStatsController extends Controller { // 「今日 / 昨日」两个数字要单独算,所以无论如何至少取 2 天 const trendDays = Math.max(span, 2); + // 统计只认「绑定到未删除工作台的记录」,工作台 id 只查一次,下面几个聚合共用 + const workstationIds = await ctx.service.scan.boundWorkstationIds(subjectId); + const [ deviceCount, channelCount, recordCount, latest, trend, stations, hourly ] = await Promise.all([ ctx.service.scanner.count({ subjectId }), ctx.service.scan.countChannels({ subjectId }), - ctx.service.scan.countRecords({ subjectId }), - ctx.service.scan.listRecords({ subjectId, page: 1, pageSize: 1 }), - ctx.service.scan.dailyCounts({ subjectId, days: trendDays }), + ctx.service.scan.countRecords({ subjectId, workstationIds }), + ctx.service.scan.listRecords({ subjectId, page: 1, pageSize: 1, workstationIds }), + ctx.service.scan.dailyCounts({ subjectId, days: trendDays, workstationIds }), ctx.service.scan.workstationCounts({ subjectId, days: span, endAt: at }), - period ? ctx.service.scan.hourlyCounts({ subjectId, day: at }) : null, + period ? ctx.service.scan.hourlyCounts({ subjectId, day: at, workstationIds }) : null, ]); const dailyCounts = trend.list; @@ -75,7 +81,6 @@ class WebStatsController extends Controller { todayCount, yesterdayCount, workstationStats: stations.list, - workstationUnassigned: stations.unassigned, }, }; } diff --git a/backend/app/service/scan.js b/backend/app/service/scan.js index 227a0ee..f1e2e2e 100644 --- a/backend/app/service/scan.js +++ b/backend/app/service/scan.js @@ -643,12 +643,31 @@ class ScanService extends Service { }; } + /** + * 首页统计口径:只算绑定到**未删除工作台**的扫码记录 + * + * 未绑定工作台的扫码(通道没挂到任何工作台上)和挂到已删除工作台上的历史记录 + * 都不进首页统计(KPI / 趋势图 / 工作台榜 / 最近一次扫码)。 + * + * @param {number} subjectId 当前主体 + * @return {Promise} 该主体下未删除工作台的 id + */ + async boundWorkstationIds(subjectId) { + const rows = await this.app.model.Workstation.findAll({ + where: { subjectId: Number(subjectId) }, + attributes: [ 'id' ], + }); + return rows + .map(row => Number(row.id)) + .filter(id => Number.isInteger(id) && id > 0); + } + /** * 扫码记录列表(分页 + 通道 / 条码 / 时间范围过滤),带所属中控 * @param {object} params { page, pageSize, scannerId 单个中控, scannerIds 多个中控(用户端按「我的设备」过滤用), - * channelId, barcode, startTime, endTime } + * channelId, barcode, startTime, endTime, workstationIds 只取这些工作台的记录(首页统计用) } */ - async listRecords({ page = 1, pageSize = 20, scannerId, scannerIds, subjectId, channelId, barcode, startTime, endTime } = {}) { + async listRecords({ page = 1, pageSize = 20, scannerId, scannerIds, subjectId, channelId, barcode, startTime, endTime, workstationIds } = {}) { const size = Math.min(Math.max(Number(pageSize) || 20, 1), 200); const current = Math.max(Number(page) || 1, 1); @@ -658,6 +677,7 @@ class ScanService extends Service { if (subjectId) where.subjectId = Number(subjectId); if (channelId) where.channelId = channelId; if (barcode) where.barcode = { [Op.like]: `%${barcode}%` }; + if (workstationIds) where.workstationId = { [Op.in]: workstationIds.map(Number) }; const from = parseScanTime(startTime); const to = parseScanTime(endTime); @@ -694,9 +714,12 @@ class ScanService extends Service { } /** 扫码记录数(首页统计用;`{ scannerIds }` 限定中控,同 countChannels) */ - async countRecords({ scannerIds, subjectId, ...where } = {}) { + async countRecords({ scannerIds, subjectId, workstationIds, ...where } = {}) { if (scannerIds) where.scannerId = { [Op.in]: scannerIds.map(Number) }; - if (subjectId) where.subjectId = Number(subjectId); + if (subjectId) { + where.subjectId = Number(subjectId); + where.workstationId = { [Op.in]: workstationIds || await this.boundWorkstationIds(subjectId) }; + } return this.ScanRecord.count({ where }); } @@ -706,16 +729,20 @@ class ScanService extends Service { * 日期口径按 +08:00 切(与 Sequelize 的 timezone 一致),没有记录的日期补 0, * 保证前端拿到的是**连续**的 N 天,直接画图。 * - * @param {object} params { subjectId, days = 7, endAt = new Date() } + * @param {object} params { subjectId, days = 7, endAt = new Date(), workstationIds } * @return {Promise<{ list: Array<{ date: string, count: number }>, total: number }>} */ - async dailyCounts({ subjectId, days = 7, endAt = new Date() } = {}) { + async dailyCounts({ subjectId, days = 7, endAt = new Date(), workstationIds } = {}) { const span = clampDays(days); const keys = dayKeys(endAt, span); const start = dayStart(keys[0]); // 上界取「明天 0 点」,把未来时间的异常记录排除在区间外 const end = new Date(start.getTime() + span * 86400000); - const where = { subjectId: Number(subjectId), scanTime: { [Op.gte]: start, [Op.lt]: end } }; + const where = { + subjectId: Number(subjectId), + workstationId: { [Op.in]: workstationIds || await this.boundWorkstationIds(subjectId) }, + scanTime: { [Op.gte]: start, [Op.lt]: end }, + }; const sequelize = this.ScanRecord.sequelize || this.app.Sequelize; const counts = new Map(); @@ -752,14 +779,18 @@ class ScanService extends Service { * 日期口径同上(+08:00 切日),固定返回 0~23 点共 24 个点(没有记录的小时补 0), * 前端直接画成时段分布图。 * - * @param {object} params { subjectId, day = new Date()(任意落在目标那天的时刻) } + * @param {object} params { subjectId, day = new Date()(任意落在目标那天的时刻), workstationIds } * @return {Promise<{ date: string, list: Array<{ date: string, label: string, count: number }>, total: number }>} */ - async hourlyCounts({ subjectId, day = new Date() } = {}) { + async hourlyCounts({ subjectId, day = new Date(), workstationIds } = {}) { const key = dayKey(day); const start = dayStart(key); const end = new Date(start.getTime() + 86400000); - const where = { subjectId: Number(subjectId), scanTime: { [Op.gte]: start, [Op.lt]: end } }; + const where = { + subjectId: Number(subjectId), + workstationId: { [Op.in]: workstationIds || await this.boundWorkstationIds(subjectId) }, + scanTime: { [Op.gte]: start, [Op.lt]: end }, + }; const sequelize = this.ScanRecord.sequelize || this.app.Sequelize; const counts = new Map(); @@ -794,35 +825,38 @@ class ScanService extends Service { /** * 按工作台统计扫码(打包)数量(首页「每个工作台打包数量」图) * - * 统计口径:区间内扫码记录上冻结的 `workstation_id`(工作台被删/改过也不影响历史计数)。 - * 没有关联工作台的记录数单独返回(`unassigned`),避免图上数字和总数对不上。 - * 工作台按数量倒序,数量相同按 id 升序;已删除的工作台也会返回(带 `deleted` 标记)。 + * 统计口径:区间内扫码记录上冻结的 `workstation_id`。 + * 只统计**未删除**的工作台:未绑定工作台的记录、挂在已删除工作台上的历史记录都不计入, + * 已删除的工作台也不出现在榜单里。 * * @param {object} params { subjectId, days = 7, endAt = new Date() } - * @return {Promise<{ list: Array, unassigned: number }>} + * @return {Promise<{ list: Array }>} */ async workstationCounts({ subjectId, days = 7, endAt = new Date() } = {}) { const span = clampDays(days); const keys = dayKeys(endAt, span); const start = dayStart(keys[0]); const end = new Date(start.getTime() + span * 86400000); - const where = { subjectId: Number(subjectId), scanTime: { [Op.gte]: start, [Op.lt]: end } }; - const sequelize = this.ScanRecord.sequelize || this.app.Sequelize; - const counts = new Map(); - let unassigned = 0; + const stations = await this.app.model.Workstation.findAll({ + where: { subjectId: Number(subjectId) }, + attributes: [ 'id', 'code', 'name', 'wsType', 'status' ], + order: [[ 'id', 'ASC' ]], + }); + if (!stations.length) return { list: [] }; - const add = (workstationId, count) => { - const id = Number(workstationId); - if (!Number.isInteger(id) || id <= 0) { - unassigned += count; - return; - } - counts.set(id, (counts.get(id) || 0) + count); + const where = { + subjectId: Number(subjectId), + workstationId: { [Op.in]: stations.map(station => Number(station.id)) }, + scanTime: { [Op.gte]: start, [Op.lt]: end }, }; + const sequelize = this.ScanRecord.sequelize || this.app.Sequelize; + const aggregated = Boolean(sequelize && typeof sequelize.fn === 'function'); + const counts = new Map(); + let rows; - if (sequelize && typeof sequelize.fn === 'function') { + if (aggregated) { rows = await this.ScanRecord.findAll({ attributes: [ [ sequelize.col('workstation_id'), 'workstationId' ], @@ -836,37 +870,26 @@ class ScanService extends Service { rows = await this.ScanRecord.findAll({ attributes: [ 'workstationId' ], where, raw: true }); } for (const row of rows) { - const id = row.workstationId === undefined ? row.workstation_id : row.workstationId; - add(id, sequelize && typeof sequelize.fn === 'function' ? (Number(row.count) || 0) : 1); + const id = Number(row.workstationId === undefined ? row.workstation_id : row.workstationId); + if (!Number.isInteger(id) || id <= 0) continue; + const count = aggregated ? (Number(row.count) || 0) : 1; + counts.set(id, (counts.get(id) || 0) + count); } - const stations = await this.app.model.Workstation.findAll({ - where: { subjectId: Number(subjectId) }, - attributes: [ 'id', 'code', 'name', 'wsType', 'status', 'deletedAt' ], - order: [[ 'id', 'ASC' ]], - paranoid: false, // 历史记录可能挂到已删除的工作台上,统计要算进去 - }); - const list = stations.map(station => { const id = Number(station.id); - const count = counts.get(id) || 0; - counts.delete(id); return { id, code: station.code, name: station.name || '', wsType: Number(station.wsType) || 1, status: Number(station.status) || 0, - deleted: Boolean(station.deletedAt), - count, + count: counts.get(id) || 0, }; }); - // 记录上挂的工作台已经不属于当前主体(理论上不会发生):同样算作「未关联」 - for (const count of counts.values()) unassigned += count; - list.sort((a, b) => (b.count - a.count) || (a.id - b.id)); - return { list, unassigned }; + return { list }; } /** 某中控的通道(上报后回显用) */ diff --git a/backend/test/app/controller/web.data.test.js b/backend/test/app/controller/web.data.test.js index c056030..5639d24 100644 --- a/backend/test/app/controller/web.data.test.js +++ b/backend/test/app/controller/web.data.test.js @@ -159,8 +159,9 @@ describe('test/app/controller/web.data.test.js', () => { await setAuth(app.httpRequest().get('/api/web/records?deviceId=100')).expect(404); }); - it('GET /api/web/stats:设备/通道/记录数都限定在当前主体范围内', async () => { + it('GET /api/web/stats:设备/通道/记录数都限定在当前主体范围内(只算已绑定工作台的记录)', async () => { const wanted = []; + let recordWhere = null; mockModels({ Scanner: { async count({ where }) { @@ -172,21 +173,26 @@ describe('test/app/controller/web.data.test.js', () => { async count({ where }) { wanted.push(where.subjectId); return 5; }, }, ScanRecord: { - async count({ where }) { wanted.push(where.subjectId); return 9; }, + async count({ where }) { wanted.push(where.subjectId); recordWhere = where; return 9; }, async findAndCountAll() { return { rows: [], count: 0 }; }, async findAll() { return []; }, }, - Workstation: { async findAll() { return []; } }, + Workstation: { async findAll() { return [ instance({ id: 3 }), instance({ id: 4 }) ]; } }, }); const res = await setAuth(app.httpRequest().get('/api/web/stats')).expect(200); assert(res.body.data.deviceCount === 2 && res.body.data.channelCount === 5 && res.body.data.recordCount === 9, JSON.stringify(res.body)); assert(wanted.every(item => item === SUBJECT_ID), `统计范围应限定在当前主体: ${wanted.join('|')}`); + assert( + recordWhere.workstationId[Op.in].join(',') === '3,4', + `统计只算绑定到未删除工作台的记录:${JSON.stringify(recordWhere)}`, + ); }); - it('GET /api/web/stats:近 N 天趋势补零 + 工作台打包数量(含未关联)', async () => { + it('GET /api/web/stats:近 N 天趋势补零 + 工作台打包数量(不含未绑定 / 已删除)', async () => { const now = new Date(); const yesterday = new Date(now.getTime() - 86400000); + const stationWheres = []; mockModels({ Scanner: { async count() { return 1; } }, @@ -198,6 +204,10 @@ describe('test/app/controller/web.data.test.js', () => { const attr = String(options.attributes[0]); if (attr === 'scanTime') { assert(options.where.subjectId === SUBJECT_ID, '趋势统计也必须限定当前主体'); + assert( + options.where.workstationId[Op.in].join(',') === '3,4', + `趋势统计只算绑定到未删除工作台的记录:${JSON.stringify(options.where)}`, + ); return [ { scanTime: now }, { scanTime: now }, @@ -206,11 +216,15 @@ describe('test/app/controller/web.data.test.js', () => { } if (attr === 'workstationId') { assert(options.where.subjectId === SUBJECT_ID, '工作台统计也必须限定当前主体'); + assert( + options.where.workstationId[Op.in].join(',') === '3,4', + `工作台统计只查未删除的工作台:${JSON.stringify(options.where)}`, + ); return [ { workstationId: 3 }, { workstationId: 3 }, - { workstationId: null }, - { workstationId: 99 }, // 不属于本主体的工作台 → 算「未关联」 + { workstationId: null }, // 未绑定工作台:不计入 + { workstationId: 99 }, // 工作台已删除 / 不属于本主体:不计入 ]; } throw new Error(`未预期的查询: ${attr}`); @@ -219,6 +233,8 @@ describe('test/app/controller/web.data.test.js', () => { Workstation: { async findAll(options) { assert(options.where.subjectId === SUBJECT_ID, '只统计本主体的工作台'); + assert(options.paranoid !== false, '已删除的工作台不参与统计'); + stationWheres.push(options); return [ instance({ id: 3, code: 'WS-3', name: '3号工作台', wsType: 1, status: 1, deletedAt: null }), instance({ id: 4, code: 'WS-4', name: '4号工作台', wsType: 2, status: 1, deletedAt: null }), @@ -238,10 +254,12 @@ describe('test/app/controller/web.data.test.js', () => { '日期应连续升序', ); + assert(stationWheres.length >= 1, '应查询本主体的工作台'); assert(data.workstationStats.length === 2, JSON.stringify(data.workstationStats)); assert(data.workstationStats[0].id === 3 && data.workstationStats[0].count === 2, JSON.stringify(data.workstationStats)); assert(data.workstationStats[1].id === 4 && data.workstationStats[1].count === 0, JSON.stringify(data.workstationStats)); - assert(data.workstationUnassigned === 2, JSON.stringify(data.workstationUnassigned)); + assert(data.workstationUnassigned === undefined, '未绑定工作台的记录不再单独统计'); + assert(data.workstationStats.every(item => item.deleted === undefined), '不再返回已删除工作台标记'); assert(data.period === '' && data.scanTrendUnit === 'day', JSON.stringify(data.period)); assert(data.todayCount === 2 && data.yesterdayCount === 1, `今日/昨日应单独给出:${data.todayCount}/${data.yesterdayCount}`); }); diff --git a/desktop/installer/YuncangTrace.iss b/desktop/installer/YuncangTrace.iss new file mode 100644 index 0000000..9a8514c --- /dev/null +++ b/desktop/installer/YuncangTrace.iss @@ -0,0 +1,152 @@ +; 云仓视频溯源软件 —— EXE 安装包定义(Inno Setup 6) +; +; 为什么要有 EXE 版: +; MSI 依赖 Windows Installer 服务(msiserver)。现场有一部分电脑把该服务禁用 / 被安全软件拦 / +; 组策略禁止 MSI,导致双击安装包直接失败。EXE 版只用「解压 + 复制文件 + 写 HKCU」, +; 完全不碰 Windows Installer,安装目录、注册表项、快捷方式与 MSI 版保持一致,可以互相顶替。 +; +; 与 MSI 版的对应关系: +; - 同一个安装目录 %LOCALAPPDATA%\Programs\YuncangTrace; +; - 同样注册 yuncang:// 协议(HKCU\Software\Classes\yuncang); +; - 同样是 perUser 安装(不需要管理员/UAC)。 +; +; 安装旧版 MSI 的机器再装本 EXE 时,[Code] 里会先静默卸载旧 MSI,避免「应用和功能」里 +; 留下两个条目(旧 MSI 卸载会删掉本 EXE 装的文件)。 +; +; 编译(build.ps1 -Target Exe 会自动调用): +; ISCC.exe /DVersion=1.0.0 /Oout YuncangTrace.iss +; 产物:out\YuncangTraceSetup-<版本>.exe +; +; 静默安装(自动更新用): +; YuncangTraceSetup-<版本>.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- + +#ifndef Version + #define Version "0.0.0" +#endif + +[Setup] +; AppId 与 MSI 的 UpgradeCode 保持一致:同一个产品、同一个安装位置,升级时能识别出旧版本 +AppId={{A1E7CF0F-4FC5-4A88-84B5-13E818F352CC} +AppName=云仓视频溯源软件 +AppVersion={#Version} +AppVerName=云仓视频溯源软件 {#Version} +AppPublisher=云仓 +DefaultDirName={localappdata}\Programs\YuncangTrace +DefaultGroupName=云仓视频溯源软件 +DisableProgramGroupPage=yes +DisableDirPage=auto +OutputDir=out +OutputBaseFilename=YuncangTraceSetup-{#Version} +SetupIconFile=..\Assets\app.ico +UninstallDisplayIcon={app}\YuncangTrace.LocalService.exe +UninstallDisplayName=云仓视频溯源软件 +; perUser:不需要管理员,也就不受「安装 MSI 要管理员」这类限制影响 +PrivilegesRequired=lowest +ArchitecturesAllowed=x64compatible +ArchitecturesInstallIn64BitMode=x64compatible +Compression=lzma2/max +SolidCompression=yes +WizardStyle=modern +; 装/升级时先让正在运行的软件退出,避免 exe 被占用换不掉 +CloseApplications=yes +RestartApplications=no +AllowNoIcons=yes +SetupLogging=yes +VersionInfoVersion={#Version} +VersionInfoCompany=云仓 +VersionInfoDescription=云仓视频溯源软件 安装程序 +VersionInfoProductName=云仓视频溯源软件 +VersionInfoProductVersion={#Version} + +[Files] +Source: "..\publish\YuncangTrace.LocalService.exe"; DestDir: "{app}"; Flags: ignoreversion +; 海康运行库(HCNetSDK.dll + HCNetSDKCom\*):取通道/取流必需 +Source: "..\publish\native\*"; DestDir: "{app}\native"; Flags: ignoreversion recursesubdirs createallsubdirs +; 谷歌浏览器插件:菜单「工具 → 复制谷歌插件地址」给出的就是这个目录 +Source: "..\publish\extension\*"; DestDir: "{app}\extension"; Flags: ignoreversion recursesubdirs createallsubdirs + +[Icons] +Name: "{group}\云仓视频溯源软件"; Filename: "{app}\YuncangTrace.LocalService.exe"; WorkingDir: "{app}"; Comment: "本机打印与溯源服务(打开后最小化到托盘)" + +[Registry] +; yuncang:// 启动协议(安装即生效,卸载时删除) +Root: HKCU; Subkey: "Software\Classes\yuncang"; ValueType: string; ValueData: "URL:云仓视频溯源软件"; Flags: uninsdeletekey +Root: HKCU; Subkey: "Software\Classes\yuncang"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Flags: uninsdeletekey +Root: HKCU; Subkey: "Software\Classes\yuncang\shell\open\command"; ValueType: string; ValueData: """{app}\YuncangTrace.LocalService.exe"" ""%1"""; Flags: uninsdeletekey + +[Run] +Filename: "{app}\YuncangTrace.LocalService.exe"; Description: "启动云仓视频溯源软件"; Flags: nowait postinstall skipifsilent + +[Code] +const + UninstallKey = 'Software\Microsoft\Windows\CurrentVersion\Uninstall'; + AppDisplayName = '云仓视频溯源软件'; + +function HasParam(const Value: String): Boolean; +var + I: Integer; +begin + Result := False; + for I := 1 to ParamCount do + if CompareText(ParamStr(I), Value) = 0 then + begin + Result := True; + Exit; + end; +end; + +{ 卸载旧 MSI 版:只认 UninstallString 里有 msiexec 的同名条目,不碰 EXE 版自己 } +procedure RemoveOldMsiAt(const RootKey: Integer; const RootName: String); +var + Names: TArrayOfString; + I: Integer; + SubKey, DisplayName, UninstallString, ProductCode, Params: String; + ResultCode: Integer; +begin + if not RegGetSubkeyNames(RootKey, UninstallKey, Names) then Exit; + + for I := 0 to GetArrayLength(Names) - 1 do + begin + SubKey := UninstallKey + '\' + Names[I]; + if not RegQueryStringValue(RootKey, SubKey, 'DisplayName', DisplayName) then Continue; + if CompareText(DisplayName, AppDisplayName) <> 0 then Continue; + if not RegQueryStringValue(RootKey, SubKey, 'UninstallString', UninstallString) then Continue; + if Pos('msiexec', LowerCase(UninstallString)) = 0 then Continue; + if Copy(Names[I], 1, 1) <> '{' then Continue; + + ProductCode := Names[I]; + Params := '/x ' + ProductCode + ' /qn /norestart'; + Log('发现旧 MSI 版:' + RootName + '\' + ProductCode + ',先静默卸载'); + Exec('msiexec.exe', Params, '', SW_HIDE, ewWaitUntilTerminated, ResultCode); + Log('msiexec 退出码:' + IntToStr(ResultCode)); + + if ResultCode <> 0 then + begin + { MSI 卸载失败(现场正是 MSI 坏掉的机器):删掉它的卸载项, + 否则以后从「应用和功能」卸载旧 MSI 会把 EXE 版装的文件一起删掉 } + if RegDeleteKeyIncludingSubkeys(RootKey, SubKey) then + Log('MSI 卸载失败,已移除其卸载项:' + SubKey) + else + Log('MSI 卸载失败,且移除卸载项失败:' + SubKey); + end; + end; +end; + +procedure RemoveOldMsi; +begin + if HasParam('/SKIPMSICLEANUP') then + begin + Log('跳过旧 MSI 清理(/SKIPMSICLEANUP)'); + Exit; + end; + + RemoveOldMsiAt(HKCU, 'HKCU'); + RemoveOldMsiAt(HKLM, 'HKLM'); + RemoveOldMsiAt(HKLM32, 'HKLM32'); +end; + +procedure CurStepChanged(CurStep: TSetupStep); +begin + if CurStep = ssInstall then + RemoveOldMsi; +end; \ No newline at end of file diff --git a/desktop/installer/build.ps1 b/desktop/installer/build.ps1 index df09169..017cc06 100644 --- a/desktop/installer/build.ps1 +++ b/desktop/installer/build.ps1 @@ -1,14 +1,15 @@ #requires -Version 5.1 <# .SYNOPSIS - 打「云仓视频溯源软件」的 MSI 安装包,并生成本机自动更新用的 version.json。 + 打「云仓视频溯源软件」的安装包(MSI 和/或 EXE),并生成本机自动更新用的 version.json。 .DESCRIPTION 1. 按 -Environment 从 package.config.json 取该环境的域名(开发 / 生产); 2. dotnet publish(自包含单文件,不依赖 .NET 运行时); - 3. wix build 生成 MSI; - 4. 计算 MD5 → 写 version.json(version / downloadUrl / md5 / size / publishedAt / buildId); - 5. 把 version.json + MSI 复制到后端目录(MSI → backend/app/public/download/desktop/、 + 3. wix build 生成 MSI;Inno Setup(ISCC)生成 EXE; + 4. 计算 MD5 → 写 version.json(version / downloadUrl / md5 / size / publishedAt / buildId; + EXE 版另有 downloadUrlExe / md5Exe / sizeExe); + 5. 把 version.json + 安装包复制到后端目录(安装包 → backend/app/public/download/desktop/、 version.json → backend/app/public/version/desktop/),供软件启动时 GET /download/version.json 检测更新; 6. 本地 out/ 与后端目录各只保留最近 keepVersions(默认 5)个安装包。 @@ -22,21 +23,31 @@ .PARAMETER ServerBaseUrl 覆盖该环境配置里的域名(临时打测试包用)。 +.PARAMETER Target + 打哪种安装包:Both(默认,MSI + EXE)/ Msi / Exe。 + .PARAMETER Keep 保留多少个历史安装包(默认读 package.config.json 的 keepVersions = 5)。 .PARAMETER ReleaseNotes 写进 version.json 的更新说明(软件弹更新提示时展示)。 +.PARAMETER SkipDeploy + 只在本机 out\ 出包,不复制到后端目录(调试打包脚本用)。 + .EXAMPLE .\build.ps1 -Environment Production -Version 1.0.1 -ReleaseNotes "修复若干问题" .EXAMPLE - .\build.ps1 # 开发环境、版本取 csproj + .\build.ps1 -Target Exe # 只出 EXE(部分电脑装不了 MSI 时用) + +.EXAMPLE + .\build.ps1 # 开发环境、版本取 csproj、MSI + EXE .NOTES - 前置:dotnet tool install --global wix --version 5.0.2 - (WiX v6+ 需要 OSMF 付费协议,v5 不需要) + 前置: + dotnet tool install --global wix --version 5.0.2 (WiX v6+ 需要 OSMF 付费协议,v5 不需要) + winget install --id JRSoftware.InnoSetup (EXE 包用,装完有 ISCC.exe) 本文件必须保存为 UTF-8 with BOM —— PowerShell 5.1 读无 BOM 脚本会按 GBK 解析,中文注释直接语法报错。 #> param( @@ -45,8 +56,13 @@ param( [string]$Version, [string]$ServerBaseUrl, + + [ValidateSet('Both', 'Msi', 'Exe')] + [string]$Target = 'Both', + [int]$Keep = 0, - [string]$ReleaseNotes = '' + [string]$ReleaseNotes = '', + [switch]$SkipDeploy ) $ErrorActionPreference = 'Stop' @@ -83,6 +99,20 @@ function Write-Utf8NoBom([string]$p, [string]$text) { [System.IO.File]::WriteAllText($p, $text, (New-Object System.Text.UTF8Encoding($false))) } +# Inno Setup 编译器(EXE 安装包用):PATH → 默认安装位置(winget 装到用户目录) +function Resolve-Iscc { + $candidates = @( + (Get-Command ISCC.exe -ErrorAction SilentlyContinue).Source, + (Join-Path $env:LOCALAPPDATA 'Programs\Inno Setup 6\ISCC.exe'), + (Join-Path ${env:ProgramFiles(x86)} 'Inno Setup 6\ISCC.exe'), + (Join-Path $env:ProgramFiles 'Inno Setup 6\ISCC.exe') + ) + foreach ($candidate in $candidates) { + if ($candidate -and (Test-Path $candidate)) { return $candidate } + } + return $null +} + # ---------------- 1. 配置 ---------------- $configPath = Join-Path $PSScriptRoot 'package.config.json' $cfg = Read-Utf8 $configPath | ConvertFrom-Json @@ -111,6 +141,13 @@ Write-Host "环境:$Environment" Write-Host "版本:$Version" Write-Host "后端:$ServerBaseUrl" +# 打哪种安装包:Both = MSI + EXE(默认)。 +# EXE 版存在的意义:现场有电脑装不了 MSI(Windows Installer 服务被禁用 / 安全软件拦截 / 组策略), +# EXE 走 Inno Setup,不依赖 Windows Installer。 +$buildMsi = $Target -ne 'Exe' +$buildExe = $Target -ne 'Msi' +Write-Host "安装包:$Target" + # ---------------- 3. 发布 ---------------- Push-Location $desktop try { @@ -139,48 +176,114 @@ if (-not (Test-Path $ffmpeg)) { } Write-Host "ffmpeg:$([math]::Round((Get-Item $ffmpeg).Length / 1MB, 1)) MB" -# ---------------- 4. 打 MSI ---------------- -$wix = (Get-Command wix.exe -ErrorAction SilentlyContinue).Source -if (-not $wix) { $wix = Join-Path $env:USERPROFILE '.dotnet\tools\wix.exe' } -if (-not (Test-Path $wix)) { - throw "找不到 wix.exe。先执行:dotnet tool install --global wix --version 5.0.2" -} - +# ---------------- 4. 打安装包 ---------------- New-Item -ItemType Directory -Force -Path $outDir | Out-Null -$msiName = "YuncangTraceSetup-$Version.msi" -$msi = Join-Path $outDir $msiName -Push-Location $PSScriptRoot -try { - & $wix build Product.wxs -arch x64 -d "Version=$Version" -o $msi - if ($LASTEXITCODE -ne 0) { throw "wix build 失败($LASTEXITCODE)" } +# 4a. MSI(WiX) +$msi = $null +$msiName = $null +if ($buildMsi) { + $wix = (Get-Command wix.exe -ErrorAction SilentlyContinue).Source + if (-not $wix) { $wix = Join-Path $env:USERPROFILE '.dotnet\tools\wix.exe' } + if (-not (Test-Path $wix)) { + throw "找不到 wix.exe。先执行:dotnet tool install --global wix --version 5.0.2" + } + + $msiName = "YuncangTraceSetup-$Version.msi" + $msi = Join-Path $outDir $msiName + + Push-Location $PSScriptRoot + try { + & $wix build Product.wxs -arch x64 -d "Version=$Version" -o $msi + if ($LASTEXITCODE -ne 0) { throw "wix build 失败($LASTEXITCODE)" } + } + finally { + Pop-Location + } } -finally { - Pop-Location + +# 4b. EXE(Inno Setup,不依赖 Windows Installer) +$setupExe = $null +$exeName = $null +if ($buildExe) { + $iscc = Resolve-Iscc + if (-not $iscc) { + if ($Target -eq 'Exe') { + throw "找不到 ISCC.exe(Inno Setup 6)。先执行:winget install --id JRSoftware.InnoSetup" + } + + # Both 模式下没有 Inno 也别把 MSI 流程一起搞挂:只提示,继续出 MSI + Write-Warning "找不到 ISCC.exe(Inno Setup 6),本次跳过 EXE(只出 MSI)。要 EXE 请先:winget install --id JRSoftware.InnoSetup" + $buildExe = $false + } +} + +if ($buildExe) { + $exeName = "YuncangTraceSetup-$Version.exe" + $setupExe = Join-Path $outDir $exeName + + Push-Location $PSScriptRoot + try { + & $iscc "/DVersion=$Version" "/O$outDir" "YuncangTrace.iss" + if ($LASTEXITCODE -ne 0) { throw "ISCC 编译失败($LASTEXITCODE)" } + } + finally { + Pop-Location + } + + if (-not (Test-Path $setupExe)) { throw "EXE 安装包没有生成:$setupExe" } + Write-Host "EXE:$([math]::Round((Get-Item $setupExe).Length / 1MB, 1)) MB" } # ---------------- 5. version.json ---------------- -$hash = (Get-FileHash -Algorithm MD5 -Path $msi).Hash.ToLowerInvariant() -$size = (Get-Item $msi).Length -$downloadUrl = "$ServerBaseUrl/download/desktop/$msiName" $now = Get-Date +$msiHash = $null +$msiSize = 0 +if ($msi) { + $msiHash = (Get-FileHash -Algorithm MD5 -Path $msi).Hash.ToLowerInvariant() + $msiSize = (Get-Item $msi).Length + Write-Host "MSI:$msiHash($([math]::Round($msiSize / 1MB, 1)) MB)" +} + +$exeHash = $null +$exeSize = 0 +if ($setupExe) { + $exeHash = (Get-FileHash -Algorithm MD5 -Path $setupExe).Hash.ToLowerInvariant() + $exeSize = (Get-Item $setupExe).Length + Write-Host "EXE:$exeHash($([math]::Round($exeSize / 1MB, 1)) MB)" +} + +# downloadUrl/md5/size 是**老客户端唯一认识的字段**,必须继续指向 MSI(老客户端只会 msiexec); +# downloadUrlExe/md5Exe/sizeExe 给新客户端,新客户端优先下载 EXE(不依赖 Windows Installer)。 +$primaryName = if ($msi) { $msiName } else { $exeName } +$primaryHash = if ($msi) { $msiHash } else { $exeHash } +$primarySize = if ($msi) { $msiSize } else { $exeSize } +$downloadUrl = "$ServerBaseUrl/download/desktop/$primaryName" + +if (-not $msi) { + Write-Warning "本次没有打 MSI:downloadUrl 只能指向 EXE,老客户端(按 .msi 校验 / msiexec 安装)无法自动更新。" +} + $versionJson = [ordered]@{ - version = $Version - downloadUrl = $downloadUrl - md5 = $hash - size = $size - publishedAt = $now.ToString('yyyy-MM-ddTHH:mm:sszzz') - buildId = $now.ToString('yyyyMMddHHmmss') - environment = $Environment - releaseNotes = $ReleaseNotes -} | ConvertTo-Json + version = $Version + downloadUrl = $downloadUrl + md5 = $primaryHash + size = $primarySize +} +if ($setupExe) { + $versionJson.downloadUrlExe = "$ServerBaseUrl/download/desktop/$exeName" + $versionJson.md5Exe = $exeHash + $versionJson.sizeExe = $exeSize +} +$versionJson.publishedAt = $now.ToString('yyyy-MM-ddTHH:mm:sszzz') +$versionJson.buildId = $now.ToString('yyyyMMddHHmmss') +$versionJson.environment = $Environment +$versionJson.releaseNotes = $ReleaseNotes +$versionJson = $versionJson | ConvertTo-Json $versionFile = Join-Path $outDir 'version.json' Write-Utf8NoBom $versionFile $versionJson - -Write-Host "MD5:$hash($([math]::Round($size / 1MB, 1)) MB)" - # ---------------- 6. 复制到后端 ---------------- # MSI → app/public/download/desktop/(/download/desktop/xxx.msi,长缓存) # version.json → app/public/version/desktop/(/download/version.json 由路由提供,绝不能缓存) @@ -189,7 +292,10 @@ $downloadDir = $null $versionDir = $null $existingVj = $null -if ($envCfg.copyToServer -ne $false) { +if ($SkipDeploy) { + Write-Host "(-SkipDeploy:不复制到后端目录)" +} +elseif ($envCfg.copyToServer -ne $false) { $downloadDir = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot $envCfg.downloadFolder)) $versionDir = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot $envCfg.versionFolder)) New-Item -ItemType Directory -Force -Path $downloadDir | Out-Null @@ -212,10 +318,13 @@ if ($envCfg.copyToServer -ne $false) { catch { /* 旧文件坏了就当没有 */ } } - $dstMsi = Join-Path $downloadDir $msiName - Copy-Item -Path $msi -Destination $dstMsi -Force - # 刷新 mtime:即使上游还有一层协商缓存,也能认出文件变了 - (Get-Item $dstMsi).LastWriteTime = $now + foreach ($package in @($msi, $setupExe)) { + if (-not $package) { continue } + $dstPackage = Join-Path $downloadDir (Split-Path -Leaf $package) + Copy-Item -Path $package -Destination $dstPackage -Force + # 刷新 mtime:即使上游还有一层协商缓存,也能认出文件变了 + (Get-Item $dstPackage).LastWriteTime = $now + } if (-not $skipVersionJson) { Write-Utf8NoBom $existingVj $versionJson @@ -228,18 +337,18 @@ if ($envCfg.copyToServer -ne $false) { $staleVj = Join-Path $downloadDir 'version.json' if (Test-Path $staleVj) { Remove-Item $staleVj -Force } - Write-Host "已复制到:$downloadDir(MSI)、$versionDir(version.json)" + Write-Host "已复制到:$downloadDir(安装包)、$versionDir(version.json)" } else { Write-Host "(该环境 copyToServer=false,跳过复制到后端)" } # ---------------- 7. 只保留最近 N 个安装包 ---------------- -function Remove-OldPackages([string]$dir, [int]$keep) { +function Remove-OldPackages([string]$dir, [int]$keep, [string]$pattern) { if (-not (Test-Path $dir)) { return } $items = @( - Get-ChildItem -Path $dir -Filter 'YuncangTraceSetup-*.msi' -File | ForEach-Object { + Get-ChildItem -Path $dir -Filter $pattern -File | ForEach-Object { if ($_.BaseName -match 'YuncangTraceSetup-(\d+(\.\d+){1,3})$') { [pscustomobject]@{ File = $_; Ver = [version]$Matches[1] } } @@ -253,17 +362,25 @@ function Remove-OldPackages([string]$dir, [int]$keep) { Write-Host " 清理旧包:$($_.File.Name)" } - if ($removed -eq 0) { Write-Host " $dir:共 $($items.Count) 个,未超过 $keep 个" } + if ($removed -eq 0) { Write-Host " $dir($pattern):共 $($items.Count) 个,未超过 $keep 个" } } -Write-Host "保留最近 $Keep 个安装包:" -Remove-OldPackages $outDir $Keep -if ($downloadDir) { Remove-OldPackages $downloadDir $Keep } +Write-Host "保留最近 $Keep 个安装包(.msi / .exe 分别计算):" +foreach ($pattern in @('YuncangTraceSetup-*.msi', 'YuncangTraceSetup-*.exe')) { + Remove-OldPackages $outDir $Keep $pattern + if ($downloadDir) { Remove-OldPackages $downloadDir $Keep $pattern } +} # ---------------- 8. 摘要 ---------------- Write-Host "" -Write-Host "完成:$msi" -ForegroundColor Green +if ($msi) { Write-Host "MSI:$msi" -ForegroundColor Green } +if ($setupExe) { Write-Host "EXE:$setupExe" -ForegroundColor Green } Write-Host "版本文件:$versionFile" Write-Host "下载地址:$downloadUrl" -Write-Host "安装:msiexec /i `"$msi`"" -Write-Host "卸载:msiexec /x `"$msi`"" +if ($setupExe) { + Write-Host "静默安装(EXE):`"$setupExe`" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-" +} +if ($msi) { + Write-Host "静默安装(MSI):msiexec /i `"$msi`" /passive /norestart" +} +Write-Host "卸载:设置 → 应用 → 云仓视频溯源软件(或运行安装目录下的 unins000.exe)" diff --git a/desktop/installer/package.config.json b/desktop/installer/package.config.json index fe87712..7e69de1 100644 --- a/desktop/installer/package.config.json +++ b/desktop/installer/package.config.json @@ -1,10 +1,10 @@ { - "$comment": "打包配置:build.ps1 -Environment Development|Production 读取对应环境。版本号默认取 csproj 的 ,可用 -Version 覆盖。安装包与版本信息统一放进后端的 desktop 子目录:下载地址 /download/desktop/*.msi,版本信息仍由 /download/version.json 提供。", + "$comment": "打包配置:build.ps1 -Environment Development|Production 读取对应环境。版本号默认取 csproj 的 ,可用 -Version 覆盖。安装包与版本信息统一放进后端的 desktop 子目录:下载地址 /download/desktop/*.exe(新客户端优先)或 *.msi(老客户端),版本信息仍由 /download/version.json 提供。", "keepVersions": 5, "environments": { "Development": { - "$comment": "开发环境:后端本机 7300。打包后会把 version.json + MSI 复制到后端,本机即可测自动更新。", + "$comment": "开发环境:后端本机 7300。打包后会把 version.json + MSI + EXE 复制到后端,本机即可测自动更新。", "serverBaseUrl": "http://127.0.0.1:7300", "downloadFolder": "../../backend/app/public/download/desktop", "versionFolder": "../../backend/app/public/version/desktop", diff --git a/desktop/installer/test-update.ps1 b/desktop/installer/test-update.ps1 index b6e5294..bedfd16 100644 --- a/desktop/installer/test-update.ps1 +++ b/desktop/installer/test-update.ps1 @@ -1,4 +1,4 @@ -#requires -Version 5.1 +#requires -Version 5.1 <# .SYNOPSIS 验证「自动更新」全链路(**不卸载重装**):启动当前已安装的旧版本,让它自己升级到后端最新版。 @@ -42,7 +42,7 @@ function Get-Base([string]$version) { $exe = Join-Path $env:LOCALAPPDATA 'Programs\YuncangTrace\YuncangTrace.LocalService.exe' if (-not (Test-Path $exe)) { - throw "本机还没安装本软件:$exe(先装一次 MSI)" + throw "本机还没安装本软件:$exe(先装一次 MSI 或 EXE)" } $installed = (Get-Item $exe).VersionInfo.ProductVersion diff --git a/frontend/src/api/download.ts b/frontend/src/api/download.ts index 779d3dc..00b4646 100644 --- a/frontend/src/api/download.ts +++ b/frontend/src/api/download.ts @@ -5,11 +5,14 @@ * (见 `backend/app/controller/download.js`),所以不能用 `api/client`, * 这里用裸 `fetch` + `cache: 'no-store'`(部署时 nginx 也对这两个路径关了缓存)。 * - * GET /download/version.json → 桌面端(Windows 安装包 .msi) + * GET /download/version.json → 桌面端(Windows 安装包 .exe / .msi) * GET /download/android_client/version.json → Android 扫码台(.apk) * * 返回里的 `downloadUrl` 是**打包时写进去的绝对地址**(生产域名), * 所以本地开发点下载也是去生产取包,这是预期行为。 + * + * 桌面端有两个包:`downloadUrlExe`(EXE,不依赖 Windows Installer,优先)与 + * `downloadUrl`(MSI,老客户端自动更新用)。下载入口一律用 {@link preferredDownloadUrl}。 */ export type InstallerKind = 'desktop' | 'android_client'; @@ -20,6 +23,10 @@ export interface InstallerVersion { /** 字节数 */ size?: number; md5?: string; + /** 桌面端才有:EXE 安装包(不依赖 Windows Installer,优先给用户下这个) */ + downloadUrlExe?: string; + sizeExe?: number; + md5Exe?: string; publishedAt?: string; /** Android 才有 */ versionCode?: number; @@ -27,6 +34,11 @@ export interface InstallerVersion { releaseNotes?: string; } +/** 下载入口优先用 EXE;没有 EXE 字段(老版本 / Android APK)就退回 downloadUrl */ +export function preferredDownloadUrl(pkg: InstallerVersion | null | undefined): string | undefined { + return pkg?.downloadUrlExe || pkg?.downloadUrl; +} + const VERSION_PATH: Record = { desktop: '/download/version.json', android_client: '/download/android_client/version.json', @@ -38,7 +50,7 @@ export async function fetchInstallerVersion(kind: InstallerKind): Promise(), { unassigned: 0, total: 0, limit: 8 }); +}>(), { 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 sum = props.items.reduce((acc, item) => acc + Math.max(Number(item.count) || 0, 0), 0); const total = Number(props.total); return Math.max(Number.isFinite(total) && total > 0 ? total : 0, sum, 1); }); @@ -50,7 +46,6 @@ const rows = computed(() => { label: item.name || item.code, code: item.code, count: Math.max(Number(item.count) || 0, 0), - deleted: item.deleted, })); const rest = props.items.slice(props.limit); @@ -62,9 +57,6 @@ const rows = computed(() => { muted: true, })); } - if (props.unassigned > 0) { - list.push(toRow({ key: 'unassigned', label: '未关联工作台', count: props.unassigned, muted: true })); - } return list; }); @@ -87,7 +79,6 @@ function percentText(percent: number, count: number): string {
  • {{ row.label }} - 已删除 @@ -132,16 +123,6 @@ function percentText(percent: number, count: number): string { white-space: nowrap; } -.tag { - flex: none; - font-size: 10px; - color: var(--danger); - background: #fef2f2; - border: 1px solid #fecaca; - border-radius: 4px; - padding: 0 4px; -} - .track { height: 10px; border-radius: 999px; diff --git a/frontend/src/utils/localSoftware.ts b/frontend/src/utils/localSoftware.ts index e59fe1a..b10f636 100644 --- a/frontend/src/utils/localSoftware.ts +++ b/frontend/src/utils/localSoftware.ts @@ -18,6 +18,10 @@ export interface SoftwareRelease { downloadUrl?: string; size?: number; md5?: string; + /** 桌面端才有:EXE 安装包(不依赖 Windows Installer,优先) */ + downloadUrlExe?: string; + sizeExe?: number; + md5Exe?: string; publishedAt?: string; releaseNotes?: string; } @@ -44,7 +48,7 @@ export async function fetchSoftwareRelease(): Promise { } } -/** 安装包下载地址(release 里优先,其次环境变量兜底) */ +/** 安装包下载地址(优先 EXE:现场有电脑装不了 MSI;其次 MSI,最后环境变量兜底) */ export function softwareDownloadUrl(release: SoftwareRelease | null): string { - return release?.downloadUrl || FALLBACK_DOWNLOAD_URL; + return release?.downloadUrlExe || release?.downloadUrl || FALLBACK_DOWNLOAD_URL; } diff --git a/frontend/src/views/HomeView.vue b/frontend/src/views/HomeView.vue index b12dea7..486e2f3 100644 --- a/frontend/src/views/HomeView.vue +++ b/frontend/src/views/HomeView.vue @@ -5,6 +5,8 @@ * - KPI:设备 / 通道 / 扫码记录 / **今日扫码** / **昨日扫码**(后两张固定显示,与所选维度无关) * - 图表:近 N 天扫码趋势 + 每个工作台打包数量;维度可切 **今日 / 昨日 / 7 / 14 / 30 天** * (今日 / 昨日 换成**按小时**的时段分布,工作台榜也只统计那一天) + * - 统计口径:只算**绑定到未删除工作台**的扫码记录(未绑定工作台 / 工作台已删除的不计入, + * 已删除的工作台也不出现在榜单里) * - 最近一次扫码 * - **全屏(看板模式)**:隐藏左侧菜单与顶栏,内容占满屏幕;优先用浏览器原生全屏, * 不支持/被拒时降级成「只隐藏菜单与顶栏」;Esc 或再点按钮退出 @@ -58,8 +60,7 @@ const days = computed(() => (period.value ? 7 : Number(range.value))); /** 当前维度是「按小时」还是「按天」 */ const isHourly = computed(() => (stats.value?.scanTrendUnit ?? 'day') === 'hour'); const hasScanTrend = computed(() => (stats.value?.scanTrendTotal ?? 0) > 0); -const hasWorkstationStats = computed(() => Boolean(stats.value - && (stats.value.workstationStats.length > 0 || stats.value.workstationUnassigned > 0))); +const hasWorkstationStats = computed(() => Boolean(stats.value && stats.value.workstationStats.length > 0)); /** 看板副标题:当前看的是哪个维度 */ const headHint = computed(() => { @@ -320,7 +321,7 @@ onBeforeUnmount(() => { 扫码记录 {{ stats.recordCount }} - 条(全部) + 条(已绑定工作台) 今日扫码 @@ -374,7 +375,6 @@ onBeforeUnmount(() => {

    @@ -388,7 +388,7 @@ onBeforeUnmount(() => {

    最近一次扫码

    -

    当前主体的最后一条扫码记录

    +

    当前主体最后一条绑定到工作台的扫码记录

    查看全部 →