mirror of
https://github.com/IoTManagerProject/IoTManagerWeb.git
synced 2026-03-26 23:12:34 +03:00
исправление бага мульти интерфейса
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<meta name="viewport" content="width=device-width,initial-scale=1" />
|
<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="icon" type="image/png" href="/favicon.ico" />
|
||||||
<link rel="stylesheet" href="/build/bundle.css" />
|
<link rel="stylesheet" href="/build/bundle.css" />
|
||||||
|
|||||||
@@ -468,7 +468,7 @@
|
|||||||
if (IsJsonParse(data)) {
|
if (IsJsonParse(data)) {
|
||||||
let statusJson = JSON.parse(data);
|
let statusJson = JSON.parse(data);
|
||||||
udateStatusOfWidget(statusJson);
|
udateStatusOfWidget(statusJson);
|
||||||
if (debug) console.log("[i]", statusJson);
|
if (debug) console.log("[i] status:", statusJson);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
<script>
|
<script>
|
||||||
import Chart from "svelte-frappe-charts";
|
import Chart from "svelte-frappe-charts";
|
||||||
import Modal from "../components/Modal.svelte";
|
|
||||||
|
|
||||||
export let widget;
|
export let widget;
|
||||||
|
|
||||||
@@ -33,10 +32,12 @@
|
|||||||
$: widget.status, collectDataToArr();
|
$: widget.status, collectDataToArr();
|
||||||
|
|
||||||
function collectDataToArr() {
|
function collectDataToArr() {
|
||||||
|
if (Array.isArray(widget.status)) {
|
||||||
//отсекаем лишние события изменения переменной widget
|
//отсекаем лишние события изменения переменной widget
|
||||||
if (prevSatus !== widget.status) {
|
if (prevSatus !== widget.status) {
|
||||||
console.log("[i]", "collecting chart data");
|
console.log("[i]", "collecting chart data, topic:", widget.topic);
|
||||||
let incomingDataArr = widget.status;
|
let incomingDataArr = widget.status;
|
||||||
|
//console.log("[i]", incomingDataArr);
|
||||||
collectingDataArray = [...collectingDataArray, ...incomingDataArr];
|
collectingDataArray = [...collectingDataArray, ...incomingDataArr];
|
||||||
|
|
||||||
for (let i = 0; i < collectingDataArray.length; i++) {
|
for (let i = 0; i < collectingDataArray.length; i++) {
|
||||||
@@ -54,6 +55,8 @@
|
|||||||
],
|
],
|
||||||
};
|
};
|
||||||
prevSatus = widget.status;
|
prevSatus = widget.status;
|
||||||
|
datachart = datachart;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user