|
|
@ -1153,6 +1153,7 @@ module.exports = function (app, opts) { |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
console.log('数据组合', JSON.stringify(pepProject_name)); |
|
|
|
|
|
|
|
pepProject_name.forEach(h => { |
|
|
|
let rowspan1 = 0 |
|
|
@ -1177,6 +1178,7 @@ module.exports = function (app, opts) { |
|
|
|
delete c.alarmDatas |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
} else { |
|
|
|
delete f.devices |
|
|
|
} |
|
|
@ -1185,19 +1187,20 @@ module.exports = function (app, opts) { |
|
|
|
} |
|
|
|
f.rowspan = rowspan3 |
|
|
|
}) |
|
|
|
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) |
|
|
|
} else { |
|
|
|
delete h.projects |
|
|
|
} |
|
|
|
h.rowspan = rowspan1 |
|
|
|
}) |
|
|
|
console.log('数据组合', JSON.stringify(pepProject_name)); |
|
|
|
//
|
|
|
|
dataAlarmG1 = pepProject_name |
|
|
|
|
|
|
|
dataAlarmG1 = pepProject_name.filter(b => b.projects && b.projects.length>0)||[] |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -1216,6 +1219,7 @@ module.exports = function (app, opts) { |
|
|
|
|
|
|
|
if (type == 1) { |
|
|
|
|
|
|
|
|
|
|
|
alarmData.map((h, hi) => { |
|
|
|
|
|
|
|
if (h.projects && h.projects.length) { |
|
|
|