diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js index a466329..c8ef878 100644 --- a/api/app/lib/controllers/alarm/data.js +++ b/api/app/lib/controllers/alarm/data.js @@ -130,7 +130,7 @@ async function list (ctx) { const confirmedAlarmDetailMax = confirmedAlarm.length ? await clickHouse.dataAlarm.query(` SELECT - max(Time) AS Time,AlarmId + max(Time) AS Time, AlarmId , max(Content) AS Content FROM alarm_details WHERE @@ -166,11 +166,12 @@ async function list (ctx) { // 最新告警详情 - 确认信息 let corConfirmedData = (confirmedAlarmDetailMax.find(cdm => cdm.AlarmId == ar.AlarmId) || {}); - if (corConfirmedData.AlarmState && corConfirmedData.AlarmState > 2) { - } else { - corConfirmedData = {} - } + // if (corConfirmedData.AlarmState && corConfirmedData.AlarmState > 2) { + + // } else { + // corConfirmedData = {} + // } ar.confirmedContent = corConfirmedData.Content ar.confirmedTime = corConfirmedData.Time