Browse Source

暂时注释自动恢复的告警的信息的查询

dev
巴林闲侠 3 years ago
parent
commit
6fceb5f08f
  1. 11
      api/app/lib/controllers/alarm/video.js

11
api/app/lib/controllers/alarm/video.js

@ -83,7 +83,8 @@ async function alarmList (ctx) {
cameraAlarm.platform AS platform, cameraAlarm.platform AS platform,
cameraAlarm.confirmContent AS confirmContent, cameraAlarm.confirmContent AS confirmContent,
cameraAlarm.confirmTime AS confirmTime, cameraAlarm.confirmTime AS confirmTime,
cameraAlarm.autoRestore AS autoRestore, ${//'cameraAlarm.autoRestore AS autoRestore,'
''}
camera_status_resolve.id AS resolveId, camera_status_resolve.id AS resolveId,
camera_status.describe AS statusDescribe, camera_status.describe AS statusDescribe,
camera_status_resolve.resolve AS resolve, camera_status_resolve.resolve AS resolve,
@ -110,8 +111,12 @@ async function alarmList (ctx) {
camera_status_alarm.serial_no AS cameraSerialNo, camera_status_alarm.serial_no AS cameraSerialNo,
camera_status_alarm.channel_no AS cameraChannelNo, camera_status_alarm.channel_no AS cameraChannelNo,
camera_status_alarm.confirm AS confirmContent, camera_status_alarm.confirm AS confirmContent,
camera_status_alarm.confirm_time AS confirmTime, ${
camera_status_alarm.auto_restore AS autoRestore //' camera_status_alarm.auto_restore AS autoRestore,'
''
}
camera_status_alarm.confirm_time AS confirmTime
FROM camera_status_alarm FROM camera_status_alarm
LEFT JOIN camera LEFT JOIN camera
ON camera.serial_no = camera_status_alarm.serial_no ON camera.serial_no = camera_status_alarm.serial_no

Loading…
Cancel
Save