测试111

api/app/lib/schedule/alarms_push.js

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