diff --git a/api/app/lib/schedule/alarms_push.js b/api/app/lib/schedule/alarms_push.js index d8ec7e9..96efb59 100644 --- a/api/app/lib/schedule/alarms_push.js +++ b/api/app/lib/schedule/alarms_push.js @@ -1235,11 +1235,12 @@ module.exports = function (app, opts) { let alarmContent = '' let alarmHtmlTitle = packageTableTitle(alarmTitleArr) + let accumulate = 0 if (type == 1) { alarmData.map((h, hi) => { - + accumulate += h.rowspan || 0 if (h.projects && h.projects.length) { h.projects.map((x, xi) => { @@ -1320,6 +1321,7 @@ module.exports = function (app, opts) { newAddCount++ } } + accumulate = alarmData.length } @@ -1327,7 +1329,7 @@ module.exports = function (app, opts) { titlePrefix != '数据异常&视频异常' ? c.tactics == 'abnormal_rate' ? `${alarmData.length}个` : - `新增${newAddCount}个,未解决累计${alarmData.length}个` + tableTitlePostfix + `新增${newAddCount}个,未解决累计${accumulate}个` + tableTitlePostfix : '' alarmHtml += `` + tableTitlePrefix + '' alarmHtml += alarmHtmlTitle @@ -1472,7 +1474,7 @@ module.exports = function (app, opts) { if (isDev) { // !开发测试用的数据 // emails = ['1650192445@qq.com'] - emails = ['2798774060@qq.com'] + emails = ['wen.lele@free-sun.com.cn'] } if (emails.length) {