From 1c87bdb106171baf402a9839bbf064f0c3e94c4b Mon Sep 17 00:00:00 2001 From: wuqun Date: Tue, 8 Nov 2022 10:24:36 +0800 Subject: [PATCH] =?UTF-8?q?(*)=E5=B7=B2=E7=A1=AE=E8=AE=A4=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=20State>2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/control/data.js | 2 +- api/app/lib/schedule/alarms_handle_statistics.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/app/lib/controllers/control/data.js b/api/app/lib/controllers/control/data.js index 4b8b1a1..4b09bcd 100644 --- a/api/app/lib/controllers/control/data.js +++ b/api/app/lib/controllers/control/data.js @@ -61,7 +61,7 @@ async function queryAlarm(ctx, alarmQueryOptionStr, type) { alarms.State AS State, StartTime, AlarmGroup - ${alarmQueryOptionStr} and alarms.AlarmGroup in [${type}] and alarms.State > 3) group by days) + ${alarmQueryOptionStr} and alarms.AlarmGroup in [${type}] and alarms.State > 2) group by days) ) group by days ORDER BY days `).toPromise(); diff --git a/api/app/lib/schedule/alarms_handle_statistics.js b/api/app/lib/schedule/alarms_handle_statistics.js index 91f9ef6..c22fb65 100644 --- a/api/app/lib/schedule/alarms_handle_statistics.js +++ b/api/app/lib/schedule/alarms_handle_statistics.js @@ -171,7 +171,7 @@ module.exports = function (app, opts) { alarms.State AS State, alarms.StructureId AS StructureId, StartTime, EndTime - ${alarmQueryOptionStr}) where State>3 and ${paramStr}` + ${alarmQueryOptionStr}) where State>2 and ${paramStr}` } async function getDataAlarms(anxinStruc) {