forked from ddrilling/asb_cloud_front
unique keys errors fix
This commit is contained in:
parent
8560ce5f47
commit
73968646e6
@ -46,19 +46,19 @@ export default function ClusterSections({ clusterData }) {
|
|||||||
setWellOperations(operations)
|
setWellOperations(operations)
|
||||||
|
|
||||||
const tvdPlanData = operations.map(el => {
|
const tvdPlanData = operations.map(el => {
|
||||||
return {key: el.plan?.id, depth: el.plan?.wellDepth, date: el.plan?.startDate}
|
return {key: el.caption, depth: el.plan?.wellDepth, date: el.plan?.startDate}
|
||||||
}).filter(el => el.key)
|
}).filter(el => el.key)
|
||||||
|
|
||||||
setTvdDataPlan(tvdPlanData)
|
setTvdDataPlan(tvdPlanData)
|
||||||
|
|
||||||
const tvdFactData = operations.map(el => {
|
const tvdFactData = operations.map(el => {
|
||||||
return {key: el.fact?.id, depth: el.fact?.wellDepth, date: el.fact?.startDate}
|
return {key: el.caption, depth: el.fact?.wellDepth, date: el.fact?.startDate}
|
||||||
}).filter(el => el.key)
|
}).filter(el => el.key)
|
||||||
|
|
||||||
setTvdDataFact(tvdFactData)
|
setTvdDataFact(tvdFactData)
|
||||||
|
|
||||||
const tvdPredictData = operations.map(el => {
|
const tvdPredictData = operations.map(el => {
|
||||||
return {key: el.predict?.id, depth: el.predict?.wellDepth, date: el.predict?.startDate}
|
return {key: el.caption, depth: el.predict?.wellDepth, date: el.predict?.startDate}
|
||||||
}).filter(el => el.key)
|
}).filter(el => el.key)
|
||||||
|
|
||||||
setTvdDataForecast(tvdPredictData)
|
setTvdDataForecast(tvdPredictData)
|
||||||
@ -231,7 +231,7 @@ export default function ClusterSections({ clusterData }) {
|
|||||||
title: "Подрядчики",
|
title: "Подрядчики",
|
||||||
dataIndex: "companies",
|
dataIndex: "companies",
|
||||||
render: (item) =>
|
render: (item) =>
|
||||||
item?.map((company) => <Tag color="blue">{company.caption}</Tag>),
|
item?.map((company) => <Tag key={company.caption} color="blue">{company.caption}</Tag>),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -96,7 +96,7 @@ export default function ClusterWells({clusterData}) {
|
|||||||
routeSpeedFact: well.total?.fact?.routeSpeed,
|
routeSpeedFact: well.total?.fact?.routeSpeed,
|
||||||
notProductiveTimePlan: well.total?.plan?.nonProductiveHours,
|
notProductiveTimePlan: well.total?.plan?.nonProductiveHours,
|
||||||
notProductiveTimeFact: well.total?.fact?.nonProductiveHours,
|
notProductiveTimeFact: well.total?.fact?.nonProductiveHours,
|
||||||
companies: well.companies,
|
companies: well.companies
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -171,6 +171,7 @@ export default function ClusterWells({clusterData}) {
|
|||||||
: '-'),
|
: '-'),
|
||||||
{
|
{
|
||||||
title: "TVD",
|
title: "TVD",
|
||||||
|
key: "tvd",
|
||||||
render: (value) => <Button onClick={()=> {
|
render: (value) => <Button onClick={()=> {
|
||||||
getOperations(value.id)
|
getOperations(value.id)
|
||||||
setIsTVDModalVisible(true)
|
setIsTVDModalVisible(true)
|
||||||
@ -179,6 +180,7 @@ export default function ClusterWells({clusterData}) {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: "Операции",
|
title: "Операции",
|
||||||
|
key: "operations",
|
||||||
render: (value) => <Button onClick={()=> {
|
render: (value) => <Button onClick={()=> {
|
||||||
getOperations(value.id)
|
getOperations(value.id)
|
||||||
setIsOpsModalVisible(true)
|
setIsOpsModalVisible(true)
|
||||||
@ -190,7 +192,7 @@ export default function ClusterWells({clusterData}) {
|
|||||||
key: "companies",
|
key: "companies",
|
||||||
dataIndex: "companies",
|
dataIndex: "companies",
|
||||||
render: (item) =>
|
render: (item) =>
|
||||||
item?.map((company) => <Tag color="blue">{company.caption}</Tag>) ?? '-',
|
item?.map((company) => <Tag key={company.caption} color="blue">{company.caption}</Tag>) ?? '-',
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ export default function WellOperationsTable({wellOperations}) {
|
|||||||
)
|
)
|
||||||
];
|
];
|
||||||
|
|
||||||
const operations = wellOperations.map(el => {
|
const operations = wellOperations?.map(el => {
|
||||||
return {
|
return {
|
||||||
key: el.plan?.id ?? el.fact.id,
|
key: el.plan?.id ?? el.fact.id,
|
||||||
sectionType: el.plan?.wellSectionTypeName ?? el.fact?.wellSectionTypeName,
|
sectionType: el.plan?.wellSectionTypeName ?? el.fact?.wellSectionTypeName,
|
||||||
|
@ -61,12 +61,13 @@ export default function Deposit() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<LoaderPortal show={showLoader}>
|
<LoaderPortal show={showLoader}>
|
||||||
<Map
|
<div className={'h-100vh'}>
|
||||||
height='100vh'
|
<Map
|
||||||
center={viewParams.center}
|
center={viewParams.center}
|
||||||
zoom={viewParams.zoom}>
|
zoom={viewParams.zoom}>
|
||||||
{markers}
|
{markers}
|
||||||
</Map>
|
</Map>
|
||||||
|
</div>
|
||||||
</LoaderPortal>
|
</LoaderPortal>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -39,6 +39,10 @@ body {
|
|||||||
margin-left: 30px;
|
margin-left: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.h-100vh {
|
||||||
|
height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
.vertical-align-center {
|
.vertical-align-center {
|
||||||
vertical-align: center;
|
vertical-align: center;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user