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

добавление графиков дневного расхода

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-09-28 17:55:35 +02:00
parent 7ac2e96c7b
commit 1625455594
17 changed files with 453 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data_svelte/build/bundle.css.gz
View File

Binary file not shown.

BIN
data_svelte/build/bundle.js.gz
View File

Binary file not shown.

6
data_svelte/index.html
View File

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

191
data_svelte/items.json
View File

@@ -7,7 +7,7 @@
"header": "Виртуальные элементы"
},
{
"name": "1. Логирование в график",
"name": "1. График",
"type": "Writing",
"subtype": "Loging",
"id": "log",
@@ -20,7 +20,20 @@
"points": 300
},
{
"name": "2. Таймер",
"name": "2. График дневного расхода",
"type": "Writing",
"subtype": "LogingDaily",
"id": "log",
"widget": "chart3",
"page": "Графики",
"descr": "Температура",
"num": 2,
"int": 1,
"logid": "t",
"points": 365
},
{
"name": "3. Таймер",
"type": "Writing",
"subtype": "Timer",
"id": "timer",
@@ -32,10 +45,10 @@
"ticker": 1,
"repeat": 1,
"needSave": 0,
"num": 2
"num": 3
},
{
"name": "3. Окно ввода числа (переменная)",
"name": "4. Окно ввода числа (переменная)",
"type": "Reading",
"subtype": "Variable",
"id": "value",
@@ -44,10 +57,10 @@
"descr": "Введите число",
"int": "0",
"val": "0.0",
"num": 3
"num": 4
},
{
"name": "4. Окно ввода времени",
"name": "5. Окно ввода времени",
"type": "Reading",
"subtype": "Variable",
"id": "time",
@@ -56,10 +69,10 @@
"descr": "Введите время",
"int": "0",
"val": "02:00",
"num": 4
"num": 5
},
{
"name": "5. Окно ввода даты",
"name": "6. Окно ввода даты",
"type": "Reading",
"subtype": "Variable",
"id": "time",
@@ -68,10 +81,10 @@
"descr": "Введите дату",
"int": "0",
"val": "24.05.2022",
"num": 5
"num": 6
},
{
"name": "6. Окно ввода текста",
"name": "7. Окно ввода текста",
"type": "Reading",
"subtype": "Variable",
"id": "txt",
@@ -80,10 +93,10 @@
"descr": "Введите текст",
"int": "0",
"val": "текст",
"num": 6
"num": 7
},
{
"name": "7. Виртуальная кнопка",
"name": "8. Виртуальная кнопка",
"type": "Reading",
"subtype": "VButton",
"id": "vbtn",
@@ -92,13 +105,13 @@
"descr": "Кнопка",
"int": "0",
"val": "0",
"num": 7
"num": 8
},
{
"header": "Сенсоры"
},
{
"name": "8. Acs712 Ток",
"name": "9. Acs712 Ток",
"type": "Reading",
"subtype": "Acs712",
"id": "amp",
@@ -108,10 +121,10 @@
"round": 3,
"pin": 39,
"int": 5,
"num": 8
"num": 9
},
{
"name": "9. AHT20 Температура",
"name": "10. AHT20 Температура",
"type": "Reading",
"subtype": "Aht20t",
"id": "Temp20",
@@ -121,10 +134,10 @@
"int": 15,
"addr": "0x38",
"round": 1,
"num": 9
"num": 10
},
{
"name": "10. AHT20 Влажность",
"name": "11. AHT20 Влажность",
"type": "Reading",
"subtype": "Aht20h",
"id": "Hum20",
@@ -134,10 +147,10 @@
"int": 15,
"addr": "0x38",
"round": 1,
"num": 10
"num": 11
},
{
"name": "11. Аналоговый сенсор",
"name": "12. Аналоговый сенсор",
"type": "Reading",
"subtype": "AnalogAdc",
"id": "t",
@@ -151,10 +164,10 @@
"pin": 0,
"int": 15,
"avgSteps": 1,
"num": 11
"num": 12
},
{
"name": "12. BME280 Температура",
"name": "13. BME280 Температура",
"type": "Reading",
"subtype": "Bme280t",
"id": "tmp3",
@@ -164,10 +177,10 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 12
"num": 13
},
{
"name": "13. BME280 Давление",
"name": "14. BME280 Давление",
"type": "Reading",
"subtype": "Bme280p",
"id": "Press3",
@@ -177,10 +190,10 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 13
"num": 14
},
{
"name": "14. BME280 Влажность",
"name": "15. BME280 Влажность",
"type": "Reading",
"subtype": "Bme280h",
"id": "Hum3",
@@ -190,10 +203,10 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 14
"num": 15
},
{
"name": "15. BMP280 Температура",
"name": "16. BMP280 Температура",
"type": "Reading",
"subtype": "Bmp280t",
"id": "tmp3",
@@ -203,10 +216,10 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 15
"num": 16
},
{
"name": "16. BMP280 Давление",
"name": "17. BMP280 Давление",
"type": "Reading",
"subtype": "Bmp280p",
"id": "Press3",
@@ -216,10 +229,10 @@
"int": 15,
"addr": "0x77",
"round": 1,
"num": 16
"num": 17
},
{
"name": "17. DHT11 Температура",
"name": "18. DHT11 Температура",
"type": "Reading",
"subtype": "Dht1122t",
"id": "tmp3",
@@ -229,10 +242,10 @@
"int": 15,
"pin": 0,
"senstype": "dht11",
"num": 17
"num": 18
},
{
"name": "18. DHT11 Влажность",
"name": "19. DHT11 Влажность",
"type": "Reading",
"subtype": "Dht1122h",
"id": "Hum3",
@@ -242,10 +255,10 @@
"int": 15,
"pin": 0,
"senstype": "dht11",
"num": 18
"num": 19
},
{
"name": "19. DS18B20 Температура",
"name": "20. DS18B20 Температура",
"type": "Reading",
"subtype": "Ds18b20",
"id": "dstmp",
@@ -257,10 +270,10 @@
"index": 0,
"addr": "",
"round": 1,
"num": 19
"num": 20
},
{
"name": "20. GY21 Температура",
"name": "21. GY21 Температура",
"type": "Reading",
"subtype": "GY21t",
"id": "tmp4",
@@ -269,10 +282,10 @@
"descr": "Температура",
"round": 1,
"int": 15,
"num": 20
"num": 21
},
{
"name": "21. GY21 Влажность",
"name": "22. GY21 Влажность",
"type": "Reading",
"subtype": "GY21h",
"id": "Hum4",
@@ -281,10 +294,10 @@
"descr": "Влажность",
"round": 1,
"int": 15,
"num": 21
"num": 22
},
{
"name": "22. HDC1080 Температура",
"name": "23. HDC1080 Температура",
"type": "Reading",
"subtype": "Hdc1080t",
"id": "Temp1080",
@@ -294,10 +307,10 @@
"int": 15,
"addr": "0x40",
"round": 1,
"num": 22
"num": 23
},
{
"name": "23. HDC1080 Влажность",
"name": "24. HDC1080 Влажность",
"type": "Reading",
"subtype": "Hdc1080h",
"id": "Hum1080",
@@ -307,10 +320,10 @@
"int": 15,
"addr": "0x40",
"round": 1,
"num": 23
"num": 24
},
{
"name": "24. MAX6675 Температура",
"name": "25. MAX6675 Температура",
"type": "Reading",
"subtype": "Max6675t",
"id": "maxtmp",
@@ -321,10 +334,10 @@
"DO": 12,
"CS": 13,
"CLK": 14,
"num": 24
"num": 25
},
{
"name": "25. PZEM 004t Напряжение",
"name": "26. PZEM 004t Напряжение",
"type": "Reading",
"subtype": "Pzem004v",
"id": "v",
@@ -333,10 +346,10 @@
"descr": "Напряжение",
"int": 15,
"addr": "0xF8",
"num": 25
"num": 26
},
{
"name": "26. PZEM 004t Сила тока",
"name": "27. PZEM 004t Сила тока",
"type": "Reading",
"subtype": "Pzem004a",
"id": "a",
@@ -345,10 +358,10 @@
"descr": "Сила тока",
"int": 15,
"addr": "0xF8",
"num": 26
"num": 27
},
{
"name": "27. PZEM 004t Мощность",
"name": "28. PZEM 004t Мощность",
"type": "Reading",
"subtype": "Pzem004w",
"id": "w",
@@ -357,10 +370,10 @@
"descr": "Мощность",
"int": 15,
"addr": "0xF8",
"num": 27
"num": 28
},
{
"name": "28. PZEM 004t Энергия",
"name": "29. PZEM 004t Энергия",
"type": "Reading",
"subtype": "Pzem004wh",
"id": "wh",
@@ -369,10 +382,10 @@
"descr": "Энергия",
"int": 15,
"addr": "0xF8",
"num": 28
"num": 29
},
{
"name": "29. PZEM 004t Частота",
"name": "30. PZEM 004t Частота",
"type": "Reading",
"subtype": "Pzem004hz",
"id": "hz",
@@ -381,11 +394,11 @@
"descr": "Частота",
"int": 15,
"addr": "0xF8",
"num": 29
"num": 30
},
{
"name": "30. Сканер кнопок 433 MHz",
"num": 30,
"name": "31. Сканер кнопок 433 MHz",
"num": 31,
"type": "Reading",
"subtype": "RCswitch",
"id": "rsw",
@@ -394,7 +407,7 @@
"pinTx": 12
},
{
"name": "31. Sht20 Температура",
"name": "32. Sht20 Температура",
"type": "Reading",
"subtype": "Sht20t",
"id": "tmp2",
@@ -403,10 +416,10 @@
"descr": "Температура",
"int": 15,
"round": 1,
"num": 31
"num": 32
},
{
"name": "32. Sht20 Влажность",
"name": "33. Sht20 Влажность",
"type": "Reading",
"subtype": "Sht20h",
"id": "Hum2",
@@ -415,10 +428,10 @@
"descr": "Влажность",
"int": 15,
"round": 1,
"num": 32
"num": 33
},
{
"name": "33. Sht30 Температура",
"name": "34. Sht30 Температура",
"type": "Reading",
"subtype": "Sht30t",
"id": "tmp30",
@@ -427,10 +440,10 @@
"descr": "SHT30 Температура",
"int": 15,
"round": 1,
"num": 33
"num": 34
},
{
"name": "34. Sht30 Влажность",
"name": "35. Sht30 Влажность",
"type": "Reading",
"subtype": "Sht30h",
"id": "Hum30",
@@ -439,11 +452,11 @@
"descr": "SHT30 Влажность",
"int": 15,
"round": 1,
"num": 34
"num": 35
},
{
"name": "35. HC-SR04 Ультразвуковой дальномер",
"num": 35,
"name": "36. HC-SR04 Ультразвуковой дальномер",
"num": 36,
"type": "Reading",
"subtype": "Sonar",
"id": "sonar",
@@ -455,7 +468,7 @@
"int": 5
},
{
"name": "36. UART",
"name": "37. UART",
"type": "Reading",
"subtype": "UART",
"page": "",
@@ -465,13 +478,13 @@
"tx": 12,
"rx": 13,
"speed": 9600,
"num": 36
"num": 37
},
{
"header": "Исполнительные устройства"
},
{
"name": "37. Кнопка подключенная к пину",
"name": "38. Кнопка подключенная к пину",
"type": "Writing",
"subtype": "ButtonIn",
"id": "btn",
@@ -484,10 +497,10 @@
"pinMode": "INPUT",
"debounceDelay": 50,
"fixState": 0,
"num": 37
"num": 38
},
{
"name": "38. Управление пином",
"name": "39. Управление пином",
"type": "Writing",
"subtype": "ButtonOut",
"id": "btn",
@@ -497,10 +510,10 @@
"int": 0,
"inv": 0,
"pin": 2,
"num": 38
"num": 39
},
{
"name": "39. Сервопривод",
"name": "40. Сервопривод",
"type": "Writing",
"subtype": "IoTServo",
"id": "servo",
@@ -511,10 +524,10 @@
"pin": 12,
"apin": -1,
"amap": "0, 4096, 0, 180",
"num": 39
"num": 40
},
{
"name": "40. Расширитель портов Mcp23017",
"name": "41. Расширитель портов Mcp23017",
"type": "Reading",
"subtype": "Mcp23017",
"id": "Mcp",
@@ -524,10 +537,10 @@
"int": "0",
"addr": "0x20",
"index": 1,
"num": 40
"num": 41
},
{
"name": "41. MP3 плеер",
"name": "42. MP3 плеер",
"type": "Reading",
"subtype": "Mp3",
"id": "mp3",
@@ -537,10 +550,10 @@
"int": 1,
"pins": "14,12",
"volume": 20,
"num": 41
"num": 42
},
{
"name": "42. PWM ESP8266",
"name": "43. PWM ESP8266",
"type": "Writing",
"subtype": "Pwm8266",
"id": "pwm",
@@ -552,10 +565,10 @@
"freq": 5000,
"val": 0,
"apin": -1,
"num": 42
"num": 43
},
{
"name": "43. Телеграм-Лайт",
"name": "44. Телеграм-Лайт",
"type": "Writing",
"subtype": "TelegramLT",
"id": "tg",
@@ -564,13 +577,13 @@
"descr": "",
"token": "",
"chatID": "",
"num": 43
"num": 44
},
{
"header": "Экраны"
},
{
"name": "44. LCD экран 2004",
"name": "45. LCD экран 2004",
"type": "Reading",
"subtype": "Lcd2004",
"id": "Lcd",
@@ -582,10 +595,10 @@
"size": "20,4",
"coord": "0,0",
"id2show": "id датчика",
"num": 44
"num": 45
},
{
"name": "45. LCD экран 1602",
"name": "46. LCD экран 1602",
"type": "Reading",
"subtype": "Lcd2004",
"id": "Lcd",
@@ -597,6 +610,6 @@
"size": "16,2",
"coord": "0,0",
"id2show": "id датчика",
"num": 45
"num": 46
}
]

21
data_svelte/widgets.json
View File

@@ -47,7 +47,7 @@
"name": "anydataWth",
"label": "Энергия",
"widget": "anydata",
"after": "Wt/Hr",
"after": "kWt/Hr",
"icon": "speedometer"
},
{
@@ -103,34 +103,27 @@
},
{
"name": "chart1",
"label": "График1",
"label": "График без точек",
"widget": "chart",
"dateFormat": "HH:mm",
"maxCount": 255,
"maxCount": 86400,
"pointRadius": 0
},
{
"name": "chart2",
"label": "График2",
"label": "График с точками",
"widget": "chart",
"maxCount": 255,
"maxCount": 86400,
"dateFormat": "HH:mm"
},
{
"name": "chart3",
"label": "График3",
"label": "График Дневной",
"widget": "chart",
"dateFormat": "DD.MM.YYYY",
"maxCount": 255,
"maxCount": 86400,
"type": "bar"
},
{
"name": "chart4",
"label": "График4",
"widget": "chart",
"maxCount": 255,
"dateFormat": "DD.MM.YYYY"
},
{
"name": "fillgauge",
"label": "Бочка",