исправление бага мульти интерфейса

This commit is contained in:
Dmitry Borisenko
2022-09-01 01:56:23 +02:00
parent 054de71fbc
commit ca9d305593
3 changed files with 25 additions and 22 deletions

View File

@@ -4,7 +4,7 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>IoT Manager 4.2.1</title>
<title>IoT Manager 4.2.2</title>
<link rel="icon" type="image/png" href="/favicon.ico" />
<link rel="stylesheet" href="/build/bundle.css" />

View File

@@ -468,7 +468,7 @@
if (IsJsonParse(data)) {
let statusJson = JSON.parse(data);
udateStatusOfWidget(statusJson);
if (debug) console.log("[i]", statusJson);
if (debug) console.log("[i] status:", statusJson);
}
}
}

View File

@@ -1,6 +1,5 @@
<script>
import Chart from "svelte-frappe-charts";
import Modal from "../components/Modal.svelte";
export let widget;
@@ -33,27 +32,31 @@
$: widget.status, collectDataToArr();
function collectDataToArr() {
//отсекаем лишние события изменения переменной widget
if (prevSatus !== widget.status) {
console.log("[i]", "collecting chart data");
let incomingDataArr = widget.status;
collectingDataArray = [...collectingDataArray, ...incomingDataArr];
if (Array.isArray(widget.status)) {
//отсекаем лишние события изменения переменной widget
if (prevSatus !== widget.status) {
console.log("[i]", "collecting chart data, topic:", widget.topic);
let incomingDataArr = widget.status;
//console.log("[i]", incomingDataArr);
collectingDataArray = [...collectingDataArray, ...incomingDataArr];
for (let i = 0; i < collectingDataArray.length; i++) {
labels[i] = getHHMM(collectingDataArray[i].x);
values[i] = [collectingDataArray[i].y1];
for (let i = 0; i < collectingDataArray.length; i++) {
labels[i] = getHHMM(collectingDataArray[i].x);
values[i] = [collectingDataArray[i].y1];
}
datachart = {
labels: labels,
datasets: [
{
name: widget.descr,
values: values,
},
],
};
prevSatus = widget.status;
datachart = datachart;
}
datachart = {
labels: labels,
datasets: [
{
name: widget.descr,
values: values,
},
],
};
prevSatus = widget.status;
}
}