diff --git a/src/pages/Measure/MeasureTable.jsx b/src/pages/Measure/MeasureTable.jsx
index 810c4bf..9ba5ac7 100755
--- a/src/pages/Measure/MeasureTable.jsx
+++ b/src/pages/Measure/MeasureTable.jsx
@@ -134,7 +134,7 @@ export const MeasureTable = memo(({ group, updateMeasuresFunc, additionalButtons
-
+
{data.map((item, index) => (
diff --git a/src/pages/Measure/View.jsx b/src/pages/Measure/View.jsx
index f7213e8..cf3911e 100755
--- a/src/pages/Measure/View.jsx
+++ b/src/pages/Measure/View.jsx
@@ -6,18 +6,29 @@ import { Grid, GridItem } from '@components/Grid'
import '@styles/index.css'
import '@styles/measure.css'
-const colsCount = 3
-
-export const View = memo(({ columns, item }) => !item || !columns?.length ? (
+export const View = memo(({ columns, item, rowsInColumn }) => {
+ let rowPosition = 0
+ let columnPosition = 1
+ return !item || !columns?.length ? (
) : (
- {columns.map((column, i) => (
+ {columns.map((column, i) => {
+ if (i === rowsInColumn.first) {
+ columnPosition = 3
+ rowPosition = 0
+ } else if (i === rowsInColumn.second) {
+ columnPosition = 5
+ rowPosition = 0
+ }
+ rowPosition++
+
+ return (
{column.title}
@@ -25,8 +36,8 @@ export const View = memo(({ columns, item }) => !item || !columns?.length ? (
@@ -45,6 +56,6 @@ export const View = memo(({ columns, item }) => !item || !columns?.length ? (
)}
- ))}
+ )})}
-))
+)})
diff --git a/src/pages/Measure/index.jsx b/src/pages/Measure/index.jsx
index e6b4590..6449b4d 100755
--- a/src/pages/Measure/index.jsx
+++ b/src/pages/Measure/index.jsx
@@ -20,16 +20,31 @@ const defaultData = [
title: 'Замер бурового раствора',
columns: columnsDrillingFluid,
defaultValue: drillingFluidDefaultData,
+ rowsInColumn: {
+ first: 10,
+ second: 19,
+ third: 28,
+ },
}, {
idCategory: 2,
title: 'Шламограмма',
columns: columnsMudDiagram,
defaultValue: mudDiagramDefaultData,
+ rowsInColumn: {
+ first: 6,
+ second: 15,
+ third: 22,
+ },
}, {
idCategory: 3,
title: 'ННБ',
columns: columnsNnb,
defaultValue: nnbDefaultData,
+ rowsInColumn: {
+ first: 6,
+ second: 12,
+ third: 17,
+ },
additionalButtons: (group, idx, onClick) => (isEditing) => isEditing ? null : (