diff --git a/src/pages/Cluster/ClusterSections.jsx b/src/pages/Cluster/ClusterSections.jsx index 21789a8..2a367db 100644 --- a/src/pages/Cluster/ClusterSections.jsx +++ b/src/pages/Cluster/ClusterSections.jsx @@ -46,19 +46,19 @@ export default function ClusterSections({ clusterData }) { setWellOperations(operations) 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) setTvdDataPlan(tvdPlanData) 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) setTvdDataFact(tvdFactData) 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) setTvdDataForecast(tvdPredictData) @@ -231,7 +231,7 @@ export default function ClusterSections({ clusterData }) { title: "Подрядчики", dataIndex: "companies", render: (item) => - item?.map((company) => {company.caption}), + item?.map((company) => {company.caption}), }, ]; diff --git a/src/pages/Cluster/ClusterWells.jsx b/src/pages/Cluster/ClusterWells.jsx index 777f320..0bb4adc 100644 --- a/src/pages/Cluster/ClusterWells.jsx +++ b/src/pages/Cluster/ClusterWells.jsx @@ -96,7 +96,7 @@ export default function ClusterWells({clusterData}) { routeSpeedFact: well.total?.fact?.routeSpeed, notProductiveTimePlan: well.total?.plan?.nonProductiveHours, notProductiveTimeFact: well.total?.fact?.nonProductiveHours, - companies: well.companies, + companies: well.companies }; }); @@ -171,6 +171,7 @@ export default function ClusterWells({clusterData}) { : '-'), { title: "TVD", + key: "tvd", render: (value) =>