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

изменения

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-02-11 00:22:41 +01:00
parent 050a813471
commit 34d26bbe1d
11 changed files with 216 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/App.svelte
View File

@@ -26,7 +26,7 @@
let version = 401;
let debug = true;
let LOG_MAX_MESSAGES = 10;
let reconnectTimeout = 30000;
let reconnectTimeout = 20000;
let rebootingTimeout = 20000;
let opened = false;
let preventMove = false;
@@ -785,6 +785,16 @@
myTimeout = setTimeout(rebootingTask, rebootingTimeout);
}
function mqttConnect() {
errorsJson.mqtt = 8;
console.log("[i]", settingsJson);
wsSendMsg(selectedWs, "/sgnittes|" + JSON.stringify(settingsJson));
//wsSendMsg(selectedWs, '/rorre|{"mqtt":8}');
wsSendMsg(selectedWs, "/mqtt|");
clearData();
sendCurrentPageName();
}
function rebootingTask() {
clearTimeout(myTimeout);
connectToAllDevices();
@@ -887,7 +897,7 @@
<ConfigPage configJson={configJson} widgetsJson={widgetsJson} itemsJson={itemsJson} saveConfig={() => saveConfig()} />
</Route>
<Route path="/connection">
<ConnectionPage settingsJson={settingsJson} errorsJson={errorsJson} ssidJson={ssidJson} rebootEsp={() => rebootEsp()} ssidDropdownClick={() => ssidDropdownClick()} saveSettings={() => saveSettings()} />
<ConnectionPage settingsJson={settingsJson} errorsJson={errorsJson} ssidJson={ssidJson} rebootEsp={() => rebootEsp()} ssidDropdownClick={() => ssidDropdownClick()} saveSettings={() => saveSettings()} mqttConnect={() => mqttConnect()} />
</Route>
<Route path="/system">
<SystemPage settingsJson={settingsJson} errorsJson={errorsJson} rebootEsp={() => rebootEsp()} cancelAlarm={(alarmKey) => cancelAlarm(alarmKey)} version={version} />
@@ -938,15 +948,9 @@
.crd-itm-psn {
@apply flex mb-3 h-8 items-center;
}
.wgt-dscr-w {
@apply w-2/3;
}
.wgt-dscr-stl {
@apply pr-4 text-gray-500 font-bold;
}
.wgt-w {
@apply flex justify-end w-1/3;
}
/*====================================================others=====================================================*/
.btn-i {
@apply py-2 px-4 bg-indigo-500 text-white font-semibold rounded-lg shadow-md hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-400 focus:ring-opacity-75;