From b3b4cbeb10115f228d7cd92f3141db93fd5676fe Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Wed, 28 Sep 2022 17:26:33 +0200 Subject: [PATCH] =?UTF-8?q?=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=80=D0=B0=D1=81=D1=85=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 6 +++--- src/App.svelte | 5 +++-- src/pages/Config.svelte | 4 ++-- src/widgets/Anydata.svelte | 6 +++--- src/widgets/Chart.svelte | 11 +++++++++-- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/public/index.html b/public/index.html index b036526..f9d231a 100644 --- a/public/index.html +++ b/public/index.html @@ -4,12 +4,12 @@ - IoT Manager 4.3.4 + IoT Manager 4.3.5 - + - + diff --git a/src/App.svelte b/src/App.svelte index 7319a99..bada680 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -42,7 +42,7 @@ //****************************************************variable section**********************************************************/ //******************************************************************************************************************************/ let myip = document.location.hostname; - if (devMode) myip = "192.168.88.248"; + if (devMode) myip = "192.168.88.241"; //Flags let firstDevListRequest = true; @@ -769,7 +769,8 @@ widget.topic = settingsJson.root + "/" + config.id; if (setWidget !== "nil") layout.push(widget); - if (widget.widget === "chart") { + //создаем графики с окнами ввода + if (widget.widget === "chart" && widget.type !== "bar") { let input = getInput(); input.page = config.page; input.topic = settingsJson.root + "/" + config.id + "-date"; diff --git a/src/pages/Config.svelte b/src/pages/Config.svelte index e2768c8..a696be1 100644 --- a/src/pages/Config.svelte +++ b/src/pages/Config.svelte @@ -16,7 +16,7 @@ export let saveConfig = () => {}; export let rebootEsp = () => {}; - export let cleanLogs = () => {}; + //export let cleanLogs = () => {}; function elementsDropdownChange() { for (let i = 0; i < itemsJson.length; i++) { @@ -137,7 +137,7 @@
- +
diff --git a/src/widgets/Anydata.svelte b/src/widgets/Anydata.svelte index 44cf967..2002876 100644 --- a/src/widgets/Anydata.svelte +++ b/src/widgets/Anydata.svelte @@ -12,7 +12,7 @@ function blink() { if (widget.status) { if (widget.status != prevStatus) { - setTimeout(stopBlink, 4000); + setTimeout(stopBlink, 500); green = true; } prevStatus = widget.status; @@ -31,8 +31,8 @@
- + - +
diff --git a/src/widgets/Chart.svelte b/src/widgets/Chart.svelte index 2b2d488..41d9c51 100644 --- a/src/widgets/Chart.svelte +++ b/src/widgets/Chart.svelte @@ -33,6 +33,11 @@ lineOptions = { regionFill: 1, dotSize: 3, spline: 1 }; } + let type = "line"; + if (widget.type == "bar") { + type = widget.type; + } + $: widget, collectDataToArr(); function collectDataToArr() { @@ -49,7 +54,9 @@ } for (let i = 0; i < widget.status.length; i++) { - if (i === 0) { + if (type === "bar") { + labels[i] = getDDMM(widget.status[i].x); + } else if (i === 0) { labels[i] = getDDMM(widget.status[i].x); } else { labels[i] = getHHMM(widget.status[i].x); @@ -107,4 +114,4 @@ - +