111111111

api/app/lib/schedule/alarms_push.js

@@ -571,7 +571,7 @@ module.exports = function (app, opts) {
                         f: (d) => {
                            // d.factor.join('<b/>')
                            // console.log(21211231131,d.factor);
-                           let data=[]
+                           let data = []
                            d.factor.map(f => data.push(f.name + '(' + f.breakData + '/' + f.sum + ')'))
                            return data.join('<br/>')
                         }
@@ -843,6 +843,8 @@ module.exports = function (app, opts) {
                                     t_sensor.structure = (${d.StructureId})
                                     AND
                                     t_sensor.factor IN (${factorId.join(',')})
+                                    AND
+                                    ${dataAlarm}.alarms.AlarmGroup is (${1})
                                 `
                               ).toPromise() || []