iotmanager/IoTManagerWeb
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManagerWeb.git synced 2026-03-26 23:12:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

последний веб

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-10-12 03:18:04 +02:00
parent 22f1e80c60
commit 9c8bce7244
2 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/App.svelte
View File

@@ -39,12 +39,12 @@
let opened = false;
let preventMove = false;
const blobDebug = false;
const devMode = true;
const devMode = false;
//****************************************************variable section**********************************************************/
//******************************************************************************************************************************/
let myip = document.location.hostname;
if (devMode) myip = "192.168.88.234";
if (devMode) myip = "192.168.88.248";
//Flags
let firstDevListRequest = true;
@@ -77,7 +77,7 @@
let itemsJson = [];
let widgetsJson = [];
let configJson = [];
let scenarioTxt = "";
let scenarioTxt = " ";
let settingsJson = {};
let ssidJson = {};
let errorsJson = {};
@@ -438,7 +438,6 @@
if (blobDebug) console.log("[e]", "devParams parse error");
}
}
if (header === "charta") {
let txt = await getPayloadAsTxt(blob, size);
txt = "[" + txt.substring(0, txt.length - 1) + "]";
@@ -469,7 +468,6 @@
if (blobDebug) console.log("[✔]", "chartJson: ", finalDataJson);
apdateWidgetByArray(finalDataJson);
}
if (header === "chartb") {
let out = {};
if (await getPayloadAsJson(blob, size, out)) {
@@ -545,13 +543,11 @@
pageReady.system = true;
}
// if (currentPageName === "/dev|" && parsed.errorsJson && parsed.settingsJson && configJsonPacket.isParced && itemsJsonPacket.isParced) {
// clearParcedFlags();
// configJson = configJsonPacket.getData;
// itemsJson = itemsJsonPacket.getData;
// if (debug) console.log("✔✔", "dev page parced");
// pageReady.dev = true;
// }
if (currentPageName === "/dev|" && parsed.errorsJson && parsed.settingsJson && parsed.configJson && parsed.itemsJson) {
clearParcedFlags();
if (debug) console.log("✔✔", "dev page parced");
pageReady.dev = true;
}
}
function handleDeviseList() {
@@ -819,7 +815,7 @@
itemsJson = [];
widgetsJson = [];
configJson = [];
scenarioTxt = "-";
scenarioTxt = " ";
settingsJson = {};
//ssidJson = {};
errorsJson = {};
@@ -1282,7 +1278,7 @@
<ListPage show={pageReady.list} deviceList={deviceList} showInput={showInput} addDevInList={() => addDevInList()} newDevice={newDevice} sendToAllDevices={(msg) => sendToAllDevices(msg)} />
</Route>
<Route path="/system">
<SystemPage show={pageReady.system} errorsJson={errorsJson} settingsJson={settingsJson} saveSett={() => saveSett()} cleanLogs={() => cleanLogs()} cancelAlarm={(alarmKey) => cancelAlarm(alarmKey)} versionsList={versionsList} bind:choosingVersion startUpdate={() => startUpdate()} coreMessages={coreMessages} />
<SystemPage show={pageReady.system} errorsJson={errorsJson} settingsJson={settingsJson} saveSett={() => saveSett()} rebootEsp={() => rebootEsp()} cleanLogs={() => cleanLogs()} cancelAlarm={(alarmKey) => cancelAlarm(alarmKey)} versionsList={versionsList} bind:choosingVersion startUpdate={() => startUpdate()} coreMessages={coreMessages} />
</Route>
{#if devMode}
<Route path="/dev">

53
src/pages/System.svelte
View File

@@ -112,10 +112,18 @@
1: {
descr: "Ошибка json",
color: "text-red-500",
txt: "Ошибка чтения json файла с виджетами",
txt: "Ошибка чтения json файла с виджетами при отправки в mqtt",
cancel: true,
},
},
tme1: {
1: {
descr: "Ошибка времени",
color: "text-red-500",
txt: "Ошибка синхронизации времени с NTP сервером",
cancel: false,
},
},
};
import Card from "../components/Card.svelte";
@@ -123,8 +131,6 @@
export let errorsJson;
//export let rebootEsp = () => {};
export let versionsList;
export let choosingVersion;
export let coreMessages;
@@ -133,11 +139,14 @@
export let startUpdate = () => {};
export let saveSett = () => {};
export let cleanLogs = () => {};
export let rebootEsp = () => {};
export let show;
export let paramsBeenChanged = false;
let reboot = false;
export let cancelAlarm = (alarmKey) => {};
</script>
@@ -317,10 +326,48 @@
</div>
</div>
<!--I2C-->
<div class="flex mb-2 h-6 items-center">
<div class="w-2/3">
<p class="pr-4 text-gray-500 font-bold text-sm truncate">i2c SCL gpio</p>
</div>
<div class="flex justify-center w-1/3">
<input bind:value={settingsJson.pinSCL} on:change={() => (reboot = true)} class="ipt-rnd h-7 text-center focus:border-indigo-500" type="number" />
</div>
</div>
<div class="flex mb-2 h-6 items-center">
<div class="w-2/3">
<p class="pr-4 text-gray-500 font-bold text-sm truncate">i2c SDA gpio</p>
</div>
<div class="flex justify-center w-1/3">
<input bind:value={settingsJson.pinSDA} on:change={() => (reboot = true)} class="ipt-rnd h-7 text-center focus:border-indigo-500" type="number" />
</div>
</div>
<div class="flex mb-2 h-6 items-center">
<div class="w-2/3">
<p class="pr-4 text-gray-500 font-bold text-sm truncate">i2c частота</p>
</div>
<div class="flex justify-center w-1/3">
<input bind:value={settingsJson.i2cFreq} on:change={() => (reboot = true)} class="ipt-rnd h-7 text-center focus:border-indigo-500" type="number" />
</div>
</div>
<!--WORKING GROUP-->
<div class="flex mb-2 h-6 items-center">
<div class="w-2/3">
<p class="pr-4 text-gray-500 font-bold text-sm truncate">Группа устройств</p>
</div>
<div class="flex justify-center w-1/3">
<input bind:value={settingsJson.wg} on:change={() => (reboot = true)} class="ipt-rnd h-7 text-center focus:border-indigo-500" />
</div>
</div>
<!--<div class="grd-2col1">-->
{#if paramsBeenChanged}
<button class="btn-lg animate-pulse" on:click={() => (saveSett(), (paramsBeenChanged = false))}>{"Сохранить"}</button>
{/if}
{#if reboot}
<button class="btn-lg animate-pulse" on:click={() => (saveSett(), rebootEsp(), (reboot = false))}>{"Сохранить и перезагрузить"}</button>
{/if}
<!--<button class="btn-lg" on:click={() => rebootEsp()}>{"Перезагрузить"}</button>-->
<!--</div>-->
</Card>