From a1ed3368c5ee48979f73b58c65c40e9e08b79f59 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Fri, 15 Oct 2021 16:03:36 +0500
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Cluster/ClusterWells.jsx           |  3 ++-
 src/pages/WellOperations/index.jsx           | 14 +++++++-------
 src/services/api/models/DrillFlowChartDto.ts |  1 +
 src/services/api/models/WellDto.ts           |  1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

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]}>
-        <Menu.Item key="tvd" icon={<FolderOutlined />}>
+        <Menu.Item key="tvd" icon={<LineChartOutlined />}>
           <Link to={`${rootPath}/tvd`}>TVD</Link>
         </Menu.Item>
-        <Menu.Item key="sections" icon={<FolderOutlined />}>
+        <Menu.Item key="sections" icon={<BuildOutlined />}>
           <Link to={`${rootPath}/sections`}>Секции</Link>
         </Menu.Item>
-        <Menu.Item key="plan" icon={<FolderOutlined />}>
+        <Menu.Item key="plan" icon={<TableOutlined />}>
           <Link to={`${rootPath}/plan`}>План</Link>
         </Menu.Item>        
-        <Menu.Item key="fact" icon={<FolderOutlined />}>
+        <Menu.Item key="fact" icon={<TableOutlined />}>
           <Link to={`${rootPath}/fact`}>Факт</Link>
         </Menu.Item>
-        <Menu.Item key="params" icon={<FolderOutlined />}>
+        <Menu.Item key="params" icon={<ControlOutlined />}>
           <Link to={`${rootPath}/params`}>Режимы</Link>
         </Menu.Item>
-        <Menu.Item key="composite" icon={<FolderOutlined />}>
+        <Menu.Item key="composite" icon={<DeploymentUnitOutlined />}>
           <Link to={`${rootPath}/composite`}>Композитная скважина</Link>
         </Menu.Item>
         <ImportExportBar idWell={idWell} disabled={isIEBarDisabled} onImported={onImported}/>
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;
 }