diff --git a/weapp/package/deviceBigdataGraph/deviceBigdataGraph.js b/weapp/package/deviceBigdataGraph/deviceBigdataGraph.js index 6de4b74..19adc3a 100644 --- a/weapp/package/deviceBigdataGraph/deviceBigdataGraph.js +++ b/weapp/package/deviceBigdataGraph/deviceBigdataGraph.js @@ -148,10 +148,11 @@ Page({ maxInspectionTimeByPointId[pointId] = inspectionTime; } }); + console.log('maxInspectionTimeByPointId',maxInspectionTimeByPointId) // 过滤数据以获取相同pointId中inspectionTime最大的记录 const filteredData = res.filter((item) => { const {pointId,inspectionTime} = item; - return inspectionTime === maxInspectionTimeByPointId[pointId]; + return inspectionTime == maxInspectionTimeByPointId[pointId] }); //获取设备信息 const devices=that.data.deviceList.map(item=>{return {id:item.id,name:item.name,status:'unknown'}}) diff --git a/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.js b/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.js index ecda7b2..3c41878 100644 --- a/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.js +++ b/weapp/package/deviceBigdataGraph/statusDetail/statusDetail.js @@ -136,7 +136,7 @@ Page({ const { pointId,inspectionTime} = item; const inspectionDate = moment(inspectionTime); if (inspectionDate.isBetween(sevenDaysAgo, today, null, '[]')) { - return inspectionTime === maxInspectionTimeByPointId[pointId]; + return inspectionTime == maxInspectionTimeByPointId[pointId]; } return false; }); @@ -194,6 +194,7 @@ Page({ }); } }); + console.log('sssss',normal,unknown,abnormal) return {normal,unknown,abnormal} }, //统计每天异常-正常-未知个数