небольшие правки

This commit is contained in:
Dmitry Borisenko
2022-09-14 18:20:07 +02:00
parent 3bf24d62f3
commit 27f5647e35
2 changed files with 14 additions and 5 deletions

View File

@@ -39,12 +39,12 @@
let updatingTimeout = 80000; let updatingTimeout = 80000;
let opened = false; let opened = false;
let preventMove = false; let preventMove = false;
let devMode = false; let devMode = true;
//****************************************************variable section**********************************************************/ //****************************************************variable section**********************************************************/
//******************************************************************************************************************************/ //******************************************************************************************************************************/
let myip = document.location.hostname; let myip = document.location.hostname;
if (devMode) myip = "192.168.1.197"; if (devMode) myip = "192.168.1.117";
//Flags //Flags
let firstDevListRequest = true; let firstDevListRequest = true;
@@ -468,7 +468,7 @@
if (IsJsonParse(data)) { if (IsJsonParse(data)) {
let statusJson = JSON.parse(data); let statusJson = JSON.parse(data);
udateStatusOfWidget(statusJson); udateStatusOfWidget(statusJson);
if (debug) console.log("[i] status:", statusJson); if (debug) console.log("[i] status", ip, ws, statusJson);
} }
} }
} }
@@ -589,6 +589,7 @@
function saveConfig() { function saveConfig() {
wsSendMsg(selectedWs, "/tuoyal|" + JSON.stringify(generateLayout())); wsSendMsg(selectedWs, "/tuoyal|" + JSON.stringify(generateLayout()));
del();
wsSendMsg(selectedWs, "/gifnoc|" + JSON.stringify(configJson)); wsSendMsg(selectedWs, "/gifnoc|" + JSON.stringify(configJson));
wsSendMsg(selectedWs, "/oiranecs|" + JSON.stringify(scenarioJson)); wsSendMsg(selectedWs, "/oiranecs|" + JSON.stringify(scenarioJson));
clearData(); clearData();
@@ -610,7 +611,7 @@
} }
function cleanLogs() { function cleanLogs() {
wsSendMsg(selectedWs, "/clean|"); wsSendMsg(selectedWs, "/clean1|");
} }
function saveMqtt() { function saveMqtt() {
@@ -637,6 +638,14 @@
return input; return input;
} }
function del() {
for (let i = 0; i < configJson.length; i++) {
let config = configJson[i];
delete config["show"];
}
}
//по конфигу делаем виджеты
function generateLayout() { function generateLayout() {
let layout = []; let layout = [];
for (let i = 0; i < configJson.length; i++) { for (let i = 0; i < configJson.length; i++) {

View File

@@ -103,7 +103,7 @@
</tr> </tr>
{#if element.show} {#if element.show}
{#each Object.entries(element) as [key, param]} {#each Object.entries(element) as [key, param]}
{#if key != "type" && key != "subtype" && key != "id" && key != "widget" && key != "page" && key != "descr"} {#if key != "type" && key != "subtype" && key != "id" && key != "widget" && key != "page" && key != "descr" && key != "show"}
<tr class="txt-sz txt-pad"> <tr class="txt-sz txt-pad">
<td /> <td />
<td /> <td />