From 50377de9e4e043fa73305cc5858b606dfbe61bab Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 5 Oct 2023 00:17:14 +0300 Subject: [PATCH] export error fix --- static/templates/reports/report.html | 2 +- static/templates/videos/export.html | 2 +- static/templates/videos/playback.html | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/static/templates/reports/report.html b/static/templates/reports/report.html index 3d17fee..3e85d42 100644 --- a/static/templates/reports/report.html +++ b/static/templates/reports/report.html @@ -205,7 +205,7 @@ diff --git a/static/templates/videos/export.html b/static/templates/videos/export.html index 9852e14..30c8799 100644 --- a/static/templates/videos/export.html +++ b/static/templates/videos/export.html @@ -863,7 +863,7 @@ endVideoTimeInput.addEventListener("blur", sendPostRequest); const serial = selectedDevice.value; - const url = `https://localhost:8081/export?url=http%3A%2F%2F{{VIRTUAL_HOST}}%2Fhttp%2Fdownload.flv%3Fserial%3D${serial}%26channel%3D${channel}%26queryTime%3D${selectedDate}%26startTime%3D${startTime}%26endTime%3D${endTime}%26recordID%3D${resData.dataId}`; + const url = `http://localhost:8081/export?url=http%3A%2F%2F{{VIRTUAL_HOST}}%2Fhttp%2Fdownload.flv%3Fserial%3D${serial}%26channel%3D${channel}%26queryTime%3D${selectedDate}%26startTime%3D${startTime}%26endTime%3D${endTime}%26recordID%3D${resData.dataId}`; document.getElementById("exportLoading").style.display = 'none'; window.open(url, '_blank'); } diff --git a/static/templates/videos/playback.html b/static/templates/videos/playback.html index d88370b..23c3e26 100644 --- a/static/templates/videos/playback.html +++ b/static/templates/videos/playback.html @@ -350,6 +350,8 @@ async function sendPostRequest() { const response = await fetch(`/getData?serial=${selectedSerial}&selectedDate=${formatDate(selectedDate)}&selectedTime=${formatTime(videoTime)}&selectedChannel=${selectedChannel}`); const data = await response.json(); + console.log(data); + HasData = data.success; if (data.success) { @@ -525,6 +527,7 @@ async function sendPostRequest() { }, }, }); + document.getElementById("dataLoading").style.display = 'none'; const speedBG = document.getElementById("speed-bg"); speedBG.style.display = 'flex'; } @@ -683,7 +686,7 @@ videoTimeInput.addEventListener("blur", sendPostRequest); selectedChannel = channel; - const url = `https://localhost:8081/playback?url=http%3A%2F%2F{{VIRTUAL_HOST}}%2Fhttp%2Fplayback.flv%3Fserial%3D${serial}%26channel%3D${channel}%26quality%3D1%26queryTime%3D${selectedDate}%26startTime%3D${startTime}%26endTime%3D${endTime}`; + const url = `http://localhost:8081/playback?url=http%3A%2F%2F{{VIRTUAL_HOST}}%2Fhttp%2Fplayback.flv%3Fserial%3D${serial}%26channel%3D${channel}%26quality%3D1%26queryTime%3D${selectedDate}%26startTime%3D${startTime}%26endTime%3D${endTime}`; window.open(url, '_blank'); }