Исправлено отображение НПВ на странице композитной скважины

This commit is contained in:
goodmice 2022-05-19 11:52:54 +05:00
parent 0db0984ba7
commit a343308a47

View File

@ -7,7 +7,7 @@ import { IdWellContext } from '@asb/context'
import { CompanyView } from '@components/views' import { CompanyView } from '@components/views'
import LoaderPortal from '@components/LoaderPortal' import LoaderPortal from '@components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '@components/factory' import { invokeWebApiWrapperAsync } from '@components/factory'
import { makeTextColumn, makeNumericColumnPlanFact } from '@components/Table' import { makeTextColumn, makeNumericColumnPlanFact, makeNumericColumn, makeNumericRender } from '@components/Table'
import { WellCompositeService } from '@api' import { WellCompositeService } from '@api'
import { hasPermission } from '@utils/permissions' import { hasPermission } from '@utils/permissions'
import { import {
@ -70,8 +70,7 @@ export const WellCompositeSections = memo(({ statsWells, selectedSections }) =>
sectionBhaUpSpeedFact: section.fact?.bhaUpSpeed, sectionBhaUpSpeedFact: section.fact?.bhaUpSpeed,
sectionCasingDownSpeedPlan: section.plan?.casingDownSpeed, sectionCasingDownSpeedPlan: section.plan?.casingDownSpeed,
sectionCasingDownSpeedFact: section.fact?.casingDownSpeed, sectionCasingDownSpeedFact: section.fact?.casingDownSpeed,
nonProductiveTimePlan: section.plan?.nonProductiveHours, nonProductiveHours: section.fact?.nonProductiveHours,
nonProductiveTimeFact: section.fact?.nonProductiveHours,
companies: well.companies, companies: well.companies,
} }
@ -150,7 +149,7 @@ export const WellCompositeSections = memo(({ statsWells, selectedSections }) =>
makeNumericColumnPlanFact('Спуск КНБК, м/ч', 'sectionBhaDownSpeed', filtersMinMax, makeFilterMinMaxFunction), makeNumericColumnPlanFact('Спуск КНБК, м/ч', 'sectionBhaDownSpeed', filtersMinMax, makeFilterMinMaxFunction),
makeNumericColumnPlanFact('Подъем КНБК, м/ч', 'sectionBhaUpSpeed', filtersMinMax, makeFilterMinMaxFunction), makeNumericColumnPlanFact('Подъем КНБК, м/ч', 'sectionBhaUpSpeed', filtersMinMax, makeFilterMinMaxFunction),
makeNumericColumnPlanFact('Скорость спуска ОК, м/ч', 'sectionCasingDownSpeed', filtersMinMax, makeFilterMinMaxFunction), makeNumericColumnPlanFact('Скорость спуска ОК, м/ч', 'sectionCasingDownSpeed', filtersMinMax, makeFilterMinMaxFunction),
makeNumericColumnPlanFact('НПВ, сут', 'nonProductiveTime', filtersMinMax, makeFilterMinMaxFunction, null, '70px'), makeNumericColumn('НПВ, ч', 'nonProductiveHours', filtersMinMax, makeFilterMinMaxFunction, null, '80px'),
{ {
title: 'TVD', title: 'TVD',
render: (value) => ( render: (value) => (