From 3077ffabcf1a33b5ff6b267cebed72b8cae117f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Wed, 18 Aug 2021 11:40:46 +0500 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=B5=D1=81=D1=8C=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D1=8B=D0=B9=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=B4=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=B2=20=D0=BF=D0=B0=D0=BF=D0=BA=D1=83=20concept?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {src/pages => concept}/Analysis.jsx | 6 +++--- {src/pages => concept}/Smbo/EquipmentDetails.jsx | 0 {src/pages => concept}/Smbo/SmboPlate.jsx | 0 {src/pages => concept}/Smbo/index.jsx | 0 {src/pages => concept}/WellStat.jsx | 10 +++++----- .../WellTelemetryAnalysis.jsx | 8 ++++---- concept/readme.md | 1 + tsconfig.json | 4 +--- 8 files changed, 14 insertions(+), 15 deletions(-) rename {src/pages => concept}/Analysis.jsx (76%) rename {src/pages => concept}/Smbo/EquipmentDetails.jsx (100%) rename {src/pages => concept}/Smbo/SmboPlate.jsx (100%) rename {src/pages => concept}/Smbo/index.jsx (100%) rename {src/pages => concept}/WellStat.jsx (93%) rename src/pages/WellAnalysis.jsx => concept/WellTelemetryAnalysis.jsx (95%) create mode 100644 concept/readme.md diff --git a/src/pages/Analysis.jsx b/concept/Analysis.jsx similarity index 76% rename from src/pages/Analysis.jsx rename to concept/Analysis.jsx index 4033654..ce49235 100644 --- a/src/pages/Analysis.jsx +++ b/concept/Analysis.jsx @@ -1,6 +1,6 @@ -import { AnalysisDepthToDay } from '../components/AnalysisDepthToDay' -import { AnalysisDepthToInterval } from '../components/AnalysisDepthToInterval' -import { AnalysisOperationTime } from '../components/AnalysisOperationTime' +import { AnalysisDepthToDay } from '../src/components/AnalysisDepthToDay' +import { AnalysisDepthToInterval } from '../src/components/AnalysisDepthToInterval' +import { AnalysisOperationTime } from '../src/components/AnalysisOperationTime' import { Row, Col } from 'antd' export default function Analysis({idWell}) { diff --git a/src/pages/Smbo/EquipmentDetails.jsx b/concept/Smbo/EquipmentDetails.jsx similarity index 100% rename from src/pages/Smbo/EquipmentDetails.jsx rename to concept/Smbo/EquipmentDetails.jsx diff --git a/src/pages/Smbo/SmboPlate.jsx b/concept/Smbo/SmboPlate.jsx similarity index 100% rename from src/pages/Smbo/SmboPlate.jsx rename to concept/Smbo/SmboPlate.jsx diff --git a/src/pages/Smbo/index.jsx b/concept/Smbo/index.jsx similarity index 100% rename from src/pages/Smbo/index.jsx rename to concept/Smbo/index.jsx diff --git a/src/pages/WellStat.jsx b/concept/WellStat.jsx similarity index 93% rename from src/pages/WellStat.jsx rename to concept/WellStat.jsx index 1ffa927..4d767f9 100644 --- a/src/pages/WellStat.jsx +++ b/concept/WellStat.jsx @@ -1,9 +1,9 @@ -import LoaderPortal from '../components/LoaderPortal' +import LoaderPortal from '../src/components/LoaderPortal' import { useState, useEffect } from "react"; -import {makeColumn, makeColumnsPlanFact, RegExpIsFloat} from '../components/factory' -import {WellSectionService} from '../services/api' -import {invokeWebApiWrapperAsync} from '../components/factory' -import { EditableTable } from '../components/EditableTable'; +import {makeColumn, makeColumnsPlanFact, RegExpIsFloat} from '../src/components/factory' +import {WellSectionService} from '../src/services/api' +import {invokeWebApiWrapperAsync} from '../src/components/factory' +import { EditableTable } from '../src/components/EditableTable'; import { Input } from 'antd' const TypeSelector = diff --git a/src/pages/WellAnalysis.jsx b/concept/WellTelemetryAnalysis.jsx similarity index 95% rename from src/pages/WellAnalysis.jsx rename to concept/WellTelemetryAnalysis.jsx index be2d447..e0505b9 100644 --- a/src/pages/WellAnalysis.jsx +++ b/concept/WellTelemetryAnalysis.jsx @@ -1,9 +1,9 @@ import { Table, Select, DatePicker } from "antd"; -import { TelemetryAnalyticsService } from "../services/api"; +import { TelemetryAnalyticsService } from "../src/services/api"; import { useState, useEffect } from "react"; import { useParams } from "react-router-dom"; -import notify from "../components/notify"; -import LoaderPortal from "../components/LoaderPortal"; +import notify from "../src/components/notify"; +import LoaderPortal from "../src/components/LoaderPortal"; import moment from "moment"; import "../styles/message.css"; @@ -61,7 +61,7 @@ const filterOptions = [ { label: "На поверхности", value: 17 }, ]; -export default function WellAnalysis() { +export default function WellTelemetryAnalysis() { let { id } = useParams(); const [page, setPage] = useState(1); diff --git a/concept/readme.md b/concept/readme.md new file mode 100644 index 0000000..922de29 --- /dev/null +++ b/concept/readme.md @@ -0,0 +1 @@ +Папка для компонент реализация которых отложена, но наработки уже есть \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index a273b0c..dec663b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,7 +20,5 @@ "noEmit": true, "jsx": "react-jsx" }, - "include": [ - "src" - ] + "include": ["src"] }