update:修复bug

This commit is contained in:
2026-09-23 15:36:39 +08:00
parent 19a4631df3
commit 169e2e4a51
4 changed files with 85 additions and 12 deletions
@@ -11,8 +11,10 @@ export function useDeviceStatus({
user,
device,
deviceStatus,
deviceUsageDuration,
online,
updateDevice,
updateDeviceUsageDuration,
clearDevice,
unbindDialogVisible,
}) {
@@ -41,14 +43,28 @@ export function useDeviceStatus({
const batteryText = computed(() =>
battery.value === null ? "暂无数据" : `${battery.value}%`
);
const normalizeDuration = (value) => {
if (value == null || String(value).trim() === "") return null;
const seconds = Number(value);
return Number.isFinite(seconds) && seconds >= 0 ? seconds : null;
};
const onlineDurationText = computed(() => {
const rawDuration = deviceStatus.value.onlineDuration;
if (rawDuration == null || String(rawDuration).trim() === "") return "--";
const currentDeviceId = String(device.value.deviceId || "");
const cachedDuration =
String(deviceUsageDuration.value.deviceId || "") === currentDeviceId
? normalizeDuration(deviceUsageDuration.value.seconds)
: null;
const durations = [
normalizeDuration(deviceStatus.value.onlineDuration),
normalizeDuration(deviceDetails.value.onlineDuration),
cachedDuration,
].filter((value) => value !== null);
const seconds = Number(rawDuration);
if (!Number.isFinite(seconds) || seconds < 0) return "--";
if (!durations.length) return "--";
const seconds = Math.max(...durations);
// WS 推送秒数,页面按完整分钟展示累计使用时间。
// 累计时长应单调递增,页面按完整分钟展示当前已知最大值。
const totalMinutes = Math.floor(seconds / 60);
const hours = Math.floor(totalMinutes / 60);
const minutes = totalMinutes % 60;
@@ -109,6 +125,7 @@ export function useDeviceStatus({
detail.qrCodeUrl ?? deviceDetails.value.qrCodeUrl ?? ""
).trim(),
};
updateDeviceUsageDuration(detail.onlineDuration, deviceId);
} catch (error) {
// 实时刷新失败时保留当前页面数据,等待下次通知或页面重新显示。
console.log("刷新设备详情失败", error);
@@ -158,6 +175,7 @@ export function useDeviceStatus({
latestDevice.name ||
"我的智能弓"
);
updateDeviceUsageDuration(latestDevice.onlineDuration, latestDevice.deviceId);
return;
}
clearDevice();