Merge branch 'dev' into feature/documentation

2022-12-19 08:07:37 +05:00 · 2022-12-19 08:07:37 +05:00 · 923d469a86
commit 923d469a86
parent 8f52066bce 0ef6d67772
44 changed files with 305 additions and 560 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -2,7 +2,15 @@
  "cSpell.words": [
    "день",
    "спиннера",
-    "Saub"
+    "Saub",
+    "КНБК",
+    "САУБ",
+    "antd",
+    "Poprompt",
+    "saub",
+    "setpoint",
+    "Setpoints",
+    "usehooks"
  ],
  "liveServer.settings.port": 5501
 }
--- a/src/components/Table/Columns/date.tsx
+++ b/src/components/Table/Columns/date.tsx
@ -40,6 +40,7 @@ export const makeDateColumn = <T extends unknown>(
    other?: ColumnProps<T>,
    pickerOther?: DatePickerWrapperProps,
 ) => makeColumn<T>(title, key, {
+    editable: true,
    ...other,
    render: (date) => (
        <div className={'text-align-r-container'}>
--- a/src/components/Table/Columns/index.ts
+++ b/src/components/Table/Columns/index.ts
@ -9,7 +9,6 @@ import { OmitExtends } from '@utils/types'
 export * from './date'
 export * from './time'
 export * from './numeric'
-export * from './plan_fact'
 export * from './select'
 export * from './tag'
 export * from './text'
@ -45,6 +44,7 @@ export const makeColumn = <T = any>(title: ReactNode, key: Key, other?: ColumnPr
    title: title,
    key: key,
    dataIndex: key,
+    render: (value: T) => value,
    ...other,
 })

--- a/src/components/Table/Columns/numeric.tsx
+++ b/src/components/Table/Columns/numeric.tsx
@ -1,4 +1,3 @@
-import { ColumnFilterItem } from 'antd/lib/table/interface'
 import { InputNumber } from 'antd'
 import { Key, ReactNode } from 'react'

@ -46,18 +45,17 @@ export const makeNumericColumnOptions = <T extends number>(fixed?: number, sorte
 export const makeNumericColumn = <T extends number>(
    title: ReactNode,
    key: Key,
-    filters?: ColumnFilterItem[],
-    filterDelegate?: FilterGenerator<T>,
    renderDelegate?: RenderMethod<T>,
+    filterDelegate?: FilterGenerator<T>,
    width?: string | number,
    other?: ColumnProps<T>,
 ) => makeColumn(title, key, {
-    filters,
+    editable: true,
    onFilter: filterDelegate ? filterDelegate(key) : undefined,
    sorter: makeNumericSorter(key),
    width,
-    input: <InputNumber style={{ width: '100%' }}/>,
-    render: renderDelegate ?? makeNumericRender<T>(2),
+    input: <InputNumber style={{ width: '100%' }} defaultValue={0} />,
+    render: renderDelegate || makeNumericRender<T>(2),
    align: 'right',
    ...other
 })
@ -65,54 +63,78 @@ export const makeNumericColumn = <T extends number>(
 export const makeNumericColumnPlanFact = <T extends number>(
    title: ReactNode,
    key: Key,
-    filters?: ColumnFilterItem[],
-    filterDelegate?: FilterGenerator<T>,
    renderDelegate?: RenderMethod<T>,
+    filterDelegate?: FilterGenerator<T>,
+    width?: string | number,
+    other?: ColumnProps<T>,
+) => {
+    return {
+        title,
+        children: [
+            makeNumericColumn<T>('План', `${key}.plan`, renderDelegate, filterDelegate, width, other),
+            makeNumericColumn<T>('Факт', `${key}.fact`, renderDelegate, filterDelegate, width, other),
+        ]
+    }
+}
+
+/**
+ * @deprecated Для значений типа план/факт появилась модель `PlanFactDto`, использование 2 полей с суффиксами неактуально
+ * @param title Заголовок столбца
+ * @param key Ключ столбца
+ * @param filters Список значений для фильтрации
+ * @param filterDelegate Метод фильтрации
+ * @param renderDelegate Render-метод отображения ячейки
+ * @param width Ширина столбца
+ * @param other Дополнительные опции
+ * @returns Объект-столбец для таблицы
+ */
+export const makeNumericColumnPlanFactOld = <T extends number>(
+    title: ReactNode,
+    key: Key,
+    renderDelegate?: RenderMethod<T>,
+    filterDelegate?: FilterGenerator<T>,
    width?: string | number,
    other?: ColumnProps<T>,
 ) => makeGroupColumn(title, [
-    makeNumericColumn<T>('п', key + 'Plan', filters, filterDelegate, renderDelegate, width, other),
-    makeNumericColumn<T>('ф', key + 'Fact', filters, filterDelegate, renderDelegate, width, other),
+    makeNumericColumn<T>('План', key + 'Plan', renderDelegate, filterDelegate, width, other),
+    makeNumericColumn<T>('Факт', key + 'Fact', renderDelegate, filterDelegate, width, other),
 ])

 export const makeNumericStartEnd = <T extends number>(
    title: ReactNode,
    key: Key,
    fixed: number,
-    filters?: ColumnFilterItem[],
-    filterDelegate?: FilterGenerator<T>,
    renderDelegate?: RenderMethod<T>,
+    filterDelegate?: FilterGenerator<T>,
    width?: string | number,
 ) => makeGroupColumn(title, [
-    makeNumericColumn<T>('старт', key + 'Start', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, key + 'Start')),
-    makeNumericColumn<T>('конец', key + 'End', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, key + 'End'))
+    makeNumericColumn<T>('старт', key + 'Start', renderDelegate, filterDelegate, width, makeNumericColumnOptions(fixed, key + 'Start')),
+    makeNumericColumn<T>('конец', key + 'End', renderDelegate, filterDelegate, width, makeNumericColumnOptions(fixed, key + 'End'))
 ])

 export const makeNumericMinMax = <T extends number>(
    title: ReactNode,
    key: Key,
    fixed: number,
-    filters?: ColumnFilterItem[],
-    filterDelegate?: FilterGenerator<T>,
    renderDelegate?: RenderMethod<T>,
+    filterDelegate?: FilterGenerator<T>,
    width?: string | number,
 ) => makeGroupColumn(title, [
-    makeNumericColumn<T>('мин', key + 'Min', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, key + 'Min')),
-    makeNumericColumn<T>('макс', key + 'Max', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, key + 'Max')),
+    makeNumericColumn<T>('мин', key + 'Min', renderDelegate, filterDelegate, width, makeNumericColumnOptions(fixed, key + 'Min')),
+    makeNumericColumn<T>('макс', key + 'Max', renderDelegate, filterDelegate, width, makeNumericColumnOptions(fixed, key + 'Max')),
 ])

 export const makeNumericAvgRange = <T extends number>(
    title: ReactNode,
    key: Key,
    fixed: number,
-    filters?: ColumnFilterItem[],
-    filterDelegate?: FilterGenerator<T>,
    renderDelegate?: RenderMethod<T>,
+    filterDelegate?: FilterGenerator<T>,
    width?: string | number,
 ) => makeGroupColumn(title, [
-    makeNumericColumn<T>('мин', `${key}.min`, filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, `${key}.min`)),
-    makeNumericColumn<T>('сред', `${key}.avg`, filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, `${key}.avg`)),
-    makeNumericColumn<T>('макс', `${key}.max`, filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, `${key}.max`)),
+    makeNumericColumn<T>('мин', `${key}.min`, renderDelegate, filterDelegate, width, makeNumericColumnOptions(fixed, `${key}.min`)),
+    makeNumericColumn<T>('сред', `${key}.avg`, renderDelegate, filterDelegate, width, makeNumericColumnOptions(fixed, `${key}.avg`)),
+    makeNumericColumn<T>('макс', `${key}.max`, renderDelegate, filterDelegate, width, makeNumericColumnOptions(fixed, `${key}.max`)),
 ])

 export default makeNumericColumn
--- a/src/components/Table/Columns/plan_fact.tsx
+++ b/src/components/Table/Columns/plan_fact.tsx
@ -1,22 +0,0 @@
-import { Key, ReactNode } from 'react'
-
-import { ColumnProps, makeColumn } from '.'
-
-export const makeColumnsPlanFact = <T,>(
-    title: string | ReactNode,
-    key: Key | [Key, Key],
-    columsOther?: ColumnProps<T> | [ColumnProps<T>, ColumnProps<T>],
-) => {
-    const keys = Array.isArray(key) ? key : [`${key}Plan`, `${key}Fact`]
-    const others = Array.isArray(columsOther) ? columsOther : [columsOther, columsOther]
-
-    return {
-        title,
-        children: [
-            makeColumn<T>('план', keys[0], others[0]),
-            makeColumn<T>('факт', keys[1], others[1]),
-        ]
-    }
-}
-
-export default makeColumnsPlanFact
--- a/src/components/Table/Columns/select.tsx
+++ b/src/components/Table/Columns/select.tsx
@ -1,9 +1,17 @@
 import { Select, SelectProps } from 'antd'
 import { DefaultOptionType, SelectValue } from 'antd/lib/select'
-import { Key, ReactNode } from 'react'
+import { Key, ReactNode, useMemo } from 'react'

 import { ColumnProps, makeColumn } from '.'

