|
|
@ -1173,7 +1173,7 @@ module.exports = function (app, opts) { |
|
|
|
if (f.devices.length) { |
|
|
|
f.devices.forEach(c => { |
|
|
|
if (c.alarmDatas.length) { |
|
|
|
|
|
|
|
rowspan3 += 1 |
|
|
|
let grouped = c.alarmDatas.reduce((acc, cur) => { |
|
|
|
if (!acc[cur.AlarmCode]) { |
|
|
|
acc[cur.AlarmCode] = [] |
|
|
@ -1185,7 +1185,6 @@ module.exports = function (app, opts) { |
|
|
|
for (let key in grouped) { |
|
|
|
rowspan1 += 1 |
|
|
|
rowspan2 += 1 |
|
|
|
rowspan3 += 1 |
|
|
|
grouped[key].sort((a, b) => new Date(b.StartTime) - new Date(a.StartTime)) |
|
|
|
alarmData.push(grouped[key][0]) |
|
|
|
} |
|
|
|