diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue index 31b2306..a5e8c61 100644 --- a/pages/6170/deviceControl/index.vue +++ b/pages/6170/deviceControl/index.vue @@ -48,7 +48,9 @@ 设备状态 - {{ deviceInfo.onlineStatus === 0 ? '离线' : '在线' }} + + {{ deviceInfo.onlineStatus === 0 ? '离线' : deviceInfo.onlineStatus === 2 ? '故障' : '在线' }} + 定位信息 diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue index 4947bab..702dcbb 100644 --- a/pages/common/index/index.vue +++ b/pages/common/index/index.vue @@ -50,6 +50,9 @@ 离线 + 故障 + 电量:{{ item.battery || '0' }}% @@ -372,10 +375,9 @@ } else { this.deviceList = [...this.deviceList, ...newDevices]; } - // 关键:正确判断是否加载完成 + // 判断是否加载完成 if (this.loadedCount >= this.total || newDevices.length < this.size) { this.finished = true; - console.log(`加载完成 - 已加载${this.loadedCount}/${this.total}`); } else { this.page++; } @@ -384,7 +386,6 @@ reject(res.msg || '获取数据失败'); } }).catch((err) => { - console.error('获取设备列表失败:', err); reject(err); }).finally(() => { this.loading = false;