- )
- }
-
- return (<>
-
-
-
-
-
-
- {charts}
-
-
- )
-}
\ No newline at end of file
diff --git a/src/pages/Archive/ArchiveColumn.jsx b/src/pages/Archive/ArchiveColumn.jsx
new file mode 100644
index 0000000..0118086
--- /dev/null
+++ b/src/pages/Archive/ArchiveColumn.jsx
@@ -0,0 +1,35 @@
+import { useEffect, useState } from 'react'
+import { Grid, GridItem } from '../../components/Grid'
+import { Column } from '../../components/charts/Column'
+
+export const ArchiveColumn = ({ lineGroup, data, interval, style, headerHeight, yStart }) => {
+ const [lineGroupWithoutShapes, setLineGroupWithoutShapes] = useState([])
+ const [pv, setPV] = useState([])
+
+ useEffect(() => {
+ const lgws = lineGroup.filter(cfg => !cfg.isShape)
+ setLineGroupWithoutShapes(lgws)
+ setPV(lgws.filter(line => line.showLabels).map(line => ({
+ color: line.color,
+ label: line.label
+ })))
+ }, [lineGroup])
+
+
+ return (
+
+
+ {pv?.map((v, idx) => (
+ {v.label}
+ ))}
+
+
+
+ )
+}
diff --git a/src/pages/Archive/ArchiveDisplay.jsx b/src/pages/Archive/ArchiveDisplay.jsx
new file mode 100644
index 0000000..7035c82
--- /dev/null
+++ b/src/pages/Archive/ArchiveDisplay.jsx
@@ -0,0 +1,66 @@
+import { useEffect, useState } from 'react'
+import { Grid, GridItem } from '../../components/Grid'
+import { ArchiveColumn } from './ArchiveColumn'
+import { paramsGroups } from '../TelemetryView'
+
+const interpolationSearch = (data, begin, end, accessor) => {
+ const fy = (i) => new Date(data[i]?.[accessor] ?? 0)
+ const fx = (y, b, e) => Math.round(b + (y - fy(b)) * (e - b) / (fy(e) - fy(b)))
+ const findIdx = (val, startIdx, c) => {
+ let x = startIdx
+ let endIdx = data.length - 1
+ if(val < fy(startIdx))
+ return startIdx
+ if(val > fy(endIdx))
+ return endIdx
+ for(let i = 0; i < c; i++){
+ x = fx(val, startIdx, endIdx)
+ if(fy(x) < val)
+ startIdx = x
+ else
+ endIdx = x
+ if ((startIdx === endIdx)||(fy(startIdx) === fy(endIdx)))
+ return x
+ }
+ return x
+ }
+ let x0 = findIdx(begin, 0, 5)
+ let x1 = findIdx(end, x0, 3)
+ return { start: x0, end: x1, count: x1 - x0 }
+}
+
+export const cutData = (data, beginDate, endDate) => {
+ if (data?.length > 0) {
+ let { start, end } = interpolationSearch(data, beginDate, endDate, 'date')
+ if (start > 0) start--
+ if (end + 1 < end.length) end++
+ return data.slice(start, end)
+ }
+ return data
+}
+
+export const ArchiveDisplay = ({data, startDate, interval, onWheel}) => {
+ const [chartData, setChartData] = useState([])
+
+ useEffect(() => {
+ const endDate = new Date(+startDate + interval)
+ setChartData(cutData(data, startDate, endDate))
+ }, [data, startDate, interval])
+
+ return (
+
+ {paramsGroups.map((group, index) => (
+
+
+
+ ))}
+
+ )
+}
diff --git a/src/pages/Archive/index.jsx b/src/pages/Archive/index.jsx
new file mode 100644
index 0000000..f22a53b
--- /dev/null
+++ b/src/pages/Archive/index.jsx
@@ -0,0 +1,146 @@
+import moment from 'moment'
+import { DatePicker } from 'antd'
+import { useState, useEffect } from 'react'
+import { TelemetryDataSaubService } from '../../services/api'
+import { invokeWebApiWrapperAsync } from '../../components/factory'
+import LoaderPortal from '../../components/LoaderPortal'
+import { Flex } from '../../components/Grid'
+import { PeriodPicker, defaultPeriod } from '../../components/PeriodPicker'
+import { ArchiveDisplay, cutData } from './ArchiveDisplay'
+import { normalizeData, sortByDate } from '../TelemetryView'
+
+const DATA_COUNT = 2048 // Колличество точек на подгрузку графика
+const ADDITIVE_PAGES = 2 // Дополнительные данные для графиков
+const LOADING_TRIGGER = 0.5
+const WHEEL_SENSITIVITY = 1 / 530
+
+const getLoadingInterval = (loaded, startDate, interval) => {
+ // Если данные загружены и дата не заходит за тригер дозагрузка не требуется
+ if (
+ loaded &&
+ +startDate - interval * LOADING_TRIGGER > loaded.start &&
+ +startDate + interval * (LOADING_TRIGGER + 1) < loaded.end
+ )
+ return { loadingStartDate: startDate, newLoaded: loaded, loadingInterval: 0 }
+
+ let loadingStartDate = +startDate - interval * ADDITIVE_PAGES
+ let loadingEndDate = +startDate + interval * (ADDITIVE_PAGES + 1)
+
+ const newLoaded = {
+ start: loadingStartDate,
+ end: loadingEndDate
+ }
+
+ if (loaded) {
+ if (loadingStartDate >= loaded.start)
+ loadingStartDate = loaded.end
+ if (loadingEndDate <= loaded.end)
+ loadingEndDate = loaded.start
+ newLoaded.start = Math.min(loaded.start, loadingStartDate)
+ newLoaded.end = Math.max(loaded.end, loadingEndDate)
+ }
+
+ const loadingInterval = Math.trunc((loadingEndDate - loadingStartDate) / 1000)
+
+ return {
+ loadingStartDate: new Date(loadingStartDate),
+ newLoaded: {
+ start: new Date(newLoaded.start),
+ end: new Date(newLoaded.end)
+ },
+ loadingInterval
+ }
+}
+
+export default function Archive({idWell}) {
+ const [dataSaub, setDataSaub] = useState([])
+ const [chartInterval, setChartInterval] = useState(parseInt(defaultPeriod) * 1000)
+ const [startDate, setStartDate] = useState(new Date(+new Date() - chartInterval))
+ const [showLoader, setShowLoader] = useState(false)
+ const [loaded, setLoaded] = useState(null)
+
+ const onGraphWheel = (e) => {
+ if (loaded) {
+ setStartDate((prevStartDate) => {
+ const offset = e.deltaY * chartInterval * WHEEL_SENSITIVITY
+ const nextStartDate = new Date(+prevStartDate + offset)
+ const lastPossibleDate = new Date(Math.min(loaded.end, new Date()) - chartInterval)
+ return new Date(Math.max(loaded.start, Math.min(nextStartDate, lastPossibleDate)))
+ })
+ }
+ }
+
+ useEffect(() => invokeWebApiWrapperAsync(
+ async () => {
+ const dates = await TelemetryDataSaubService.getDataDatesRange(idWell)
+ let startDate
+ if (dates?.from && dates?.to)
+ startDate = Math.max(new Date(dates.from), +new Date(dates.to) - chartInterval)
+ else
+ startDate = +new Date() - chartInterval
+ setStartDate(new Date(startDate))
+ },
+ setShowLoader,
+ `Не удалось загрузить диапозон телеметрии для скважины "${idWell}"`
+ ), [])
+
+ useEffect(() => {
+ setStartDate((startDate) => new Date(Math.min(+new Date() - chartInterval, startDate)))
+ setDataSaub([])
+ }, [chartInterval])
+
+ useEffect(() => {
+ if (showLoader) return
+ const { loadingStartDate, loadingInterval, newLoaded } = getLoadingInterval(loaded, startDate, chartInterval)
+ if (loadingInterval <= 0) return
+ invokeWebApiWrapperAsync(
+ async () => {
+ const data = await TelemetryDataSaubService.getData(idWell, loadingStartDate.toISOString(), loadingInterval, DATA_COUNT)
+
+ const loadedStartDate = new Date(Math.max(+newLoaded.start, +startDate - chartInterval * ADDITIVE_PAGES))
+ const loadedEndDate = new Date(Math.min(+newLoaded.end, +startDate + chartInterval * (ADDITIVE_PAGES + 1)))
+ setLoaded({ start: loadedStartDate, end: loadedEndDate })
+
+ if (data) {
+ data.forEach(elm => elm.date = new Date(elm.date))
+ setDataSaub((prevDataSaub) => {
+ const newData = [...prevDataSaub, ...normalizeData(data)]
+ newData.sort(sortByDate)
+ return cutData(newData, loadedStartDate, loadedEndDate)
+ })
+ }
+
+ },
+ setShowLoader,
+ `Не удалось загрузить данные по скважине "${idWell}" c ${startDate.toISOString()} по ${new Date(+startDate + chartInterval).toISOString()}`
+ )
+ }, [idWell, chartInterval, loaded, startDate])
+
+ return (
+ <>
+
+
+ Начальная дата:
+ setStartDate(new Date(startDate))}
+ value={moment(startDate)}
+ />
+
+
+ Период:
+
setChartInterval(parseInt(val) * 1000)} />
+
-
- {pv?.map((v, idx) => (
- {v.label}
- ))}
-
-
-
- {pv?.map((v, idx) => (
- {v.value?.toFixed(2) ?? '--'} {v.unit}
- ))}
-
-
-
-
-
+
+ {pv?.map((v, idx) => (
+ {v.label}
+ ))}
+
+
+
+ {pv?.map((v, idx) => (
+ {v.value?.toFixed(2) ?? '--'} {v.unit}
+ ))}
+
+
+
+
+
Интервал:
-
+
Статус:
@@ -399,14 +392,16 @@ export default function TelemetryView({ idWell }) {
{paramsGroups.map((group, index) =>
-
+ showBorder={getIndexOfDrillingBy(dataSaub) === index}
+ />
)}
diff --git a/src/services/api/models/ClusterDtoPaginationContainer.ts b/src/services/api/models/ClusterDtoPaginationContainer.ts
index ae329ff..5b6d4e3 100644
--- a/src/services/api/models/ClusterDtoPaginationContainer.ts
+++ b/src/services/api/models/ClusterDtoPaginationContainer.ts
@@ -9,4 +9,4 @@ export type ClusterDtoPaginationContainer = {
take?: number;
count?: number;
items?: Array | null;
-}
\ No newline at end of file
+}
diff --git a/src/services/api/models/CompanyDtoPaginationContainer.ts b/src/services/api/models/CompanyDtoPaginationContainer.ts
index 006ad77..e3a7dcc 100644
--- a/src/services/api/models/CompanyDtoPaginationContainer.ts
+++ b/src/services/api/models/CompanyDtoPaginationContainer.ts
@@ -9,4 +9,4 @@ export type CompanyDtoPaginationContainer = {
take?: number;
count?: number;
items?: Array | null;
-}
\ No newline at end of file
+}
diff --git a/src/services/api/models/DepositDtoPaginationContainer.ts b/src/services/api/models/DepositDtoPaginationContainer.ts
index 861b9bd..704269c 100644
--- a/src/services/api/models/DepositDtoPaginationContainer.ts
+++ b/src/services/api/models/DepositDtoPaginationContainer.ts
@@ -9,4 +9,4 @@ export type DepositDtoPaginationContainer = {
take?: number;
count?: number;
items?: Array | null;
-}
\ No newline at end of file
+}
diff --git a/src/services/api/models/FilePublishInfoDto.ts b/src/services/api/models/FilePublishInfoDto.ts
index 8d0a093..59099f9 100644
--- a/src/services/api/models/FilePublishInfoDto.ts
+++ b/src/services/api/models/FilePublishInfoDto.ts
@@ -6,4 +6,4 @@ export type FilePublishInfoDto = {
publisherLogin?: string | null;
date?: string;
webStorageFileUrl?: string | null;
-}
\ No newline at end of file
+}
diff --git a/src/services/api/models/TelemetryDtoPaginationContainer.ts b/src/services/api/models/TelemetryDtoPaginationContainer.ts
index 0d23b24..ef7a641 100644
--- a/src/services/api/models/TelemetryDtoPaginationContainer.ts
+++ b/src/services/api/models/TelemetryDtoPaginationContainer.ts
@@ -9,4 +9,4 @@ export type TelemetryDtoPaginationContainer = {
take?: number;
count?: number;
items?: Array | null;
-}
\ No newline at end of file
+}
diff --git a/src/services/api/models/UserDtoPaginationContainer.ts b/src/services/api/models/UserDtoPaginationContainer.ts
index 650abe0..d1b285d 100644
--- a/src/services/api/models/UserDtoPaginationContainer.ts
+++ b/src/services/api/models/UserDtoPaginationContainer.ts
@@ -9,4 +9,4 @@ export type UserDtoPaginationContainer = {
take?: number;
count?: number;
items?: Array | null;
-}
\ No newline at end of file
+}
diff --git a/src/services/api/models/UserRoleDtoPaginationContainer.ts b/src/services/api/models/UserRoleDtoPaginationContainer.ts
index d77dd06..aa0e25a 100644
--- a/src/services/api/models/UserRoleDtoPaginationContainer.ts
+++ b/src/services/api/models/UserRoleDtoPaginationContainer.ts
@@ -9,4 +9,4 @@ export type UserRoleDtoPaginationContainer = {
take?: number;
count?: number;
items?: Array | null;
-}
\ No newline at end of file
+}
diff --git a/src/services/api/models/WellDtoPaginationContainer.ts b/src/services/api/models/WellDtoPaginationContainer.ts
index f3f299d..d0bec27 100644
--- a/src/services/api/models/WellDtoPaginationContainer.ts
+++ b/src/services/api/models/WellDtoPaginationContainer.ts
@@ -9,4 +9,4 @@ export type WellDtoPaginationContainer = {
take?: number;
count?: number;
items?: Array | null;
-}
\ No newline at end of file
+}