From dce9fd98b55be4b11fe77d85a08fa2fad3a7d76d Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Wed, 10 May 2023 08:46:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E7=94=A8=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/schedule/alarms_push.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/api/app/lib/schedule/alarms_push.js b/api/app/lib/schedule/alarms_push.js
index 4624de7..4af615e 100644
--- a/api/app/lib/schedule/alarms_push.js
+++ b/api/app/lib/schedule/alarms_push.js
@@ -1129,17 +1129,12 @@ module.exports = function (app, opts) {
                                  v.devices.push({ ...f })
                               }
                            })
-                        })
-
-                        factorData.map(a => {
-                           if (strucMap[a.structureId]) {
-                              strucMap[a.structureId].factor.push({ ...a })
+                           if (strucMap[v.structureId]) {
+                              strucMap[v.structureId].factor.push({ ...v })
                            }
                         })
 
-                        pepProject_name.map(s => {
-
-                        })
+                      
                         let projectList = []
                         for (let key in strucMap) {
                            if (strucMap[key].factor.length > 0) {
@@ -1199,6 +1194,7 @@ module.exports = function (app, opts) {
                            }
                            h.rowspan = rowspan1
                         })
+                        console.log('数据组合',pepProject_name);
                         dataAlarmG1 = pepProject_name
                      }
 
@@ -1355,6 +1351,7 @@ module.exports = function (app, opts) {
                         alarmHtml += `<tr><td colspan="${alarmTitleArr.length}" style="background-color:#ffff00">` + tableTitlePrefix + '</td></tr>'
                         alarmHtml += alarmHtmlTitle
                         alarmHtml += alarmContent
+                        console.log('表格结果',alarmContent);
                         alarmHtml += '</table><br/>'
 
                         return alarmHtml