From 62d8e8ddbedd099c7d4a6ac50131127cadb8d290 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Fri, 26 Aug 2022 00:01:29 +0200 Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20=D0=BE?= =?UTF-8?q?=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B8=20=D0=BB=D0=BE=D0=B3=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 8 +++++++- public/index.html | 19 +++++++++---------- src/App.svelte | 8 ++++++-- src/pages/System.svelte | 29 +++++++++++++++++++++-------- 4 files changed, 43 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index d281d91..906a2ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "iotm-web", - "version": "1.0.0", + "version": "4.1.8", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -151,6 +151,12 @@ "@types/node": "*" } }, + "@zerodevx/svelte-toast": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@zerodevx/svelte-toast/-/svelte-toast-0.7.2.tgz", + "integrity": "sha512-vWiY6IqsstcOoQ8PFBuFuxgPkj1JFAGhUF9gC7wLx7c5A9SSfdtxWs/39ekGSIeyJK0yqWhTcmzGrCEWSELzDw==", + "dev": true + }, "acorn": { "version": "7.4.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", diff --git a/public/index.html b/public/index.html index b0aba63..1224049 100644 --- a/public/index.html +++ b/public/index.html @@ -1,17 +1,16 @@ - - - + + + - IoT Manager 4.1.8 + IoT Manager 4.1.9 - - + + - - + + - - + diff --git a/src/App.svelte b/src/App.svelte index 15822fd..1f3977d 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.228"; + if (devMode) myip = "192.168.88.223"; //Flags let firstDevListRequest = true; @@ -601,6 +601,10 @@ sendCurrentPageName(); } + function cleanLogs() { + wsSendMsg(selectedWs, "/clean|"); + } + function saveMqtt() { var size = Object.keys(settingsJson).length; console.log("[i]", "settingsJson length: " + size); @@ -1143,7 +1147,7 @@ addDevInList()} newDevice={newDevice} sendToAllDevices={(msg) => sendToAllDevices(msg)} /> - saveSett()} cancelAlarm={(alarmKey) => cancelAlarm(alarmKey)} versionsList={versionsList} bind:choosingVersion startUpdate={() => startUpdate()} coreMessages={coreMessages} /> + saveSett()} cleanLogs={() => cleanLogs()} cancelAlarm={(alarmKey) => cancelAlarm(alarmKey)} versionsList={versionsList} bind:choosingVersion startUpdate={() => startUpdate()} coreMessages={coreMessages} /> {/if} diff --git a/src/pages/System.svelte b/src/pages/System.svelte index 550a988..0fa84d3 100644 --- a/src/pages/System.svelte +++ b/src/pages/System.svelte @@ -132,6 +132,7 @@ export let startUpdate = () => {}; export let saveSett = () => {}; + export let cleanLogs = () => {}; export let show; @@ -264,6 +265,25 @@ + +
+
+

Часовой пояс

+
+
+ (paramsBeenChanged = true)} class="ipt-rnd h-7 text-center focus:border-indigo-500" type="number" /> +
+
+ +
+
+

Данные графиков

+
+
+ +
+
+

Включить лог

@@ -278,14 +298,7 @@
-
-
-

Часовой пояс

-
-
- (paramsBeenChanged = true)} class="ipt-rnd text-center focus:border-indigo-500" type="number" /> -
-
+ {#if paramsBeenChanged}