|
|
@ -1125,7 +1125,7 @@ module.exports = function (app, opts) { |
|
|
factorData.map(v => { |
|
|
factorData.map(v => { |
|
|
v.devices = [] |
|
|
v.devices = [] |
|
|
equipment.map(f => { |
|
|
equipment.map(f => { |
|
|
if (v.id == f.factorId) { |
|
|
if (v.id == f.factorId && v.structureId == f.structureId) { |
|
|
v.devices.push({ ...f }) |
|
|
v.devices.push({ ...f }) |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
@ -1169,9 +1169,9 @@ module.exports = function (app, opts) { |
|
|
f.devices.forEach(c => { |
|
|
f.devices.forEach(c => { |
|
|
if (c.alarmDatas.length) { |
|
|
if (c.alarmDatas.length) { |
|
|
|
|
|
|
|
|
rowspan1 += 1 |
|
|
rowspan1 += 1 |
|
|
rowspan2 += 1 |
|
|
rowspan2 += 1 |
|
|
rowspan3 += 1 |
|
|
rowspan3 += 1 |
|
|
|
|
|
|
|
|
} else { |
|
|
} else { |
|
|
delete c.alarmDatas |
|
|
delete c.alarmDatas |
|
|
@ -1195,7 +1195,7 @@ module.exports = function (app, opts) { |
|
|
} |
|
|
} |
|
|
h.rowspan = rowspan1 |
|
|
h.rowspan = rowspan1 |
|
|
}) |
|
|
}) |
|
|
// console.log('数据组合', JSON.stringify(pepProject_name));
|
|
|
console.log('数据组合', JSON.stringify(pepProject_name)); |
|
|
//
|
|
|
//
|
|
|
dataAlarmG1 = pepProject_name |
|
|
dataAlarmG1 = pepProject_name |
|
|
} |
|
|
} |
|
|
|
