diff --git a/src/App.svelte b/src/App.svelte index 1c046fd..8e39957 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -4,8 +4,7 @@ import { Route, router, active } from "tinro"; router.mode.hash(); // enables hash navigation method //router.mode.memory(); // enables in-memory navigation method - let wsSelected = undefined; - router.subscribe(handleNavigation); + //import Chart from "svelte-frappe-charts"; import Card from "./widgets/Card.svelte"; @@ -146,22 +145,21 @@ let flag = true; let newDevice = {}; let coreMessages = []; + let wsSelected = undefined; deviceList = [ { name: "Устройство 1", id: "987654321", - ip: "192.168.88.230", - status: false, - }, - { - name: "Устройство 2", - id: "987654321", - ip: "192.168.88.231", + ip: "192.168.88.235", status: false, }, ]; + //navigation + let currentPageName = undefined; + router.subscribe(handleNavigation); + //=================================functions section======================================== //web socket functions====================================================================== function connectToAllDevices() { @@ -242,14 +240,21 @@ socket[ws].addEventListener("open", function (event) { if (debug) console.log("[i]", ip, "completed connecting"); markDeviceStatus(ws, true); + sendCurrentPageName(); //socket[ws].send("HELLO"); }); socket[ws].addEventListener("message", function (event) { let data = event.data.toString(); - if (debug) console.log("[i]", "new data:", event.data); - if (data.includes("/core/")) { - data = data.replace("/core/", ""); + if (data.includes("[log]")) { + data = data.replace("[log]", ""); addCoreMsg(data); + //if (debug) console.log("[i]", "log data:", data); + } else if (data.includes("[config]")) { + data = data.replace("[config]", ""); + data = JSON.parse(data); + config.push(data); + config = config; + //if (debug) console.log("[i]", "config data:", data); } }); socket[ws].addEventListener("close", (event) => { @@ -366,12 +371,15 @@ //navigation=========================================================================================== function handleNavigation() { - let page = $router.path.toString(); - console.log("[i]", "user on page:", page); - if (page === "/config") { - if (wsSelected !== undefined) { - wsSendMsg(wsSelected, "config"); - } + config = []; + currentPageName = $router.path.toString(); + console.log("[i]", "user on page:", currentPageName); + sendCurrentPageName(); + } + + function sendCurrentPageName() { + if (wsSelected !== undefined) { + wsSendMsg(wsSelected, currentPageName); } } @@ -489,7 +497,29 @@
- + + + + + + + + + + + + {#each config as element} + + + + + + + {/each} + +
ТипПодтипId4
{element.type}{element.subtype}{element.id}4
+ +