From 5967cbdd1d252eec240354829d1affc6d89e184b 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, 28 Jul 2021 17:44:44 +0500 Subject: [PATCH] Add WellStat, rename ClusterStat --- package.json | 2 +- src/pages/Files.jsx | 7 ------- src/pages/Well.jsx | 9 ++++----- src/services/api/models/WellOperationDto.ts | 6 ++++++ 4 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 src/pages/Files.jsx diff --git a/package.json b/package.json index 576e207..08ccc73 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "react_test": "react-scripts test", "eject": "react-scripts eject" }, - "proxy": "http://192.168.1.70:5000", + "proxy": "http://127.0.0.1:5000", "eslintConfig": { "extends": [ "react-app", diff --git a/src/pages/Files.jsx b/src/pages/Files.jsx deleted file mode 100644 index 9ec760b..0000000 --- a/src/pages/Files.jsx +++ /dev/null @@ -1,7 +0,0 @@ -export default function Files(props) { - return ( -
-

Файлы

-
- ) -} \ No newline at end of file diff --git a/src/pages/Well.jsx b/src/pages/Well.jsx index 5a197fe..79772db 100644 --- a/src/pages/Well.jsx +++ b/src/pages/Well.jsx @@ -1,14 +1,13 @@ import {Layout, Menu} from "antd"; import {FolderOutlined, FundViewOutlined} from "@ant-design/icons"; import {Link, Redirect, Route, Switch, useParams} from "react-router-dom"; -import Files from "../pages/Files"; import Archive from "../pages/Archive"; import Messages from "../pages/Messages"; import Report from "../pages/Report"; import Analysis from "../pages/Analysis"; import WellAnalysis from "../pages/WellAnalysis"; import TelemetryView from "../pages/TelemetryView"; -import MenuDocuments from "../components/MenuDocuments"; +import WellStat from "./WellStat"; const { Content } = Layout @@ -41,7 +40,7 @@ export default function Well() { Операции по скважине }> - Файлы + Статистика }> Архив @@ -82,8 +81,8 @@ export default function Well() { - - + + diff --git a/src/services/api/models/WellOperationDto.ts b/src/services/api/models/WellOperationDto.ts index 2e9fb3c..3e90db8 100644 --- a/src/services/api/models/WellOperationDto.ts +++ b/src/services/api/models/WellOperationDto.ts @@ -3,4 +3,10 @@ /* eslint-disable */ export type WellOperationDto = { + id?: number; + idWell?: number; + caption?: string | null; + description?: string | null; + casingSection?: number; + wellDepth?: number; } \ No newline at end of file