Browse Source

feat:fix bugs

master
zhaobing’ 2 years ago
parent
commit
d24b47b750
  1. 3
      weapp/package/deviceBigdataGraph/deviceBigdataGraph.js
  2. 3
      weapp/package/deviceBigdataGraph/statusDetail/statusDetail.js

3
weapp/package/deviceBigdataGraph/deviceBigdataGraph.js

@ -148,10 +148,11 @@ Page({
maxInspectionTimeByPointId[pointId] = inspectionTime; maxInspectionTimeByPointId[pointId] = inspectionTime;
} }
}); });
console.log('maxInspectionTimeByPointId',maxInspectionTimeByPointId)
// 过滤数据以获取相同pointId中inspectionTime最大的记录 // 过滤数据以获取相同pointId中inspectionTime最大的记录
const filteredData = res.filter((item) => { const filteredData = res.filter((item) => {
const {pointId,inspectionTime} = 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'}}) const devices=that.data.deviceList.map(item=>{return {id:item.id,name:item.name,status:'unknown'}})

3
weapp/package/deviceBigdataGraph/statusDetail/statusDetail.js

@ -136,7 +136,7 @@ Page({
const { pointId,inspectionTime} = item; const { pointId,inspectionTime} = item;
const inspectionDate = moment(inspectionTime); const inspectionDate = moment(inspectionTime);
if (inspectionDate.isBetween(sevenDaysAgo, today, null, '[]')) { if (inspectionDate.isBetween(sevenDaysAgo, today, null, '[]')) {
return inspectionTime === maxInspectionTimeByPointId[pointId]; return inspectionTime == maxInspectionTimeByPointId[pointId];
} }
return false; return false;
}); });
@ -194,6 +194,7 @@ Page({
}); });
} }
}); });
console.log('sssss',normal,unknown,abnormal)
return {normal,unknown,abnormal} return {normal,unknown,abnormal}
}, },
//统计每天异常-正常-未知个数 //统计每天异常-正常-未知个数

Loading…
Cancel
Save