iotmanager/IoTManagerWeb
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManagerWeb.git synced 2026-03-26 15:02:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

исправление серьезного бага графиков

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-10-01 03:07:09 +02:00
parent 6ef976187c
commit 9e5c1e74bd
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/App.svelte
View File

@@ -145,6 +145,8 @@
//***********************************************************navigation********************************************************/
let currentPageName = undefined;
var chartJsonBlobArray = [];
let chartTopic;
var chartJsonBlob = new MyBlobBuilder();
var layoutJsonBlobArray = [];
@@ -448,13 +450,17 @@
}
//сборщик chartJson пакетов
if (data.includes("/st/chart.json|")) {
chartJsonFlag[ws] = true;
let json = JSON.parse(deleteBeforeDelimiter(data, "|"));
chartTopic = json.topic;
chartJsonFlag[chartTopic] = true;
}
if (data.includes("/end/chart.json|")) {
let json = JSON.parse(deleteBeforeDelimiter(data, "|"));
chartTopic = json.topic;
chartJsonFlag[chartTopic] = false;
console.log("[i] chart blob", json.topic, json.maxCount);
chartJsonFlag[ws] = false;
var bb = chartJsonBlob.getBlob();
var bb = chartJsonBlobArray[chartTopic].getBlob();
let chartJsonReader = new FileReader();
chartJsonReader.readAsText(bb);
chartJsonReader.onload = () => {
@@ -504,7 +510,10 @@
if (scenarioJsonPacket) scenarioJsonPacket.append(event.data);
}
//принимаем данные от всех устройств
if (chartJsonFlag[ws]) chartJsonBlob.append(event.data);
//if (chartJsonFlag[ws]) chartJsonBlob.append(event.data);
if (!chartJsonBlobArray[chartTopic]) chartJsonBlobArray[chartTopic] = new MyBlobBuilder();
if (chartJsonFlag[chartTopic]) chartJsonBlobArray[chartTopic].append(event.data);
if (!layoutJsonBlobArray[ws]) layoutJsonBlobArray[ws] = new MyBlobBuilder();
if (layoutJsonFlag[ws]) layoutJsonBlobArray[ws].append(event.data);
@@ -805,6 +814,7 @@
itemsJson = [];
layoutJson = [];
layoutJsonBlobArray = [];
chartJsonBlobArray = [];
scenarioTxt = "";