diff --git a/src/pages/TelemetryView.jsx b/src/pages/TelemetryView.jsx
index 2fcefb2..637f854 100644
--- a/src/pages/TelemetryView.jsx
+++ b/src/pages/TelemetryView.jsx
@@ -12,7 +12,7 @@ import moment from 'moment'
import {Subscribe} from '../services/signalr'
import {DataService, MessageService} from '../services/api'
import '../styles/message.css'
-import notify from "../components/notify";
+import notify from "../components/notify"
const {Option} = Select
@@ -60,7 +60,7 @@ const axialLoadGroup = {
}
const hookWeightGroup = {
- label: "Ввес на крюке",
+ label: "Вес на крюке",
yDisplay: false,
linePv: {label: "hookWeight", units: 'т', xAccessorName: "hookWeight", yAccessorName: "date", color: '#0aa'},
lineIdle: {
@@ -114,7 +114,7 @@ const rotorTorqueGroup = {
const paramsGroups = [blockHeightGroup, blockSpeedGroup, pressureGroup, axialLoadGroup, hookWeightGroup, rotorTorqueGroup]
-export const Column = ({lineGroup, data, interval}) => {
+export const Column = ({lineGroup, data, interval, showBorder}) => {
let lines = [lineGroup.linePv]
if (lineGroup.lineSp)
@@ -123,6 +123,12 @@ export const Column = ({lineGroup, data, interval}) => {
if (lineGroup.lineOther)
lines.push(lineGroup.lineOther)
+ if (lineGroup.lineAvg)
+ lines.push(lineGroup.lineAvg)
+
+ if (lineGroup.lineMax)
+ lines.push(lineGroup.lineMax)
+
let dataLast = null
let pv = null
if (data?.length > 0) {
@@ -133,10 +139,12 @@ export const Column = ({lineGroup, data, interval}) => {
return (
<>
-
+
+
+
{line.label} )
const children = timePeriodCollection.map((line) => {line.label} )
@@ -270,14 +280,14 @@ export default function TelemetryView(props) {
-
-
- {paramsGroups.map(group =>
+ {paramsGroups.map((group, index) =>
+
diff --git a/src/pages/Well.jsx b/src/pages/Well.jsx
new file mode 100644
index 0000000..3845f4d
--- /dev/null
+++ b/src/pages/Well.jsx
@@ -0,0 +1,141 @@
+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 Documents from "../components/Documents";
+import LastData from '../pages/LastData'
+import TelemetryView from "../pages/TelemetryView";
+
+const { Content } = Layout
+
+export default function Well() {
+ let { id } = useParams()
+
+ const {SubMenu} = Menu
+
+ return (<>
+
+
+ }>
+
+ }>
+
+ }>
+
+ }>
+
+ }>
+
+ }>
+
+ }>
+
+ Документы}
+ icon={}>
+
+ }>
+
+ }>
+
+ }>
+
+ }>
+
+ }>
+
+ }>
+
+ }>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
diff --git a/src/pages/WellAnalysis.jsx b/src/pages/WellAnalysis.jsx
new file mode 100644
index 0000000..6a4600c
--- /dev/null
+++ b/src/pages/WellAnalysis.jsx
@@ -0,0 +1,159 @@
+import {Table, Select, DatePicker, ConfigProvider} from 'antd';
+import {AnalyticsService} from '../services/api'
+import {useState, useEffect} from 'react'
+import {useParams} from 'react-router-dom'
+import notify from '../components/notify'
+import LoaderPortal from '../components/LoaderPortal'
+import locale from "antd/lib/locale/ru_RU";
+import moment from 'moment'
+import '../styles/message.css'
+
+const {Option} = Select
+const pageSize = 26
+const {RangePicker} = DatePicker;
+
+const columns = [
+ {
+ title: 'Название операции',
+ key: 'name',
+ dataIndex: 'name',
+ },
+ {
+ title: 'Дата начала операции',
+ key: 'beginDate',
+ dataIndex: 'beginDate',
+ render: (item) => moment.utc(item).local().format('DD MMM YYYY, HH:mm:ss')
+ },
+ {
+ title: 'Дата окончания операции',
+ key: 'endDate',
+ dataIndex: 'endDate',
+ render: (item) => moment.utc(item).local().format('DD MMM YYYY, HH:mm:ss')
+ },
+ {
+ title: 'Глубина скважины в начале операции',
+ key: 'beginWellDepth',
+ dataIndex: 'startWellDepth',
+ },
+ {
+ title: 'Глубина скважины в конце операции',
+ key: 'endWellDepth',
+ dataIndex: 'endWellDepth',
+ }
+];
+
+const filterOptions = [
+ {label: 'Невозможно определить операцию', value: 1},
+ {label: 'Роторное бурение', value: 2},
+ {label: 'Слайдирование', value: 3},
+ {label: 'Подъем с проработкой', value: 4},
+ {label: 'Спуск с проработкой', value: 5},
+ {label: 'Подъем с промывкой', value: 6},
+ {label: 'Спуск с промывкой', value: 7},
+ {label: 'Спуск в скважину', value: 8},
+ {label: 'Спуск с вращением', value: 9},
+ {label: 'Подъем из скважины', value: 10},
+ {label: 'Подъем с вращением', value: 11},
+ {label: 'Промывка в покое', value: 12},
+ {label: 'Промывка с вращением', value: 13},
+ {label: 'Удержание в клиньях', value: 14},
+ {label: 'Неподвижное состояние', value: 15},
+ {label: 'Вращение без циркуляции', value: 16},
+ {label: 'На поверхности', value: 17}
+]
+
+export default function WellAnalysis() {
+ let {id} = useParams()
+
+ const [page, setPage] = useState(1)
+ const [range, setRange] = useState([])
+ const [categories, setCategories] = useState([])
+ const [pagination, setPagination] = useState(null)
+ const [operations, setOperations] = useState([])
+
+ const [loader, setLoader] = useState(false)
+
+ const children = filterOptions.map((line) => {line.label} )
+
+ const onChangeRange = (range) => {
+ setRange(range)
+ }
+
+ useEffect(() => {
+ const GetOperations = async () => {
+ setLoader(true)
+ try {
+ let begin = null
+ let end = null
+ if (range?.length > 1) {
+ begin = range[0].toISOString()
+ end = range[1].toISOString()
+ }
+
+ await AnalyticsService.getOperationsByWell(
+ `${id}`,
+ (page-1) * pageSize,
+ pageSize,
+ categories,
+ begin,
+ end).then((paginatedOperations) => {
+ setOperations(paginatedOperations?.items.map(o => {
+ return {
+ key: o.id,
+ begin: o.date,
+ ...o
+ }
+ }))
+
+ setPagination({
+ total: paginatedOperations?.count,
+ current: Math.floor(paginatedOperations?.skip / pageSize),
+ })
+ }
+ )
+ } catch (ex) {
+ notify(`Не удалось загрузить операции по скважине "${id}"`, 'error')
+ console.log(ex)
+ }
+ setLoader(false)
+ }
+ GetOperations()
+ }, [id, categories, range, page])
+
+ return(<>
+
+
Фильтр операций
+
+ {children}
+
+
+
+
+
+ setPage(page)
+ }}
+ rowKey={(record) => record.id}
+ />
+
+ )
+ }
\ No newline at end of file
diff --git a/src/pages/Wells.jsx b/src/pages/Wells.jsx
deleted file mode 100644
index 4bf4e9a..0000000
--- a/src/pages/Wells.jsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { useState, useEffect } from 'react'
-import { WellService } from '../services/api'
-import LoaderPortal from '../components/LoaderPortal'
-import { Table } from 'antd' // TreeSelect
-import { useHistory } from 'react-router-dom'
-import notify from '../components/notify'
-
-const columns = [
- {
- title: 'Месторождение',
- dataIndex: 'deposit',
- key: 'deposit',
- },
- {
- title: 'Куст',
- dataIndex: 'cluster',
- key: 'cluster',
- },
- {
- title: 'Скважина',
- dataIndex: 'caption',
- key: 'caption',
- },
- {
- title: 'Данные',
- dataIndex: 'lastData',
- key: 'lastData',
- },
-];
-
-export default function Wells(props){
- const [wells, setWells] = useState([])
- const [loader, setLoader] = useState(false)
- const history = useHistory()
-
- const updateWellsList = async () => {
- setLoader(true)
- try{
- let newWells = (await WellService.getWells()).map(w =>{return {key:w.id, ...w}})
- console.log(newWells)
- setWells( newWells )
- }
- catch(e){
- notify('Не удалось загрузить список скважин', 'error')
- console.error(`${e}`);
- }
- setLoader(false)
- }
-
- useEffect(()=>updateWellsList(), [])
-
- return(<>
- Скважины
-
- {
- return {
- onClick: event => {history.push(`/well/${record.id}/`)},
- };
- }}/>
-
- )
-}
\ No newline at end of file
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index 619b824..18cdace 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -5,11 +5,19 @@ export { ApiError } from './core/ApiError';
export { OpenAPI } from './core/OpenAPI';
export type { AuthDto } from './models/AuthDto';
+export type { ClusterDto } from './models/ClusterDto';
+export type { ClusterStatDto } from './models/ClusterStatDto';
+export type { CompanyDto } from './models/CompanyDto';
export type { DataSaubBaseDto } from './models/DataSaubBaseDto';
export type { DatesRangeDto } from './models/DatesRangeDto';
+export type { DepositDto } from './models/DepositDto';
export type { EventDto } from './models/EventDto';
+export type { FilePropertiesDto } from './models/FilePropertiesDto';
+export type { FilePropertiesDtoPaginationContainer } from './models/FilePropertiesDtoPaginationContainer';
export type { MessageDto } from './models/MessageDto';
export type { MessageDtoPaginationContainer } from './models/MessageDtoPaginationContainer';
+export type { OperationDto } from './models/OperationDto';
+export type { OperationDtoPaginationContainer } from './models/OperationDtoPaginationContainer';
export type { OperationDurationDto } from './models/OperationDurationDto';
export type { TelemetryInfoDto } from './models/TelemetryInfoDto';
export type { TelemetryMessageDto } from './models/TelemetryMessageDto';
@@ -18,10 +26,15 @@ export type { UserTokenDto } from './models/UserTokenDto';
export type { WellDepthToDayDto } from './models/WellDepthToDayDto';
export type { WellDepthToIntervalDto } from './models/WellDepthToIntervalDto';
export type { WellDto } from './models/WellDto';
+export type { WellSectionDto } from './models/WellSectionDto';
+export type { WellStatDto } from './models/WellStatDto';
export { AnalyticsService } from './services/AnalyticsService';
export { AuthService } from './services/AuthService';
+export { ClusterService } from './services/ClusterService';
export { DataService } from './services/DataService';
+export { DepositService } from './services/DepositService';
+export { FileService } from './services/FileService';
export { MessageService } from './services/MessageService';
export { ReportService } from './services/ReportService';
export { TelemetryService } from './services/TelemetryService';
diff --git a/src/services/api/models/ClusterDto.ts b/src/services/api/models/ClusterDto.ts
new file mode 100644
index 0000000..ec20834
--- /dev/null
+++ b/src/services/api/models/ClusterDto.ts
@@ -0,0 +1,14 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { WellDto } from './WellDto';
+
+export type ClusterDto = {
+ id?: number;
+ caption?: string | null;
+ description?: string | null;
+ latitude?: number | null;
+ longitude?: number | null;
+ wells?: Array | null;
+}
\ No newline at end of file
diff --git a/src/services/api/models/ClusterStatDto.ts b/src/services/api/models/ClusterStatDto.ts
new file mode 100644
index 0000000..911a264
--- /dev/null
+++ b/src/services/api/models/ClusterStatDto.ts
@@ -0,0 +1,16 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { WellDto } from './WellDto';
+import type { WellStatDto } from './WellStatDto';
+
+export type ClusterStatDto = {
+ id?: number;
+ caption?: string | null;
+ description?: string | null;
+ latitude?: number | null;
+ longitude?: number | null;
+ wells?: Array | null;
+ wellsStat?: Array | null;
+}
\ No newline at end of file
diff --git a/src/services/api/models/CompanyDto.ts b/src/services/api/models/CompanyDto.ts
new file mode 100644
index 0000000..fcd415a
--- /dev/null
+++ b/src/services/api/models/CompanyDto.ts
@@ -0,0 +1,9 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type CompanyDto = {
+ id?: number;
+ caption?: string | null;
+ companyType?: string | null;
+}
\ No newline at end of file
diff --git a/src/services/api/models/DataSaubBaseDto.ts b/src/services/api/models/DataSaubBaseDto.ts
index 0a9e94f..e12e1c5 100644
--- a/src/services/api/models/DataSaubBaseDto.ts
+++ b/src/services/api/models/DataSaubBaseDto.ts
@@ -38,4 +38,6 @@ export type DataSaubBaseDto = {
flow?: number | null;
flowIdle?: number | null;
flowDeltaLimitMax?: number | null;
+ idFeedRegulator?: number | null;
+ mseState?: number | null;
}
\ No newline at end of file
diff --git a/src/services/api/models/DepositDto.ts b/src/services/api/models/DepositDto.ts
new file mode 100644
index 0000000..c142448
--- /dev/null
+++ b/src/services/api/models/DepositDto.ts
@@ -0,0 +1,14 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { ClusterDto } from './ClusterDto';
+
+export type DepositDto = {
+ id?: number;
+ caption?: string | null;
+ description?: string | null;
+ latitude?: number | null;
+ longitude?: number | null;
+ clusters?: Array | null;
+}
\ No newline at end of file
diff --git a/src/services/api/models/FilePropertiesDto.ts b/src/services/api/models/FilePropertiesDto.ts
new file mode 100644
index 0000000..59ed185
--- /dev/null
+++ b/src/services/api/models/FilePropertiesDto.ts
@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type FilePropertiesDto = {
+ id?: number;
+ name?: string | null;
+ idCategory?: number;
+ uploadDate?: string;
+ userName?: string | null;
+}
\ No newline at end of file
diff --git a/src/services/api/models/FilePropertiesDtoPaginationContainer.ts b/src/services/api/models/FilePropertiesDtoPaginationContainer.ts
new file mode 100644
index 0000000..b2226ef
--- /dev/null
+++ b/src/services/api/models/FilePropertiesDtoPaginationContainer.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { FilePropertiesDto } from './FilePropertiesDto';
+
+export type FilePropertiesDtoPaginationContainer = {
+ skip?: number;
+ take?: number;
+ count?: number;
+ items?: Array | null;
+}
\ No newline at end of file
diff --git a/src/services/api/models/OperationDto.ts b/src/services/api/models/OperationDto.ts
new file mode 100644
index 0000000..9481988
--- /dev/null
+++ b/src/services/api/models/OperationDto.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type OperationDto = {
+ id?: number;
+ name?: string | null;
+ beginDate?: string;
+ endDate?: string;
+ startWellDepth?: number;
+ endWellDepth?: number;
+}
\ No newline at end of file
diff --git a/src/services/api/models/OperationDtoPaginationContainer.ts b/src/services/api/models/OperationDtoPaginationContainer.ts
new file mode 100644
index 0000000..64fcf00
--- /dev/null
+++ b/src/services/api/models/OperationDtoPaginationContainer.ts
@@ -0,0 +1,12 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { OperationDto } from './OperationDto';
+
+export type OperationDtoPaginationContainer = {
+ skip?: number;
+ take?: number;
+ count?: number;
+ items?: Array | null;
+}
\ No newline at end of file
diff --git a/src/services/api/models/OperationDurationDto.ts b/src/services/api/models/OperationDurationDto.ts
index 7f061a0..5be7a04 100644
--- a/src/services/api/models/OperationDurationDto.ts
+++ b/src/services/api/models/OperationDurationDto.ts
@@ -3,6 +3,6 @@
/* eslint-disable */
export type OperationDurationDto = {
- processName?: string | null;
+ operationName?: string | null;
duration?: number;
}
\ No newline at end of file
diff --git a/src/services/api/models/UserTokenDto.ts b/src/services/api/models/UserTokenDto.ts
index 9b4db8f..1439c28 100644
--- a/src/services/api/models/UserTokenDto.ts
+++ b/src/services/api/models/UserTokenDto.ts
@@ -9,7 +9,7 @@ export type UserTokenDto = {
surname?: string | null;
patronymic?: string | null;
id?: number;
- customerName?: string | null;
+ companyName?: string | null;
roleName?: string | null;
token?: string | null;
}
\ No newline at end of file
diff --git a/src/services/api/models/WellDto.ts b/src/services/api/models/WellDto.ts
index c161219..d681ec5 100644
--- a/src/services/api/models/WellDto.ts
+++ b/src/services/api/models/WellDto.ts
@@ -7,5 +7,7 @@ export type WellDto = {
cluster?: string | null;
deposit?: string | null;
id?: number;
- lastData?: any;
+ latitude?: number | null;
+ longitude?: number | null;
+ wellType?: string | null;
}
\ No newline at end of file
diff --git a/src/services/api/models/WellSectionDto.ts b/src/services/api/models/WellSectionDto.ts
new file mode 100644
index 0000000..684e7e5
--- /dev/null
+++ b/src/services/api/models/WellSectionDto.ts
@@ -0,0 +1,21 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type WellSectionDto = {
+ sectionType?: string | null;
+ wellDepthPlan?: number;
+ wellDepthFact?: number;
+ buildDaysPlan?: number;
+ buildDaysFact?: number;
+ rateOfPenetrationPlan?: number;
+ rateOfPenetrationFact?: number;
+ routeSpeedPlan?: number;
+ routeSpeedFact?: number;
+ bhaUpSpeedPlan?: number;
+ bhaUpSpeedFact?: number;
+ bhaDownSpeedPlan?: number;
+ bhaDownSpeedFact?: number;
+ casingDownSpeedPlan?: number;
+ casingDownSpeedFact?: number;
+}
\ No newline at end of file
diff --git a/src/services/api/models/WellStatDto.ts b/src/services/api/models/WellStatDto.ts
new file mode 100644
index 0000000..7293b43
--- /dev/null
+++ b/src/services/api/models/WellStatDto.ts
@@ -0,0 +1,27 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { CompanyDto } from './CompanyDto';
+import type { WellSectionDto } from './WellSectionDto';
+
+export type WellStatDto = {
+ caption?: string | null;
+ cluster?: string | null;
+ deposit?: string | null;
+ id?: number;
+ latitude?: number | null;
+ longitude?: number | null;
+ wellType?: string | null;
+ planStart?: string | null;
+ planEnd?: string | null;
+ factStart?: string | null;
+ factEnd?: string | null;
+ unProductiveDays?: number | null;
+ rateOfPenetrationPlan?: number | null;
+ rateOfPenetrationFact?: number | null;
+ routeSpeedPlan?: number | null;
+ routeSpeedFact?: number | null;
+ sections?: Array | null;
+ companies?: Array | null;
+}
\ No newline at end of file
diff --git a/src/services/api/services/AnalyticsService.ts b/src/services/api/services/AnalyticsService.ts
index e9d0d87..8c52822 100644
--- a/src/services/api/services/AnalyticsService.ts
+++ b/src/services/api/services/AnalyticsService.ts
@@ -1,6 +1,7 @@
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */
+import type { OperationDtoPaginationContainer } from '../models/OperationDtoPaginationContainer';
import type { OperationDurationDto } from '../models/OperationDurationDto';
import type { WellDepthToDayDto } from '../models/WellDepthToDayDto';
import type { WellDepthToIntervalDto } from '../models/WellDepthToIntervalDto';
@@ -8,6 +9,39 @@ import { request as __request } from '../core/request';
export class AnalyticsService {
+ /**
+ * Возвращает список операций на скважине за все время
+ * @param wellId id скважины
+ * @param skip для пагинации кол-во записей пропустить
+ * @param take для пагинации кол-во записей
+ * @param categoryIds список категорий
+ * @param begin дата начала
+ * @param end окончание
+ * @returns OperationDtoPaginationContainer Success
+ * @throws ApiError
+ */
+ public static async getOperationsByWell(
+wellId: number,
+skip: number,
+take: number = 32,
+categoryIds?: Array,
+begin?: string,
+end?: string,
+): Promise {
+ const result = await __request({
+ method: 'GET',
+ path: `/api/analytics/${wellId}/operationsByWell`,
+ query: {
+ 'skip': skip,
+ 'take': take,
+ 'categoryIds': categoryIds,
+ 'begin': begin,
+ 'end': end,
+ },
+ });
+ return result.body;
+ }
+
/**
* Возвращает данные по скважине "глубина-день"
* @param wellId id скважины
@@ -27,22 +61,22 @@ wellId: number,
/**
* Возвращает данные по глубине скважины за период
* @param wellId id скважины
- * @param intervalHoursTimestamp количество секунд в необходимом интервале времени
- * @param workBeginTimestamp количество секунд в времени начала смены
+ * @param intervalSeconds количество секунд в необходимом интервале времени
+ * @param workBeginSeconds количество секунд в времени начала смены
* @returns WellDepthToIntervalDto Success
* @throws ApiError
*/
public static async getWellDepthToInterval(
wellId: number,
-intervalHoursTimestamp?: number,
-workBeginTimestamp?: number,
+intervalSeconds?: number,
+workBeginSeconds?: number,
): Promise> {
const result = await __request({
method: 'GET',
path: `/api/analytics/${wellId}/wellDepthToInterval`,
query: {
- 'intervalHoursTimestamp': intervalHoursTimestamp,
- 'workBeginTimestamp': workBeginTimestamp,
+ 'intervalSeconds': intervalSeconds,
+ 'workBeginSeconds': workBeginSeconds,
},
});
return result.body;
@@ -75,22 +109,22 @@ end?: string,
/**
* Возвращает детальные данные по операциям на скважине за период
* @param wellId id скважины
- * @param intervalHoursTimestamp количество секунд в необходимом интервале времени
- * @param workBeginTimestamp количество секунд в времени начала смены
+ * @param intervalSeconds количество секунд в необходимом интервале времени
+ * @param workBeginSeconds количество секунд в времени начала смены
* @returns OperationDurationDto Success
* @throws ApiError
*/
public static async getOperationsToInterval(
wellId: number,
-intervalHoursTimestamp?: number,
-workBeginTimestamp?: number,
+intervalSeconds?: number,
+workBeginSeconds?: number,
): Promise> {
const result = await __request({
method: 'GET',
path: `/api/analytics/${wellId}/operationsToInterval`,
query: {
- 'intervalHoursTimestamp': intervalHoursTimestamp,
- 'workBeginTimestamp': workBeginTimestamp,
+ 'intervalSeconds': intervalSeconds,
+ 'workBeginSeconds': workBeginSeconds,
},
});
return result.body;
diff --git a/src/services/api/services/ClusterService.ts b/src/services/api/services/ClusterService.ts
new file mode 100644
index 0000000..da970cc
--- /dev/null
+++ b/src/services/api/services/ClusterService.ts
@@ -0,0 +1,56 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { ClusterDto } from '../models/ClusterDto';
+import type { ClusterStatDto } from '../models/ClusterStatDto';
+import type { WellDto } from '../models/WellDto';
+import { request as __request } from '../core/request';
+
+export class ClusterService {
+
+ /**
+ * Получает список доступных пользователю кустов
+ * @returns ClusterDto Success
+ * @throws ApiError
+ */
+ public static async getClusters(): Promise> {
+ const result = await __request({
+ method: 'GET',
+ path: `/api/cluster`,
+ });
+ return result.body;
+ }
+
+ /**
+ * Получение доступных пользователю скважин
+ * @param idCluster
+ * @returns WellDto Success
+ * @throws ApiError
+ */
+ public static async getWells(
+idCluster: number,
+): Promise> {
+ const result = await __request({
+ method: 'GET',
+ path: `/api/cluster/${idCluster}`,
+ });
+ return result.body;
+ }
+
+ /**
+ * Получение обопщенной статистики по кусту (лучшая/худшая скважина)
+ * @param idCluster
+ * @returns ClusterStatDto Success
+ * @throws ApiError
+ */
+ public static async getStat(
+idCluster: number,
+): Promise {
+ const result = await __request({
+ method: 'GET',
+ path: `/api/cluster/${idCluster}/Stat`,
+ });
+ return result.body;
+ }
+
+}
\ No newline at end of file
diff --git a/src/services/api/services/DataService.ts b/src/services/api/services/DataService.ts
index fa8fc17..38d648a 100644
--- a/src/services/api/services/DataService.ts
+++ b/src/services/api/services/DataService.ts
@@ -13,7 +13,7 @@ export class DataService {
* @param wellId id скважины
* @param begin дата начала выборки. По умолчанию: текущее время - intervalSec
* @param intervalSec интервал времени даты начала выборки, секунды
- * @param approxPointsCount желаемое количество точек. Если в выборке точек будет больше, то выборка будет прорежена.
+ * @param approxPointsCount жела��мое количество точек. Если в выборке точек будет больше, то выборка будет прорежена.
* @returns DataSaubBaseDto Success
* @throws ApiError
*/
diff --git a/src/services/api/services/DepositService.ts b/src/services/api/services/DepositService.ts
new file mode 100644
index 0000000..ca61820
--- /dev/null
+++ b/src/services/api/services/DepositService.ts
@@ -0,0 +1,39 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { ClusterDto } from '../models/ClusterDto';
+import type { DepositDto } from '../models/DepositDto';
+import { request as __request } from '../core/request';
+
+export class DepositService {
+
+ /**
+ * Получает список доступных пользователю месторождений
+ * @returns DepositDto Success
+ * @throws ApiError
+ */
+ public static async getDeposits(): Promise> {
+ const result = await __request({
+ method: 'GET',
+ path: `/api/deposit`,
+ });
+ return result.body;
+ }
+
+ /**
+ * Получает список доступных пользователю кустов месторождения
+ * @param depositId
+ * @returns ClusterDto Success
+ * @throws ApiError
+ */
+ public static async getClusters(
+depositId: number,
+): Promise> {
+ const result = await __request({
+ method: 'GET',
+ path: `/api/deposit/${depositId}`,
+ });
+ return result.body;
+ }
+
+}
\ No newline at end of file
diff --git a/src/services/api/services/FileService.ts b/src/services/api/services/FileService.ts
new file mode 100644
index 0000000..60af0b4
--- /dev/null
+++ b/src/services/api/services/FileService.ts
@@ -0,0 +1,87 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { FilePropertiesDtoPaginationContainer } from '../models/FilePropertiesDtoPaginationContainer';
+import { request as __request } from '../core/request';
+
+export class FileService {
+
+ /**
+ * Сохраняет переданные файлы и информацию о них
+ * @param wellId id скважины
+ * @param idCategory id категории файла
+ * @param idUser id отправившего файл пользователя
+ * @param requestBody
+ * @returns number Success
+ * @throws ApiError
+ */
+ public static async saveFiles(
+wellId: number,
+idCategory?: number,
+idUser?: number,
+requestBody?: any,
+): Promise {
+ const result = await __request({
+ method: 'POST',
+ path: `/api/files/${wellId}/files`,
+ query: {
+ 'idCategory': idCategory,
+ 'idUser': idUser,
+ },
+ body: requestBody,
+ });
+ return result.body;
+ }
+
+ /**
+ * Возвращает информацию о файлах для сква��ины в выбраной категории
+ * @param wellId id скважины
+ * @param skip для пагинации кол-во записей пропустить
+ * @param take для пагинации кол-во записей взять
+ * @param idCategory id категории файла
+ * @param begin дата начала
+ * @param end дата окончания
+ * @returns FilePropertiesDtoPaginationContainer Success
+ * @throws ApiError
+ */
+ public static async getFilesInfo(
+wellId: number,
+skip: number,
+take: number = 32,
+idCategory: number,
+begin?: string,
+end?: string,
+): Promise {
+ const result = await __request({
+ method: 'GET',
+ path: `/api/files/${wellId}`,
+ query: {
+ 'skip': skip,
+ 'take': take,
+ 'idCategory': idCategory,
+ 'begin': begin,
+ 'end': end,
+ },
+ });
+ return result.body;
+ }
+
+ /**
+ * Возвращает файл с диска на сервере
+ * @param wellId id скважины
+ * @param fileId id запрашиваемого файла
+ * @returns string Success
+ * @throws ApiError
+ */
+ public static async getFile(
+wellId: number,
+fileId: number,
+): Promise {
+ const result = await __request({
+ method: 'GET',
+ path: `/api/files/${wellId}/${fileId}`,
+ });
+ return result.body;
+ }
+
+}
\ No newline at end of file
diff --git a/src/services/api/services/ReportService.ts b/src/services/api/services/ReportService.ts
index e63a83e..e02c282 100644
--- a/src/services/api/services/ReportService.ts
+++ b/src/services/api/services/ReportService.ts
@@ -116,7 +116,7 @@ end?: string,
}
/**
- * Возвращает даты самого старого и самого свежего отчетов в БД
+ * Возвра��ает даты самого старого и самого свежего отчетов в БД
* @param wellId id скважины
* @returns DatesRangeDto Success
* @throws ApiError
diff --git a/src/services/signalr/index.ts b/src/services/signalr/index.ts
index 02aad65..72ed2fb 100644
--- a/src/services/signalr/index.ts
+++ b/src/services/signalr/index.ts
@@ -12,16 +12,21 @@ type ConnectionsDict = {
[route: string]: HubConnection;
};
+//var baseUrl = `http://192.168.1.70:5000`
+var baseUrl = process.env.NODE_ENV === 'development'
+ ?'http://192.168.1.70:5000'
+ :''
+
const Connections: ConnectionsDict = {
'hubs/telemetry': new HubConnectionBuilder()
- .withUrl(`http://192.168.1.70:5000/hubs/telemetry`, ConnectionOptions)
- .withAutomaticReconnect()
- .build(),
+ .withUrl(`${baseUrl}/hubs/telemetry`, ConnectionOptions)//
+ .withAutomaticReconnect()
+ .build(),
'hubs/reports': new HubConnectionBuilder()
- .withUrl(`http://192.168.1.70:5000/hubs/reports`, ConnectionOptions)
- .withAutomaticReconnect()
- .build()
+ .withUrl(`${baseUrl}/hubs/reports`, ConnectionOptions)
+ .withAutomaticReconnect()
+ .build()
}
let connectionPromise: Promise
@@ -43,6 +48,21 @@ type handlerFunction = (...args: any[]) => void;
type cleanFunction = (...args: any[]) => void;
+const MakeUnsubscribeFunction = (
+ connection: HubConnection,
+ methodName: string,
+ groupName: (string|null)):cleanFunction => {
+ return async() => {
+ if(connection.state === HubConnectionState.Connected)
+ {
+ if(groupName)
+ await connection.send('RemoveFromGroup', groupName)
+ connection.off(methodName)
+ }
+ connection.stop()
+ }
+}
+
/** Subscribe on some SignalR method (topic).
* @example useEffect(() => Subscribe('methodName', `${id}`, handleNewData), [id]);
* @param {string} methodName name of the method
@@ -61,12 +81,7 @@ const Subscribe = (
connection.on(methodName, handler)
})
- if(groupName)
- return () => {
- Connections[hubUrl].send('RemoveFromGroup', groupName)
- .finally(()=>Connections[hubUrl].off(methodName))
- }
- return () => Connections[hubUrl].off(methodName)
+ return MakeUnsubscribeFunction(Connections[hubUrl],methodName,groupName)
}
/** Invokes some SignalR method.
diff --git a/src/styles/App.less b/src/styles/App.less
index 1ed41b2..25c6ad0 100644
--- a/src/styles/App.less
+++ b/src/styles/App.less
@@ -163,6 +163,7 @@ tr.table_row_size {
}
.header-tree-select{
+ width: 300px;
border: 1px solid rgba(255, 255, 255, 0.2);
background-color: rgba(0, 0, 0, 0.3);
}
diff --git a/src/styles/index.css b/src/styles/index.css
index 8d31ab7..9a60f46 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -48,3 +48,11 @@ code {
monospace;
}
+.linkDocuments {
+ color: #000;
+}
+
+.linkDocuments:hover {
+ color: #c32828;
+}
+
diff --git a/src/styles/message.css b/src/styles/message.css
index fb003b0..cd0e395 100644
--- a/src/styles/message.css
+++ b/src/styles/message.css
@@ -33,7 +33,7 @@
margin: 0 0 5px 0;
}
-.filter-group__heading {
+.filter-group-heading {
margin: 5px auto;
align-items: center;
}
+
+