forked from ddrilling/asb_cloud_front
CompanyView используется в местах упоминания компаний
This commit is contained in:
parent
f228b64a6f
commit
613b5b232a
@ -1,21 +1,28 @@
|
|||||||
import { Link } from 'react-router-dom'
|
import { Link } from 'react-router-dom'
|
||||||
import { useState, useEffect } from 'react'
|
import { useState, useEffect } from 'react'
|
||||||
import { Tag, Button, Modal } from 'antd'
|
import { Tag, Button, Modal } from 'antd'
|
||||||
import { Table } from '../../components/Table'
|
|
||||||
import { LineChartOutlined, ProfileOutlined } from '@ant-design/icons'
|
import { LineChartOutlined, ProfileOutlined } from '@ant-design/icons'
|
||||||
|
|
||||||
import {
|
import {
|
||||||
makeTextColumn,
|
makeTextColumn,
|
||||||
makeGroupColumn,
|
makeGroupColumn,
|
||||||
makeColumn,
|
makeColumn,
|
||||||
makeDateSorter,
|
makeDateSorter,
|
||||||
makeNumericColumnPlanFact} from '../../components/Table'
|
makeNumericColumnPlanFact,
|
||||||
import { calcAndUpdateStatsBySections, makeFilterMinMaxFunction } from './functions'
|
Table,
|
||||||
|
} from '../../components/Table'
|
||||||
import { invokeWebApiWrapperAsync } from '../../components/factory'
|
import { invokeWebApiWrapperAsync } from '../../components/factory'
|
||||||
import { Tvd } from '../WellOperations/Tvd'
|
|
||||||
import WellOperationsTable from './WellOperationsTable'
|
|
||||||
import { getOperations } from './functions'
|
|
||||||
import LoaderPortal from '../../components/LoaderPortal'
|
import LoaderPortal from '../../components/LoaderPortal'
|
||||||
import PointerIcon from '../../components/icons/PointerIcon'
|
import PointerIcon from '../../components/icons/PointerIcon'
|
||||||
|
import { CompanyView } from '../../components/Views'
|
||||||
|
|
||||||
|
import { Tvd } from '../WellOperations/Tvd'
|
||||||
|
import {
|
||||||
|
getOperations,
|
||||||
|
calcAndUpdateStatsBySections,
|
||||||
|
makeFilterMinMaxFunction
|
||||||
|
} from './functions'
|
||||||
|
import WellOperationsTable from './WellOperationsTable'
|
||||||
|
|
||||||
const filtersMinMax = [
|
const filtersMinMax = [
|
||||||
{ text: 'min', value: 'min' },
|
{ text: 'min', value: 'min' },
|
||||||
@ -147,7 +154,11 @@ export default function ClusterWells({statsWells}) {
|
|||||||
title: 'Участники',
|
title: 'Участники',
|
||||||
key: 'companies',
|
key: 'companies',
|
||||||
dataIndex: 'companies',
|
dataIndex: 'companies',
|
||||||
render: (item) => item?.map((company) => <Tag key={company.caption} color='blue'>{company.caption}</Tag>) ?? '-',
|
render: (item) => item?.map((company) => (
|
||||||
|
<Tag key={company.caption} color='blue'>
|
||||||
|
<CompanyView company={company} />
|
||||||
|
</Tag>
|
||||||
|
)) ?? '-',
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -2,17 +2,20 @@ import { LineChartOutlined, ProfileOutlined } from '@ant-design/icons'
|
|||||||
import { Table, Tag, Button, Badge, Divider, Modal, Row, Col, Popconfirm } from 'antd'
|
import { Table, Tag, Button, Badge, Divider, Modal, Row, Col, Popconfirm } from 'antd'
|
||||||
import { Link } from 'react-router-dom'
|
import { Link } from 'react-router-dom'
|
||||||
import { useState, useEffect } from 'react'
|
import { useState, useEffect } from 'react'
|
||||||
|
|
||||||
import { makeTextColumn, makeNumericColumnPlanFact } from '../../../components/Table'
|
import { makeTextColumn, makeNumericColumnPlanFact } from '../../../components/Table'
|
||||||
|
import { DrillParamsService, WellCompositeService } from '../../../services/api'
|
||||||
|
import LoaderPortal from '../../../components/LoaderPortal'
|
||||||
|
import { invokeWebApiWrapperAsync } from '../../../components/factory'
|
||||||
|
import { CompanyView } from '../../../components/Views'
|
||||||
|
|
||||||
import {
|
import {
|
||||||
calcAndUpdateStatsBySections,
|
calcAndUpdateStatsBySections,
|
||||||
makeFilterMinMaxFunction,
|
makeFilterMinMaxFunction,
|
||||||
getOperations
|
getOperations
|
||||||
} from '../../Cluster/functions'
|
} from '../../Cluster/functions'
|
||||||
import { Tvd } from '../Tvd'
|
import { Tvd } from '../Tvd'
|
||||||
import { DrillParamsService, WellCompositeService } from '../../../services/api'
|
|
||||||
import LoaderPortal from '../../../components/LoaderPortal'
|
|
||||||
import WellOperationsTable from '../../Cluster/WellOperationsTable'
|
import WellOperationsTable from '../../Cluster/WellOperationsTable'
|
||||||
import { invokeWebApiWrapperAsync } from '../../../components/factory'
|
|
||||||
import { columns as paramsColumns } from '../WellDrillParams'
|
import { columns as paramsColumns } from '../WellDrillParams'
|
||||||
|
|
||||||
|
|
||||||
@ -149,8 +152,11 @@ export const WellCompositeSections = ({idWell, statsWells, selectedSections}) =>
|
|||||||
{
|
{
|
||||||
title: 'Участники',
|
title: 'Участники',
|
||||||
dataIndex: 'companies',
|
dataIndex: 'companies',
|
||||||
render: (item) =>
|
render: (item) => item?.map((company) => (
|
||||||
item?.map((company) => <Tag key={company.caption} color={'blue'}>{company.caption}</Tag>),
|
<Tag key={company.caption} color={'blue'}>
|
||||||
|
<CompanyView company={company} />
|
||||||
|
</Tag>
|
||||||
|
)) ?? '-',
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user