diff --git a/src/pages/Cluster/ClusterWells.jsx b/src/pages/Cluster/ClusterWells.jsx index fcb4360..f986c13 100644 --- a/src/pages/Cluster/ClusterWells.jsx +++ b/src/pages/Cluster/ClusterWells.jsx @@ -1,6 +1,7 @@ import { Link } from 'react-router-dom' import { useState, useEffect } from 'react' -import { Table, Tag, Button, Modal } from 'antd' +import { Tag, Button, Modal } from 'antd' +import { Table } from '../../components/Table' import { LineChartOutlined, ProfileOutlined } from '@ant-design/icons' import { makeTextColumn, diff --git a/src/pages/WellOperations/index.jsx b/src/pages/WellOperations/index.jsx index 02a7b4f..cb5283d 100644 --- a/src/pages/WellOperations/index.jsx +++ b/src/pages/WellOperations/index.jsx @@ -1,6 +1,6 @@ import {Layout, Menu} from "antd"; import {Switch, Link, Route, Redirect, useParams, useHistory} from "react-router-dom"; -import { FolderOutlined } from "@ant-design/icons"; +import { DeploymentUnitOutlined, LineChartOutlined, BuildOutlined, TableOutlined, ControlOutlined } from "@ant-design/icons"; import { WellDrillParams } from './WellDrillParams' import { WellSectionsStat } from './WellSectionsStat' import { WellCompositeEditor } from './WellCompositeEditor' @@ -25,22 +25,22 @@ export default function WellOperations({idWell}) { selectable={true} className="well_menu" selectedKeys={[tab]}> - }> + }> TVD - }> + }> Секции - }> + }> План - }> + }> Факт - }> + }> Режимы - }> + }> Композитная скважина diff --git a/src/services/api/models/DrillFlowChartDto.ts b/src/services/api/models/DrillFlowChartDto.ts index 11e104c..ec4a959 100644 --- a/src/services/api/models/DrillFlowChartDto.ts +++ b/src/services/api/models/DrillFlowChartDto.ts @@ -5,6 +5,7 @@ export type DrillFlowChartDto = { id?: number; idWell?: number; + idWellOperationCategory?: number; lastUpdate?: string; depthStart?: number; depthEnd?: number; diff --git a/src/services/api/models/WellDto.ts b/src/services/api/models/WellDto.ts index 0557855..bdb4e1d 100644 --- a/src/services/api/models/WellDto.ts +++ b/src/services/api/models/WellDto.ts @@ -12,5 +12,6 @@ export type WellDto = { latitude?: number | null; longitude?: number | null; wellType?: string | null; + lastTelemetryDate?: string; telemetry?: TelemetryDto; }