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:
Александр Сироткин 2022-11-21 12:04:48 +05:00
parent 16fb37910f
commit 51ac260c74
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/Well/Telemetry/TelemetryView/TelemetrySummary.jsx
View File

@ -74,8 +74,8 @@ const params = [
{ label: 'Рот.', unit: 'об/мин', accessorName: 'rotorSpeed', iconRenderer }, { label: 'Рот.', unit: 'об/мин', accessorName: 'rotorSpeed', iconRenderer },
{ label: 'Долото', unit: 'м', accessorName: 'bitDepth', iconRenderer, format: 2 }, { label: 'Долото', unit: 'м', accessorName: 'bitDepth', iconRenderer, format: 2 },
{ label: 'Забой', unit: 'м', accessorName: 'wellDepth', iconRenderer, format: 2 }, { label: 'Забой', unit: 'м', accessorName: 'wellDepth', iconRenderer, format: 2 },
{ label: 'Расход', unit: 'м³/ч', accessorName: 'flow', iconRenderer }, { label: 'Расход', unit: 'л/ч', accessorName: 'flow', iconRenderer },
{ label: 'Расход х.х.', unit: 'м³/ч', accessorName: 'flowIdle', iconRenderer }, { label: 'Расход х.х.', unit: 'л/ч', accessorName: 'flowIdle', iconRenderer },
{ label: 'MSE', unit: '%', accessorName: 'mse', format: 2 }, { label: 'MSE', unit: '%', accessorName: 'mse', format: 2 },
] ]

8
src/pages/Well/WellOperations/OperationEditor/WellOperationsEditor.jsx
View File

@ -138,11 +138,9 @@ export const WellOperationsEditor = memo(({ idType, showNpt, ...other }) => {
) )
}, [well]) }, [well])
useEffect(() => { useEffect(() => setTopRightBlock((well) => (
setTopRightBlock( <ImportExportBar well={well} onImported={updateOperations} />
<ImportExportBar well={well} onImported={updateOperations} /> )), [setTopRightBlock, updateOperations])
)
}, [well, setTopRightBlock, updateOperations])
return ( return (
<LoaderPortal show={showLoader}> <LoaderPortal show={showLoader}>

14
src/pages/Well/WellOperations/Tvd/index.jsx
View File

@ -229,14 +229,12 @@ const Tvd = memo(({ well: givenWell, title, ...other }) => {
) )
}, [well]) }, [well])
useEffect(() => { useEffect(() => setTopRightBlock((well) => (
setTopRightBlock( <div style={{ display: 'flex', gap: 15 }}>
<div style={{ display: 'flex', gap: 15 }}> <StatExport well={well} />
<StatExport well={well} /> <NetGraphExport well={well} />
<NetGraphExport well={well} /> </div>
</div> )), [setTopRightBlock])
)
}, [well, setTopRightBlock])
return ( return (
<div className={'container tvd-page'} {...other}> <div className={'container tvd-page'} {...other}>

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

@ -78,11 +78,9 @@ const Well = memo(() => {
useEffect(() => setLayoutProps({ useEffect(() => setLayoutProps({
sider: <NavigationMenu idWell={well.id} />, sider: <NavigationMenu idWell={well.id} />,
breadcrumb: makeMenuBreadcrumbItems(menuItems, location.pathname, /^\/well\/[0-9]+\//), breadcrumb: makeMenuBreadcrumbItems(menuItems, location.pathname, /^\/well\/[0-9]+\//),
topRightBlock: topRightBlock, topRightBlock: topRightBlock?.(well),
}), [well, location.pathname, setLayoutProps, topRightBlock]) }), [well, location.pathname, setLayoutProps, topRightBlock])
useEffect(() => setTopRightBlock(undefined), [location])
return ( return (
<RootPathContext.Provider value={rootPath}> <RootPathContext.Provider value={rootPath}>
<WellContext.Provider value={[well, updateWell]}> <WellContext.Provider value={[well, updateWell]}>