mirror of
https://github.com/IoTManagerProject/IoTManagerWeb.git
synced 2026-03-26 23:12:34 +03:00
исправление серьезного бага графиков
This commit is contained in:
@@ -145,6 +145,8 @@
|
|||||||
//***********************************************************navigation********************************************************/
|
//***********************************************************navigation********************************************************/
|
||||||
let currentPageName = undefined;
|
let currentPageName = undefined;
|
||||||
|
|
||||||
|
var chartJsonBlobArray = [];
|
||||||
|
let chartTopic;
|
||||||
var chartJsonBlob = new MyBlobBuilder();
|
var chartJsonBlob = new MyBlobBuilder();
|
||||||
var layoutJsonBlobArray = [];
|
var layoutJsonBlobArray = [];
|
||||||
|
|
||||||
@@ -448,13 +450,17 @@
|
|||||||
}
|
}
|
||||||
//сборщик chartJson пакетов
|
//сборщик chartJson пакетов
|
||||||
if (data.includes("/st/chart.json|")) {
|
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|")) {
|
if (data.includes("/end/chart.json|")) {
|
||||||
let json = JSON.parse(deleteBeforeDelimiter(data, "|"));
|
let json = JSON.parse(deleteBeforeDelimiter(data, "|"));
|
||||||
|
chartTopic = json.topic;
|
||||||
|
chartJsonFlag[chartTopic] = false;
|
||||||
|
|
||||||
console.log("[i] chart blob", json.topic, json.maxCount);
|
console.log("[i] chart blob", json.topic, json.maxCount);
|
||||||
chartJsonFlag[ws] = false;
|
var bb = chartJsonBlobArray[chartTopic].getBlob();
|
||||||
var bb = chartJsonBlob.getBlob();
|
|
||||||
let chartJsonReader = new FileReader();
|
let chartJsonReader = new FileReader();
|
||||||
chartJsonReader.readAsText(bb);
|
chartJsonReader.readAsText(bb);
|
||||||
chartJsonReader.onload = () => {
|
chartJsonReader.onload = () => {
|
||||||
@@ -504,7 +510,10 @@
|
|||||||
if (scenarioJsonPacket) scenarioJsonPacket.append(event.data);
|
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 (!layoutJsonBlobArray[ws]) layoutJsonBlobArray[ws] = new MyBlobBuilder();
|
||||||
if (layoutJsonFlag[ws]) layoutJsonBlobArray[ws].append(event.data);
|
if (layoutJsonFlag[ws]) layoutJsonBlobArray[ws].append(event.data);
|
||||||
@@ -805,6 +814,7 @@
|
|||||||
itemsJson = [];
|
itemsJson = [];
|
||||||
layoutJson = [];
|
layoutJson = [];
|
||||||
layoutJsonBlobArray = [];
|
layoutJsonBlobArray = [];
|
||||||
|
chartJsonBlobArray = [];
|
||||||
|
|
||||||
scenarioTxt = "";
|
scenarioTxt = "";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user