+const findOption = <T extends DefaultOptionType>(value: any, options: T[] | undefined) =>
+    options?.find((option) => String(option?.value) === String(value))
+
+const SelectWrapper = ({ value, options, ...other }: SelectProps) => {
+    const selectValue = useMemo(() => findOption(value, options)?.label, [value, options])
+    return <Select value={selectValue} options={options} {...other} />
+}
+
 export const makeSelectColumn = <T extends DefaultOptionType>(
    title: ReactNode,
    key: Key,
@ -12,10 +20,11 @@ export const makeSelectColumn = <T extends DefaultOptionType>(
    other?: ColumnProps<T>,
    selectOther?: SelectProps<SelectValue>
 ) => makeColumn(title, key, {
+    editable: true,
    ...other,
-    input: <Select options={options} {...selectOther}/>,
+    input: <SelectWrapper options={options} {...selectOther}/>,
    render: (value, dataset, index) => {
-        const item = options?.find(option => String(option?.value) === String(value))
+        const item = findOption(value, options)
        return other?.render?.(item, dataset, index) ?? item?.label ?? defaultValue?.label ?? value?.label ?? '--'
    }
 })
--- a/src/components/Table/Columns/tag.tsx
+++ b/src/components/Table/Columns/tag.tsx
@ -65,6 +65,7 @@ export const makeTagColumn = <T extends DataType>(
    const InputComponent = makeTagInput<T>(value_key, label_key)

    return makeColumn(title, dataIndex, {
+        editable: true,
        ...other,
        render: (item: T[] | undefined, dataset, index) => item?.map((elm: T) => <Tag key={elm[label_key]} color={'blue'}>{other?.render?.(elm, dataset, index) ?? elm[label_key]}</Tag>) ?? '-',
        input: <InputComponent {...tagOther} options={options} />,
--- a/src/components/Table/Columns/text.tsx
+++ b/src/components/Table/Columns/text.tsx
@ -1,3 +1,4 @@
+import { Tooltip } from 'antd'
 import { ColumnFilterItem } from 'antd/lib/table/interface'
 import { Key, ReactNode } from 'react'

@ -15,6 +16,18 @@ export const makeStringSorter = <T extends string>(key: Key): SorterMethod<T> =>
    return String(vA).localeCompare(String(vB))
 }

+export const makeTextRender = <T extends string>(def = '---', stringCutter?: (text: string) => string) => (value: T) => {
+    if (!value) return def
+    if (stringCutter) {
+        return (
+            <Tooltip title={value}>
+                {stringCutter(value)}
+            </Tooltip>
+        )
+    }
+    return value
+}
+
 export const makeFilterTextMatch = <T extends unknown>(key: keyof DataType<T>) =>
    (filterValue: T, dataItem: DataType<T>) => dataItem[key] === filterValue

@ -26,10 +39,11 @@ export const makeTextColumn = <T extends unknown = any>(
    render?: RenderMethod<T>,
    other?: ColumnProps
 ) => makeColumn(title, key, {
+    editable: true,
    filters,
    onFilter: filters ? makeFilterTextMatch(key) : undefined,
-    sorter: sorter ?? makeStringSorter(key),
-    render: render,
+    sorter: sorter || makeStringSorter(key),
+    render: render || makeTextRender(),
    ...other
 })

--- a/src/components/Table/Columns/time.tsx
+++ b/src/components/Table/Columns/time.tsx
@ -24,6 +24,7 @@ export const makeTimeColumn = <T extends TimeDto>(
    other?: ColumnProps,
    pickerOther?: TimePickerWrapperProps,
 ) => makeColumn<T>(title, key, {
+    editable: true,
    ...other,
    render: (time) => (
        <div className={'text-align-r-container'}>
--- a/src/components/selectors/WellSelector.jsx
+++ b/src/components/selectors/WellSelector.jsx
@ -59,6 +59,7 @@ export const WellSelector = memo(({ value, onChange, treeData, treeLabels, ...ot
        <TreeSelect
            multiple
            treeCheckable
+            maxTagCount={'responsive'}
            showCheckedStrategy={TreeSelect.SHOW_CHILD}
            treeDefaultExpandAll
            treeData={wellsTree}
--- a/src/pages/AdminPanel/ClusterController.jsx
+++ b/src/pages/AdminPanel/ClusterController.jsx
@ -3,11 +3,12 @@ import { Input } from 'antd'

 import {
    EditableTable,
-    makeColumn,
    makeSelectColumn,
    makeStringSorter,
    defaultPagination,
-    makeTimezoneColumn
+    makeTimezoneColumn,
+    makeNumericColumn,
+    makeTextColumn
 } from '@components/Table'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { AdminClusterService, AdminDepositService } from '@api'
@ -30,17 +31,11 @@ const ClusterController = memo(() => {
    const clusterColumns = useMemo(() => [
        makeSelectColumn('Месторождение', 'idDeposit', deposits, '--', {
            width: 200,
-            editable: true,
            sorter: makeStringSorter('idDeposit')
        }),
-        makeColumn('Название', 'caption', {
-            width: 200,
-            editable: true,
-            sorter: makeStringSorter('caption'),
-            formItemRules: min1,
-        }),
-        makeColumn('Широта', 'latitude', { width: 150, editable: true, render: coordsFormat }),
-        makeColumn('Долгота', 'longitude', { width: 150, editable: true, render: coordsFormat }),
+        makeTextColumn('Название', 'caption', undefined, undefined, undefined, { width: 200, formItemRules: min1 }),
+        makeNumericColumn('Широта', 'latitude', coordsFormat, undefined, 150),
+        makeNumericColumn('Долгота', 'longitude', coordsFormat, undefined, 150),
        makeTimezoneColumn('Зона', 'timezone', null, true, { width: 150 }),
    ], [deposits])

--- a/src/pages/AdminPanel/CompanyController.jsx
+++ b/src/pages/AdminPanel/CompanyController.jsx
@ -3,10 +3,9 @@ import { Input } from 'antd'

 import {
    EditableTable,
-    makeColumn,
-    makeStringSorter,
    makeSelectColumn,
-    defaultPagination
+    defaultPagination,
+    makeTextColumn
 } from '@components/Table'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { AdminCompanyService, AdminCompanyTypeService } from '@api'
@ -37,16 +36,8 @@ const CompanyController = memo(() => {
                }))

                setColumns([
-                    makeColumn('Название', 'caption', {
-                        width: 200,
-                        editable: true,
-                        sorter: makeStringSorter('caption'),
-                        formItemRules: min1,
-                    }),
-                    makeSelectColumn('Тип компании', 'idCompanyType', companyTypes, null, {
-                        width: 200,
-                        editable: true
-                    }),
+                    makeTextColumn('Название', 'caption', undefined, undefined, undefined, { width: 200, formItemRules: min1 }),
+                    makeSelectColumn('Тип компании', 'idCompanyType', companyTypes, null, { width: 200 }),
                ])

                await updateTable()
--- a/src/pages/AdminPanel/CompanyTypeController.jsx
+++ b/src/pages/AdminPanel/CompanyTypeController.jsx
@ -1,19 +1,14 @@
 import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import { Input } from 'antd'

-import { EditableTable, makeColumn, makeStringSorter, defaultPagination } from '@components/Table'
+import { EditableTable, defaultPagination, makeTextColumn } from '@components/Table'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { arrayOrDefault, withPermissions } from '@utils'
 import { min1 } from '@utils/validationRules'
 import { AdminCompanyTypeService } from '@api'

 const columns = [
-    makeColumn('Название', 'caption', {
-        width: 200,
-        editable: true,
-        sorter: makeStringSorter('caption'),
-        formItemRules: min1,
-    }),
+    makeTextColumn('Название', 'caption', undefined, undefined, undefined, { width: 200, formItemRules: min1 }),
 ]

 const CompanyTypeController = memo(() => {
--- a/src/pages/AdminPanel/DepositController.jsx
+++ b/src/pages/AdminPanel/DepositController.jsx
@ -2,15 +2,15 @@ import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import { Input } from 'antd'

 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { EditableTable, makeColumn, defaultPagination, makeTimezoneColumn } from '@components/Table'
+import { EditableTable, defaultPagination, makeTimezoneColumn, makeTextColumn, makeNumericColumn } from '@components/Table'
 import { arrayOrDefault, coordsFormat, withPermissions } from '@utils'
 import { min1 } from '@utils/validationRules'
 import { AdminDepositService } from '@api'

 const depositColumns = [
-    makeColumn('Название', 'caption', { width: 200, editable: true, formItemRules: min1 }),
-    makeColumn('Широта', 'latitude', { width: 150, editable: true, render: coordsFormat }),
-    makeColumn('Долгота', 'longitude', { width: 150, editable: true, render: coordsFormat }),
+    makeTextColumn('Название', 'caption', undefined, undefined, undefined, { width: 200, formItemRules: min1 }),
+    makeNumericColumn('Широта', 'latitude', coordsFormat, undefined, 150),
+    makeNumericColumn('Долгота', 'longitude', coordsFormat, undefined, 150),
    makeTimezoneColumn('Зона', 'timezone', null, true, { width: 150 }),
 ]

--- a/src/pages/AdminPanel/PermissionController.jsx
+++ b/src/pages/AdminPanel/PermissionController.jsx
@ -1,23 +1,15 @@
 import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import { Input } from 'antd'

-import { EditableTable, makeColumn, makeStringSorter } from '@components/Table'
+import { EditableTable, makeTextColumn } from '@components/Table'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { arrayOrDefault, withPermissions } from '@utils'
 import { min1 } from '@utils/validationRules'
 import { AdminPermissionService } from '@api'

 const columns = [
-    makeColumn('Название', 'name', {
-        editable: true,
-        sorter: makeStringSorter('name'),
-        isRequired: true,
-        formItemRules: min1,
-    }),
-    makeColumn('Описание', 'description', {
-        editable: true,
-        sorter: makeStringSorter('description'),
-    }),
+    makeTextColumn('Название', 'name', undefined, undefined, undefined, { isRequired: true, formItemRules: min1 }),
+    makeTextColumn('Описание', 'description'),
 ]

 const PermissionController = memo(() => {
--- a/src/pages/AdminPanel/RoleController.jsx
+++ b/src/pages/AdminPanel/RoleController.jsx
@ -19,15 +19,13 @@ const RoleController = memo(() => {
    )), [roles, searchValue])

    const columns = useMemo(() => [
-        makeTextColumn('Название', 'caption', null, null, null, { width: 100, editable: true, formItemRules: min1 }),
+        makeTextColumn('Название', 'caption', null, null, null, { width: 100, formItemRules: min1 }),
        makeTagColumn('Включённые роли', 'roles', roles, 'id', 'caption', {
            width: 400,
-            editable: true,
            render: (role) => <RoleView role={role} />
        }, { allowClear: true }),
        makeTagColumn('Разрешения', 'permissions', permissions, 'id', 'name', {
            width: 600,
-            editable: true,
            render: (permission) => <PermissionView info={permission} />,
        }),
    ], [roles, permissions])
--- a/src/pages/AdminPanel/Telemetry/TelemetryViewer.jsx
+++ b/src/pages/AdminPanel/Telemetry/TelemetryViewer.jsx
@ -50,7 +50,7 @@ const TelemetryController = memo(() => {

    const columns = useMemo(() => [
        makeColumn('', 'hasParent', { render: mergeRender }),
-        makeNumericColumn('ID', 'id', null, null, makeNumericRender(0)),
+        makeNumericColumn('ID', 'id', makeNumericRender(0)),
        makeTextColumn('UID', 'remoteUid'),
        makeTextColumn('Назначена на скважину', 'realWell'),
        makeDateColumn('Дата начала бурения', 'drillingStartDate'),
--- a/src/pages/AdminPanel/UserController/index.jsx
+++ b/src/pages/AdminPanel/UserController/index.jsx
@ -115,7 +115,6 @@ const UserController = memo(() => {

                setColumns([
                    makeTextColumn('Логин', 'login', null, null, null, {
-                        editable: true,
                        formItemRules: [
                            { required: true },
                            ...createLoginRules,
@ -130,41 +129,34 @@ const UserController = memo(() => {
                        ],
                    }),
                    makeTextColumn('Фамилия', 'surname', filters.surname, null, null, {
-                        editable: true,
                        formItemRules: [{ required: true }, ...nameRules],
                        filterSearch: true,
                        onFilter: makeTextOnFilter('surname'),
                    }),
                    makeTextColumn('Имя', 'name', filters.name, null, null, {
-                        editable: true,
                        formItemRules: nameRules,
                        filterSearch: true,
                        onFilter: makeTextOnFilter('name'),
                    }),
                    makeTextColumn('Отчество', 'patronymic', filters.partonymic, null, null, {
-                        editable: true,
                        formItemRules: nameRules,
                        filterSearch: true,
                        onFilter: makeTextOnFilter('patronymic'),
                    }),
                    makeTextColumn('E-mail', 'email', filters.email, null, null, {
-                        editable: true,
                        formItemRules: [{ required: true }, ...emailRules],
                        filterSearch: true,
                        onFilter: makeTextOnFilter('email'),
                    }),
                    makeTextColumn('Номер телефона', 'phone', null, null, null, {
-                        editable: true,
                        formItemRules: phoneRules,
                    }),
-                    makeTextColumn('Должность', 'position', null, null, null, { editable: true }),
+                    makeTextColumn('Должность', 'position', null, null, null),
                    makeTextColumn('Роли', 'roleNames', roleFilters, null, rolesRender, {
-                        editable: true,
                        input: <RoleTag roles={roles} />,
                        onFilter: makeArrayOnFilter('roleNames'),
                    }),
                    makeSelectColumn('Компания', 'idCompany', companies, '--', {
-                        editable: true,
                        sorter: makeNumericSorter('idCompany'),
                    })
                ])
--- a/src/pages/AdminPanel/WellController/index.jsx
+++ b/src/pages/AdminPanel/WellController/index.jsx
@ -12,11 +12,12 @@ import {
    EditableTable,
    makeColumn,
    makeSelectColumn,
-    makeStringSorter,
    makeNumericSorter,
    makeTagColumn,
    defaultPagination,
    makeTimezoneColumn,
+    makeTextColumn,
+    makeNumericColumn,
 } from '@components/Table'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { TelemetryView, CompanyView } from '@components/views'
@ -81,23 +82,11 @@ const WellController = memo(() => {
                }))

                setColumns([
-                    makeSelectColumn('Куст', 'idCluster', clusters, '--', {
-                        width: '5rem',
-                        editable: true,
-                        sorter: makeNumericSorter('idCluster'),
-                    }),
-                    makeColumn('Название', 'caption', {
-                        width: '5rem',
-                        editable: true,
-                        sorter: makeStringSorter('caption'),
-                    }),
-                    makeSelectColumn('Тип', 'idWellType', wellTypes, '--', {
-                        width: 150,
-                        editable: true,
-                        sorter: makeNumericSorter('idWellType'),
-                    }),
-                    makeColumn('Широта', 'latitude', { width: 150, editable: true, render: coordsFormat }),
-                    makeColumn('Долгота', 'longitude', { width: 150, editable: true, render: coordsFormat }),
+                    makeSelectColumn('Куст', 'idCluster', clusters, '--', { width: '5rem', sorter: makeNumericSorter('idCluster') }),
+                    makeTextColumn('Название', 'caption', undefined, undefined, undefined, { width: '5rem' }),
+                    makeSelectColumn('Тип', 'idWellType', wellTypes, '--', { width: 150, sorter: makeNumericSorter('idWellType') }),
+                    makeNumericColumn('Широта', 'latitude', coordsFormat, undefined, 150),
+                    makeNumericColumn('Долгота', 'longitude', coordsFormat, undefined, 150),
                    makeColumn('Телеметрия', 'telemetry', {
                        editable: true,
                        render: (telemetry) => <TelemetryView telemetry={telemetry} />,
@ -105,7 +94,6 @@ const WellController = memo(() => {
                    }, ),
                    makeTimezoneColumn('Зона', 'timezone', null, true, { width: 170 }),
                    makeTagColumn('Компании', 'companies', companies, 'id', 'caption', {
-                        editable: true,
                        render: (company) => <CompanyView company={company} />,
                    }),
                ])
--- a/src/pages/Cluster/ClusterWells.jsx
+++ b/src/pages/Cluster/ClusterWells.jsx
@ -7,7 +7,7 @@ import {
  makeTextColumn,
  makeGroupColumn,
  makeColumn,
-  makeNumericColumnPlanFact,
+  makeNumericColumnPlanFactOld,
  Table,
  makeNumericRender,
  makeNumericColumn,
@ -117,7 +117,10 @@ const ClusterWells = memo(({ statsWells }) => {
  const columns = useMemo(() => [
    makeTextColumn('скв №', 'caption', null, null,
      (_, item) => (
-        <Link to={{ pathname: `/well/${item.id}`, state: { from: location.pathname }}} style={{display: 'flex', alignItems: 'center'}}>
+        <Link
+          to={{ pathname: `/well/${item.id}`, state: { from: location.pathname }}}
+          style={{ display: 'flex', alignItems: 'center' }}
+        >
          <PointerIcon
            state={item.idState === 1 ? 'active' : 'unknown'}
            width={32}
@ -133,10 +136,10 @@ const ClusterWells = memo(({ statsWells }) => {
      makeDateColumn('начало', 'factStart'),
      makeDateColumn('окончание', 'factEnd'),
    ]),
-    makeNumericColumnPlanFact('Продолжительность, сут', 'period', filtersMinMax, makeFilterMinMaxFunction, numericRender),
-    makeNumericColumnPlanFact('МСП, м/ч', 'rateOfPenetration', filtersMinMax, makeFilterMinMaxFunction, numericRender),
-    makeNumericColumnPlanFact('Рейсовая скорость, м/ч', 'routeSpeed', filtersMinMax, makeFilterMinMaxFunction, numericRender),
-    makeNumericColumn('НПВ, ч', 'notProductiveTimeFact', filtersMinMax, makeFilterMinMaxFunction, numericRender),
+    makeNumericColumnPlanFactOld('Продолжительность, сут', 'period', numericRender, makeFilterMinMaxFunction, { filters: filtersMinMax }),
+    makeNumericColumnPlanFactOld('МСП, м/ч', 'rateOfPenetration', numericRender, makeFilterMinMaxFunction, { filters: filtersMinMax }),
+    makeNumericColumnPlanFactOld('Рейсовая скорость, м/ч', 'routeSpeed', numericRender, makeFilterMinMaxFunction, { filters: filtersMinMax }),
+    makeNumericColumn('НПВ, ч', 'notProductiveTimeFact', numericRender, makeFilterMinMaxFunction, { filters: filtersMinMax }),
    makeColumn('TVD', 'tvd', { align: 'center', render: (_, value) => (
      <Button onClick={() => {
        setSelectedWell(value)
--- a/src/pages/Cluster/WellOperationsTable.jsx
+++ b/src/pages/Cluster/WellOperationsTable.jsx
@ -1,14 +1,14 @@
 import { memo, useMemo } from 'react'

-import { Table, makeTextColumn, makeNumericColumnPlanFact } from '@components/Table'
+import { Table, makeTextColumn, makeNumericColumnPlanFactOld } from '@components/Table'
 import { getPrecision } from '@utils/functions'

 const columns = [
    makeTextColumn('Конструкция секции', 'sectionType'),
    makeTextColumn('Операция', 'operationName'),
-    makeNumericColumnPlanFact('Глубина забоя', 'depth', null, null, (number) => getPrecision(number)),
-    makeNumericColumnPlanFact('Часы', 'durationHours', null, null, (number) => getPrecision(number)),
-    makeNumericColumnPlanFact('Комментарий', 'comment', null, null, (text) => text ?? '-')
+    makeNumericColumnPlanFactOld('Глубина забоя', 'depth', (number) => getPrecision(number)),
+    makeNumericColumnPlanFactOld('Часы', 'durationHours', (number) => getPrecision(number)),
+    makeNumericColumnPlanFactOld('Комментарий', 'comment', (text) => text ?? '-'),
 ]

 export const WellOperationsTable = memo(({ wellOperations }) => {
--- a/src/pages/Deposit/StatisticsADW.jsx
+++ b/src/pages/Deposit/StatisticsADW.jsx
@ -18,7 +18,7 @@ const columns = [
    makeNumericColumn('Проходка, м', 'sumDepthInterval'),
    makeNumericColumn('Время работы, ч', 'usedTimeHours'),
    makeNumericColumn('Кол-во запусков', 'operationCount'),
-    makeNumericColumn('Коэф. использования, %', 'kUsage', undefined, undefined, (value) => numericRender(value * 100)),
+    makeNumericColumn('Коэф. использования, %', 'kUsage', (value) => numericRender(value * 100)),
 ]

 const getSubsystemState = (subsystem) => {
--- a/src/pages/Well/Analytics/Statistics.jsx
+++ b/src/pages/Well/Analytics/Statistics.jsx
@ -21,13 +21,13 @@ const speedNumericRender = (section) => numericRender(section?.speed)

 const makeSectionSorter = (key, name) => (a, b) => (a?.[key]?.[name] ?? 0) - (b?.[key]?.[name] ?? 0)
 export const makeSectionColumn = (title, key, { speedRender } = {}) => makeGroupColumn(title, [
-    makeNumericColumn('Проходка', key, null, null, (section => numericRender(section?.depth)), 100, {
+    makeNumericColumn('Проходка', key, (section => numericRender(section?.depth)), undefined, 100, {
        sorter: makeSectionSorter(key, 'depth'),
    }),
-    makeNumericColumn('Время', key, null, null, (section => numericRender(section?.time)), 100, {
+    makeNumericColumn('Время', key, (section => numericRender(section?.time)), undefined, 100, {
        sorter: makeSectionSorter(key, 'time'),
    }),
-    makeNumericColumn((<>V<sub>рейсовая</sub></>), key, null, null, speedRender ?? speedNumericRender, 100, {
+    makeNumericColumn((<>V<sub>рейсовая</sub></>), key, speedRender ?? speedNumericRender, undefined, 100, {
        sorter: makeSectionSorter(key, 'speed'),
    }),
 ])
@ -37,7 +37,7 @@ export const defaultColumns = [
    makeTextColumn('Скважина', 'caption', null, null, null, { fixed: 'left', width: 100 }),
 ]

-const scrollSettings = { scrollToFirstRowOnChange: true, x: 100, y: 200 }
+const scrollSettings = { scrollToFirstRowOnChange: true, x: 100, y: '25vh' }
 const summaryColSpan = 1 /// TODO: Когда добавится куст изменить на 2

 const getWellData = async (wellsList) => {
--- a/src/pages/Well/Analytics/WellCompositeEditor/NewParamsTable.jsx
+++ b/src/pages/Well/Analytics/WellCompositeEditor/NewParamsTable.jsx
@ -1,146 +0,0 @@
-import { memo, useCallback, useEffect, useState } from 'react'
-import { Button, Modal, Popconfirm } from 'antd'
-
-import { useWell } from '@asb/context'
-import { makeColumn, makeGroupColumn, makeNumericRender, makeSelectColumn, Table } from '@components/Table'
-import LoaderPortal from '@components/LoaderPortal'
-import { invokeWebApiWrapperAsync } from '@components/factory'
-import { DrillParamsService, WellOperationService } from '@api'
-
-const getDeepValue = (data, key) => {
-    if (!key || key.trim() === '') return null
-    const keys = key.split('.')
-    let out = data
-    while (keys.length > 0) {
-        if (!(keys[0] in out)) return null
-        out = out[keys[0]]
-        keys.splice(0, 1)
-    }
-    return out
-}
-
-const makeNumericSorter = (keys) => (a, b) => getDeepValue(a, keys) - getDeepValue(b, keys)
-
-const numericRender = makeNumericRender(1)
-const makeNumericColumn = (title, dataIndex, render, other) => makeColumn(title, dataIndex, {
-    sorter: makeNumericSorter(dataIndex),
-    render: (_, record, index) => {
-        const func = render ?? ((value) => <>{value}</>)
-        const item = getDeepValue(record, dataIndex)
-        return func(item, record, index)
-    },
-    align: 'right',
-    ...other,
-})
-
-const makeAvgRender = (dataIndex) => (avg, record) => {
-    const max = record[dataIndex]?.max
-    const fillW = (max - avg) / max * 100
-    return (
-        <div className={'avg-column'}>
-            <div className={'avg-fill'} style={{ width: `${fillW}%` }} />
-            <div className={'avg-value'}>
-                {numericRender(avg)}
-            </div>
-        </div>
-    )
-}
-
-const makeNumericAvgRange = (title, dataIndex, defaultRender = false) => makeGroupColumn(title, [
-    makeNumericColumn('мин', `${dataIndex}.min`),
-    makeNumericColumn('сред', `${dataIndex}.avg`, defaultRender ? undefined : makeAvgRender(dataIndex)),
-    makeNumericColumn('макс', `${dataIndex}.max`),
-])
-
-export const getColumns = async (idWell) => {
-    let sectionTypes = await WellOperationService.getSectionTypes(idWell)
-    sectionTypes = Object.entries(sectionTypes).map(([id, value]) => ({
-        label: value,
-        value: id,
-    }))
-
-    return [
-        makeSelectColumn('Конструкция секции','idWellSectionType', sectionTypes, null, {
-            width: 160,
-            sorter: makeNumericSorter('idWellSectionType'),
-        }),
-        makeNumericAvgRange('Нагрузка, т', 'axialLoad'),
-        makeNumericAvgRange('Давление, атм', 'pressure'),
-        makeNumericAvgRange('Момент на ВСП, кН·м', 'rotorTorque', true),
-        makeNumericAvgRange('Обороты на ВСП, об/мин', 'rotorSpeed'),
-        makeNumericAvgRange('Расход, л/с', 'flow'),
-    ]
-}
-
-export const NewParamsTable = memo(({ selectedWellsKeys }) => {
-    const [params, setParams] = useState([])
-    const [paramsColumns, setParamsColumns] = useState([])
-    const [showParamsLoader, setShowParamsLoader] = useState(false)
-    const [isParamsModalVisible, setIsParamsModalVisible] = useState(false)
-
-    const [well] = useWell()
-
-    useEffect(() => {
-        invokeWebApiWrapperAsync(async () => setParamsColumns(await getColumns(well.id)))
-    }, [well])
-
-    const onParamButtonClick = useCallback(() => invokeWebApiWrapperAsync(
-        async () => {
-            setIsParamsModalVisible(true)
-            const params = await DrillParamsService.getCompositeAll(well.id)
-            setParams(params)
-        },
-        setShowParamsLoader,
-        `Не удалось загрузить список режимов`,
-        { actionName: 'Получение списка режимов скважины', well }
-    ), [well])
-
-    const onParamsAddClick = useCallback(() => invokeWebApiWrapperAsync(
-        async () => {
-            await DrillParamsService.save(well.id, params)
-            setIsParamsModalVisible(false)
-        },
-        setShowParamsLoader,
-        `Не удалось добавить режимы в список`,
-        { actionName: 'Добавление режима скважины', well }
-    ), [well, params])
-
-    return (
-        <>
-            <Button
-                size={'large'}
-                disabled={selectedWellsKeys.length <= 0}
-                onClick={onParamButtonClick}
-            >
-                Заполнить режимы текущей скважины
-            </Button>
-            <Modal
-                title={'Заполнить режимы текущей скважины'}
-                centered
-                open={isParamsModalVisible}
-                onCancel={() => setIsParamsModalVisible(false)}
-                width={1700}
-                footer={(
-                    <Popconfirm title={'Заменить существующие режимы выбранными?'} onConfirm={onParamsAddClick}>
-                            <Button
-                                size={'large'}
-                                disabled={params.length <= 0}
-                            >Сохранить</Button>
-                    </Popconfirm>
-                )}
-            >
-                <LoaderPortal show={showParamsLoader}>
-                    <Table
-                        bordered
-                        size={'small'}
-                        columns={paramsColumns}
-                        dataSource={params}
-                        pagination={false}
-                    />
-                </LoaderPortal>
-            </Modal>
-        </>
-    )
-})
-
-export default NewParamsTable
--- a/src/pages/Well/Analytics/WellCompositeEditor/WellCompositeSections.jsx
+++ b/src/pages/Well/Analytics/WellCompositeEditor/WellCompositeSections.jsx
@ -1,12 +1,13 @@
 import { Link, useLocation } from 'react-router-dom'
 import { useState, useEffect, memo, useMemo, lazy, Suspense } from 'react'
 import { LineChartOutlined, ProfileOutlined, TeamOutlined } from '@ant-design/icons'
-import { Button, Badge, Divider, Modal, Row, Col } from 'antd'
+import { Button, Badge, Divider, Modal } from 'antd'

 import { useWell } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
+import SuspenseFallback from '@components/SuspenseFallback'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { Table, makeTextColumn, makeNumericColumnPlanFact, makeNumericColumn } from '@components/Table'
+import { Table, makeTextColumn, makeNumericColumnPlanFactOld, makeNumericColumn } from '@components/Table'
 import { WellCompositeService } from '@api'
 import {
  hasPermission,
@ -16,8 +17,6 @@ import {
  getOperations
 } from '@utils'

-import NewParamsTable from './NewParamsTable'
-import SuspenseFallback from '@asb/components/SuspenseFallback'

 const Tvd = lazy(() => import('@pages/Well/WellOperations/Tvd'))
 const CompaniesTable = lazy(() => import('@pages/Cluster/CompaniesTable'))
@ -146,15 +145,15 @@ const WellCompositeSections = memo(({ statsWells, selectedSections }) => {
    makeTextColumn('скв №', 'caption', null, null,
      (text, item) => <Link to={{ pathname: `/well/${item?.id}`, state: { from: location.pathname }}}>{text ?? '-'}</Link>
    ),
-    makeTextColumn('Секция', 'sectionType', filtersSectionsType, sortBySectionId, (text) => text ?? '-'),
-    makeNumericColumnPlanFact('Глубина, м', 'sectionWellDepth', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('Продолжительность, ч', 'sectionBuildDays', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('МСП, м/ч', 'sectionRateOfPenetration', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('Рейсовая скорость, м/ч', 'sectionRouteSpeed', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('Спуск КНБК, м/ч', 'sectionBhaDownSpeed', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('Подъем КНБК, м/ч', 'sectionBhaUpSpeed', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumnPlanFact('Скорость спуска ОК, м/ч', 'sectionCasingDownSpeed', filtersMinMax, makeFilterMinMaxFunction),
-    makeNumericColumn('НПВ, ч', 'nonProductiveHours', filtersMinMax, makeFilterMinMaxFunction, null, '80px'),
+    makeTextColumn('Секция', 'sectionType', filtersSectionsType, sortBySectionId, (text) => text ?? '-', { width: 100 }),
+    makeNumericColumnPlanFactOld('Глубина, м', 'sectionWellDepth', undefined, makeFilterMinMaxFunction, undefined, { filters: filtersMinMax }),
+    makeNumericColumnPlanFactOld('Продолжительность, ч', 'sectionBuildDays', undefined, makeFilterMinMaxFunction, undefined, { filters: filtersMinMax }),
+    makeNumericColumnPlanFactOld('МСП, м/ч', 'sectionRateOfPenetration', undefined, makeFilterMinMaxFunction, undefined, { filters: filtersMinMax }),
+    makeNumericColumnPlanFactOld('Рейсовая скорость, м/ч', 'sectionRouteSpeed', undefined, makeFilterMinMaxFunction, undefined, { filters: filtersMinMax }),
+    makeNumericColumnPlanFactOld('Спуск КНБК, м/ч', 'sectionBhaDownSpeed', undefined, makeFilterMinMaxFunction, undefined, { filters: filtersMinMax }),
+    makeNumericColumnPlanFactOld('Подъем КНБК, м/ч', 'sectionBhaUpSpeed', undefined, makeFilterMinMaxFunction, undefined, { filters: filtersMinMax }),
+    makeNumericColumnPlanFactOld('Скорость спуска ОК, м/ч', 'sectionCasingDownSpeed', undefined, makeFilterMinMaxFunction, undefined, { filters: filtersMinMax }),
+    makeNumericColumn('НПВ, ч', 'nonProductiveHours', undefined, makeFilterMinMaxFunction, '80px', { filters: filtersMinMax }),
    {
      title: 'TVD',
      render: (value) => (
@ -200,11 +199,11 @@ const WellCompositeSections = memo(({ statsWells, selectedSections }) => {
        dataSource={rows}
        size={'small'}
        bordered
-        scroll={{ x: true, y: 620 }}
+        scroll={{ x: true, y: '30vh' }}
        rowSelection={rowSelection}
        pagination={false}
      />
-      <Divider />
+      <Divider style={{ marginTop: 0 }} />
      <Badge.Ribbon text={'комбинированная скважина'} color={'gray'}>
        <h3>Выбранные секции</h3>
      </Badge.Ribbon>
@ -214,12 +213,9 @@ const WellCompositeSections = memo(({ statsWells, selectedSections }) => {
        rowSelection={rowSelection}
        size={'small'}
        bordered
-        scroll={{ x: true }}
+        scroll={{ x: true, y: '30vh' }}
        pagination={false}
      />
-      <Row justify={'end'} style={{ margin: '1rem 0' }}>
-        <Col><NewParamsTable selectedWellsKeys={selectedWellsKeys} /></Col>
-      </Row>

      <Modal
        title={'TVD'}
--- a/src/pages/Well/Documents/DocumentsTemplate.jsx
+++ b/src/pages/Well/Documents/DocumentsTemplate.jsx
@ -40,7 +40,7 @@ export const DocumentsTemplate = ({ idCategory, well: givenWell, mimeTypes, head
      ),
    },
    makeDateColumn('Дата загрузки', 'uploadDate'),
-    makeNumericColumn('Размер', 'size', null, null, (value) => formatBytes(value)),
+    makeNumericColumn('Размер', 'size', (value) => formatBytes(value)),
    makeColumn('Автор', 'author', { render: item => <UserView user={item}/> }),
    makeColumn('Компания', 'company', { render: (_, record) => <CompanyView company={record?.author?.company}/> }),
    ...(customColumns ?? [])
--- a/src/pages/Well/Telemetry/Messages.jsx
+++ b/src/pages/Well/Telemetry/Messages.jsx
@ -29,7 +29,7 @@ const categoryDictionary = {
 // Конфигурация таблицы
 export const makeMessageColumns = (idWell) => [
  makeDateColumn('Дата', 'date', undefined, undefined, { width: '120px' }),
-  makeNumericColumn('Глубина, м', 'wellDepth', null, null, (depth, item) => (
+  makeNumericColumn('Глубина, м', 'wellDepth', (depth, item) => (
    <Tooltip title={'Нажмите для перехода в архив'}>
      <Link
        style={{ color: 'inherit'}}
@ -40,7 +40,7 @@ export const makeMessageColumns = (idWell) => [
        {depth.toFixed(2)}
      </Link>
    </Tooltip>
-  ), '7rem'),
+  ), undefined, '7rem'),
  makeColumn('Категория', 'categoryId', {
    width: '8rem',
    render: (_, item) => categoryDictionary[item.categoryId].title,
--- a/src/pages/Well/Telemetry/OperationTime/index.jsx
+++ b/src/pages/Well/Telemetry/OperationTime/index.jsx
@ -26,10 +26,10 @@ const tableColumns = [
        <div className={'table_color'} style={{ backgroundColor }} />
    )}),
    makeTextColumn('Подсистема', 'subsystemName'),
-    makeNumericColumn('Использование, %', 'kUsage', undefined, undefined, val => (+val * 100).toFixed(2), 200),
-    makeNumericColumn('Проходка, м', 'sumDepthInterval', undefined, undefined, undefined, 200),
-    makeNumericColumn('Время работы, ч', 'usedTimeHours', undefined, undefined, undefined, 200),
-    makeNumericColumn('Кол-во запусков', 'operationCount', undefined, undefined, makeNumericRender(0), 200),
+    makeNumericColumn('Использование, %', 'kUsage', val => (+val * 100).toFixed(2), undefined, 200),
+    makeNumericColumn('Проходка, м', 'sumDepthInterval', undefined, undefined, 200),
+    makeNumericColumn('Время работы, ч', 'usedTimeHours', undefined, undefined, 200),
+    makeNumericColumn('Кол-во запусков', 'operationCount', makeNumericRender(0), undefined, 200),
 ]

 // Выбор доступен только до текущей даты
--- a/src/pages/Well/Telemetry/Operations/DrillerList.jsx
+++ b/src/pages/Well/Telemetry/Operations/DrillerList.jsx
@ -5,14 +5,13 @@ import { EditableTable, makeTextColumn } from '@components/Table'
 import { DrillerService } from '@api'

 const columnOptions = {
-    editable: true,
    formItemRules: [{ message: 'Обязательное поле!', required: true }]
 }

 const columns = [
    makeTextColumn('Фамилия', 'surname', undefined, undefined, undefined, columnOptions),
    makeTextColumn('Имя', 'name', undefined, undefined, undefined, columnOptions),
-    makeTextColumn('Отчество', 'patronymic', undefined, undefined, undefined, { editable: true }),
+    makeTextColumn('Отчество', 'patronymic'),
 ]

 const rowClassName = (record) => record.has ? 'driller_list_active' : ''
--- a/src/pages/Well/Telemetry/Operations/DrillerSchedule.jsx
+++ b/src/pages/Well/Telemetry/Operations/DrillerSchedule.jsx
@ -14,7 +14,6 @@ import { arrayOrDefault } from '@utils'
 import { ScheduleService } from '@api'

 const columnOptions = {
-    editable: true,
    formItemRules: [{ message: 'Обязательное поле!', required: true }]
 }

--- a/src/pages/Well/Telemetry/Operations/OperationsTable.jsx
+++ b/src/pages/Well/Telemetry/Operations/OperationsTable.jsx
@ -24,11 +24,11 @@ const makeDrillerSorter = (key) => (a, b) => {

 export const columns = [
    makeTextColumn('Бурильщик', 'driller', null, makeDrillerSorter('driller'), drillerRender, { width: 200 }),
-    makeNumericColumn('Кол-во операций', 'count', null, null, (value) => parseInt(value), 150),
-    makeNumericColumn('Среднее по ключевому показателю', 'averageValue', null, null, numericRender, 150),
-    makeNumericColumn('Среднее целевого показателя', 'averageTargetValue', null, null, numericRender, 150),
-    makeNumericColumn('Эффективность (%)', 'efficiency', null, null, numericRender, 150),
-    makeNumericColumn('Коэффициент потерь', 'loss', null, null, numericRender, 100),
+    makeNumericColumn('Кол-во операций', 'count', (value) => parseInt(value), undefined, 150),
+    makeNumericColumn('Среднее по ключевому показателю', 'averageValue', numericRender, undefined, 150),
+    makeNumericColumn('Среднее целевого показателя', 'averageTargetValue', numericRender, undefined, 150),
+    makeNumericColumn('Эффективность (%)', 'efficiency', numericRender, undefined, 150),
+    makeNumericColumn('Коэффициент потерь', 'loss', numericRender, undefined, 100),
 ]

 export const OperationsTable = memo(({ data, height, ...other }) => (
--- a/src/pages/Well/Telemetry/Operations/TargetEditor.jsx
+++ b/src/pages/Well/Telemetry/Operations/TargetEditor.jsx
@ -8,7 +8,6 @@ import { DetectedOperationService, OperationValueService } from '@api'
 import { arrayOrDefault } from '@utils'

 const columnOptions = {
-    editable: true,
    formItemRules: [{ message: 'Обязательное поле!', required: true }]
 }

@ -72,11 +71,11 @@ export const TargetEditor = memo(({ loading, onChange }) => {
                        filterOption: (input, option) =>
                            String(option?.label ?? '').toLowerCase().indexOf(input.toLowerCase()) >= 0
                    }),
-                    makeNumericColumn('Цель', 'targetValue', undefined, undefined, numericRender, 150, columnOptions),
-                    makeNumericColumn('Норм.', 'standardValue', undefined, undefined, numericRender, 150, columnOptions),
+                    makeNumericColumn('Цель', 'targetValue', numericRender, undefined, 150, columnOptions),
+                    makeNumericColumn('Норм.', 'standardValue', numericRender, undefined, 150, columnOptions),
                    makeGroupColumn('Глубина, м', [
-                        makeNumericColumn('Начало', 'depthStart', undefined, undefined, numericRender, 150, columnOptions),
-                        makeNumericColumn('Окончание', 'depthEnd', undefined, undefined, numericRender, 150, columnOptions),
+                        makeNumericColumn('Начало', 'depthStart', numericRender, undefined, 150, columnOptions),
+                        makeNumericColumn('Окончание', 'depthEnd', numericRender, undefined, 150, columnOptions),
                    ]),
                ])
            },
--- a/src/pages/Well/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
+++ b/src/pages/Well/Telemetry/TelemetryView/Setpoints/SetpointSender.jsx
@ -1,11 +1,11 @@
 import { memo, useCallback, useMemo, useState } from 'react'
-import { Select, Modal, Input, InputNumber } from 'antd'
+import { Modal, Input } from 'antd'

 import { useWell } from '@asb/context'
 import { Grid, GridItem } from '@components/Grid'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { makeNumericRender, EditableTable } from '@components/Table'
+import { makeNumericRender, EditableTable, makeSelectColumn, makeNumericColumn } from '@components/Table'
 import { PeriodPicker, defaultPeriod } from '@components/selectors/PeriodPicker'
 import { SetpointsService } from '@api'

@ -19,24 +19,8 @@ export const SetpointSender = memo(({ onClose, visible, setpointNames }) => {
    const [well] = useWell()

    const addingColumns = useMemo(() => [
-        {
-            title: 'Наименование уставки',
-            dataIndex: 'name',
-            editable: true,
-            isRequired: true,
-            width: 200,
-            input: <Select options={setpointNames} />,
-            render: (val) => setpointNames.find((name) => name.value === val)?.label
-        }, {
-            title: 'Значение',
-            dataIndex: 'value',
-            editable: true,
-            isRequired: true,
-            width: 125,
-            input: <InputNumber style={{ width: '100%' }} formatter={value => `${value}`.replace(',', '.')}/>,
-            render: makeNumericRender(1),
-            align: 'right'
-        }
+        makeSelectColumn('Наименование уставки', 'name', setpointNames, undefined, { width: 200, isRequired: true }),
+        makeNumericColumn('Значение', 'value', makeNumericRender(1), undefined, 125, { isRequired: true, align: 'right' }),
    ], [setpointNames])

    const onAdd = useCallback(async (sp) => setSetpoints((prevSp) => {
--- a/src/pages/Well/Telemetry/TelemetryView/cursorRender.jsx
+++ b/src/pages/Well/Telemetry/TelemetryView/cursorRender.jsx
@ -5,9 +5,9 @@ import { Grid, GridItem } from '@components/Grid'
 import { getChartIcon, makeDisplayValue } from '@utils'
 import moment from 'moment'

-const defaultFormater = makeDisplayValue({ def: '---', fixed: 2 })
+const defaultFormatter = makeDisplayValue({ def: '---', fixed: 2 })
 const defaultValueRender = (v, unit) => (
-    <>{defaultFormater(v)} {unit ?? ''}</>
+    <>{defaultFormatter(v)} {unit ?? ''}</>
 )

 export const cursorRender = (group, data, flowData) => {
@ -17,7 +17,7 @@ export const cursorRender = (group, data, flowData) => {
    const firstChart = group.charts[0]
    const y = firstChart.y(d)
    const yDate = moment(y)
-    const flow = flowData.filter((row) => yDate.isBetween(row.dateStart, row.dateEnd, 's', '[]'))
+    const flow = flowData?.filter((row) => yDate.isBetween(row.dateStart, row.dateEnd, 's', '[]'))
    const yValue = firstChart.yAxis.format?.(y) ?? defaultValueRender(y, firstChart.yAxis.unit)
    const xFormat = (chart) => {
        const v = chart.x(d)
@ -42,13 +42,13 @@ export const cursorRender = (group, data, flowData) => {
                {group.charts.filter((chart) => chart.type === 'rect_area').map((chart, i) => {
                    const minX = getByAccessor(chart.minXAccessor)
                    const maxX = getByAccessor(chart.maxXAccessor)
-                    const value = (row) => <span>{defaultFormater(minX(row))} - {defaultFormater(maxX(row))}</span>
+                    const value = (row) => <span>{defaultFormatter(minX(row))} - {defaultFormatter(maxX(row))}</span>

                    return (
                        <Fragment key={chart.key}>
                            <GridItem row={i+2} col={1} style={{ padding: '2px 0' }}>{getChartIcon(chart)}</GridItem>
                            <GridItem row={i+2} col={2}>{chart.shortLabel || chart.label}</GridItem>
-                            {flow.map((row, j) => (
+                            {flow?.map((row, j) => (
                                <GridItem key={`${j}`} row={i+2+(j++)} col={3} style={{ paddingRight: 0, textAlign: 'end' }}>
                                    {chart.xAxis.format?.(row) ?? value(row)}
                                </GridItem>
--- a/src/pages/Well/Telemetry/TelemetryView/index.jsx
+++ b/src/pages/Well/Telemetry/TelemetryView/index.jsx
@ -13,13 +13,12 @@ import { PeriodPicker, defaultPeriod } from '@components/selectors/PeriodPicker'
 import { formatDate, hasPermission, isRawDate, withPermissions } from '@utils'
 import { Subscribe } from '@services/signalr'
 import {
-    DrillFlowChartService,
    OperationStatService,
    TelemetryDataSaubService,
    TelemetryDataSpinService
 } from '@api'

-import { calcFlowData, makeChartGroups, yAxis } from './dataset'
+import { makeChartGroups, yAxis } from './dataset'
 import { ADDITIVE_PAGES, cutData, DATA_COUNT, getLoadingInterval, makeDateTimeDisabled } from './archive_methods'
 import ActiveMessagesOnline from './ActiveMessagesOnline'
 import TelemetrySummary from './TelemetrySummary'
@ -64,12 +63,12 @@ export const normalizeData = (data) => data?.map(item => ({
 const dateSorter = makeDateSorter('date')
 const defaultDate = () => new Date(Date.now() - defaultPeriod * 1000)

-const makeSubjectSubsription = (subject$, handler) => {
-    const subscribtion = subject$.pipe(
+const makeSubjectSubscription = (subject$, handler) => {
+    const subscription = subject$.pipe(
        buffer(subject$.pipe(throttleTime(700)))
    ).subscribe((data) => handler(data.flat().filter(Boolean)))

-    return () => subscribtion.unsubscribe()
+    return () => subscription.unsubscribe()
 }

 const getRowDate = (row) => row && isRawDate(row.date) ? new Date(row.date) : null
@ -81,7 +80,6 @@ const TelemetryView = memo(() => {
    const [dataSaub, setDataSaub] = useState([])
    const [dataSpin, setDataSpin] = useState([])
    const [showLoader, setShowLoader] = useState(false)
-    const [flowChartData, setFlowChartData] = useState([])
    const [rop, setRop] = useState(null)
    const [chartMethods, setChartMethods] = useState()

@ -147,7 +145,6 @@ const TelemetryView = memo(() => {
    const spinSubject$ = useMemo(() => new BehaviorSubject(), [])

    const filteredData = useMemo(() => cutData(dataSaub, domain.min, domain.max), [dataSaub, domain])
-    const flowData = useMemo(() => calcFlowData(dataSaub, flowChartData), [dataSaub, flowChartData])
    const chartGroups = useMemo(() => makeChartGroups(), [])

    useEffect(() => {
@ -170,8 +167,8 @@ const TelemetryView = memo(() => {
        setSearchParams(params)
    }, [archiveMode, endDate, chartInterval])

-    useEffect(() => makeSubjectSubsription(saubSubject$, handleDataSaub), [saubSubject$, handleDataSaub])
-    useEffect(() => makeSubjectSubsription(spinSubject$, handleDataSpin), [spinSubject$, handleDataSpin])
+    useEffect(() => makeSubjectSubscription(saubSubject$, handleDataSaub), [saubSubject$, handleDataSaub])
+    useEffect(() => makeSubjectSubscription(spinSubject$, handleDataSpin), [spinSubject$, handleDataSpin])

    useEffect(() => {
        if (archiveMode) return
@ -233,8 +230,6 @@ const TelemetryView = memo(() => {
    useEffect(() => {
        invokeWebApiWrapperAsync(
            async () => {
-                const flowChart = await DrillFlowChartService.getByIdWell(well.id)
-                setFlowChartData(flowChart ?? [])
                const rop = await OperationStatService.getClusterRopStatByIdWell(well.id)
                setRop(rop)
                let dates = await TelemetryDataSaubService.getDataDatesRange(well.id)
@ -312,7 +307,6 @@ const TelemetryView = memo(() => {
                    {...chartProps}
                    yDomain={domain}
                    data={filteredData}
-                    flowData={flowData}
                    methods={setChartMethods}
                    datasetGroups={chartGroups}
                    onWheel={onWheel}
--- a/src/pages/Well/WellNavigationMenu.jsx
+++ b/src/pages/Well/WellNavigationMenu.jsx
@ -40,7 +40,6 @@ export const menuItems = [
        makeItem('План', 'plan', [], <TableOutlined />),
        makeItem('Факт', 'fact', [], <TableOutlined />),
        makeItem('РТК', 'drillProcessFlow', [], <BarChartOutlined />),
-        makeItem('Режимы', 'params', [], <ControlOutlined />),
    ]),
    makeItem('Документы', 'document', [], <FolderOutlined />, [
        makeItem('Растворный сервис', 'fluidService', [], <FolderOutlined />),
--- a/src/pages/Well/WellOperations/DrillProcessFlow.jsx
+++ b/src/pages/Well/WellOperations/DrillProcessFlow.jsx
@ -1,44 +1,83 @@
 import { useState, useEffect, memo, useMemo, useCallback } from 'react'

 import { useWell } from '@asb/context'
+import {
+    EditableTable,
+    makeGroupColumn,
+    makeNumericColumn,
+    makeNumericColumnPlanFact,
+    makeNumericRender,
+    makeNumericSorter,
+    makeSelectColumn,
+} from '@components/Table'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { EditableTable, makeNumericMinMax, makeNumericStartEnd } from '@components/Table'
-import { DrillFlowChartService } from '@api'
+import { ProcessMapService, WellOperationService } from '@api'
 import { arrayOrDefault } from '@utils'

-const columns = [
-    makeNumericStartEnd('Глубина, м', 'depth'),
-    makeNumericMinMax('Нагрузка, т', 'axialLoad'),
-    makeNumericMinMax('Перепад давления, атм', 'pressure'),
-    makeNumericMinMax('Момент на ВСП, кН·м', 'rotorTorque'),
-    makeNumericMinMax('Обороты на ВСП, об/мин', 'rotorSpeed'),
-    makeNumericMinMax('Расход, л/с', 'flow')
-]
+const numericRender = makeNumericRender(2)
+
+export const getColumns = async (idWell) => {
+    let sectionTypes = await WellOperationService.getSectionTypes(idWell)
+    sectionTypes = Object.entries(sectionTypes).map(([id, value]) => ({
+        label: value,
+        value: id,
+    }))
+
+    return [
+        makeSelectColumn('Конструкция секции','idWellSectionType', sectionTypes, null, {
+            width: 160,
+            sorter: makeNumericSorter('idWellSectionType'),
+        }),
+        makeGroupColumn('Интервал бурения, м', [
+            makeNumericColumn('От', 'depthStart', numericRender),
+            makeNumericColumn('До', 'depthEnd', numericRender),
+        ]),
+        makeNumericColumnPlanFact('Перепад давления, атм', 'pressure', numericRender),
+        makeNumericColumnPlanFact('Нагрузка, т', 'axialLoad', numericRender),
+        makeNumericColumnPlanFact('Момент на ВСП, кН·м', 'topDriveTorque', numericRender),
+        makeNumericColumnPlanFact('Обороты на ВСП, об/мин', 'topDriveSpeed', numericRender),
+        makeNumericColumnPlanFact('Расход, л/с', 'flow', numericRender),
+        makeNumericColumn('Плановая механическая скорость, м/ч', 'ropPlan', numericRender),
+    ]
+}

 export const DrillProcessFlow = memo(() => {
    const [flows, setFlows] = useState([])
    const [showLoader, setShowLoader] = useState(false)
+    const [columns, setColumns] = useState([])

    const [well] = useWell()

    const updateFlows = useCallback(() => invokeWebApiWrapperAsync(
        async () => {
-            const flows = await DrillFlowChartService.getByIdWell(well.id)
+            const flows = await ProcessMapService.getByIdWell(well.id)
            setFlows(arrayOrDefault(flows))
        },
        setShowLoader,
        `Не удалось загрузить режимно-технологическую карту`,
-        { actionName: 'Получение режимно-технологической карты', well }
+        { actionName: 'Получение режимно-технологической карты', well },
    ), [well])

+    useEffect(() => {
+        invokeWebApiWrapperAsync(
+            async () => {
+                const columns = await getColumns(well.id)
+                setColumns(columns)
+            },
+            setShowLoader,
+            `Не удалось загрузить список конструкций секций`,
+            { actionName: 'Получение списка конструкций секций', well },
+        )
+    }, [well])
+
    useEffect(() => {
        updateFlows()
    }, [well])

    const tableHandlers = useMemo(() => {
        const handlerProps = {
-            service: DrillFlowChartService,
+            service: ProcessMapService,
            setLoader: setShowLoader,
            onComplete: updateFlows,
            permission: 'DrillFlowChart.edit',
--- a/src/pages/Well/WellOperations/OperationEditor/WellOperationsEditor.jsx
+++ b/src/pages/Well/WellOperations/OperationEditor/WellOperationsEditor.jsx
@ -31,26 +31,20 @@ const dayWithoutNptRender = (_, row) => dayRender((row.day ?? 0) - (row.nptHours
 const generateColumns = (showNpt = false, categories = [], sectionTypes = []) => [
  makeSelectColumn('Конструкция секции', 'idWellSectionType', sectionTypes, undefined, {
    sorter: makeNumericSorter('idWellSectionType'),
-    editable: true,
    width: 160,
  }),
  makeSelectColumn('Операция', 'idCategory', categories, undefined, {
    sorter: makeNumericSorter('idCategory'),
-    editable: true,
    width: 200,
  }),
-  makeTextColumn('Доп. инфо', 'categoryInfo', null, null, null, { editable: true, width: 300, input: <TextArea/> }),
-  makeColumn('Глубина забоя на начало, м', 'depthStart', makeNumericColumnOptions(2, 'depthStart')),
-  makeColumn('Глубина забоя при завершении, м', 'depthEnd', makeNumericColumnOptions(2, 'depthEnd')),
-  makeDateColumn('Время начала', 'dateStart', undefined, undefined, {
-    editable: true,
-    width: 170,
-    initialValue: moment().format(),
-  }),
-  makeNumericColumn('День', 'day', null, null, dayRender, 80),
-  showNpt && makeNumericColumn('День без НПВ', 'dayWithoutNpt', null, null, dayWithoutNptRender, 80),
-  makeColumn('Часы', 'durationHours', { ...makeNumericColumnOptions(2, 'durationHours'), width: 70 }),
-  makeTextColumn('Комментарий', 'comment', null, null, null, { editable: true, input: <TextArea/> }),
+  makeTextColumn('Доп. инфо', 'categoryInfo', null, null, null, { width: 300, input: <TextArea/> }),
+  makeNumericColumn('Глубина забоя на начало, м', 'depthStart'),
+  makeNumericColumn('Глубина забоя при завершении, м', 'depthEnd'),
+  makeDateColumn('Время начала', 'dateStart', undefined, undefined, { width: 170, initialValue: moment().format() }),
+  makeNumericColumn('День', 'day', dayRender, undefined, 80),
+  showNpt && makeNumericColumn('День без НПВ', 'dayWithoutNpt', dayWithoutNptRender, undefined, 80),
+  makeNumericColumn('Часы', 'durationHours', undefined, undefined, 70),
+  makeTextColumn('Комментарий', 'comment', null, null, null, { input: <TextArea /> }),
 ].filter(Boolean)

 export const WellOperationsEditor = memo(({ idType, showNpt, ...other }) => {
--- a/src/pages/Well/WellOperations/Tvd/NptTable.jsx
+++ b/src/pages/Well/WellOperations/Tvd/NptTable.jsx
@ -4,15 +4,15 @@ import { FilterOutlined } from '@ant-design/icons'

 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { makeDateColumn, makeNumericColumn, makeNumericRender, makeTextColumn, Table } from '@components/Table'
+import { makeDateColumn, makeNumericColumn, makeTextColumn, Table } from '@components/Table'

 import '@styles/pages/tvd.less'

 export const columns = [
    makeTextColumn('Конструкция секции', 'wellSectionTypeName', null, null, null, { width: 140 }),
-    makeNumericColumn('Глубина', 'depth', null, null, null, 80),
+    makeNumericColumn('Глубина', 'depth', undefined, undefined, 80),
    makeDateColumn('Дата начала', 'date', false, undefined, { width: 90 }),
-    makeNumericColumn('Длительность (ч)', 'durationHours', null, null, makeNumericRender(2), 120),
+    makeNumericColumn('Длительность (ч)', 'durationHours', undefined, undefined, 120),
    makeTextColumn('Доп. инфо', 'categoryInfo', null, null, null),
    makeTextColumn('Комментарий', 'comment'),
 ]
--- a/src/pages/Well/WellOperations/Tvd/TLPie.jsx
+++ b/src/pages/Well/WellOperations/Tvd/TLPie.jsx
@ -18,9 +18,9 @@ const tableColumns = [
        <div style={{ backgroundColor: d, padding: '5px 0' }} />
    ) }),
    makeTextColumn('Название', 'category', undefined, undefined, undefined, { width: 300 }),
-    makeNumericColumn('Время, мин', 'minutesTotal', undefined, undefined, undefined, 100),
-    makeNumericColumn('Кол-во', 'count', undefined, undefined, (d) => d ? d.toString() : '---', 100),
-    makeNumericColumn('Процент, %', 'percent', undefined, undefined, (d) => d ? d.toFixed(2) : '---', 100)
+    makeNumericColumn('Время, мин', 'minutesTotal', undefined, undefined, 100),
+    makeNumericColumn('Кол-во', 'count', (d) => d ? d.toString() : '---', undefined, 100),
+    makeNumericColumn('Процент, %', 'percent', (d) => d ? d.toFixed(2) : '---', undefined, 100),
 ]

 export const TLPie = memo(({ well }) => {
--- a/src/pages/Well/WellOperations/WellDrillParams.jsx
+++ b/src/pages/Well/WellOperations/WellDrillParams.jsx
@ -1,98 +0,0 @@
-import { useState, useEffect, useCallback, memo, useMemo } from 'react'
-
-import { useWell } from '@asb/context'
-import {
-    EditableTable,
-    makeSelectColumn,
-    makeNumericSorter,
-    makeNumericAvgRange,
-} from '@components/Table'
-import LoaderPortal from '@components/LoaderPortal'
-import { invokeWebApiWrapperAsync } from '@components/factory'
-import { DrillParamsService, WellOperationService } from '@api'
-import { arrayOrDefault } from '@utils'
-
-export const getColumns = async (idWell) => {
-    let sectionTypes = await WellOperationService.getSectionTypes(idWell)
-    sectionTypes = Object.entries(sectionTypes).map(([id, value]) => ({
-        label: value,
-        value: id,
-    }))
-
-    return [
-        makeSelectColumn('Конструкция секции','idWellSectionType', sectionTypes, null, {
-            editable: true,
-            width: 160,
-            sorter: makeNumericSorter('idWellSectionType'),
-        }),
-        makeNumericAvgRange('Нагрузка, т', 'axialLoad', 1),
-        makeNumericAvgRange('Перепад давления, атм', 'pressure', 1),
-        makeNumericAvgRange('Момент на ВСП, кН·м', 'rotorTorque', 1),
-        makeNumericAvgRange('Обороты на ВСП, об/мин', 'rotorSpeed', 1),
-        makeNumericAvgRange('Расход, л/с', 'flow', 1),
-    ]
-}
-
-export const WellDrillParams = memo(() => {
-    const [params, setParams] = useState([])
-    const [showLoader, setShowLoader] = useState(false)
-    const [columns, setColumns] = useState([])
-
-    const [well] = useWell()
-
-    const updateParams = useCallback(async () => await invokeWebApiWrapperAsync(
-        async () => {
-            const params = arrayOrDefault(await DrillParamsService.getAll(well.id))
-            // Typescript против использования числа в качестве типа значения select
-            params.forEach((param) => param.idWellSectionType = `${param.idWellSectionType}`)
-            setParams(params)
-        },
-        setShowLoader,
-        `Не удалось загрузить список режимов бурения`,
-        { actionName: 'Получение списка режимов бурения скважины', well }
-    ), [well])
-
-    useEffect(() => {
-        (async () => {
-            setColumns(await getColumns(well.id))
-            await updateParams()
-        })()
-    }, [well.id, updateParams])
-
-    const recordParser = useCallback((record) => ({ ...record, idWell: well.id }), [well.id])
-
-    const tableHandlers = useMemo(() => {
-        const handlerProps = {
-            service: DrillParamsService,
-            setLoader: setShowLoader,
-            onComplete: updateParams,
-            permission: 'DrillParams.edit',
-            idWell: well.id,
-            idRecord: true,
-        }
-
-        return {
-            add: { ...handlerProps, action: 'insert', actionName: 'Добавление режима бурения', recordParser },
-            edit: { ...handlerProps, action: 'update', actionName: 'Редактирование режима бурения', recordParser },
-            delete: { ...handlerProps, action: 'delete', actionName: 'Удаление режима бурения', permission: 'DrillParams.delete' },
-        }
-    }, [well.id, updateParams, recordParser])
-
-    return (
-        <LoaderPortal show={showLoader}>
-            <EditableTable
-                bordered
-                size={'small'}
-                columns={columns}
-                dataSource={params}
-                tableName={'well_drill_params'}
-                onRowAdd={tableHandlers.add}
-                onRowEdit={tableHandlers.edit}
-                onRowDelete={tableHandlers.delete}
-                pagination={false}
-            />
-        </LoaderPortal>
-    )
-})
-
-export default WellDrillParams
--- a/src/pages/Well/WellOperations/WellSectionsStat.jsx
+++ b/src/pages/Well/WellOperations/WellSectionsStat.jsx
@ -3,76 +3,75 @@ import { useState, useEffect, memo } from 'react'
 import { useWell } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { Table, makeColumn, makeColumnsPlanFact, makeNumericRender } from '@components/Table'
+import { Table, makeColumn, makeNumericRender, makeNumericColumnPlanFactOld } from '@components/Table'
 import { calcDuration } from '@utils'
 import { OperationStatService } from '@api'

-
 const numericRender = makeNumericRender(2)

 const columns = [
-  makeColumn('Тип секции', 'sectionType'),
-  makeColumnsPlanFact('Глубина, м'            ,'wellDepth',       { render: numericRender }),
-  makeColumnsPlanFact('Часы'                  ,'duration',        { render: numericRender }),
-  makeColumnsPlanFact('МСП, м/ч'              ,'rop',             { render: numericRender }),
-  makeColumnsPlanFact('Рейсовая скорость, м/ч','routeSpeed',      { render: numericRender }),
-  makeColumnsPlanFact('Подъем КНБК, м/ч'      ,'bhaUpSpeed',      { render: numericRender }),
-  makeColumnsPlanFact('Спуск КНБК, м/ч'       ,'bhaDownSpeed',    { render: numericRender }),
-  makeColumnsPlanFact('Спуск ОК, м/ч'         ,'casingDownSpeed', { render: numericRender }),
+    makeColumn('Тип секции', 'sectionType'),
+    makeNumericColumnPlanFactOld('Глубина, м', 'wellDepth', numericRender),
+    makeNumericColumnPlanFactOld('Часы', 'duration', numericRender),
+    makeNumericColumnPlanFactOld('МСП, м/ч', 'rop', numericRender),
+    makeNumericColumnPlanFactOld('Рейсовая скорость, м/ч', 'routeSpeed', numericRender),
+    makeNumericColumnPlanFactOld('Подъем КНБК, м/ч', 'bhaUpSpeed', numericRender),
+    makeNumericColumnPlanFactOld('Спуск КНБК, м/ч', 'bhaDownSpeed', numericRender),
+    makeNumericColumnPlanFactOld('Спуск ОК, м/ч', 'casingDownSpeed', numericRender),
 ]

 export const WellSectionsStat = memo(() => {
-  const [sections, setSections] = useState([])
-  const [showLoader, setShowLoader] = useState(false)
+    const [sections, setSections] = useState([])
+    const [showLoader, setShowLoader] = useState(false)

-  const [well] = useWell()
+    const [well] = useWell()

-  useEffect(() => {
-    invokeWebApiWrapperAsync(
-      async () => {
-        const sectionsResponse = await OperationStatService.getStatWell(well.id)
+    useEffect(() => {
+        invokeWebApiWrapperAsync(
+            async () => {
+                const sectionsResponse = await OperationStatService.getStatWell(well.id)

-        if(sectionsResponse?.sections){
-          const sections = sectionsResponse.sections.map(s => ({
-            key: s.id,
-            sectionType: s.caption,
-            wellDepthPlan: s.plan?.wellDepthEnd,
-            durationPlan: calcDuration(s.plan?.start, s.plan?.end),
-            ropPlan: s.plan?.rop,
-            routeSpeedPlan: s.plan?.routeSpeed,
-            bhaUpSpeedPlan: s.plan?.bhaUpSpeed,
-            bhaDownSpeedPlan: s.plan?.bhaDownSpeed,
-            casingDownSpeedPlan: s.plan?.casingDownSpeed,
+                if(sectionsResponse?.sections){
+                    const sections = sectionsResponse.sections.map(s => ({
+                        key: s.id,
+                        sectionType: s.caption,
+                        wellDepthPlan: s.plan?.wellDepthEnd,
+                        durationPlan: calcDuration(s.plan?.start, s.plan?.end),
+                        ropPlan: s.plan?.rop,
+                        routeSpeedPlan: s.plan?.routeSpeed,
+                        bhaUpSpeedPlan: s.plan?.bhaUpSpeed,
+                        bhaDownSpeedPlan: s.plan?.bhaDownSpeed,
+                        casingDownSpeedPlan: s.plan?.casingDownSpeed,

-            wellDepthFact: s.fact?.wellDepthEnd,
-            durationFact: calcDuration(s.fact?.start, s.fact?.end),
-            ropFact: s.fact?.rop,
-            routeSpeedFact: s.fact?.routeSpeed,
-            bhaUpSpeedFact: s.fact?.bhaUpSpeed,
-            bhaDownSpeedFact: s.fact?.bhaDownSpeed,
-            casingDownSpeedFact: s.fact?.casingDownSpeed,
-          }))
-          sections.sort((a,b) => a.wellDepthPlan - b.wellDepthPlan)
-          setSections(sections)
-        }
-      },
-      setShowLoader,
-      `Не удалось получить статистику по секциям`,
-      { actionName: 'Получение статистики по секциям', well }
+                        wellDepthFact: s.fact?.wellDepthEnd,
+                        durationFact: calcDuration(s.fact?.start, s.fact?.end),
+                        ropFact: s.fact?.rop,
+                        routeSpeedFact: s.fact?.routeSpeed,
+                        bhaUpSpeedFact: s.fact?.bhaUpSpeed,
+                        bhaDownSpeedFact: s.fact?.bhaDownSpeed,
+                        casingDownSpeedFact: s.fact?.casingDownSpeed,
+                    }))
+                    sections.sort((a,b) => a.wellDepthPlan - b.wellDepthPlan)
+                    setSections(sections)
+                }
+            },
+            setShowLoader,
+            `Не удалось получить статистику по секциям`,
+            { actionName: 'Получение статистики по секциям', well }
+        )
+    }, [well])
+
+    return (
+        <LoaderPortal show={showLoader}>
+            <Table
+                bordered
+                size={'small'}
+                columns={columns}
+                dataSource={sections}
+                tableName={'well_operations_sections'}
+            />
+        </LoaderPortal>
    )
-  }, [well])
-
-  return (
-    <LoaderPortal show={showLoader}>
-      <Table
-        bordered
-        size={'small'}
-        columns={columns}
-        dataSource={sections}
-        tableName={'well_operations_sections'}
-      />
-    </LoaderPortal>
-  )
 })

 export default WellSectionsStat
--- a/src/pages/Well/index.jsx
+++ b/src/pages/Well/index.jsx
@ -1,5 +1,5 @@
 import { lazy, memo, useCallback, useEffect, useMemo, useState } from 'react'
-import { Navigate, Route, Routes, useLocation, useParams } from 'react-router-dom'
+import { Navigate, Route, Routes, useParams } from 'react-router-dom'

 import { WellContext, RootPathContext, useRootPath, useLayoutProps, TopRightBlockContext } from '@asb/context'
 import { FastRunMenu } from '@components/FastRunMenu'
@ -22,7 +22,6 @@ const WellOperations = lazy(() => import('./WellOperations'))
 const DrillingProgram = lazy(() => import('./DrillingProgram'))

 const Tvd = lazy(() => import('./WellOperations/Tvd'))
-const WellDrillParams = lazy(() => import('./WellOperations/WellDrillParams'))
 const DrillProcessFlow = lazy(() => import('./WellOperations/DrillProcessFlow'))
 const WellSectionsStat = lazy(() => import('./WellOperations/WellSectionsStat'))
 const WellOperationsEditorFact = lazy(() => import('./WellOperations/OperationEditor/Fact'))
@ -45,8 +44,6 @@ const breadcrumb = makeMenuBreadcrumbItemsRender(menuItems, /^\/well\/[^\/#?]+\/
 const Well = memo(() => {
    const { idWell } = useParams()

-    const location = useLocation()
-
    const [well, setWell] = useState({ id: idWell })
    const [topRightBlock, setTopRightBlock] = useState()

@ -130,7 +127,6 @@ const Well = memo(() => {
                            <Route path={'plan'} element={<WellOperationsEditorPlan />} />
                            <Route path={'fact'} element={<WellOperationsEditorFact />} />
                            <Route path={'drillProcessFlow'} element={<DrillProcessFlow />} />
-                            <Route path={'params'} element={<WellDrillParams />} />
                        </Route>
                        <Route path={'document/*'} element={<Documents />} />
                        <Route path={'measure/*'} element={<Measure />} />
--- a/src/styles/components/loader.css
+++ b/src/styles/components/loader.css
@ -39,6 +39,8 @@
 }

 .loader-content{
+    width: 100%;
+    height: 100%;
    display: flex;
    flex-direction: column;
    grid-column-start: 1;