mirror of
https://github.com/IoTManagerProject/IoTManagerWeb.git
synced 2026-03-26 23:12:34 +03:00
исправление бага мульти интерфейса
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user