DmitrMakeev commited on
Commit
ddf3c5a
·
verified ·
1 Parent(s): c05e610

Update table.html

Browse files
Files changed (1) hide show
  1. table.html +38 -35
table.html CHANGED
@@ -3,46 +3,49 @@
3
  <head>
4
  <meta charset="UTF-8">
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
6
- <title>Tabulator Table</title>
7
- <link href="https://unpkg.com/tabulator-tables@5.4.3/dist/css/tabulator.min.css" rel="stylesheet">
8
- <script src="https://unpkg.com/tabulator-tables@5.4.3/dist/js/tabulator.min.js"></script>
9
  </head>
10
  <body>
11
-
12
- <div id="table"></div>
13
 
14
  <script>
15
- // JSON-данные
16
- const tableData = [
17
- {
18
- "date_time": "2025-03-22 10:21:42", "dey": "1", "ec": "1.2", "hDm": "50.0",
19
- "id": 1, "nEC": "1.20", "nLoff": "22:00", "nLon": "10:00", "nPh": "5.55",
20
- "nTa": "28", "onA": "1", "onB": "3", "onC": "2", "ph": "1.55",
21
- "sVen": "100", "tA": "22.0", "tS": "25.0", "v_hid": "10", "v_min": "30", "wek": "1"
22
- },
23
- {
24
- "date_time": "2025-03-22 10:21:45", "dey": "1", "ec": "1.2", "hDm": "50.0",
25
- "id": 2, "nEC": "1.20", "nLoff": "22:00", "nLon": "10:00", "nPh": "5.55",
26
- "nTa": "28", "onA": "1", "onB": "3", "onC": "2", "ph": "1.55",
27
- "sVen": "100", "tA": "22.0", "tS": "25.0", "v_hid": "10", "v_min": "30", "wek": "1"
28
- }
29
- ];
30
-
31
- // Определение колонок
32
- const table = new Tabulator("#table", {
33
- data: tableData,
34
- layout: "fitColumns",
35
- columns: [
36
- { title: "ID", field: "id", sorter: "number", width: 60 },
37
- { title: "Дата и время", field: "date_time", sorter: "string" },
38
- { title: "День", field: "dey", sorter: "number" },
39
- { title: "EC", field: "ec", sorter: "number" },
40
- { title: "Температура воздуха", field: "tA", sorter: "number" },
41
- { title: "PH", field: "ph", sorter: "number" },
42
- { title: "Влажность", field: "hDm", sorter: "number" }
43
- ]
 
 
 
 
 
44
  });
45
  </script>
46
-
47
  </body>
48
  </html>
 
3
  <head>
4
  <meta charset="UTF-8">
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
6
+ <title>Таблица данных</title>
7
+ <link href="https://unpkg.com/tabulator-tables@5.5.0/dist/css/tabulator.min.css" rel="stylesheet">
8
+ <script src="https://unpkg.com/tabulator-tables@5.5.0/dist/js/tabulator.min.js"></script>
9
  </head>
10
  <body>
11
+ <div id="data-table"></div>
 
12
 
13
  <script>
14
+ document.addEventListener("DOMContentLoaded", function () {
15
+ fetch("/get_all_data")
16
+ .then(response => response.json())
17
+ .then(data => {
18
+ const table = new Tabulator("#data-table", {
19
+ layout: "fitColumns",
20
+ columns: [
21
+ { title: "ID", field: "id", sorter: "number" },
22
+ { title: "Неделя", field: "wek", sorter: "number" },
23
+ { title: "День", field: "dey", sorter: "number" },
24
+ { title: "Время системы", field: "time_system", sorter: "string" },
25
+ { title: "Уровень pH", field: "ph", sorter: "number" },
26
+ { title: "Уровень EC", field: "ec", sorter: "number" },
27
+ { title: "Темп. раствора", field: "tS", sorter: "number" },
28
+ { title: "Темп. воздуха", field: "tA", sorter: "number" },
29
+ { title: "Влажность воздуха", field: "hDm", sorter: "number" },
30
+ { title: "Об. вентилятора", field: "sVen", sorter: "number" },
31
+ { title: "pH (нас)", field: "nPh", sorter: "number" },
32
+ { title: "EC (нас)", field: "nEC", sorter: "number" },
33
+ { title: "Свет ВКЛ (нас)", field: "nLon", sorter: "string" },
34
+ { title: "Свет ОТКЛ (нас)", field: "nLoff", sorter: "string" },
35
+ { title: "Темп. воздуха (нас)", field: "nTa", sorter: "number" },
36
+ { title: "Насос A (нас)", field: "onA", sorter: "number" },
37
+ { title: "Насос B (нас)", field: "onB", sorter: "number" },
38
+ { title: "Насос C (нас)", field: "onC", sorter: "number" },
39
+ { title: "Дата записи", field: "date_time", sorter: "datetime" }
40
+ ],
41
+ data: data.map(item => ({
42
+ ...item,
43
+ time_system: `${item.v_hid}:${item.v_min}` // Объединяем v_hid и v_min через двоеточие
44
+ }))
45
+ });
46
+ })
47
+ .catch(error => console.error("Ошибка загрузки данных:", error));
48
  });
49
  </script>
 
50
  </body>
51
  </html>