diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js index d763b7c..25944ac 100644 --- a/api/app/lib/controllers/alarm/data.js +++ b/api/app/lib/controllers/alarm/data.js @@ -90,8 +90,9 @@ async function list (ctx) { let alarmQueryOptionStr = ` FROM alarms - LEFT JOIN DeviceStatus - ON DeviceStatus.DeviceId = alarms.SourceId + ${//LEFT JOIN DeviceStatus + //ON DeviceStatus.DeviceId = alarms.SourceId + ''} LEFT JOIN ${anxinyun}.t_structure ON ${anxinyun}.t_structure.id = alarms.StructureId LEFT JOIN ${anxinyun}.t_alarm_code @@ -109,7 +110,8 @@ async function list (ctx) { SourceTypeId, AlarmAdviceProblem, AlarmGroup, AlarmGroupUnit, AlarmAdviceProblem, alarms.StructureId AS StructureId, - DeviceStatus.Status AS DeviceStatus, + ${//`DeviceStatus.Status AS DeviceStatus,` + ''} ${anxinyun}.t_structure.name AS StructureName, ${anxinyun}.t_structure.longitude AS StructureLongitude, ${anxinyun}.t_structure.latitude AS StructureLatitude,