system parameters, groups, fixes and more
This commit is contained in:
Ivan
parent
82b24eb909
commit
8fea734b31
GPG Key ID:
0C191B86D9582583
79
package-lock.json
generated
79
package-lock.json
generated
@ -10,11 +10,13 @@
|
|||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"axios": "^1.5.0",
|
"axios": "^1.5.0",
|
||||||
|
"body-parser": "^1.20.2",
|
||||||
"dotenv": "^16.3.1",
|
"dotenv": "^16.3.1",
|
||||||
"express": "^4.18.2",
|
"express": "^4.18.2",
|
||||||
"fs": "^0.0.1-security",
|
"fs": "^0.0.1-security",
|
||||||
"handlebars": "^4.7.7",
|
"handlebars": "^4.7.7",
|
||||||
"http": "^0.0.1-security",
|
"http": "^0.0.1-security",
|
||||||
|
"lodash": "^4.17.21",
|
||||||
"mapbox-gl": "^2.15.0",
|
"mapbox-gl": "^2.15.0",
|
||||||
"moment": "^2.29.4",
|
"moment": "^2.29.4",
|
||||||
"multer": "^1.4.5-lts.1",
|
"multer": "^1.4.5-lts.1",
|
||||||
@ -133,6 +135,29 @@
|
|||||||
"tweetnacl": "^0.14.3"
|
"tweetnacl": "^0.14.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/body-parser": {
|
||||||
|
"version": "1.20.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
|
||||||
|
"integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
|
||||||
|
"dependencies": {
|
||||||
|
"bytes": "3.1.2",
|
||||||
|
"content-type": "~1.0.5",
|
||||||
|
"debug": "2.6.9",
|
||||||
|
"depd": "2.0.0",
|
||||||
|
"destroy": "1.2.0",
|
||||||
|
"http-errors": "2.0.0",
|
||||||
|
"iconv-lite": "0.4.24",
|
||||||
|
"on-finished": "2.4.1",
|
||||||
|
"qs": "6.11.0",
|
||||||
|
"raw-body": "2.5.2",
|
||||||
|
"type-is": "~1.6.18",
|
||||||
|
"unpipe": "1.0.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.8",
|
||||||
|
"npm": "1.2.8000 || >= 1.4.16"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/buffer-from": {
|
"node_modules/buffer-from": {
|
||||||
"version": "1.1.2",
|
"version": "1.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
|
||||||
@ -661,6 +686,11 @@
|
|||||||
"resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz",
|
||||||
"integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA=="
|
"integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA=="
|
||||||
},
|
},
|
||||||
|
"node_modules/lodash": {
|
||||||
|
"version": "4.17.21",
|
||||||
|
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||||
|
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
|
||||||
|
},
|
||||||
"node_modules/mapbox-gl": {
|
"node_modules/mapbox-gl": {
|
||||||
"version": "2.15.0",
|
"version": "2.15.0",
|
||||||
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.15.0.tgz",
|
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.15.0.tgz",
|
||||||
@ -1065,6 +1095,20 @@
|
|||||||
"node": ">= 0.6"
|
"node": ">= 0.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/raw-body": {
|
||||||
|
"version": "2.5.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
|
||||||
|
"integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
|
||||||
|
"dependencies": {
|
||||||
|
"bytes": "3.1.2",
|
||||||
|
"http-errors": "2.0.0",
|
||||||
|
"iconv-lite": "0.4.24",
|
||||||
|
"unpipe": "1.0.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.8"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/readable-stream": {
|
"node_modules/readable-stream": {
|
||||||
"version": "2.3.8",
|
"version": "2.3.8",
|
||||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
|
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
|
||||||
@ -1482,6 +1526,25 @@
|
|||||||
"tweetnacl": "^0.14.3"
|
"tweetnacl": "^0.14.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"body-parser": {
|
||||||
|
"version": "1.20.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
|
||||||
|
"integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
|
||||||
|
"requires": {
|
||||||
|
"bytes": "3.1.2",
|
||||||
|
"content-type": "~1.0.5",
|
||||||
|
"debug": "2.6.9",
|
||||||
|
"depd": "2.0.0",
|
||||||
|
"destroy": "1.2.0",
|
||||||
|
"http-errors": "2.0.0",
|
||||||
|
"iconv-lite": "0.4.24",
|
||||||
|
"on-finished": "2.4.1",
|
||||||
|
"qs": "6.11.0",
|
||||||
|
"raw-body": "2.5.2",
|
||||||
|
"type-is": "~1.6.18",
|
||||||
|
"unpipe": "1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"buffer-from": {
|
"buffer-from": {
|
||||||
"version": "1.1.2",
|
"version": "1.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
|
||||||
@ -1865,6 +1928,11 @@
|
|||||||
"resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz",
|
||||||
"integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA=="
|
"integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA=="
|
||||||
},
|
},
|
||||||
|
"lodash": {
|
||||||
|
"version": "4.17.21",
|
||||||
|
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||||
|
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
|
||||||
|
},
|
||||||
"mapbox-gl": {
|
"mapbox-gl": {
|
||||||
"version": "2.15.0",
|
"version": "2.15.0",
|
||||||
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.15.0.tgz",
|
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.15.0.tgz",
|
||||||
@ -2173,6 +2241,17 @@
|
|||||||
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
|
||||||
"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
|
"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
|
||||||
},
|
},
|
||||||
|
"raw-body": {
|
||||||
|
"version": "2.5.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
|
||||||
|
"integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
|
||||||
|
"requires": {
|
||||||
|
"bytes": "3.1.2",
|
||||||
|
"http-errors": "2.0.0",
|
||||||
|
"iconv-lite": "0.4.24",
|
||||||
|
"unpipe": "1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"readable-stream": {
|
"readable-stream": {
|
||||||
"version": "2.3.8",
|
"version": "2.3.8",
|
||||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
|
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
|
||||||
|
|||||||
@ -11,11 +11,13 @@
|
|||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"axios": "^1.5.0",
|
"axios": "^1.5.0",
|
||||||
|
"body-parser": "^1.20.2",
|
||||||
"dotenv": "^16.3.1",
|
"dotenv": "^16.3.1",
|
||||||
"express": "^4.18.2",
|
"express": "^4.18.2",
|
||||||
"fs": "^0.0.1-security",
|
"fs": "^0.0.1-security",
|
||||||
"handlebars": "^4.7.7",
|
"handlebars": "^4.7.7",
|
||||||
"http": "^0.0.1-security",
|
"http": "^0.0.1-security",
|
||||||
|
"lodash": "^4.17.21",
|
||||||
"mapbox-gl": "^2.15.0",
|
"mapbox-gl": "^2.15.0",
|
||||||
"moment": "^2.29.4",
|
"moment": "^2.29.4",
|
||||||
"multer": "^1.4.5-lts.1",
|
"multer": "^1.4.5-lts.1",
|
||||||
|
|||||||
298
server.js
298
server.js
@ -10,7 +10,8 @@ const http = require("http");
|
|||||||
const Client = require('ssh2').Client;
|
const Client = require('ssh2').Client;
|
||||||
const axios = require('axios');
|
const axios = require('axios');
|
||||||
const moment = require('moment');
|
const moment = require('moment');
|
||||||
|
const bodyParser = require('body-parser');
|
||||||
|
const _ = require('lodash');
|
||||||
|
|
||||||
|
|
||||||
const storage = multer.diskStorage({
|
const storage = multer.diskStorage({
|
||||||
@ -26,6 +27,7 @@ const upload = multer({ storage: storage });
|
|||||||
app.use(express.static(path.join(__dirname, "static")));
|
app.use(express.static(path.join(__dirname, "static")));
|
||||||
app.use(express.json());
|
app.use(express.json());
|
||||||
app.use(express.urlencoded({ extended: false }));
|
app.use(express.urlencoded({ extended: false }));
|
||||||
|
app.use(bodyParser.json());
|
||||||
|
|
||||||
app.get("/", index);
|
app.get("/", index);
|
||||||
app.get("/login", login);
|
app.get("/login", login);
|
||||||
@ -241,7 +243,7 @@ for (let i = 0; i < dates.length; i++) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
console.log(templateData);
|
// console.log(templateData);
|
||||||
|
|
||||||
const source = fs.readFileSync("static/templates/index.html", "utf8");
|
const source = fs.readFileSync("static/templates/index.html", "utf8");
|
||||||
|
|
||||||
@ -275,6 +277,7 @@ async function live(req, res) {
|
|||||||
Registrars: [],
|
Registrars: [],
|
||||||
Alarms: [],
|
Alarms: [],
|
||||||
Count: 0,
|
Count: 0,
|
||||||
|
Groups: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@ -451,6 +454,44 @@ async function live(req, res) {
|
|||||||
|
|
||||||
templateData.Count = templateData.Alarms.length;
|
templateData.Count = templateData.Alarms.length;
|
||||||
|
|
||||||
|
// Выполняем запрос, чтобы получить все данные из таблицы registrars
|
||||||
|
const queryRegistrars = `
|
||||||
|
SELECT id, serial, channels, lastkeepalive, name, "group", plate, sim, ip, port
|
||||||
|
FROM registrars
|
||||||
|
ORDER BY id
|
||||||
|
`;
|
||||||
|
const registrarsResult = await client.query(queryRegistrars);
|
||||||
|
const allRegistrars = registrarsResult.rows;
|
||||||
|
|
||||||
|
// Группируем устройства по группам и сохраняем данные каждого устройства
|
||||||
|
const groupedRegistrars = {};
|
||||||
|
allRegistrars.forEach((registrar) => {
|
||||||
|
if (!groupedRegistrars[registrar.group]) {
|
||||||
|
groupedRegistrars[registrar.group] = [];
|
||||||
|
}
|
||||||
|
groupedRegistrars[registrar.group].push({
|
||||||
|
id: registrar.id,
|
||||||
|
serial: registrar.serial,
|
||||||
|
channels: registrar.channels,
|
||||||
|
status: Date.now() - Date.parse(registrar.lastkeepalive) <= minuteInMillis,
|
||||||
|
name: registrar.name,
|
||||||
|
group: registrar.group,
|
||||||
|
plate: registrar.plate,
|
||||||
|
sim: registrar.sim,
|
||||||
|
ip: registrar.ip,
|
||||||
|
port: registrar.port,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Заполняем массив групп данными устройств в каждой группе
|
||||||
|
for (const groupName in groupedRegistrars) {
|
||||||
|
templateData.Groups.push({
|
||||||
|
name: groupName,
|
||||||
|
devices: groupedRegistrars[groupName],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
const source = fs.readFileSync("static/templates/live.html", "utf8");
|
const source = fs.readFileSync("static/templates/live.html", "utf8");
|
||||||
const template = handlebars.compile(source);
|
const template = handlebars.compile(source);
|
||||||
const resultHTML = template(templateData);
|
const resultHTML = template(templateData);
|
||||||
@ -537,6 +578,7 @@ async function reports(req, res) {
|
|||||||
User: "Тестовое Имя",
|
User: "Тестовое Имя",
|
||||||
ifDBError: false,
|
ifDBError: false,
|
||||||
Registrars: [],
|
Registrars: [],
|
||||||
|
Groups: [],
|
||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
const pool = new Pool({
|
const pool = new Pool({
|
||||||
@ -696,6 +738,32 @@ async function reports(req, res) {
|
|||||||
};
|
};
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
// Выполняем запрос, чтобы получить все данные из таблицы registrars
|
||||||
|
const queryRegistrars = `
|
||||||
|
SELECT id, serial, lastkeepalive, name, "group", plate, sim, ip, port
|
||||||
|
FROM registrars
|
||||||
|
ORDER BY id
|
||||||
|
`;
|
||||||
|
const registrarsResult = await client.query(queryRegistrars);
|
||||||
|
const allRegistrars = registrarsResult.rows;
|
||||||
|
|
||||||
|
// Группируем устройства по группам
|
||||||
|
const groupedRegistrars = {};
|
||||||
|
allRegistrars.forEach((registrar) => {
|
||||||
|
if (!groupedRegistrars[registrar.group]) {
|
||||||
|
groupedRegistrars[registrar.group] = [];
|
||||||
|
}
|
||||||
|
groupedRegistrars[registrar.group].push(registrar.serial);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Заполняем массив групп и серийными номерами устройств в каждой группе
|
||||||
|
for (const groupName in groupedRegistrars) {
|
||||||
|
templateData.Groups.push({
|
||||||
|
name: groupName,
|
||||||
|
serials: groupedRegistrars[groupName],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const source = fs.readFileSync(
|
const source = fs.readFileSync(
|
||||||
"static/templates/reports/index.html",
|
"static/templates/reports/index.html",
|
||||||
"utf8"
|
"utf8"
|
||||||
@ -1069,6 +1137,7 @@ async function devices(req, res) {
|
|||||||
User: "Тестовое Имя",
|
User: "Тестовое Имя",
|
||||||
ifDBError: false,
|
ifDBError: false,
|
||||||
Registrars: [],
|
Registrars: [],
|
||||||
|
Groups: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@ -1103,9 +1172,26 @@ async function devices(req, res) {
|
|||||||
sim: registrar.sim,
|
sim: registrar.sim,
|
||||||
ip: registrar.ip,
|
ip: registrar.ip,
|
||||||
port: registrar.port,
|
port: registrar.port,
|
||||||
})),
|
}));
|
||||||
|
|
||||||
console.log(templateData);
|
// Группируем устройства по группам
|
||||||
|
const groupedRegistrars = {};
|
||||||
|
allRegistrars.forEach((registrar) => {
|
||||||
|
if (!groupedRegistrars[registrar.group]) {
|
||||||
|
groupedRegistrars[registrar.group] = [];
|
||||||
|
}
|
||||||
|
groupedRegistrars[registrar.group].push(registrar.serial);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Заполняем массив групп и серийными номерами устройств в каждой группе
|
||||||
|
for (const groupName in groupedRegistrars) {
|
||||||
|
templateData.Groups.push({
|
||||||
|
name: groupName,
|
||||||
|
serials: groupedRegistrars[groupName],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// console.log(templateData);
|
||||||
|
|
||||||
const source = fs.readFileSync("static/templates/devices/index.html", "utf8");
|
const source = fs.readFileSync("static/templates/devices/index.html", "utf8");
|
||||||
const template = handlebars.compile(source);
|
const template = handlebars.compile(source);
|
||||||
@ -1127,6 +1213,133 @@ async function devices(req, res) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function getParameterByName(serial, fieldName) {
|
||||||
|
const requestPayload = {
|
||||||
|
FIELDS: [fieldName],
|
||||||
|
};
|
||||||
|
|
||||||
|
const requestResponse = await axios.get(`http://krbl.ru:8080/http/parameters/request?serial=${serial}`, {
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
data: JSON.stringify(requestPayload),
|
||||||
|
});
|
||||||
|
// console.log(requestResponse.data);
|
||||||
|
|
||||||
|
const getResponse = await axios.get(`http://krbl.ru:8080/http/parameters/get?serial=${serial}`);
|
||||||
|
// console.log(getResponse.data);
|
||||||
|
|
||||||
|
const fieldPath = findPathForField(fieldName);
|
||||||
|
if (fieldPath) {
|
||||||
|
const value = _.get(getResponse.data, fieldPath);
|
||||||
|
return { [fieldName]: value };
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
app.post('/device-parameters', async (req, res) => {
|
||||||
|
try {
|
||||||
|
const { serial, FIELDS } = req.body;
|
||||||
|
// console.log(serial, FIELDS);
|
||||||
|
|
||||||
|
const responseData = {};
|
||||||
|
|
||||||
|
// Используем асинхронный цикл для выполнения GET-запросов по очереди
|
||||||
|
for (const field of FIELDS) {
|
||||||
|
const parameter = await getParameterByName(serial, field);
|
||||||
|
if (parameter) {
|
||||||
|
Object.assign(responseData, parameter);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// console.log(responseData);
|
||||||
|
|
||||||
|
res.json(responseData);
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error);
|
||||||
|
res.status(500).json({ error: 'Internal server error' });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
function findPathForField(fieldName) {
|
||||||
|
const fieldPathMap = {
|
||||||
|
"VEHICLEID": "DATA.RIP.BN",
|
||||||
|
"DATEMOD": "DATA.TIMEP.DATEM",
|
||||||
|
"TIMEFORMAT": "DATA.TIMEP.TIMEM",
|
||||||
|
"LANGUAGE": "DATA.GSP.LANT",
|
||||||
|
"VIDEOFORMAT": "DATA.GSP.VGA",
|
||||||
|
"GEOMOD": "DATA.GSP.GM",
|
||||||
|
"SUBSTREAMMODE": "DATA.SUBSTRNET.SM",
|
||||||
|
"NETWORK": "DATA.SUBSTRNET.NEC",
|
||||||
|
"DISPLAYMENU": "DATA.DOSD",
|
||||||
|
"RECORDINGPARAMS": "DATA.RP.RCP",
|
||||||
|
"FUTURERECORDINGSTYLE": "DATA.MP.OT",
|
||||||
|
"FUTURERECORDING": "DATA.MP.OT",
|
||||||
|
"STREAMPARAMS": "DATA.AR.VEC",
|
||||||
|
"VIDEOIMAGEMOD": "DATA.SVIP",
|
||||||
|
};
|
||||||
|
|
||||||
|
return fieldPathMap[fieldName] || null;
|
||||||
|
}
|
||||||
|
|
||||||
|
app.put('/device-parameters', async (req, res) => {
|
||||||
|
// Получаем данные из PUT запроса
|
||||||
|
const requestData = req.body;
|
||||||
|
const { serial } = req.query;
|
||||||
|
|
||||||
|
// Извлекаем необходимые параметры
|
||||||
|
const {
|
||||||
|
DATEMOD,
|
||||||
|
TIMEFORMAT,
|
||||||
|
LANGUAGE,
|
||||||
|
VIDEOFORMAT,
|
||||||
|
GEOMOD,
|
||||||
|
SUBSTREAMMODE,
|
||||||
|
NE,
|
||||||
|
TE,
|
||||||
|
VE,
|
||||||
|
SE,
|
||||||
|
GE
|
||||||
|
} = requestData;
|
||||||
|
|
||||||
|
// Создаем JSON для GET запроса
|
||||||
|
const requestBody = {
|
||||||
|
TIMEP: {
|
||||||
|
DATEM: parseInt(DATEMOD, 10) || 1,
|
||||||
|
TIMEM: parseInt(TIMEFORMAT, 10) || 0
|
||||||
|
},
|
||||||
|
GSP: {
|
||||||
|
LANT: parseInt(LANGUAGE, 10) || 12,
|
||||||
|
VGA: parseInt(VIDEOFORMAT, 10) || 0,
|
||||||
|
GM: parseInt(GEOMOD, 10) || 0
|
||||||
|
},
|
||||||
|
SUBSTRNET: {
|
||||||
|
SM: parseInt(SUBSTREAMMODE, 10) || 1
|
||||||
|
},
|
||||||
|
DOSD: {
|
||||||
|
NE: parseInt(NE, 10) || 1,
|
||||||
|
TE: parseInt(TE, 10) || 1,
|
||||||
|
VE: parseInt(VE, 10) || 0,
|
||||||
|
SE: parseInt(SE, 10) || 0,
|
||||||
|
GE: parseInt(GE, 10) || 0
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Отправляем GET запрос с JSON BODY
|
||||||
|
try {
|
||||||
|
const response = await axios.get(`http://krbl.ru:8080/http/parameters/set?serial=${serial}`, {
|
||||||
|
data: JSON.stringify(requestBody),
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
res.status(response.status).send(response.data);
|
||||||
|
} catch (error) {
|
||||||
|
res.status(500).send('Произошла ошибка при отправке GET запроса.');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
app.post("/devicedata", async (req, res) => {
|
app.post("/devicedata", async (req, res) => {
|
||||||
const id = req.body.id;
|
const id = req.body.id;
|
||||||
|
|
||||||
@ -1556,6 +1769,7 @@ async function videos(req, res) {
|
|||||||
User: "Тестовое Имя",
|
User: "Тестовое Имя",
|
||||||
ifDBError: false,
|
ifDBError: false,
|
||||||
Registrars: [],
|
Registrars: [],
|
||||||
|
Groups: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@ -1581,6 +1795,43 @@ async function videos(req, res) {
|
|||||||
status: Date.now() - Date.parse(row.lastkeepalive) <= minuteInMillis,
|
status: Date.now() - Date.parse(row.lastkeepalive) <= minuteInMillis,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
// Выполняем запрос, чтобы получить все данные из таблицы registrars
|
||||||
|
const queryRegistrars = `
|
||||||
|
SELECT id, serial, channels, lastkeepalive, name, "group", plate, sim, ip, port
|
||||||
|
FROM registrars
|
||||||
|
ORDER BY id
|
||||||
|
`;
|
||||||
|
const registrarsResult = await client.query(queryRegistrars);
|
||||||
|
const allRegistrars = registrarsResult.rows;
|
||||||
|
|
||||||
|
// Группируем устройства по группам и сохраняем данные каждого устройства
|
||||||
|
const groupedRegistrars = {};
|
||||||
|
allRegistrars.forEach((registrar) => {
|
||||||
|
if (!groupedRegistrars[registrar.group]) {
|
||||||
|
groupedRegistrars[registrar.group] = [];
|
||||||
|
}
|
||||||
|
groupedRegistrars[registrar.group].push({
|
||||||
|
id: registrar.id,
|
||||||
|
serial: registrar.serial,
|
||||||
|
channels: registrar.channels,
|
||||||
|
status: Date.now() - Date.parse(registrar.lastkeepalive) <= minuteInMillis,
|
||||||
|
name: registrar.name,
|
||||||
|
group: registrar.group,
|
||||||
|
plate: registrar.plate,
|
||||||
|
sim: registrar.sim,
|
||||||
|
ip: registrar.ip,
|
||||||
|
port: registrar.port,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Заполняем массив групп данными устройств в каждой группе
|
||||||
|
for (const groupName in groupedRegistrars) {
|
||||||
|
templateData.Groups.push({
|
||||||
|
name: groupName,
|
||||||
|
devices: groupedRegistrars[groupName],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// console.log(templateData);
|
// console.log(templateData);
|
||||||
|
|
||||||
const source = fs.readFileSync("static/templates/videos/playback.html", "utf8");
|
const source = fs.readFileSync("static/templates/videos/playback.html", "utf8");
|
||||||
@ -1606,6 +1857,7 @@ async function videoExport(req, res) {
|
|||||||
User: "Тестовое Имя",
|
User: "Тестовое Имя",
|
||||||
ifDBError: false,
|
ifDBError: false,
|
||||||
Registrars: [],
|
Registrars: [],
|
||||||
|
Groups: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@ -1631,6 +1883,44 @@ async function videoExport(req, res) {
|
|||||||
status: Date.now() - Date.parse(row.lastkeepalive) <= minuteInMillis,
|
status: Date.now() - Date.parse(row.lastkeepalive) <= minuteInMillis,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
// Выполняем запрос, чтобы получить все данные из таблицы registrars
|
||||||
|
const queryRegistrars = `
|
||||||
|
SELECT id, serial, channels, lastkeepalive, name, "group", plate, sim, ip, port
|
||||||
|
FROM registrars
|
||||||
|
ORDER BY id
|
||||||
|
`;
|
||||||
|
const registrarsResult = await client.query(queryRegistrars);
|
||||||
|
const allRegistrars = registrarsResult.rows;
|
||||||
|
|
||||||
|
// Группируем устройства по группам и сохраняем данные каждого устройства
|
||||||
|
const groupedRegistrars = {};
|
||||||
|
allRegistrars.forEach((registrar) => {
|
||||||
|
if (!groupedRegistrars[registrar.group]) {
|
||||||
|
groupedRegistrars[registrar.group] = [];
|
||||||
|
}
|
||||||
|
groupedRegistrars[registrar.group].push({
|
||||||
|
id: registrar.id,
|
||||||
|
serial: registrar.serial,
|
||||||
|
channels: registrar.channels,
|
||||||
|
status: Date.now() - Date.parse(registrar.lastkeepalive) <= minuteInMillis,
|
||||||
|
name: registrar.name,
|
||||||
|
group: registrar.group,
|
||||||
|
plate: registrar.plate,
|
||||||
|
sim: registrar.sim,
|
||||||
|
ip: registrar.ip,
|
||||||
|
port: registrar.port,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Заполняем массив групп данными устройств в каждой группе
|
||||||
|
for (const groupName in groupedRegistrars) {
|
||||||
|
templateData.Groups.push({
|
||||||
|
name: groupName,
|
||||||
|
devices: groupedRegistrars[groupName],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// console.log(templateData);
|
// console.log(templateData);
|
||||||
|
|
||||||
const source = fs.readFileSync("static/templates/videos/export.html", "utf8");
|
const source = fs.readFileSync("static/templates/videos/export.html", "utf8");
|
||||||
|
|||||||
@ -13,6 +13,7 @@ const content1 = document.getElementById("details");
|
|||||||
const content2 = document.getElementById("sim");
|
const content2 = document.getElementById("sim");
|
||||||
const content3 = document.getElementById("ts");
|
const content3 = document.getElementById("ts");
|
||||||
const content4 = document.getElementById("equipment");
|
const content4 = document.getElementById("equipment");
|
||||||
|
const content5 = document.getElementById("parameters");
|
||||||
const btn1 = document.getElementById("continue-details");
|
const btn1 = document.getElementById("continue-details");
|
||||||
const btn2 = document.getElementById("continue-sim");
|
const btn2 = document.getElementById("continue-sim");
|
||||||
const btn3 = document.getElementById("continue-ts");
|
const btn3 = document.getElementById("continue-ts");
|
||||||
@ -103,6 +104,8 @@ for (let radioButton of radioButtons) {
|
|||||||
switchContent(content3);
|
switchContent(content3);
|
||||||
} else if (radioButton.value === "equipment") {
|
} else if (radioButton.value === "equipment") {
|
||||||
switchContent(content4);
|
switchContent(content4);
|
||||||
|
} else if (radioButton.value === "parameters") {
|
||||||
|
switchContent(content5);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,115 +1,4 @@
|
|||||||
// const devices = [
|
|
||||||
// {
|
|
||||||
// id: "2",
|
|
||||||
// group: "2-device-2",
|
|
||||||
// driverID: "233",
|
|
||||||
// name: "Иван",
|
|
||||||
// surname: "Спахов",
|
|
||||||
// numberTS: "008803559E",
|
|
||||||
// phone: "+7 999 123 45 67",
|
|
||||||
// mail: "spahov@mail.ru",
|
|
||||||
// driverCard: "RUD0000000000111",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "6",
|
|
||||||
// group: "2-device-1",
|
|
||||||
// driverID: "782",
|
|
||||||
// name: "Александр",
|
|
||||||
// surname: "Богаченко",
|
|
||||||
// numberTS: "0088036B78",
|
|
||||||
// phone: "+7 989 443 23 46",
|
|
||||||
// mail: "bogachenko@mail.ru",
|
|
||||||
// driverCard: "RUD0000000000111",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "7",
|
|
||||||
// group: "2-device-4",
|
|
||||||
// driverID: "2943",
|
|
||||||
// name: "Михаил",
|
|
||||||
// surname: "Гукасян",
|
|
||||||
// numberTS: "009800852A",
|
|
||||||
// phone: "+7 909 133 55 67",
|
|
||||||
// mail: "agucasyan@mail.ru",
|
|
||||||
// driverCard: "RUD0000000000111",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "8",
|
|
||||||
// group: "2-device-4",
|
|
||||||
// driverID: "87",
|
|
||||||
// name: "Марат",
|
|
||||||
// surname: "Шмидт",
|
|
||||||
// numberTS: "009800858D",
|
|
||||||
// phone: "+7 915 555 45 89",
|
|
||||||
// mail: "shmidt@mail.ru",
|
|
||||||
// driverCard: "RUD0000000000111",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "9",
|
|
||||||
// group: "1-device-1",
|
|
||||||
// driverID: "823",
|
|
||||||
// name: "Никита",
|
|
||||||
// surname: "Ильяшенко",
|
|
||||||
// numberTS: "00980084FD",
|
|
||||||
// phone: "+7 909 123 45 67",
|
|
||||||
// mail: "iluashenko@mail.ru",
|
|
||||||
// driverCard: "RUD0000000000111",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "10",
|
|
||||||
// group: "2-device-4",
|
|
||||||
// driverID: "15",
|
|
||||||
// name: "Валерий",
|
|
||||||
// surname: "Сараев",
|
|
||||||
// numberTS: "0088036B7F",
|
|
||||||
// phone: "+7 909 123 45 67",
|
|
||||||
// mail: "saraev@mail.ru",
|
|
||||||
// driverCard: "RUD0000000000111",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "11",
|
|
||||||
// group: "2-device-3",
|
|
||||||
// driverID: "423",
|
|
||||||
// name: "Александр",
|
|
||||||
// surname: "Курочкин",
|
|
||||||
// numberTS: "00880302CD",
|
|
||||||
// phone: "+7 999 123 45 67",
|
|
||||||
// mail: "curochkin@mail.ru",
|
|
||||||
// driverCard: "RUD0000000000111",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "12",
|
|
||||||
// group: "1-device-2",
|
|
||||||
// driverID: "6456",
|
|
||||||
// name: "Екатерина",
|
|
||||||
// surname: "Миненко",
|
|
||||||
// numberTS: "008802A035",
|
|
||||||
// phone: "+7 999 123 45 67",
|
|
||||||
// mail: "minenko@mail.ru",
|
|
||||||
// driverCard: "RUD0000000000111",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "13",
|
|
||||||
// group: "3-device-1",
|
|
||||||
// driverID: "887",
|
|
||||||
// name: "Виталий",
|
|
||||||
// surname: "Гаспарян",
|
|
||||||
// numberTS: "008802A96A",
|
|
||||||
// phone: "+7 999 123 45 67",
|
|
||||||
// mail: "gosparyan@mail.ru",
|
|
||||||
// driverCard: "RUD0000000000111",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "15",
|
|
||||||
// group: "1-device-1",
|
|
||||||
// driverID: "742",
|
|
||||||
// name: "Светлана",
|
|
||||||
// surname: "Амусова",
|
|
||||||
// numberTS: "00880302C7",
|
|
||||||
// phone: "+7 999 123 45 67",
|
|
||||||
// mail: "amusova@mail.ru",
|
|
||||||
// driverCard: "RUD0000000000111",
|
|
||||||
// },
|
|
||||||
// ];
|
|
||||||
|
|
||||||
// Получаем высоту таблицы и определяем, сколько строк помещается на странице
|
// Получаем высоту таблицы и определяем, сколько строк помещается на странице
|
||||||
let currentPage = 1;
|
let currentPage = 1;
|
||||||
|
|||||||
@ -1,105 +1,3 @@
|
|||||||
// const devices = [
|
|
||||||
// {
|
|
||||||
// id: "1",
|
|
||||||
// group: "0001",
|
|
||||||
// name: "Разговор по телефону",
|
|
||||||
// reportID: "354",
|
|
||||||
// plate: "AO30877",
|
|
||||||
// numberTS: "008803559E",
|
|
||||||
// time: "12.03.23 17:33",
|
|
||||||
// place: "59.852371, 30.344543",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "2",
|
|
||||||
// group: "0001",
|
|
||||||
// name: "Водитель зевает",
|
|
||||||
// reportID: "353",
|
|
||||||
// plate: "AO64377",
|
|
||||||
// numberTS: "0088036B78",
|
|
||||||
// time: "12.03.23 14:26",
|
|
||||||
// place: "60.058236, 30.315283",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "3",
|
|
||||||
// group: "0002",
|
|
||||||
// name: "Усталость",
|
|
||||||
// reportID: "352",
|
|
||||||
// plate: "ГД44377",
|
|
||||||
// numberTS: "009800852A",
|
|
||||||
// time: "12.03.23 10:07",
|
|
||||||
// place: "59.878256, 30.31962",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "4",
|
|
||||||
// group: "0003",
|
|
||||||
// name: "Водитель зевает",
|
|
||||||
// reportID: "351",
|
|
||||||
// plate: "УА86577",
|
|
||||||
// numberTS: "009800858D",
|
|
||||||
// time: "12.03.23 09:56",
|
|
||||||
// place: "60.045981, 30.4134",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "5",
|
|
||||||
// group: "0003",
|
|
||||||
// name: "Разговор по телефону",
|
|
||||||
// reportID: "350",
|
|
||||||
// plate: "БВ74665",
|
|
||||||
// numberTS: "00980084FD",
|
|
||||||
// time: "11.03.23 20:43",
|
|
||||||
// place: "59.83257, 30.389893",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "6",
|
|
||||||
// group: "0004",
|
|
||||||
// name: "Разговор по телефону",
|
|
||||||
// reportID: "349",
|
|
||||||
// plate: "ЦУ445101",
|
|
||||||
// numberTS: "0088036B7F",
|
|
||||||
// time: "11.03.23 19:17",
|
|
||||||
// place: "59.959926, 30.42224",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "7",
|
|
||||||
// group: "0005",
|
|
||||||
// name: "Усталость",
|
|
||||||
// reportID: "348",
|
|
||||||
// plate: "КТ32376",
|
|
||||||
// numberTS: "00880302CD",
|
|
||||||
// time: "11.03.23 15:32",
|
|
||||||
// place: "60.046346, 30.405688",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "8",
|
|
||||||
// group: "0006",
|
|
||||||
// name: "Курение за рулём",
|
|
||||||
// reportID: "347",
|
|
||||||
// plate: "ОА33277",
|
|
||||||
// numberTS: "008802A035",
|
|
||||||
// time: "11.03.23 15:06",
|
|
||||||
// place: "59.956626, 30.234408",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "9",
|
|
||||||
// group: "0007",
|
|
||||||
// name: "Водитель отвлекся",
|
|
||||||
// reportID: "346",
|
|
||||||
// plate: "КЛ987102",
|
|
||||||
// numberTS: "008802A96A",
|
|
||||||
// time: "11.03.23 12:44",
|
|
||||||
// place: "59.956626, 30.234408",
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "10",
|
|
||||||
// group: "0002",
|
|
||||||
// name: "Водитель отвлекся",
|
|
||||||
// reportID: "345",
|
|
||||||
// plate: "АУ22377",
|
|
||||||
// numberTS: "00880302C7",
|
|
||||||
// time: "11.03.23 11:40",
|
|
||||||
// place: "59.956626, 30.234408",
|
|
||||||
// },
|
|
||||||
// ];
|
|
||||||
|
|
||||||
// Получаем высоту таблицы и определяем, сколько строк помещается на странице
|
// Получаем высоту таблицы и определяем, сколько строк помещается на странице
|
||||||
let currentPage = 1;
|
let currentPage = 1;
|
||||||
@ -245,7 +143,7 @@ const applyFilterAndSearch = () => {
|
|||||||
const searchString =
|
const searchString =
|
||||||
`${device.group} ${device.name} ${device.id} ${device.place} ${device.numberTS} ${device.time} ${device.place} ${device.geo} ${device.serial}`.toLowerCase();
|
`${device.group} ${device.name} ${device.id} ${device.place} ${device.numberTS} ${device.time} ${device.place} ${device.geo} ${device.serial}`.toLowerCase();
|
||||||
const matchGroup =
|
const matchGroup =
|
||||||
groupFilters.length === 0 || groupFilters.includes(device.group);
|
groupFilters.length === 0 || groupFilters.includes(device.group) || groupFilters.includes(device.serial);
|
||||||
const matchSearch = !searchValue || searchString.includes(searchValue);
|
const matchSearch = !searchValue || searchString.includes(searchValue);
|
||||||
|
|
||||||
// Фильтр по временному диапазону
|
// Фильтр по временному диапазону
|
||||||
|
|||||||
@ -1,172 +1,3 @@
|
|||||||
// const devices = [
|
|
||||||
// {
|
|
||||||
// id: "1",
|
|
||||||
// group: "2-device-1",
|
|
||||||
// name: "Трамваи",
|
|
||||||
// plate: "AB1234",
|
|
||||||
// serial: "008803559E",
|
|
||||||
// sim: "1234567890",
|
|
||||||
// channels: 12,
|
|
||||||
// ip: "192.168.0.1",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "2",
|
|
||||||
// group: "2-device-2",
|
|
||||||
// name: "Электробусы",
|
|
||||||
// plate: "BC2345",
|
|
||||||
// serial: "008803559E",
|
|
||||||
// sim: "2345678901",
|
|
||||||
// channels: 12,
|
|
||||||
// ip: "192.168.0.2",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "3",
|
|
||||||
// group: "2-device-1",
|
|
||||||
// name: "Трамваи",
|
|
||||||
// plate: "CD3456",
|
|
||||||
// serial: "009800852A",
|
|
||||||
// sim: "3456789012",
|
|
||||||
// channels: 16,
|
|
||||||
// ip: "192.168.0.3",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "4",
|
|
||||||
// group: "2-device-3",
|
|
||||||
// name: "Троллейбусы",
|
|
||||||
// plate: "DE4567",
|
|
||||||
// serial: "009800858D",
|
|
||||||
// sim: "4567890123",
|
|
||||||
// channels: 12,
|
|
||||||
// ip: "192.168.0.4",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "5",
|
|
||||||
// group: "2-device-2",
|
|
||||||
// name: "Электробусы",
|
|
||||||
// plate: "EF5678",
|
|
||||||
// serial: "00980084FD",
|
|
||||||
// sim: "5678901234",
|
|
||||||
// channels: 16,
|
|
||||||
// ip: "192.168.0.5",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "6",
|
|
||||||
// group: "2-device-1",
|
|
||||||
// name: "Трамваи",
|
|
||||||
// plate: "FG6789",
|
|
||||||
// serial: "0088036B7F",
|
|
||||||
// sim: "6789012345",
|
|
||||||
// channels: 16,
|
|
||||||
// ip: "192.168.0.6",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "7",
|
|
||||||
// group: "2-device-4",
|
|
||||||
// name: "Старые ТС",
|
|
||||||
// plate: "GH7890",
|
|
||||||
// serial: "00880302CD",
|
|
||||||
// sim: "7890123456",
|
|
||||||
// channels: 12,
|
|
||||||
// ip: "192.168.0.7",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "8",
|
|
||||||
// group: "2-device-4",
|
|
||||||
// name: "Старые ТС",
|
|
||||||
// plate: "HI8901",
|
|
||||||
// serial: "008802A035",
|
|
||||||
// sim: "8901234567",
|
|
||||||
// channels: 12,
|
|
||||||
// ip: "192.168.0.8",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "9",
|
|
||||||
// group: "1-device-1",
|
|
||||||
// name: "Трамваи",
|
|
||||||
// plate: "IJ9012",
|
|
||||||
// serial: "008802A96A",
|
|
||||||
// sim: "9012345678",
|
|
||||||
// channels: 16,
|
|
||||||
// ip: "192.168.0.9",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "10",
|
|
||||||
// group: "2-device-4",
|
|
||||||
// name: "Старые ТС",
|
|
||||||
// plate: "КТ32376",
|
|
||||||
// serial: "00880302C7",
|
|
||||||
// sim: "7012345678",
|
|
||||||
// channels: 14,
|
|
||||||
// ip: "192.168.0.10",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "11",
|
|
||||||
// group: "2-device-3",
|
|
||||||
// name: "Троллейбусы",
|
|
||||||
// plate: "ОА33277",
|
|
||||||
// serial: "008802A035",
|
|
||||||
// sim: "9034234348",
|
|
||||||
// channels: 12,
|
|
||||||
// ip: "192.168.0.11",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "12",
|
|
||||||
// group: "1-device-2",
|
|
||||||
// name: "Маршрутки",
|
|
||||||
// plate: "КЛ987102",
|
|
||||||
// serial: "009800852A",
|
|
||||||
// sim: "9023345678",
|
|
||||||
// channels: 10,
|
|
||||||
// ip: "192.168.0.12",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "13",
|
|
||||||
// group: "3-device-1",
|
|
||||||
// name: "Троллейбусы",
|
|
||||||
// plate: "КЛ987102",
|
|
||||||
// serial: "0088036B78",
|
|
||||||
// sim: "9023345678",
|
|
||||||
// channels: 8,
|
|
||||||
// ip: "192.168.0.13",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "14",
|
|
||||||
// group: "3-device-1",
|
|
||||||
// name: "Маршрутки",
|
|
||||||
// plate: "КЛ987102",
|
|
||||||
// serial: "0088036B7F",
|
|
||||||
// sim: "9023345678",
|
|
||||||
// channels: 8,
|
|
||||||
// ip: "192.168.0.14",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: "15",
|
|
||||||
// group: "1-device-1",
|
|
||||||
// name: "Трамваи",
|
|
||||||
// plate: "КЛ987102",
|
|
||||||
// serial: "008802A96A",
|
|
||||||
// sim: "9023345678",
|
|
||||||
// channels: 16,
|
|
||||||
// ip: "192.168.0.15",
|
|
||||||
// port: 17891,
|
|
||||||
// },
|
|
||||||
// ];
|
|
||||||
|
|
||||||
console.log(devices);
|
|
||||||
|
|
||||||
// Получаем высоту таблицы и определяем, сколько строк помещается на странице
|
// Получаем высоту таблицы и определяем, сколько строк помещается на странице
|
||||||
let currentPage = 1;
|
let currentPage = 1;
|
||||||
@ -208,7 +39,7 @@ const createTable = () => {
|
|||||||
|
|
||||||
// Добавляем ячейки с данными
|
// Добавляем ячейки с данными
|
||||||
const name = document.createElement("td");
|
const name = document.createElement("td");
|
||||||
name.textContent = device.name;
|
name.textContent = device.group;
|
||||||
row.appendChild(name);
|
row.appendChild(name);
|
||||||
const plate = document.createElement("td");
|
const plate = document.createElement("td");
|
||||||
plate.textContent = device.plate;
|
plate.textContent = device.plate;
|
||||||
@ -326,7 +157,7 @@ const applyFilterAndSearch = () => {
|
|||||||
const searchString =
|
const searchString =
|
||||||
`${device.group} ${device.name} ${device.plate} ${device.number} ${device.serial} ${device.sim} ${device.channels} ${device.ip} ${device.port}`.toLowerCase();
|
`${device.group} ${device.name} ${device.plate} ${device.number} ${device.serial} ${device.sim} ${device.channels} ${device.ip} ${device.port}`.toLowerCase();
|
||||||
const matchGroup =
|
const matchGroup =
|
||||||
groupFilters.length === 0 || groupFilters.includes(device.group);
|
groupFilters.length === 0 || groupFilters.includes(device.group) || groupFilters.includes(device.serial);
|
||||||
const matchSearch = !searchValue || searchString.includes(searchValue);
|
const matchSearch = !searchValue || searchString.includes(searchValue);
|
||||||
return matchGroup && matchSearch;
|
return matchGroup && matchSearch;
|
||||||
});
|
});
|
||||||
|
|||||||
@ -430,20 +430,24 @@ header h2 span {
|
|||||||
width: fit-content;
|
width: fit-content;
|
||||||
}
|
}
|
||||||
|
|
||||||
.organisation label {
|
.organisation label,
|
||||||
|
#parameters label {
|
||||||
color: rgba(0, 0, 0, 0.5);
|
color: rgba(0, 0, 0, 0.5);
|
||||||
cursor: pointer;
|
cursor: pointer !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.organisation .checkbox-label:hover {
|
.organisation .checkbox-label:hover,
|
||||||
color: rgba(0, 0, 0, 0.7);
|
.add-new .checkbox-label:hover {
|
||||||
|
color: rgba(0, 0, 0, 0.7) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.organisation .checkbox-input:checked + .checkbox-label {
|
.organisation .checkbox-input:checked + .checkbox-label,
|
||||||
color: rgba(0, 0, 0, 0.9);
|
.add-new .checkbox-input:checked + .checkbox-label {
|
||||||
|
color: rgba(0, 0, 0, 0.9) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.organisation .checkmark {
|
.organisation .checkmark,
|
||||||
|
.add-new .checkmark {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 18px;
|
width: 18px;
|
||||||
height: 18px;
|
height: 18px;
|
||||||
@ -453,11 +457,13 @@ header h2 span {
|
|||||||
transition: 0.2s;
|
transition: 0.2s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.organisation .checkbox-input:hover + .checkbox-label .checkmark {
|
.organisation .checkbox-input:hover + .checkbox-label .checkmark,
|
||||||
filter: brightness(0.95);
|
.add-new .checkbox-input:hover + .checkbox-label .checkmar {
|
||||||
|
filter: brightness(0.95) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.organisation .checkbox-input:checked + .checkbox-label .checkmark {
|
.organisation .checkbox-input:checked + .checkbox-label .checkmark,
|
||||||
|
.add-new .checkbox-input:checked + .checkbox-label .checkmark {
|
||||||
background: url(../img/checkbox-check.svg);
|
background: url(../img/checkbox-check.svg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -648,10 +654,15 @@ td {
|
|||||||
color: rgba(0, 0, 0, 0.75);
|
color: rgba(0, 0, 0, 0.75);
|
||||||
}
|
}
|
||||||
|
|
||||||
.table input[type="checkbox"] {
|
.table input[type="checkbox"],
|
||||||
|
#parameters input[type="checkbox"] {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#parameters .checkbox-label {
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.table .checkmark {
|
.table .checkmark {
|
||||||
margin-left: 15px;
|
margin-left: 15px;
|
||||||
width: 22px;
|
width: 22px;
|
||||||
|
|||||||
@ -79,25 +79,15 @@
|
|||||||
<h1>Организация</h1>
|
<h1>Организация</h1>
|
||||||
|
|
||||||
<ul class="area">
|
<ul class="area">
|
||||||
<li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="name-1" class="checkbox-input" hidden checked><label for="name-1" class="checkbox-label">Группа 1</label>
|
{{#each Groups}}
|
||||||
|
<li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="{{name}}" class="checkbox-input" hidden checked><label for="{{name}}" class="checkbox-label">{{name}}</label>
|
||||||
<ul class="area-devices" id="devices-1">
|
<ul class="area-devices" id="devices-1">
|
||||||
<li class="device"><img><input type="checkbox" id="1-device-1" class="checkbox-input device-filter" value="1-device-1" hidden checked><label for="1-device-1" class="checkbox-label"><div class="checkmark"></div>Автобусы</label></li>
|
{{#each serials}}
|
||||||
<!-- <li class="device"><img><input type="checkbox" id="1-device-2" class="checkbox-input device-filter" value="1-device-2" hidden checked><label for="1-device-2" class="checkbox-label"><div class="checkmark"></div>Маршрутки</label></li> -->
|
<li class="device"><img><input type="checkbox" id="{{this}}" class="checkbox-input device-filter" value="{{this}}" hidden checked><label for="{{this}}" class="checkbox-label"><div class="checkmark"></div>{{this}}</label></li>
|
||||||
|
{{/each}}
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<!-- <li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="name-2" class="checkbox-input" hidden checked><label for="name-2" class="checkbox-label">Группа 2</label>
|
{{/each}}
|
||||||
<ul class="area-devices" id="devices-2">
|
|
||||||
<li class="device"><img><input type="checkbox" id="2-device-1" class="checkbox-input device-filter" value="2-device-1" hidden checked><label for="2-device-1" class="checkbox-label"><div class="checkmark"></div>Трамваи</label></li>
|
|
||||||
<li class="device"><img><input type="checkbox" id="2-device-2" class="checkbox-input device-filter" value="2-device-2" hidden checked><label for="2-device-2" class="checkbox-label"><div class="checkmark"></div>Электробусы</label></li>
|
|
||||||
<li class="device"><img><input type="checkbox" id="2-device-3" class="checkbox-input device-filter" value="2-device-3" hidden checked><label for="2-device-3" class="checkbox-label"><div class="checkmark"></div>Троллейбусы</label></li>
|
|
||||||
<li class="device"><img><input type="checkbox" id="2-device-4" class="checkbox-input device-filter" value="2-device-4" hidden checked><label for="2-device-4" class="checkbox-label"><div class="checkmark"></div>Старые ТС</label></li>
|
|
||||||
</ul>
|
|
||||||
</li>
|
|
||||||
<li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="name-3" class="checkbox-input" hidden checked><label for="name-3" class="checkbox-label">Другое</label>
|
|
||||||
<ul class="area-devices" id="devices-3">
|
|
||||||
<li class="device"><img><input type="checkbox" id="3-device-1" class="checkbox-input device-filter" value="3-device-1" hidden checked><label for="3-device-1" class="checkbox-label"><div class="checkmark"></div>Маршрутки</label></li>
|
|
||||||
</ul>
|
|
||||||
</li> -->
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
@ -161,6 +151,8 @@
|
|||||||
<input name="newStage" type="radio" value="ts" id="stage-ts"><label for="stage-ts">Транспортное средство</label>
|
<input name="newStage" type="radio" value="ts" id="stage-ts"><label for="stage-ts">Транспортное средство</label>
|
||||||
<div class="vertical-line"></div>
|
<div class="vertical-line"></div>
|
||||||
<input name="newStage" type="radio" value="equipment" id="stage-equipment"><label for="stage-equipment">Оборудование</label>
|
<input name="newStage" type="radio" value="equipment" id="stage-equipment"><label for="stage-equipment">Оборудование</label>
|
||||||
|
<br>
|
||||||
|
<input name="newStage" type="radio" value="parameters" id="stage-parameters"><label style="margin-top: 115%;" for="stage-parameters">Системные настройки</label>
|
||||||
</section>
|
</section>
|
||||||
</section>
|
</section>
|
||||||
<section id="add-new-container" class="add-new">
|
<section id="add-new-container" class="add-new">
|
||||||
@ -209,7 +201,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="parameters-input">
|
<div class="parameters-input">
|
||||||
<label for="parameters-group">Группа<span style="color: rgba(255, 69, 58, 1);">*</span></label>
|
<label for="parameters-group">Группа<span style="color: rgba(255, 69, 58, 1);">*</span></label>
|
||||||
<input name="deviceGroup" type="text" id="parameters-group" placeholder="Название группы" required readonly>
|
<input name="deviceGroup" type="text" id="parameters-group" placeholder="Название группы" required>
|
||||||
</div>
|
</div>
|
||||||
<div class="parameters-input">
|
<div class="parameters-input">
|
||||||
<label for="parameters-port">Порт<span style="color: rgba(255, 69, 58, 1);">*</span></label>
|
<label for="parameters-port">Порт<span style="color: rgba(255, 69, 58, 1);">*</span></label>
|
||||||
@ -417,6 +409,83 @@
|
|||||||
|
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
<div id="parameters" class="new-parameters">
|
||||||
|
|
||||||
|
<h1>Системные настройки</h1>
|
||||||
|
<h2>Параметры регистраторов</h2>
|
||||||
|
|
||||||
|
<div class="horizontal-line"></div>
|
||||||
|
|
||||||
|
<div class="parameters-inputs">
|
||||||
|
<div class="parameters-input">
|
||||||
|
<label for="system-date">Формат даты</label>
|
||||||
|
<select name="DATEMOD" id="system-date">
|
||||||
|
<option value="0">ММ-ДД-ГГГГ</option>
|
||||||
|
<option value="1">ГГГГ-ММ-ДД</option>
|
||||||
|
<option value="2">ДД-ММ-ГГГГ</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="parameters-input">
|
||||||
|
<label for="system-time">Формат времени</label>
|
||||||
|
<select name="TIMEFORMAT" id="system-time">
|
||||||
|
<option value="0">24 ч</option>
|
||||||
|
<option value="1">12 ч</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="parameters-input">
|
||||||
|
<label for="system-video">Формат видео</label>
|
||||||
|
<select name="VIDEOFORMAT" id="system-video">
|
||||||
|
<option value="0">0</option>
|
||||||
|
<option value="1">1</option>
|
||||||
|
<option value="2">2</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="parameters-input">
|
||||||
|
<label for="system-stream">Формат трансляции</label>
|
||||||
|
<select name="SUBSTREAMMODE" id="system-stream">
|
||||||
|
<option value="0">0</option>
|
||||||
|
<option value="1">1</option>
|
||||||
|
<option value="2">2</option>
|
||||||
|
<option value="3">3</option>
|
||||||
|
<option value="4">4</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="parameters-input">
|
||||||
|
<label for="system-language">Язык системы</label>
|
||||||
|
<select name="LANGUAGE" id="system-language">
|
||||||
|
<option value="1">Английский</option>
|
||||||
|
<option value="12">Русский</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="parameters-input">
|
||||||
|
<label for="system-geo">Определение геопозиции</label>
|
||||||
|
<select name="GEOMOD" id="system-geo">
|
||||||
|
<option value="0">GPS</option>
|
||||||
|
<option value="1">BEIDO</option>
|
||||||
|
<option value="2">GALILEO</option>
|
||||||
|
<option value="3">GLENAS</option>
|
||||||
|
<option value="4">Смешанное</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="horizontal-line"></div>
|
||||||
|
|
||||||
|
<h2 style="margin-bottom: 5px;">Отметьте то, что должно отображаться на трансляции</h2>
|
||||||
|
|
||||||
|
<input type="checkbox" id="TE" class="checkbox-input" hidden><label for="TE" class="checkbox-label"><div class="checkmark"></div>Время</label>
|
||||||
|
<input type="checkbox" id="SE" class="checkbox-input" hidden><label for="SE" class="checkbox-label"><div class="checkmark"></div>Скорость</label>
|
||||||
|
<input type="checkbox" id="VE" class="checkbox-input" hidden><label for="VE" class="checkbox-label"><div class="checkmark"></div>Номер ТС</label>
|
||||||
|
<input type="checkbox" id="GE" class="checkbox-input" hidden><label for="GE" class="checkbox-label"><div class="checkmark"></div>Координаты</label>
|
||||||
|
<input type="checkbox" id="NE" class="checkbox-input" hidden><label for="NE" class="checkbox-label"><div class="checkmark"></div>Названия камер</label>
|
||||||
|
|
||||||
|
<div class="horizontal-line"></div>
|
||||||
|
|
||||||
|
<button id="continue-parameters" onclick="sendPutRequest();" type="button">Сохранить</button>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
</section>
|
</section>
|
||||||
</section>
|
</section>
|
||||||
@ -450,6 +519,79 @@
|
|||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
// Функция для отправки PUT запроса
|
||||||
|
async function sendPutRequest() {
|
||||||
|
const dateModSelect = document.getElementById('system-date');
|
||||||
|
const timeFormatSelect = document.getElementById('system-time');
|
||||||
|
const videoFormatSelect = document.getElementById('system-video');
|
||||||
|
const streamFormatSelect = document.getElementById('system-stream');
|
||||||
|
const languageSelect = document.getElementById('system-language');
|
||||||
|
const geoModSelect = document.getElementById('system-geo');
|
||||||
|
|
||||||
|
// Извлекаем значения выбранных опций
|
||||||
|
const DATEMOD = dateModSelect.value;
|
||||||
|
const TIMEFORMAT = timeFormatSelect.value;
|
||||||
|
const VIDEOFORMAT = videoFormatSelect.value;
|
||||||
|
const SUBSTREAMMODE = streamFormatSelect.value;
|
||||||
|
const LANGUAGE = languageSelect.value;
|
||||||
|
const GEOMOD = geoModSelect.value;
|
||||||
|
|
||||||
|
// Извлекаем значения чекбоксов
|
||||||
|
const NE = document.getElementById('NE').checked ? 1 : 0;
|
||||||
|
const TE = document.getElementById('TE').checked ? 1 : 0;
|
||||||
|
const VE = document.getElementById('VE').checked ? 1 : 0;
|
||||||
|
const SE = document.getElementById('SE').checked ? 1 : 0;
|
||||||
|
const GE = document.getElementById('GE').checked ? 1 : 0;
|
||||||
|
|
||||||
|
|
||||||
|
const serial = $("#parameters-serial").val();
|
||||||
|
|
||||||
|
// Создаем объект данных для PUT запроса
|
||||||
|
const requestData = {
|
||||||
|
DATEMOD,
|
||||||
|
TIMEFORMAT,
|
||||||
|
VIDEOFORMAT,
|
||||||
|
SUBSTREAMMODE,
|
||||||
|
LANGUAGE,
|
||||||
|
GEOMOD,
|
||||||
|
NE,
|
||||||
|
TE,
|
||||||
|
VE,
|
||||||
|
SE,
|
||||||
|
GE,
|
||||||
|
};
|
||||||
|
|
||||||
|
// console.log(requestData);
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Отправляем PUT запрос
|
||||||
|
const response = await fetch(`/device-parameters?serial=${serial}`, {
|
||||||
|
method: 'PUT',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify(requestData),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
// PUT запрос выполнен успешно
|
||||||
|
var formContainer = $("#form-bg");
|
||||||
|
var form = $("#form");
|
||||||
|
formContainer.removeClass("active");
|
||||||
|
form.removeClass("form-animation");
|
||||||
|
$("body").css("overflow", "auto");
|
||||||
|
console.log('PUT запрос выполнен успешно');
|
||||||
|
// Здесь вы можете выполнить дополнительные действия, если необходимо
|
||||||
|
} else {
|
||||||
|
console.error('Ошибка при выполнении PUT запроса');
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Произошла ошибка при отправке PUT запроса:', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
const form = document.getElementById('edit-form');
|
const form = document.getElementById('edit-form');
|
||||||
const sendButton = document.getElementById('send-form');
|
const sendButton = document.getElementById('send-form');
|
||||||
@ -554,6 +696,8 @@
|
|||||||
content3.style.display = "none";
|
content3.style.display = "none";
|
||||||
content4.style.opacity = 0;
|
content4.style.opacity = 0;
|
||||||
content4.style.display = "none";
|
content4.style.display = "none";
|
||||||
|
content5.style.opacity = 0;
|
||||||
|
content5.style.display = "none";
|
||||||
|
|
||||||
document.getElementById("stage-details").checked = true;
|
document.getElementById("stage-details").checked = true;
|
||||||
|
|
||||||
@ -561,14 +705,57 @@
|
|||||||
formContainer.addClass("active");
|
formContainer.addClass("active");
|
||||||
form.addClass("form-animation");
|
form.addClass("form-animation");
|
||||||
$("body").css("overflow", "hidden");
|
$("body").css("overflow", "hidden");
|
||||||
|
|
||||||
|
const requestBody = {
|
||||||
|
"serial": $("#parameters-serial").val(),
|
||||||
|
"FIELDS": [
|
||||||
|
"DATEMOD",
|
||||||
|
"TIMEFORMAT",
|
||||||
|
"LANGUAGE",
|
||||||
|
"VIDEOFORMAT",
|
||||||
|
"GEOMOD",
|
||||||
|
"SUBSTREAMMODE",
|
||||||
|
"DISPLAYMENU"
|
||||||
|
]
|
||||||
|
};
|
||||||
|
|
||||||
|
console.log(requestBody);
|
||||||
|
|
||||||
|
// Отправляем POST-запрос
|
||||||
|
fetch('/device-parameters', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
body: JSON.stringify(requestBody)
|
||||||
|
})
|
||||||
|
.then(response => response.json())
|
||||||
|
.then(data => {
|
||||||
|
// Заполняем поля input данными из ответа
|
||||||
|
document.getElementById('system-date').value = data.DATEMOD;
|
||||||
|
document.getElementById('system-time').value = data.TIMEFORMAT;
|
||||||
|
document.getElementById('system-language').value = data.LANGUAGE;
|
||||||
|
document.getElementById('system-video').value = data.VIDEOFORMAT;
|
||||||
|
document.getElementById('system-geo').value = data.GEOMOD;
|
||||||
|
document.getElementById('system-stream').value = data.SUBSTREAMMODE;
|
||||||
|
document.getElementById('NE').checked = data.DISPLAYMENU.NE === 1;
|
||||||
|
document.getElementById('TE').checked = data.DISPLAYMENU.TE === 1;
|
||||||
|
document.getElementById('VE').checked = data.DISPLAYMENU.VE === 1;
|
||||||
|
document.getElementById('SE').checked = data.DISPLAYMENU.SE === 1;
|
||||||
|
document.getElementById('GE').checked = data.DISPLAYMENU.GE === 1;
|
||||||
|
})
|
||||||
|
.catch(error => console.error('Ошибка:', error));
|
||||||
},
|
},
|
||||||
error: function() {
|
error: function() {
|
||||||
// Обработка ошибки при запросе к серверу
|
// Обработка ошибки при запросе к серверу
|
||||||
alert("Произошла ошибка при запросе к серверу.");
|
alert("Произошла ошибка при запросе к серверу.");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
var formContainer = $("#form-bg");
|
var formContainer = $("#form-bg");
|
||||||
var form = $("#form");
|
var form = $("#form");
|
||||||
|
|||||||
@ -77,9 +77,10 @@
|
|||||||
<h1>Организация</h1>
|
<h1>Организация</h1>
|
||||||
|
|
||||||
<ul class="area">
|
<ul class="area">
|
||||||
<li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="name-1" class="checkbox-input" hidden checked><label for="name-1" class="checkbox-label">Группа 1</label>
|
{{#each Groups}}
|
||||||
|
<li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="{{name}}" class="checkbox-input" hidden checked><label for="{{name}}" class="checkbox-label">{{name}}</label>
|
||||||
<ul class="area-devices" id="devices-1">
|
<ul class="area-devices" id="devices-1">
|
||||||
{{#each Registrars}}
|
{{#each devices}}
|
||||||
<li class="device">
|
<li class="device">
|
||||||
<img>
|
<img>
|
||||||
<input type="checkbox" name="devices" id="{{this.id}}" class="checkbox-input device-filter" value="{{this.id}}" hidden checked>
|
<input type="checkbox" name="devices" id="{{this.id}}" class="checkbox-input device-filter" value="{{this.id}}" hidden checked>
|
||||||
@ -93,26 +94,14 @@
|
|||||||
</label>
|
</label>
|
||||||
</li>
|
</li>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
<!-- <li class="device"><img><input type="checkbox" id="0001" class="checkbox-input device-filter" value="0001" hidden checked><label for="0001" class="checkbox-label"><div class="checkmark"></div>0001</label></li>
|
|
||||||
<li class="device"><img><input type="checkbox" id="0002" class="checkbox-input device-filter" value="0002" hidden checked><label for="0002" class="checkbox-label"><div class="checkmark"></div>0002</label></li> -->
|
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<!-- <li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="name-2" class="checkbox-input" hidden checked><label for="name-2" class="checkbox-label">Группа 2</label>
|
{{/each}}
|
||||||
<ul class="area-devices" id="devices-2">
|
|
||||||
<li class="device"><img><input type="checkbox" id="0003" class="checkbox-input device-filter" value="0003" hidden checked><label for="0003" class="checkbox-label"><div class="checkmark"></div>0003</label></li>
|
|
||||||
<li class="device"><img><input type="checkbox" id="0004" class="checkbox-input device-filter" value="0004" hidden checked><label for="0004" class="checkbox-label"><div class="checkmark"></div>0004</label></li>
|
|
||||||
<li class="device"><img><input type="checkbox" id="0005" class="checkbox-input device-filter" value="0005" hidden checked><label for="0005" class="checkbox-label"><div class="checkmark"></div>0005</label></li>
|
|
||||||
<li class="device"><img><input type="checkbox" id="0006" class="checkbox-input device-filter" value="0006" hidden checked><label for="0006" class="checkbox-label"><div class="checkmark"></div>0006</label></li>
|
|
||||||
</ul>
|
|
||||||
</li>
|
|
||||||
<li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="name-3" class="checkbox-input" hidden checked><label for="name-3" class="checkbox-label">Другое</label>
|
|
||||||
<ul class="area-devices" id="devices-3">
|
|
||||||
<li class="device"><img><input type="checkbox" id="0007" class="checkbox-input device-filter" value="0007" hidden checked><label for="0007" class="checkbox-label"><div class="checkmark"></div>0007</label></li>
|
|
||||||
</ul>
|
|
||||||
</li> -->
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<div id="video-popup" class="video-popup">
|
<div id="video-popup" class="video-popup">
|
||||||
@ -200,6 +189,57 @@
|
|||||||
|
|
||||||
<script src="../scripts/jquery.min.js"></script>
|
<script src="../scripts/jquery.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/flv.js/1.5.0/flv.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/flv.js/1.5.0/flv.min.js"></script>
|
||||||
|
<script>
|
||||||
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
|
const areaNames = document.querySelectorAll('.area-name');
|
||||||
|
|
||||||
|
areaNames.forEach(function (areaName) {
|
||||||
|
const areaCheckbox = areaName.querySelector('.checkbox-input');
|
||||||
|
const deviceCheckboxes = areaName.querySelectorAll('.device .checkbox-input');
|
||||||
|
const deviceList = areaName.querySelector('.area-devices');
|
||||||
|
|
||||||
|
// Функция для скрытия/показа дочерних элементов
|
||||||
|
function toggleChildDevices(show) {
|
||||||
|
if (show) {
|
||||||
|
deviceList.style.display = 'block';
|
||||||
|
} else {
|
||||||
|
deviceList.style.display = 'none';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Инициализация состояния чекбоксов и скрытия/показа дочерних элементов
|
||||||
|
toggleChildDevices(areaCheckbox.checked);
|
||||||
|
deviceCheckboxes.forEach(function (deviceCheckbox) {
|
||||||
|
deviceCheckbox.checked = areaCheckbox.checked;
|
||||||
|
});
|
||||||
|
|
||||||
|
areaCheckbox.addEventListener('change', function () {
|
||||||
|
const isChecked = areaCheckbox.checked;
|
||||||
|
deviceCheckboxes.forEach(function (deviceCheckbox) {
|
||||||
|
deviceCheckbox.checked = isChecked;
|
||||||
|
});
|
||||||
|
toggleChildDevices(isChecked);
|
||||||
|
});
|
||||||
|
|
||||||
|
deviceCheckboxes.forEach(function (deviceCheckbox) {
|
||||||
|
deviceCheckbox.addEventListener('change', function () {
|
||||||
|
const allUnchecked = Array.from(deviceCheckboxes).every(function (checkbox) {
|
||||||
|
return !checkbox.checked;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (allUnchecked) {
|
||||||
|
areaCheckbox.checked = false;
|
||||||
|
toggleChildDevices(false);
|
||||||
|
} else {
|
||||||
|
areaCheckbox.checked = true;
|
||||||
|
toggleChildDevices(true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
</script>
|
||||||
<script>
|
<script>
|
||||||
var cameraSerials = document.querySelectorAll('.radio-input');
|
var cameraSerials = document.querySelectorAll('.radio-input');
|
||||||
|
|
||||||
@ -367,7 +407,8 @@ const selectedDevices = Array.from(checkboxes)
|
|||||||
.map(checkbox => checkbox.value);
|
.map(checkbox => checkbox.value);
|
||||||
|
|
||||||
checkboxes.forEach(checkbox => {
|
checkboxes.forEach(checkbox => {
|
||||||
checkbox.addEventListener('change', function() {
|
checkbox.addEventListener('change', async function() {
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 100));
|
||||||
selectedDevices.length = 0; // Очищаем массив
|
selectedDevices.length = 0; // Очищаем массив
|
||||||
selectedDevices.push(...Array.from(checkboxes)
|
selectedDevices.push(...Array.from(checkboxes)
|
||||||
.filter(checkbox => checkbox.checked && checkbox.value !== 'on')
|
.filter(checkbox => checkbox.checked && checkbox.value !== 'on')
|
||||||
@ -381,9 +422,6 @@ const selectedDevices = Array.from(checkboxes)
|
|||||||
function addMarker(device) {
|
function addMarker(device) {
|
||||||
const { serial, status, longitude, latitude, direction, speed } = device;
|
const { serial, status, longitude, latitude, direction, speed } = device;
|
||||||
|
|
||||||
console.log(serial, status, longitude, latitude, direction, speed)
|
|
||||||
console.log("Trying add marker")
|
|
||||||
|
|
||||||
|
|
||||||
if (serial === $("input[name=camera-serial]:checked").val()) {
|
if (serial === $("input[name=camera-serial]:checked").val()) {
|
||||||
var marker = L.divIcon({
|
var marker = L.divIcon({
|
||||||
@ -447,7 +485,7 @@ var markerObj = L.marker([latitude, longitude], { icon: marker });
|
|||||||
console.log(selectedDevice);
|
console.log(selectedDevice);
|
||||||
|
|
||||||
if (selectedDevice) {
|
if (selectedDevice) {
|
||||||
// groupElement.textContent = selectedDevice.group;
|
groupElement.textContent = selectedDevice.group;
|
||||||
speedElement.textContent = selectedDevice.speed + ' км/ч';
|
speedElement.textContent = selectedDevice.speed + ' км/ч';
|
||||||
plateElement.textContent = selectedDevice.plate;
|
plateElement.textContent = selectedDevice.plate;
|
||||||
geoElement.textContent = `${selectedDevice.latitude.toFixed(6)}, ${selectedDevice.longitude.toFixed(6)}`;
|
geoElement.textContent = `${selectedDevice.latitude.toFixed(6)}, ${selectedDevice.longitude.toFixed(6)}`;
|
||||||
@ -576,5 +614,7 @@ closeVideoPopup();
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@ -74,25 +74,15 @@
|
|||||||
<h1>Организация</h1>
|
<h1>Организация</h1>
|
||||||
|
|
||||||
<ul class="area">
|
<ul class="area">
|
||||||
<!-- <li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="name-1" class="checkbox-input" hidden checked><label for="name-1" class="checkbox-label">Группа 1</label>
|
{{#each Groups}}
|
||||||
|
<li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="{{name}}" class="checkbox-input" hidden checked><label for="{{name}}" class="checkbox-label">{{name}}</label>
|
||||||
<ul class="area-devices" id="devices-1">
|
<ul class="area-devices" id="devices-1">
|
||||||
<li class="device"><img><input type="checkbox" id="0001" class="checkbox-input device-filter" value="0001" hidden checked><label for="0001" class="checkbox-label"><div class="checkmark"></div>0001</label></li>
|
{{#each serials}}
|
||||||
<li class="device"><img><input type="checkbox" id="0002" class="checkbox-input device-filter" value="0002" hidden checked><label for="0002" class="checkbox-label"><div class="checkmark"></div>0002</label></li>
|
<li class="device"><img><input type="checkbox" id="{{this}}" class="checkbox-input device-filter" value="{{this}}" hidden checked><label for="{{this}}" class="checkbox-label"><div class="checkmark"></div>{{this}}</label></li>
|
||||||
|
{{/each}}
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="name-2" class="checkbox-input" hidden checked><label for="name-2" class="checkbox-label">Группа 2</label>
|
{{/each}}
|
||||||
<ul class="area-devices" id="devices-2">
|
|
||||||
<li class="device"><img><input type="checkbox" id="0003" class="checkbox-input device-filter" value="0003" hidden checked><label for="0003" class="checkbox-label"><div class="checkmark"></div>0003</label></li>
|
|
||||||
<li class="device"><img><input type="checkbox" id="0004" class="checkbox-input device-filter" value="0004" hidden checked><label for="0004" class="checkbox-label"><div class="checkmark"></div>0004</label></li>
|
|
||||||
<li class="device"><img><input type="checkbox" id="0005" class="checkbox-input device-filter" value="0005" hidden checked><label for="0005" class="checkbox-label"><div class="checkmark"></div>0005</label></li>
|
|
||||||
<li class="device"><img><input type="checkbox" id="0006" class="checkbox-input device-filter" value="0006" hidden checked><label for="0006" class="checkbox-label"><div class="checkmark"></div>0006</label></li>
|
|
||||||
</ul>
|
|
||||||
</li>
|
|
||||||
<li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="name-3" class="checkbox-input" hidden checked><label for="name-3" class="checkbox-label">Другое</label>
|
|
||||||
<ul class="area-devices" id="devices-3">
|
|
||||||
<li class="device"><img><input type="checkbox" id="0007" class="checkbox-input device-filter" value="0007" hidden checked><label for="0007" class="checkbox-label"><div class="checkmark"></div>0007</label></li>
|
|
||||||
</ul>
|
|
||||||
</li> -->
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<div class="area-time-range">
|
<div class="area-time-range">
|
||||||
|
|||||||
@ -53,6 +53,23 @@
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="main">
|
<section class="main">
|
||||||
|
<section style="display: none;" class="dberror" id="exportLoading" >
|
||||||
|
<div class="erorr-container">
|
||||||
|
<div id="loader" class="loader">
|
||||||
|
<div class="square" id="sq1"></div>
|
||||||
|
<div class="square" id="sq2"></div>
|
||||||
|
<div class="square" id="sq3"></div>
|
||||||
|
<div class="square" id="sq4"></div>
|
||||||
|
<div class="square" id="sq5"></div>
|
||||||
|
<div class="square" id="sq6"></div>
|
||||||
|
<div class="square" id="sq7"></div>
|
||||||
|
<div class="square" id="sq8"></div>
|
||||||
|
<div class="square" id="sq9"></div>
|
||||||
|
</div>
|
||||||
|
<h1>Подготовка видео</h1> <br>
|
||||||
|
<span id="status">Пожалуйста, подождите..</span>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
{{#if ifDBError}}
|
{{#if ifDBError}}
|
||||||
<section class="dberror">
|
<section class="dberror">
|
||||||
<div class="erorr-container">
|
<div class="erorr-container">
|
||||||
@ -72,15 +89,16 @@
|
|||||||
</nav>
|
</nav>
|
||||||
<section class="bg">
|
<section class="bg">
|
||||||
<section class="content">
|
<section class="content">
|
||||||
<section class="for-table">
|
<section style="min-height: 800px;" class="for-table">
|
||||||
|
|
||||||
<section class="organisation">
|
<section class="organisation">
|
||||||
<h1>Организация</h1>
|
<h1>Организация</h1>
|
||||||
|
|
||||||
<ul class="area">
|
<ul class="area">
|
||||||
<li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="name-1" class="checkbox-input" hidden checked><label for="name-1" class="checkbox-label">Группа 1</label>
|
{{#each Groups}}
|
||||||
|
<li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="{{name}}" class="checkbox-input" hidden checked><label for="{{name}}" class="checkbox-label">{{name}}</label>
|
||||||
<ul class="area-devices" id="devices-1">
|
<ul class="area-devices" id="devices-1">
|
||||||
{{#each Registrars}}
|
{{#each devices}}
|
||||||
<li class="device">
|
<li class="device">
|
||||||
<img>
|
<img>
|
||||||
<input type="radio" name="camera-serial" id="radio-{{this.serial}}" class="radio-input" value="{{this.serial}}" hidden>
|
<input type="radio" name="camera-serial" id="radio-{{this.serial}}" class="radio-input" value="{{this.serial}}" hidden>
|
||||||
@ -91,6 +109,7 @@
|
|||||||
{{/each}}
|
{{/each}}
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
{{/each}}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
@ -101,16 +120,16 @@
|
|||||||
<section class="table" style="position: relative;">
|
<section class="table" style="position: relative;">
|
||||||
|
|
||||||
<div class="map">
|
<div class="map">
|
||||||
<div id="properties" class="properties" style="display: none;">
|
<!-- <div id="properties" class="properties" style="display: none;">
|
||||||
<div class="propert"><h1>Группа</h1><br><h2 id="propert-group">Автобусы</h2></div>
|
<div class="propert"><h1>Группа</h1><br><h2 id="propert-group">Автобусы</h2></div>
|
||||||
<div class="propert"><h1>Скорость</h1><br><h2 id="propert-speed"> км/ч</h2></div>
|
<div class="propert"><h1>Скорость</h1><br><h2 id="propert-speed"> км/ч</h2></div>
|
||||||
<div class="propert"><h1>Номерной знак</h1><br><h2 id="propert-plate"></h2></div>
|
<div class="propert"><h1>Номерной знак</h1><br><h2 id="propert-plate"></h2></div>
|
||||||
<div class="propert"><h1>Геопозиция</h1><br><h2 id="propert-geo"></h2></div>
|
<div class="propert"><h1>Геопозиция</h1><br><h2 id="propert-geo"></h2></div>
|
||||||
</div>
|
</div> -->
|
||||||
<div id="map"></div>
|
<div id="map"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="cameras">
|
<div id="cameras" class="cameras">
|
||||||
<div class="video-container">
|
<div class="video-container">
|
||||||
<div id="camera-1" onclick="playVideo(1);">
|
<div id="camera-1" onclick="playVideo(1);">
|
||||||
<img src="../../img/play-circle.svg">
|
<img src="../../img/play-circle.svg">
|
||||||
@ -254,6 +273,58 @@
|
|||||||
<script src="../scripts/jquery.min.js"></script>
|
<script src="../scripts/jquery.min.js"></script>
|
||||||
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
|
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
|
const areaNames = document.querySelectorAll('.area-name');
|
||||||
|
|
||||||
|
areaNames.forEach(function (areaName) {
|
||||||
|
const areaCheckbox = areaName.querySelector('.checkbox-input');
|
||||||
|
const deviceCheckboxes = areaName.querySelectorAll('.device .checkbox-input');
|
||||||
|
const deviceList = areaName.querySelector('.area-devices');
|
||||||
|
|
||||||
|
// Функция для скрытия/показа дочерних элементов
|
||||||
|
function toggleChildDevices(show) {
|
||||||
|
if (show) {
|
||||||
|
deviceList.style.display = 'block';
|
||||||
|
} else {
|
||||||
|
deviceList.style.display = 'none';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Инициализация состояния чекбоксов и скрытия/показа дочерних элементов
|
||||||
|
toggleChildDevices(areaCheckbox.checked);
|
||||||
|
deviceCheckboxes.forEach(function (deviceCheckbox) {
|
||||||
|
deviceCheckbox.checked = areaCheckbox.checked;
|
||||||
|
});
|
||||||
|
|
||||||
|
areaCheckbox.addEventListener('change', function () {
|
||||||
|
const isChecked = areaCheckbox.checked;
|
||||||
|
deviceCheckboxes.forEach(function (deviceCheckbox) {
|
||||||
|
deviceCheckbox.checked = isChecked;
|
||||||
|
});
|
||||||
|
toggleChildDevices(isChecked);
|
||||||
|
});
|
||||||
|
|
||||||
|
deviceCheckboxes.forEach(function (deviceCheckbox) {
|
||||||
|
deviceCheckbox.addEventListener('change', function () {
|
||||||
|
const allUnchecked = Array.from(deviceCheckboxes).every(function (checkbox) {
|
||||||
|
return !checkbox.checked;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (allUnchecked) {
|
||||||
|
areaCheckbox.checked = false;
|
||||||
|
toggleChildDevices(false);
|
||||||
|
} else {
|
||||||
|
areaCheckbox.checked = true;
|
||||||
|
toggleChildDevices(true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
function combineDateTime(dateString, timeString) {
|
function combineDateTime(dateString, timeString) {
|
||||||
const date = new Date(dateString);
|
const date = new Date(dateString);
|
||||||
@ -280,6 +351,7 @@ var selectedChannel = 1;
|
|||||||
|
|
||||||
|
|
||||||
async function sendPostRequest() {
|
async function sendPostRequest() {
|
||||||
|
document.getElementById("cameras").style.opacity = "30%";
|
||||||
// Получение данных из полей ввода
|
// Получение данных из полей ввода
|
||||||
const selectedDate = document.getElementById("selectedDate").value;
|
const selectedDate = document.getElementById("selectedDate").value;
|
||||||
const videoTime = document.getElementById("video-time").value;
|
const videoTime = document.getElementById("video-time").value;
|
||||||
@ -296,6 +368,8 @@ async function sendPostRequest() {
|
|||||||
|
|
||||||
HasData = data.success;
|
HasData = data.success;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (data.success) {
|
if (data.success) {
|
||||||
console.log(`Данные доступны. DATAID: ${data.dataId}`)
|
console.log(`Данные доступны. DATAID: ${data.dataId}`)
|
||||||
recordID = data.dataId;
|
recordID = data.dataId;
|
||||||
@ -304,6 +378,8 @@ async function sendPostRequest() {
|
|||||||
datetime: combinedDateTime,
|
datetime: combinedDateTime,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
fetch("/getspeedarchive", {
|
fetch("/getspeedarchive", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
@ -314,6 +390,8 @@ async function sendPostRequest() {
|
|||||||
.then((response) => response.json())
|
.then((response) => response.json())
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
|
|
||||||
|
document.getElementById("cameras").style.opacity = "100%";
|
||||||
|
|
||||||
const existingChart = Chart.getChart("speed");
|
const existingChart = Chart.getChart("speed");
|
||||||
|
|
||||||
if (existingChart) {
|
if (existingChart) {
|
||||||
@ -570,6 +648,7 @@ endVideoTimeInput.addEventListener("change", sendPostRequest);
|
|||||||
|
|
||||||
|
|
||||||
async function playVideo(channel) {
|
async function playVideo(channel) {
|
||||||
|
document.getElementById("exportLoading").style.display = 'flex';
|
||||||
const selectedDevice = document.querySelector('input[name="camera-serial"]:checked');
|
const selectedDevice = document.querySelector('input[name="camera-serial"]:checked');
|
||||||
if (!selectedDevice) {
|
if (!selectedDevice) {
|
||||||
alert('Пожалуйста, выберите устройство из списка.');
|
alert('Пожалуйста, выберите устройство из списка.');
|
||||||
@ -591,14 +670,12 @@ endVideoTimeInput.addEventListener("change", sendPostRequest);
|
|||||||
const endTime = formatTime(endTimeInput.value);
|
const endTime = formatTime(endTimeInput.value);
|
||||||
const selectedDate = formatDate(selectedDateInput.value);
|
const selectedDate = formatDate(selectedDateInput.value);
|
||||||
|
|
||||||
selectedChannel = channel;
|
|
||||||
|
|
||||||
const reqDate = document.getElementById("selectedDate").value;
|
const reqDate = document.getElementById("selectedDate").value;
|
||||||
const reqTime = document.getElementById("video-time").value;
|
const reqTime = document.getElementById("video-time").value;
|
||||||
const reqSerial = document.querySelector('input[name="camera-serial"]:checked').value;
|
const reqSerial = document.querySelector('input[name="camera-serial"]:checked').value;
|
||||||
|
|
||||||
|
|
||||||
const finalResponse = await fetch(`/getData?serial=${reqSerial}&selectedDate=${formatDate(reqDate)}&selectedTime=${formatTime(reqTime)}&selectedChannel=${selectedChannel}`);
|
const finalResponse = await fetch(`/getData?serial=${reqSerial}&selectedDate=${formatDate(reqDate)}&selectedTime=${formatTime(reqTime)}&selectedChannel=${channel}`);
|
||||||
|
|
||||||
const resData = await finalResponse.json();
|
const resData = await finalResponse.json();
|
||||||
|
|
||||||
@ -606,6 +683,7 @@ endVideoTimeInput.addEventListener("change", sendPostRequest);
|
|||||||
const serial = selectedDevice.value;
|
const serial = selectedDevice.value;
|
||||||
|
|
||||||
const url = `http://localhost:8081/export?url=http%3A%2F%2Fkrbl.ru%3A8080%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%2Fkrbl.ru%3A8080%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');
|
window.open(url, '_blank');
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -72,15 +72,16 @@
|
|||||||
</nav>
|
</nav>
|
||||||
<section class="bg">
|
<section class="bg">
|
||||||
<section class="content">
|
<section class="content">
|
||||||
<section class="for-table">
|
<section style="min-height: 800px;" class="for-table">
|
||||||
|
|
||||||
<section class="organisation">
|
<section class="organisation">
|
||||||
<h1>Организация</h1>
|
<h1>Организация</h1>
|
||||||
|
|
||||||
<ul class="area">
|
<ul class="area">
|
||||||
<li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="name-1" class="checkbox-input" hidden checked><label for="name-1" class="checkbox-label">Группа 1</label>
|
{{#each Groups}}
|
||||||
|
<li class="area-name"><img src="../img/ul.svg"><input type="checkbox" id="{{name}}" class="checkbox-input" hidden checked><label for="{{name}}" class="checkbox-label">{{name}}</label>
|
||||||
<ul class="area-devices" id="devices-1">
|
<ul class="area-devices" id="devices-1">
|
||||||
{{#each Registrars}}
|
{{#each devices}}
|
||||||
<li class="device">
|
<li class="device">
|
||||||
<img>
|
<img>
|
||||||
<input type="radio" name="camera-serial" id="radio-{{this.serial}}" class="radio-input" value="{{this.serial}}" hidden>
|
<input type="radio" name="camera-serial" id="radio-{{this.serial}}" class="radio-input" value="{{this.serial}}" hidden>
|
||||||
@ -91,6 +92,7 @@
|
|||||||
{{/each}}
|
{{/each}}
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
{{/each}}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
@ -101,16 +103,16 @@
|
|||||||
<section class="table" style="position: relative;">
|
<section class="table" style="position: relative;">
|
||||||
|
|
||||||
<div class="map">
|
<div class="map">
|
||||||
<div id="properties" class="properties" style="display: none;">
|
<!-- <div id="properties" class="properties" style="display: none;">
|
||||||
<div class="propert"><h1>Группа</h1><br><h2 id="propert-group">Автобусы</h2></div>
|
<div class="propert"><h1>Группа</h1><br><h2 id="propert-group">Автобусы</h2></div>
|
||||||
<div class="propert"><h1>Скорость</h1><br><h2 id="propert-speed"> км/ч</h2></div>
|
<div class="propert"><h1>Скорость</h1><br><h2 id="propert-speed"> км/ч</h2></div>
|
||||||
<div class="propert"><h1>Номерной знак</h1><br><h2 id="propert-plate"></h2></div>
|
<div class="propert"><h1>Номерной знак</h1><br><h2 id="propert-plate"></h2></div>
|
||||||
<div class="propert"><h1>Геопозиция</h1><br><h2 id="propert-geo"></h2></div>
|
<div class="propert"><h1>Геопозиция</h1><br><h2 id="propert-geo"></h2></div>
|
||||||
</div>
|
</div> -->
|
||||||
<div id="map"></div>
|
<div id="map"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="cameras">
|
<div class="cameras" id="cameras">
|
||||||
<div class="video-container">
|
<div class="video-container">
|
||||||
<div id="camera-1" onclick="playVideo(1);">
|
<div id="camera-1" onclick="playVideo(1);">
|
||||||
<img src="../../img/play-circle.svg">
|
<img src="../../img/play-circle.svg">
|
||||||
@ -251,6 +253,58 @@
|
|||||||
<script src="../scripts/jquery.min.js"></script>
|
<script src="../scripts/jquery.min.js"></script>
|
||||||
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
|
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
|
const areaNames = document.querySelectorAll('.area-name');
|
||||||
|
|
||||||
|
areaNames.forEach(function (areaName) {
|
||||||
|
const areaCheckbox = areaName.querySelector('.checkbox-input');
|
||||||
|
const deviceCheckboxes = areaName.querySelectorAll('.device .checkbox-input');
|
||||||
|
const deviceList = areaName.querySelector('.area-devices');
|
||||||
|
|
||||||
|
// Функция для скрытия/показа дочерних элементов
|
||||||
|
function toggleChildDevices(show) {
|
||||||
|
if (show) {
|
||||||
|
deviceList.style.display = 'block';
|
||||||
|
} else {
|
||||||
|
deviceList.style.display = 'none';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Инициализация состояния чекбоксов и скрытия/показа дочерних элементов
|
||||||
|
toggleChildDevices(areaCheckbox.checked);
|
||||||
|
deviceCheckboxes.forEach(function (deviceCheckbox) {
|
||||||
|
deviceCheckbox.checked = areaCheckbox.checked;
|
||||||
|
});
|
||||||
|
|
||||||
|
areaCheckbox.addEventListener('change', function () {
|
||||||
|
const isChecked = areaCheckbox.checked;
|
||||||
|
deviceCheckboxes.forEach(function (deviceCheckbox) {
|
||||||
|
deviceCheckbox.checked = isChecked;
|
||||||
|
});
|
||||||
|
toggleChildDevices(isChecked);
|
||||||
|
});
|
||||||
|
|
||||||
|
deviceCheckboxes.forEach(function (deviceCheckbox) {
|
||||||
|
deviceCheckbox.addEventListener('change', function () {
|
||||||
|
const allUnchecked = Array.from(deviceCheckboxes).every(function (checkbox) {
|
||||||
|
return !checkbox.checked;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (allUnchecked) {
|
||||||
|
areaCheckbox.checked = false;
|
||||||
|
toggleChildDevices(false);
|
||||||
|
} else {
|
||||||
|
areaCheckbox.checked = true;
|
||||||
|
toggleChildDevices(true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
function combineDateTime(dateString, timeString) {
|
function combineDateTime(dateString, timeString) {
|
||||||
const date = new Date(dateString);
|
const date = new Date(dateString);
|
||||||
@ -274,6 +328,7 @@ let HasData;
|
|||||||
var selectedChannel = 1;
|
var selectedChannel = 1;
|
||||||
|
|
||||||
async function sendPostRequest() {
|
async function sendPostRequest() {
|
||||||
|
document.getElementById("cameras").style.opacity = "30%";
|
||||||
// Получение данных из полей ввода
|
// Получение данных из полей ввода
|
||||||
const selectedDate = document.getElementById("selectedDate").value;
|
const selectedDate = document.getElementById("selectedDate").value;
|
||||||
const videoTime = document.getElementById("video-time").value;
|
const videoTime = document.getElementById("video-time").value;
|
||||||
@ -305,6 +360,8 @@ async function sendPostRequest() {
|
|||||||
.then((response) => response.json())
|
.then((response) => response.json())
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
|
|
||||||
|
document.getElementById("cameras").style.opacity = "100%";
|
||||||
|
|
||||||
const existingChart = Chart.getChart("speed");
|
const existingChart = Chart.getChart("speed");
|
||||||
|
|
||||||
if (existingChart) {
|
if (existingChart) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user