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

Исправлено отображение IEBar

Browse Source
This commit is contained in:
Александр Сироткин 2022-03-02 17:02:43 +05:00
parent fba06e983a
commit 79ca654d45
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/WellOperations/ImportExportBar.jsx
View File

@ -21,7 +21,7 @@ export const ImportExportBar = memo(({ idWell, onImported, disabled }) => {
} }
return ( return (
<> <div>
<Tooltip title={'Импорт - загрузить файл с операциями на сервер'}> <Tooltip title={'Импорт - загрузить файл с операциями на сервер'}>
<Button <Button
disabled={!hasPermission('WellOperation.edit') || disabled} disabled={!hasPermission('WellOperation.edit') || disabled}
@ -50,7 +50,7 @@ export const ImportExportBar = memo(({ idWell, onImported, disabled }) => {
> >
<ImportOperations idWell={idWell} onDone={onDone} /> <ImportOperations idWell={idWell} onDone={onDone} />
</Modal> </Modal>
</> </div>
) )
}) })

9
src/pages/WellOperations/index.jsx
View File

@ -1,5 +1,5 @@
import { memo, useCallback } from 'react' import { memo, useCallback } from 'react'
import { Layout, Menu } from 'antd' import { Layout, Menu, Popover } from 'antd'
import { Switch, useParams, useHistory, useLocation } from 'react-router-dom' import { Switch, useParams, useHistory, useLocation } from 'react-router-dom'
import { import {
BarChartOutlined, BarChartOutlined,
@ -17,6 +17,7 @@ import { WellDrillParams } from './WellDrillParams'
import { DrillProcessFlow } from './DrillProcessFlow' import { DrillProcessFlow } from './DrillProcessFlow'
import { WellSectionsStat } from './WellSectionsStat' import { WellSectionsStat } from './WellSectionsStat'
import { WellOperationsEditor } from './WellOperationsEditor' import { WellOperationsEditor } from './WellOperationsEditor'
import { Flex } from '@asb/components/Grid'
const { Content } = Layout const { Content } = Layout
@ -34,15 +35,17 @@ export const WellOperations = memo(({ idWell }) => {
return( return(
<> <>
<Menu mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]}> <Flex style={{ width: '100%' }}>
<Menu mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[tab]} style={{ flex: 1 }}>
<PrivateMenuItemLink root={rootPath} icon={<LineChartOutlined />} key={'tvd'} path={'tvd'} title={'TVD'} /> <PrivateMenuItemLink root={rootPath} icon={<LineChartOutlined />} key={'tvd'} path={'tvd'} title={'TVD'} />
<PrivateMenuItemLink root={rootPath} icon={<BuildOutlined />} key={'sections'} path={'sections'} title={'Секции'} /> <PrivateMenuItemLink root={rootPath} icon={<BuildOutlined />} key={'sections'} path={'sections'} title={'Секции'} />
<PrivateMenuItemLink root={rootPath} icon={<TableOutlined />} key={'plan'} path={'plan'} title={'План'} /> <PrivateMenuItemLink root={rootPath} icon={<TableOutlined />} key={'plan'} path={'plan'} title={'План'} />
<PrivateMenuItemLink root={rootPath} icon={<TableOutlined />} key={'fact'} path={'fact'} title={'Факт'} /> <PrivateMenuItemLink root={rootPath} icon={<TableOutlined />} key={'fact'} path={'fact'} title={'Факт'} />
<PrivateMenuItemLink root={rootPath} icon={<BarChartOutlined />} key={'drillProcessFlow'} path={'drillProcessFlow'} title={'РТК'} /> <PrivateMenuItemLink root={rootPath} icon={<BarChartOutlined />} key={'drillProcessFlow'} path={'drillProcessFlow'} title={'РТК'} />
<PrivateMenuItemLink root={rootPath} icon={<ControlOutlined />} key={'params'} path={'params'} title={'Режимы'} /> <PrivateMenuItemLink root={rootPath} icon={<ControlOutlined />} key={'params'} path={'params'} title={'Режимы'} />
<ImportExportBar idWell={idWell} disabled={isIEBarDisabled} onImported={onImported}/>
</Menu> </Menu>
<ImportExportBar idWell={idWell} disabled={isIEBarDisabled} onImported={onImported}/>
</Flex>
<Layout> <Layout>
<Content className={'site-layout-background'}> <Content className={'site-layout-background'}>
<Switch> <Switch>