diff --git a/src/App.svelte b/src/App.svelte index 47a09d8..6368246 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -803,18 +803,8 @@ function cancelAlarm(alarmKey) { console.log("[x]", alarmKey); - if (alarmKey === "wscle") { - errorsJson.wscle = 0; - wsSendMsg(selectedWs, '/rorre|{"wscle":0}'); - } - if (alarmKey === "jsbuf") { - errorsJson.jsbuf = 0; - wsSendMsg(selectedWs, '/rorre|{"jsbuf":0}'); - } - if (alarmKey === "jserr") { - errorsJson.jserr = 0; - wsSendMsg(selectedWs, '/rorre|{"jserr":0}'); - } + errorsJson[alarmKey] = 0; + wsSendMsg(selectedWs, '/rorre|{"' + alarmKey + '":0}'); } //*******************************************************initialisation********************************************************************/ onMount(async () => { diff --git a/src/pages/Connection.svelte b/src/pages/Connection.svelte index b8a8392..65bea2d 100644 --- a/src/pages/Connection.svelte +++ b/src/pages/Connection.svelte @@ -84,9 +84,9 @@

Состояние подключения

- {#if errorsJson.mqtt === 0} + {#if errorsJson.mqtt === "e5"}

Подключено

- {:else if errorsJson.mqtt === 8} + {:else if errorsJson.mqtt === "e13"}

Подключение

{:else}

Ошибка

diff --git a/src/pages/System.svelte b/src/pages/System.svelte index 06abdfd..ee14f8d 100644 --- a/src/pages/System.svelte +++ b/src/pages/System.svelte @@ -1,4 +1,115 @@