|
|
@ -1113,6 +1113,9 @@ module.exports = function (app, opts) { |
|
|
|
` |
|
|
|
).toPromise() || [] |
|
|
|
|
|
|
|
console.log('当前结构物下所有告警', alarmDatas); |
|
|
|
console.log('监测因素', factorData); |
|
|
|
console.log('结构物对应的设备', equipment); |
|
|
|
|
|
|
|
equipment.map(f => { |
|
|
|
f.alarmDatas = [] |
|
|
@ -1187,20 +1190,20 @@ module.exports = function (app, opts) { |
|
|
|
} |
|
|
|
f.rowspan = rowspan3 |
|
|
|
}) |
|
|
|
x.factor = x.factor.filter(b => b.devices && b.devices.length>0) |
|
|
|
x.factor = x.factor.filter(b => b.devices && b.devices.length > 0) |
|
|
|
} else { |
|
|
|
delete x.factor |
|
|
|
} |
|
|
|
x.rowspan = rowspan2 |
|
|
|
}) |
|
|
|
h.projects = h.projects.filter(b => b.factor && b.factor.length>0) |
|
|
|
h.projects = h.projects.filter(b => b.factor && b.factor.length > 0) |
|
|
|
} else { |
|
|
|
delete h.projects |
|
|
|
} |
|
|
|
h.rowspan = rowspan1 |
|
|
|
}) |
|
|
|
|
|
|
|
dataAlarmG1 = pepProject_name.filter(b => b.projects && b.projects.length>0)||[] |
|
|
|
|
|
|
|
dataAlarmG1 = pepProject_name.filter(b => b.projects && b.projects.length > 0) || [] |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -1219,7 +1222,7 @@ module.exports = function (app, opts) { |
|
|
|
|
|
|
|
if (type == 1) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
alarmData.map((h, hi) => { |
|
|
|
|
|
|
|
if (h.projects && h.projects.length) { |
|
|
|