ia.novokshanov/asb_cloud_front
1
0
Fork 0
forked from ddrilling/asb_cloud_front
Code Issues Pull Requests Packages Projects Releases Wiki Activity

сортировка по дате теперь используется из фабрики

Browse Source
This commit is contained in:
goodmice 2021-11-15 16:13:12 +05:00
parent 95cfc93048
commit c5c134071f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/Archive/ArchiveDisplay.jsx
View File

@ -55,7 +55,7 @@ export const ArchiveDisplay = ({data, startDate, interval, onWheel}) => {
style={{ width: '15vw' }} style={{ width: '15vw' }}
data={chartData} data={chartData}
lineGroup={group} lineGroup={group}
interval={interval / 1000} interval={Math.round(interval / 1000)}
headerHeight={'50px'} headerHeight={'50px'}
yStart={startDate} yStart={startDate}
/> />

5
src/pages/Archive/index.jsx
View File

@ -7,7 +7,8 @@ import LoaderPortal from '../../components/LoaderPortal'
import { Flex } from '../../components/Grid' import { Flex } from '../../components/Grid'
import { PeriodPicker, defaultPeriod } from '../../components/PeriodPicker' import { PeriodPicker, defaultPeriod } from '../../components/PeriodPicker'
import { ArchiveDisplay, cutData } from './ArchiveDisplay' import { ArchiveDisplay, cutData } from './ArchiveDisplay'
import { normalizeData, sortByDate } from '../TelemetryView' import { normalizeData } from '../TelemetryView'
import { makeDateSorter } from '../../components/Table'
const DATA_COUNT = 2048 // Колличество точек на подгрузку графика const DATA_COUNT = 2048 // Колличество точек на подгрузку графика
const ADDITIVE_PAGES = 2 // Дополнительные данные для графиков const ADDITIVE_PAGES = 2 // Дополнительные данные для графиков
@ -105,7 +106,7 @@ export default function Archive({idWell}) {
data.forEach(elm => elm.date = new Date(elm.date)) data.forEach(elm => elm.date = new Date(elm.date))
setDataSaub((prevDataSaub) => { setDataSaub((prevDataSaub) => {
const newData = [...prevDataSaub, ...normalizeData(data)] const newData = [...prevDataSaub, ...normalizeData(data)]
newData.sort(sortByDate) newData.sort(makeDateSorter('date'))
return cutData(newData, loadedStartDate, loadedEndDate) return cutData(newData, loadedStartDate, loadedEndDate)
}) })
} }

4
src/pages/TelemetryView/index.jsx
View File

@ -25,6 +25,7 @@ import SpinPicDisabled from '../../images/SpinDisabled.png'
import { PeriodPicker, defaultPeriod } from '../../components/PeriodPicker' import { PeriodPicker, defaultPeriod } from '../../components/PeriodPicker'
import '../../styles/message.css' import '../../styles/message.css'
import { makeDateSorter } from '../../components/Table'
const { Option } = Select const { Option } = Select
@ -290,7 +291,6 @@ const getIndexOfDrillingBy = (dataSaub) => {
return order[idFeedRegulator] ?? -1 return order[idFeedRegulator] ?? -1
} }
export const sortByDate = (a, b) => a.date > b.date ? 1 : -1
export const normalizeData = (data) => data?.map(item => ({ export const normalizeData = (data) => data?.map(item => ({
...item, ...item,
rotorSpeed: item.rotorSpeed < 1 ? 0 : item.rotorSpeed, rotorSpeed: item.rotorSpeed < 1 ? 0 : item.rotorSpeed,
@ -309,7 +309,7 @@ export default function TelemetryView({ idWell }) {
const handleDataSaub = (data) => { const handleDataSaub = (data) => {
if (data) { if (data) {
const dataSaub = normalizeData(data) const dataSaub = normalizeData(data)
dataSaub.sort(sortByDate) dataSaub.sort(makeDateSorter('date'))
setDataSaub(dataSaub) setDataSaub(dataSaub)
} }
} }