package update

This commit is contained in:
Dmitry Borisenko
2023-06-02 15:29:45 +02:00
parent 59c7c866eb
commit 12728298b8
6 changed files with 1252 additions and 551 deletions

1774
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -20,7 +20,7 @@
"rollup-plugin-livereload": "^2.0.0",
"rollup-plugin-svelte": "^7.0.0",
"rollup-plugin-terser": "^7.0.0",
"svelte": "^3.50.1",
"svelte": "^3.59.1",
"svelte-preprocess": "^4.10.7",
"tailwindcss": "^2.2.19",
"tinro": "^0.5.12"
@@ -28,6 +28,6 @@
"dependencies": {
"daisyui": "^1.25.4",
"sirv-cli": "^1.0.14",
"svelte-frappe-charts": "^1.9.2"
"svelte-frappe-charts": "^1.10.0"
}
}

View File

@@ -4,12 +4,12 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>IoT Manager 4.4.4</title>
<title>IoT Manager 4.4.5</title>
<link rel="icon" type="image/png" href="/favicon.ico" />
<link rel="stylesheet" href="/build/bundle.css?444" />
<link rel="stylesheet" href="/build/bundle.css?445" />
<script defer src="/build/bundle.js?444"></script>
<script defer src="/build/bundle.js?445"></script>
</head>
<body></body>

View File

@@ -33,19 +33,19 @@
//******************************************************************************************************************************/
const debug = true;
const LOG_MAX_MESSAGES = 100;
const reconnectTimeout = 30000;
const waitingAckTimeout = 6000;
const reconnectTimeout = 120000; //период проверки соединения с устройством
const waitingAckTimeout = 18000; //время ожидания ответа от устройства
const rebootingTimeout = 20000;
const updatingTimeout = 130000;
let opened = false;
let preventMove = false;
const blobDebug = false;
const devMode = false;
const devMode = true;
//****************************************************variable section**********************************************************/
//******************************************************************************************************************************/
let myip = document.location.hostname;
if (devMode) myip = "192.168.88.229";
if (devMode) myip = "192.168.88.238";
//Flags
let firstDevListRequest = true;
@@ -53,7 +53,7 @@
let showModalFlag = false;
let rebootingUpdatingInProgress = false;
const myTimeout = undefined;
let myTimeout = undefined;
//dashboard
let pages = [];
@@ -1372,9 +1372,12 @@
.grd-3col1 {
@apply grid gap-4 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-3 2xl:grid-cols-3 justify-items-center;
}
.grd-4col1 {
@apply grid gap-4 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-4 justify-items-center;
}
/*=============================================card and items inside===============================================*/
.crd-itm-psn {
@apply flex mb-2 h-8 items-center;
@apply flex mb-2 h-6 items-center;
}
.wgt-dscr-stl {
@apply pr-4 text-gray-500 font-bold;

View File

@@ -19,7 +19,7 @@
@layer components {
.crd {
@apply w-full mt-4 p-2 sm:p-2 md:p-2 lg:p-2 xl:px-4 xl:py-4 2xl:px-4 2xl:py-4 bg-white shadow-md lg:shadow-lg border border-gray-200 rounded-lg;
@apply w-full p-2 sm:p-2 md:p-2 lg:p-2 xl:px-4 xl:py-4 2xl:px-4 2xl:py-4 bg-white shadow-md lg:shadow-lg border border-gray-200 rounded-lg;
}
.crd-hdr {
@apply text-center text-lg text-gray-500 font-bold pb-2;

View File

@@ -40,6 +40,7 @@
<Card title={"Ваша панель управления пуста, вначале добавьте новые элементы в конфигураторе!"} />
{/if}
</div>
<div class="my-4">
<div class="grd-3col1">
{#each pages as pagesName, p}
<Card title={pagesName.page}>
@@ -65,6 +66,7 @@
</Card>
{/each}
</div>
</div>
{:else}
<Alarm title="Загрузка..." />
{/if}