From c3e338986819801fff852390e704d166923b5886 Mon Sep 17 00:00:00 2001 From: lzh Date: Sun, 5 Apr 2026 15:38:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(@vben/web-antd):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E5=B7=A5=E7=89=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5=E5=AF=B9=E9=BD=90=E5=8F=8A=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - work-order/detail: 工牌状态 lastHeartbeatTime→onlineTime，移除 rssi 展示 - trajectory/api: lint 修正（移除冗余空行） - badge-status-card: linter 格式修正 - pnpm-lock: 更新依赖锁定文件 Co-Authored-By: Claude Opus 4.6 (1M context) --- apps/web-antd/src/api/ops/trajectory/index.ts | 10 +--- .../trajectory/modules/badge-status-card.vue | 4 +- .../src/views/ops/work-order/detail/index.vue | 31 ++-------- pnpm-lock.yaml | 56 +++++++++++-------- 4 files changed, 41 insertions(+), 60 deletions(-) diff --git a/apps/web-antd/src/api/ops/trajectory/index.ts b/apps/web-antd/src/api/ops/trajectory/index.ts index 2f11edd00..7e4151de3 100644 --- a/apps/web-antd/src/api/ops/trajectory/index.ts +++ b/apps/web-antd/src/api/ops/trajectory/index.ts @@ -141,10 +141,7 @@ export function getTrajectorySummary(params: { } /** 获取时段出入趋势（按小时聚合） */ -export function getHourlyTrend(params: { - date: string; - deviceId?: number; -}) { +export function getHourlyTrend(params: { date: string; deviceId?: number }) { return requestClient.get( '/ops/trajectory/hourly-trend', { params }, @@ -152,10 +149,7 @@ export function getHourlyTrend(params: { } /** 获取区域停留分布 */ -export function getAreaStayStats(params: { - date: string; - deviceId?: number; -}) { +export function getAreaStayStats(params: { date: string; deviceId?: number }) { return requestClient.get( '/ops/trajectory/area-stay-stats', { params }, diff --git a/apps/web-antd/src/views/ops/trajectory/modules/badge-status-card.vue b/apps/web-antd/src/views/ops/trajectory/modules/badge-status-card.vue index 30b9b1313..6c3966e19 100644 --- a/apps/web-antd/src/views/ops/trajectory/modules/badge-status-card.vue +++ b/apps/web-antd/src/views/ops/trajectory/modules/badge-status-card.vue @@ -140,7 +140,9 @@ const recentTimeline = computed(() => {
{{ dayjs(item.enterTime).format('HH:mm') }} - + 停留中 {{ formatDuration(item.durationSeconds) }} diff --git a/apps/web-antd/src/views/ops/work-order/detail/index.vue b/apps/web-antd/src/views/ops/work-order/detail/index.vue index f3a95fc8c..0d730aed5 100644 --- a/apps/web-antd/src/views/ops/work-order/detail/index.vue +++ b/apps/web-antd/src/views/ops/work-order/detail/index.vue @@ -275,8 +275,7 @@ const MOCK_BADGE_STATUS: OpsCleaningApi.BadgeRealtimeStatus = { deviceKey: 'badge_zhangsan_001', status: 'BUSY' as OpsCleaningApi.BadgeStatus, batteryLevel: 72, - lastHeartbeatTime: new Date(Date.now() - 30 * 1000).toISOString(), - rssi: -42, + onlineTime: new Date(Date.now() - 30 * 1000).toISOString(), isInArea: true, areaId: 101, areaName: 'A区洗手间', @@ -1183,37 +1182,15 @@ onUnmounted(stopPolling);
-
- - 信号 -
-
- {{ badgeStatus.rssi }} dBm -
- 未知 -
- +
- 心跳 + 上线 - {{ formatRelativeTime(badgeStatus.lastHeartbeatTime) }} + {{ formatRelativeTime(badgeStatus.onlineTime) }}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4d45b1682..9b5f19f4b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -357,6 +357,9 @@ catalogs: jsonc-eslint-parser: specifier: ^2.4.1 version: 2.4.2 + jszip: + specifier: ^3.10.1 + version: 3.10.1 lefthook: specifier: ^1.13.6 version: 1.13.6 @@ -593,10 +596,10 @@ catalogs: version: 4.1.0 vxe-pc-ui: specifier: ^4.10.22 - version: 4.11.21 + version: 4.13.20 vxe-table: specifier: ^4.17.14 - version: 4.17.35 + version: 4.18.10 watermark-js-plus: specifier: ^1.6.2 version: 1.6.3 @@ -816,7 +819,7 @@ importers: specifier: 'catalog:' version: 11.11.1 jszip: - specifier: ^3.10.1 + specifier: 'catalog:' version: 3.10.1 pinia: specifier: ^3.0.3 @@ -1173,7 +1176,7 @@ importers: dependencies: '@commitlint/cli': specifier: 'catalog:' - version: 19.8.1(@types/node@24.10.4)(typescript@5.9.3) + version: 19.8.1(@types/node@25.0.3)(typescript@5.9.3) '@commitlint/config-conventional': specifier: 'catalog:' version: 19.8.1 @@ -2019,10 +2022,10 @@ importers: version: 3.5.26(typescript@5.9.3) vxe-pc-ui: specifier: 'catalog:' - version: 4.11.21(vue@3.5.26(typescript@5.9.3)) + version: 4.13.20(vue@3.5.26(typescript@5.9.3)) vxe-table: specifier: 'catalog:' - version: 4.17.35(vue@3.5.26(typescript@5.9.3)) + version: 4.18.10(vue@3.5.26(typescript@5.9.3)) devDependencies: '@types/codemirror': specifier: 'catalog:' @@ -5503,8 +5506,8 @@ packages: peerDependencies: vue: ^3.5.24 - '@vxe-ui/core@4.2.18': - resolution: {integrity: sha512-StRs0zbCdshNwONYmZnFaJCencIo4rbVHbOcqLAddu6PTxPAsfUE9R5upMGj8EJMIpJggPcEUFvbjSp+8VJ8Uw==} + '@vxe-ui/core@4.4.3': + resolution: {integrity: sha512-IIwi5+h7Yopq3Ps+JtlSmggUQZg3wvzuad2xuWGR9sNzR/r0qlWKfax7qimrM2UNpVhSF1jI+3Z9+3yg+HPYTw==} peerDependencies: vue: ^3.5.24 @@ -11481,11 +11484,11 @@ packages: peerDependencies: vue: ^3.5.24 - vxe-pc-ui@4.11.21: - resolution: {integrity: sha512-nt++HK+JUi0y43DxU86s5AQiT0847Zi+zA45wlPeA/m8PYZeKhVQ+WcQXDKPhkMfkv3zzm+hj03MvYIdsqFW/Q==} + vxe-pc-ui@4.13.20: + resolution: {integrity: sha512-AZqFcE5M+KPPIOdPxvQ2Ny+Zf152seKY/o6zqSjHWWzX4EGHYd7dpw3Qrnlp1VT1gVd1Nq599TsSq2MAOR7MaQ==} - vxe-table@4.17.35: - resolution: {integrity: sha512-64biGEeTW9f+2HjiAOGSQqDEYqZpbUOauQvZozKkFk5OdtC+F1bagOHmU7EXl+vueFAof92pUNalDh1uIZt6Wg==} + vxe-table@4.18.10: + resolution: {integrity: sha512-8V9WL83pB4PrvgBS6DoDU7dSRxOlJw9ZkVcxDnKBFQkTTnLVvC8HYOJ75uwfRNyo9cALNIpJnSkow2uqaMKbNQ==} w3c-keyname@2.2.8: resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==} @@ -11658,6 +11661,9 @@ packages: xe-utils@3.8.2: resolution: {integrity: sha512-u7GMyaDeVHODMd6tUdSqfLl6sYX5qmRjuTbb+QMhYHmp2qlaqsUTD5FwEiM+p/82j4kmeen6TLvxfs7uXdQ5ow==} + xe-utils@4.0.4: + resolution: {integrity: sha512-1IUuTZRHa5w88Y3kEf0O4Y/99O0hIdh5o8EXqmgqyhY3MaT1xWZgS5iuD7pys6v+9JrJOzECb07+6gxRahDsyw==} + xml-name-validator@4.0.0: resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==} engines: {node: '>=12'} @@ -12946,11 +12952,11 @@ snapshots: style-mod: 4.1.3 w3c-keyname: 2.2.8 - '@commitlint/cli@19.8.1(@types/node@24.10.4)(typescript@5.9.3)': + '@commitlint/cli@19.8.1(@types/node@25.0.3)(typescript@5.9.3)': dependencies: '@commitlint/format': 19.8.1 '@commitlint/lint': 19.8.1 - '@commitlint/load': 19.8.1(@types/node@24.10.4)(typescript@5.9.3) + '@commitlint/load': 19.8.1(@types/node@25.0.3)(typescript@5.9.3) '@commitlint/read': 19.8.1 '@commitlint/types': 19.8.1 tinyexec: 1.0.2 @@ -12997,7 +13003,7 @@ snapshots: '@commitlint/rules': 19.8.1 '@commitlint/types': 19.8.1 - '@commitlint/load@19.8.1(@types/node@24.10.4)(typescript@5.9.3)': + '@commitlint/load@19.8.1(@types/node@25.0.3)(typescript@5.9.3)': dependencies: '@commitlint/config-validator': 19.8.1 '@commitlint/execute-rule': 19.8.1 @@ -13005,7 +13011,7 @@ snapshots: '@commitlint/types': 19.8.1 chalk: 5.6.2 cosmiconfig: 9.0.0(typescript@5.9.3) - cosmiconfig-typescript-loader: 6.2.0(@types/node@24.10.4)(cosmiconfig@9.0.0(typescript@5.9.3))(typescript@5.9.3) + cosmiconfig-typescript-loader: 6.2.0(@types/node@25.0.3)(cosmiconfig@9.0.0(typescript@5.9.3))(typescript@5.9.3) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -15680,11 +15686,11 @@ snapshots: dependencies: vue: 3.5.26(typescript@5.9.3) - '@vxe-ui/core@4.2.18(vue@3.5.26(typescript@5.9.3))': + '@vxe-ui/core@4.4.3(vue@3.5.26(typescript@5.9.3))': dependencies: dom-zindex: 1.0.6 vue: 3.5.26(typescript@5.9.3) - xe-utils: 3.8.2 + xe-utils: 4.0.4 '@xmldom/xmldom@0.8.11': {} @@ -16519,9 +16525,9 @@ snapshots: core-util-is@1.0.3: {} - cosmiconfig-typescript-loader@6.2.0(@types/node@24.10.4)(cosmiconfig@9.0.0(typescript@5.9.3))(typescript@5.9.3): + cosmiconfig-typescript-loader@6.2.0(@types/node@25.0.3)(cosmiconfig@9.0.0(typescript@5.9.3))(typescript@5.9.3): dependencies: - '@types/node': 24.10.4 + '@types/node': 25.0.3 cosmiconfig: 9.0.0(typescript@5.9.3) jiti: 2.6.1 typescript: 5.9.3 @@ -22346,15 +22352,15 @@ snapshots: vooks: 0.2.12(vue@3.5.26(typescript@5.9.3)) vue: 3.5.26(typescript@5.9.3) - vxe-pc-ui@4.11.21(vue@3.5.26(typescript@5.9.3)): + vxe-pc-ui@4.13.20(vue@3.5.26(typescript@5.9.3)): dependencies: - '@vxe-ui/core': 4.2.18(vue@3.5.26(typescript@5.9.3)) + '@vxe-ui/core': 4.4.3(vue@3.5.26(typescript@5.9.3)) transitivePeerDependencies: - vue - vxe-table@4.17.35(vue@3.5.26(typescript@5.9.3)): + vxe-table@4.18.10(vue@3.5.26(typescript@5.9.3)): dependencies: - vxe-pc-ui: 4.11.21(vue@3.5.26(typescript@5.9.3)) + vxe-pc-ui: 4.13.20(vue@3.5.26(typescript@5.9.3)) transitivePeerDependencies: - vue @@ -22615,6 +22621,8 @@ snapshots: xe-utils@3.8.2: {} + xe-utils@4.0.4: {} + xml-name-validator@4.0.0: {} y18n@4.0.3: {}