测试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 })
                               }
                            })
@@ -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
                      }