кнопка очистки логов

This commit is contained in:
Dmitry Borisenko
2022-08-26 00:01:29 +02:00
parent dbe5fd170f
commit 62d8e8ddbe
4 changed files with 43 additions and 21 deletions

8
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "iotm-web", "name": "iotm-web",
"version": "1.0.0", "version": "4.1.8",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@@ -151,6 +151,12 @@
"@types/node": "*" "@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": { "acorn": {
"version": "7.4.1", "version": "7.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",

View File

@@ -1,17 +1,16 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset='utf-8'> <meta charset="utf-8" />
<meta name='viewport' content='width=device-width,initial-scale=1'> <meta name="viewport" content="width=device-width,initial-scale=1" />
<title>IoT Manager 4.1.8</title> <title>IoT Manager 4.1.9</title>
<link rel='icon' type='image/png' href='/favicon.ico'> <link rel="icon" type="image/png" href="/favicon.ico" />
<link rel='stylesheet' href='/build/bundle.css'> <link rel="stylesheet" href="/build/bundle.css" />
<script defer src='/build/bundle.js'></script> <script defer src="/build/bundle.js"></script>
</head> </head>
<body> <body></body>
</body>
</html> </html>

View File

@@ -42,7 +42,7 @@
//****************************************************variable section**********************************************************/ //****************************************************variable section**********************************************************/
//******************************************************************************************************************************/ //******************************************************************************************************************************/
let myip = document.location.hostname; let myip = document.location.hostname;
if (devMode) myip = "192.168.88.228"; if (devMode) myip = "192.168.88.223";
//Flags //Flags
let firstDevListRequest = true; let firstDevListRequest = true;
@@ -601,6 +601,10 @@
sendCurrentPageName(); sendCurrentPageName();
} }
function cleanLogs() {
wsSendMsg(selectedWs, "/clean|");
}
function saveMqtt() { function saveMqtt() {
var size = Object.keys(settingsJson).length; var size = Object.keys(settingsJson).length;
console.log("[i]", "settingsJson length: " + size); console.log("[i]", "settingsJson length: " + size);
@@ -1143,7 +1147,7 @@
<ListPage show={listReady} deviceList={deviceList} showInput={showInput} addDevInList={() => addDevInList()} newDevice={newDevice} sendToAllDevices={(msg) => sendToAllDevices(msg)} /> <ListPage show={listReady} deviceList={deviceList} showInput={showInput} addDevInList={() => addDevInList()} newDevice={newDevice} sendToAllDevices={(msg) => sendToAllDevices(msg)} />
</Route> </Route>
<Route path="/system"> <Route path="/system">
<SystemPage show={systemReady} errorsJson={errorsJson} settingsJson={settingsJson} saveSett={() => saveSett()} cancelAlarm={(alarmKey) => cancelAlarm(alarmKey)} versionsList={versionsList} bind:choosingVersion startUpdate={() => startUpdate()} coreMessages={coreMessages} /> <SystemPage show={systemReady} errorsJson={errorsJson} settingsJson={settingsJson} saveSett={() => saveSett()} cleanLogs={() => cleanLogs()} cancelAlarm={(alarmKey) => cancelAlarm(alarmKey)} versionsList={versionsList} bind:choosingVersion startUpdate={() => startUpdate()} coreMessages={coreMessages} />
</Route> </Route>
{/if} {/if}
</div> </div>

View File

@@ -132,6 +132,7 @@
export let startUpdate = () => {}; export let startUpdate = () => {};
export let saveSett = () => {}; export let saveSett = () => {};
export let cleanLogs = () => {};
export let show; export let show;
@@ -264,6 +265,25 @@
</Card> </Card>
<!--SETTINGS--> <!--SETTINGS-->
<Card title="Системные настройки"> <Card title="Системные настройки">
<!--ZONE-->
<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.timezone} on:change={() => (paramsBeenChanged = true)} class="ipt-rnd h-7 text-center focus:border-indigo-500" type="number" />
</div>
</div>
<!--CLEAN-->
<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">
<button class="btn-lg h-7" on:click={() => cleanLogs()}>{"Очистить"}</button>
</div>
</div>
<!--LOG-->
<div class="flex mb-2 h-6 items-center"> <div class="flex mb-2 h-6 items-center">
<div class="w-2/3"> <div class="w-2/3">
<p class="pr-4 text-gray-500 font-bold text-sm truncate">Включить лог</p> <p class="pr-4 text-gray-500 font-bold text-sm truncate">Включить лог</p>
@@ -278,14 +298,7 @@
</label> </label>
</div> </div>
</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">Часовой пояс</p>
</div>
<div class="flex justify-center w-1/3">
<input bind:value={settingsJson.timezone} on:change={() => (paramsBeenChanged = true)} class="ipt-rnd text-center focus:border-indigo-500" type="number" />
</div>
</div>
<!--<div class="grd-2col1">--> <!--<div class="grd-2col1">-->
{#if paramsBeenChanged} {#if paramsBeenChanged}
<button class="btn-lg animate-pulse" on:click={() => (saveSett(), (paramsBeenChanged = false))}>{"Сохранить"}</button> <button class="btn-lg animate-pulse" on:click={() => (saveSett(), (paramsBeenChanged = false))}>{"Сохранить"}</button>