parameters update, pdf fix, server-ip added

This commit is contained in:
Ivan
2023-09-21 08:54:26 +03:00
parent 8f3944692f
commit fde77bfb47
8 changed files with 550 additions and 276 deletions

View File

@ -5,13 +5,36 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Отчёт {{Id}}</title>
<!-- <link rel="stylesheet" href="../styles/main.css" /> -->
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/Modern-Technologies-SPB/site/static/styles/main.css">
<link rel="stylesheet" href="../styles/main.css" />
<!-- <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/Modern-Technologies-SPB/site/static/styles/main.css"> -->
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css" />
<script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"></script>
</head>
<body>
<style>
@page {
size: A4 !important;
margin: 0 !important;
}
@page {
margin-top: 0;
margin-bottom: 0;
}
.page-number::before {
content: none;
}
body {
width: 21cm !important;
height: auto !important;
margin: auto !important;
min-height: 0 !important;
padding: auto !important;
background-color: #fcfcff;
background: repeat center url(../img/argus5.png);
}
</style>
<header>
<img src="../img/argus.png">
<h1>Аргус</h1>
@ -19,30 +42,24 @@
</header>
<style>
body {
width: 100% !important;
height: 100% !important;
}
.name {
margin-bottom: 50px !important;
margin-bottom: 0 !important;
}
</style>
<section style="margin-left: 0;" class="main">
<div class="name">
<span>Отчёт №{{Id}}</span>
<div style="padding: 0; margin-left: 0" class="name">
<span style="padding: 0; margin-left: 2.5%; left: 2.5%;">Отчёт №{{Id}}</span>
</div>
<section style="height: 100% !important;" class="bg">
<section style="position: relative;" class="content">
<div style="position: absolute; left: 2.5%; width: 95%; height: 275px; margin: 25px auto; border-radius: 30px; border: 2px solid rgba(245, 245, 250, 1);" id="map"></div>
<div style="position: absolute; left: 2.5%; width: 95%; height: 250px; margin: 25px auto; border-radius: 30px; border: 2px solid rgba(245, 245, 250, 1); top: 325px;" class="report-info">
<div style="position: absolute; left: 2.5%; width: 95%; height: 250px; margin: 0; border-radius: 30px; border: 2px solid rgba(245, 245, 250, 1); top: 325px; background-color: white !important;" class="report-info">
<ul>
<li><svg xmlns="http://www.w3.org/2000/svg" width="23" height="23" fill="none" viewBox="0 0 19 17">
@ -67,7 +84,7 @@
</div>
<div style="position: absolute; left: 2.5%; width: 95%; height: 200px; margin: 25px auto; border-radius: 30px; border: 2px solid rgba(245, 245, 250, 1); top: 625px;" class="speedometr">
<div style="position: absolute; left: 2.5%; width: 95%; height: 200px; margin: 0; border-radius: 30px; border: 2px solid rgba(245, 245, 250, 1); top: 625px; background-color: white !important;" class="speedometr">
<h1>Скорость</h1>
<span>км/ч</span>
<div>
@ -140,7 +157,6 @@
</section>
@ -301,7 +317,23 @@ new Chart("speed", {
});
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/2.4.0/jspdf.umd.min.js"></script>
<script>
window.addEventListener('load', function() {
document.body.style.zoom = 1;
document.body.style.zoom = "100%";
var printOptions = {
footer: false,
};
window.printOptions = printOptions;
setTimeout(function() {
window.print();
window.close();
}, 2000);
});
</script>
</body>
</html>

View File

@ -91,8 +91,7 @@
<h1>Список предупреждений</h1>
<div class="export">
<img src="../img/share.svg">
<!-- <span onclick="generatePDF();">Экспорт</span> -->
<span>Экспорт</span>
<span onclick="generatePDF();">Экспорт</span>
</div>
</div>
@ -241,7 +240,7 @@
<script>
function playVideo(channel) {
const url = `http://localhost:8081/playback?url=http%3A%2F%2Fkrbl.ru%3A8080%2Fhttp%2Fplayback.flv%3Fserial%3D{{Serial}}%26channel%3D${channel}%26quality%3D1%26queryTime%3D{{QueryTime}}%26startTime%3D{{StartTime}}%26endTime%3D{{EndTime}}`;
const url = `http://localhost:8081/playback?url=http%3A%2F%2F{{SERVER_IP}}%3A8080%2Fhttp%2Fplayback.flv%3Fserial%3D{{Serial}}%26channel%3D${channel}%26quality%3D1%26queryTime%3D{{QueryTime}}%26startTime%3D{{StartTime}}%26endTime%3D{{EndTime}}`;
window.open(url, '_blank');
}
</script>