diff --git a/package-lock.json b/package-lock.json
index 83ede66..4e3dedc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,6 +18,7 @@
"chartjs-plugin-datalabels": "^2.0.0-beta.1",
"craco-less": "^1.17.1",
"date-fns": "^2.20.0",
+ "moment": "^2.29.1",
"react": "^17.0.2",
"react-datepicker": "^3.8.0",
"react-dom": "^17.0.2",
diff --git a/package.json b/package.json
index 88a9bfe..7f67ffd 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
"chartjs-plugin-datalabels": "^2.0.0-beta.1",
"craco-less": "^1.17.1",
"date-fns": "^2.20.0",
+ "moment": "^2.29.1",
"react": "^17.0.2",
"react-datepicker": "^3.8.0",
"react-dom": "^17.0.2",
diff --git a/src/components/charts/ChartDeep.jsx b/src/components/charts/ChartDepth.jsx
similarity index 83%
rename from src/components/charts/ChartDeep.jsx
rename to src/components/charts/ChartDepth.jsx
index 2e95fc2..0af149e 100644
--- a/src/components/charts/ChartDeep.jsx
+++ b/src/components/charts/ChartDepth.jsx
@@ -1,6 +1,6 @@
import ChartDataLabels from 'chartjs-plugin-datalabels'
-const defaoultOptionsDeepLabels = {
+const defaultOptionsDepthLabels = {
borderWidth: 1,
borderColor: black,
borderRadius: 4,
@@ -10,7 +10,7 @@ const defaoultOptionsDeepLabels = {
datasets: [{
datalabels: {
color: '#0f4000'
- }
+ }
}]
}
}
\ No newline at end of file
diff --git a/src/pages/Archive.jsx b/src/pages/Archive.jsx
index defb0fe..65ee8e9 100644
--- a/src/pages/Archive.jsx
+++ b/src/pages/Archive.jsx
@@ -1,5 +1,5 @@
-export default function Archive(props){
- return(
Архив )
- }
\ No newline at end of file
+export default function Archive(props) {
+ return (Архив )
+}
\ No newline at end of file
diff --git a/src/pages/Files.jsx b/src/pages/Files.jsx
index 7d12948..05d39e7 100644
--- a/src/pages/Files.jsx
+++ b/src/pages/Files.jsx
@@ -1,3 +1,3 @@
-export default function Files(props){
- return(Файлы )
+export default function Files(props) {
+ return (Файлы )
}
\ No newline at end of file
diff --git a/src/pages/Report.jsx b/src/pages/Report.jsx
index 6fe58a0..ed5c046 100644
--- a/src/pages/Report.jsx
+++ b/src/pages/Report.jsx
@@ -1,32 +1,98 @@
import React, { useState } from "react";
-import DatePicker, { registerLocale, setDefaultLocale } from "react-datepicker";
-import ru from 'date-fns/locale/ru';
-
-import "react-datepicker/dist/react-datepicker.css";
+import {
+ DatePicker,
+ Radio,
+ ConfigProvider,
+ Button,
+ Select,
+ Checkbox,
+ Pagination
+} from 'antd';
+import 'moment/locale/ru';
+import locale from 'antd/lib/locale/ru_RU';
-registerLocale('ru', ru)
+const { RangePicker } = DatePicker;
+const { Option } = Select;
-export default function Report(props){
- const PeriodOfTime = () => {
- const [startDate, setStartDate] = useState(new Date());
- return (
- setStartDate(date)}
- locale='ru'
- />
- );
- };
- return(<>
+// Расширение файла для составленного рапорта
+const ExeptionFileChecker = () => {
+ const [value, setValue] = React.useState(1);
+ const onChange = e => {
+ console.log('radio checked', e.target.value);
+ setValue(e.target.value);
+ }
+
+ return (
+ PDF
+ LAS
+
+ )
+}
+
+// Выбор периода времени
+const PeriodOfTime = () => {
+ const [startDate, setStartDate] = useState(new Date());
+
+ return (
+
+
+
+ )
+}
+
+// Выбор содержимого
+const ContentSelection = () => {
+ function onChange(e) {
+ console.log(`checked = ${e.target.checked}`);
+ }
+
+ return (<>
+ Графики
+ Сообщения
+ >
+ )
+}
+
+// Выбор шага графика
+const GraphicStep = () => {
+ function handleChange(value) {
+ console.log(`selected ${value}`);
+ }
+
+ return (
+
+ 1 минута
+ 1 день
+ 1 неделя
+
+ )
+}
+
+// Экспорт рендера
+export default function Report(props) {
+ return (<>
Рапорт
+
Выбор за период времени и расширение файла
-
- las
- pdf
-
- >
- )
-}
\ No newline at end of file
+ Шаг графиков
+
+ {/* Содержимое отчёта
+ */}
+
+
+ *Предполагаемое колличество страниц
+
+
+ Получить рапорт
+
+
+ >
+ )
+}
+
+// TODO ограничить датапикер по дате за 3 дня до