From a2530c24e2f96b732af62ddd2fb0c3e880e50f8c Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <67171972+IoTManagerProject@users.noreply.github.com> Date: Mon, 21 Nov 2022 00:38:58 +0100 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D0=B1=D0=B0=D0=B3=D0=B8=20dashboard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.svelte | 34 ++++++++++++++------------------- src/pages/Dashboard.svelte | 6 ++++-- src/pages/System.svelte | 39 ++++++++++++++++++++++++++++---------- 3 files changed, 47 insertions(+), 32 deletions(-) diff --git a/src/App.svelte b/src/App.svelte index 3e9cb36..be1312a 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -45,7 +45,7 @@ //****************************************************variable section**********************************************************/ //******************************************************************************************************************************/ let myip = document.location.hostname; - if (devMode) myip = "192.168.88.251"; + if (devMode) myip = "192.168.88.237"; //Flags let firstDevListRequest = true; @@ -200,14 +200,14 @@ function ack(ws, st) { if (!st) { - startMillis[ws] = Date.now(); //+new Date(); + startMillis[ws] = Date.now(); ackTimeoutsArr[ws] = setTimeout(function () { markDeviceStatus(ws, false); }, waitingAckTimeout); } else { if (ackTimeoutsArr[ws]) clearTimeout(ackTimeoutsArr[ws]); if (startMillis[ws]) { - ping[ws] = Date.now() - startMillis[ws]; //+new Date(); + ping[ws] = Date.now() - startMillis[ws]; } for (let i = 0; i < deviceList.length; i++) { @@ -225,28 +225,21 @@ if (device.ws === ws) { device.status = status; device.ping = 0; - if (debug) { - if (device.status) { - console.log("[i]", device.ip, ws, "status online"); - } else { - //socket[ws].close(); - console.log("[i]", device.ip, ws, "status offline"); - } + if (device.status) { + console.log("[i]", device.ip, ws, "status online"); + } else { + console.log("[i]", device.ip, ws, "status offline"); + deleteWidget(ws); + sortingLayout(ws); } } }); + whenDeviceListWasUpdated(); deviceList = deviceList; - //getSelectedDeviceData(selectedWs); - //socketConnected = selectedDeviceData.status; } - function remooveWidgets(ws) { - for (let i = 0; i < layoutJson.length; i++) { - if (ws === layoutJson[i].ws) { - delete layoutJson[i]; - } - } - layoutJson = layoutJson; + function deleteWidget(ws) { + layoutJson = layoutJson.filter((item) => item.ws !== ws); } function getDeviceStatus(ws) { @@ -304,6 +297,7 @@ if (typeof event.data === "string") { let data = event.data; if (data === "/tstr|") { + //прилетело подтверждение значит устройство онлайн ack(ws, true); } } @@ -1311,7 +1305,7 @@