Browse Source

邮件项目名不展示问题

dev
wenlele 2 years ago
parent
commit
80f10f871f
  1. 10
      api/app/lib/schedule/alarms_push.js

10
api/app/lib/schedule/alarms_push.js

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

Loading…
Cancel
Save