From 40d3a77c1c7ebf09dae9b674d471efe1202d6a7b Mon Sep 17 00:00:00 2001 From: goodmice Date: Mon, 28 Nov 2022 05:59:20 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=D0=B8=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D1=8B=20=D0=B1=D1=83=D1=80=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Well/DrillingProgram/CategoryHistory.jsx | 2 +- src/styles/drilling_program.less | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/pages/Well/DrillingProgram/CategoryHistory.jsx b/src/pages/Well/DrillingProgram/CategoryHistory.jsx index 5272d7a..a80acc5 100644 --- a/src/pages/Well/DrillingProgram/CategoryHistory.jsx +++ b/src/pages/Well/DrillingProgram/CategoryHistory.jsx @@ -74,7 +74,7 @@ export const CategoryHistory = ({ idCategory, visible, onClose }) => { const [begin, end] = range?.length > 1 ? [range[0].toISOString(), range[1].toISOString()] : [null, null] const skip = (page - 1) * pageSize - const paginatedHistory = await FileService.getFilesInfo(well.caption, idCategory, companyName, fileName, begin, end, false, skip, pageSize) + const paginatedHistory = await FileService.getFilesInfo(well.id, idCategory, companyName, fileName, begin, end, false, skip, pageSize) setTotal(paginatedHistory?.count ?? 0) setData(arrayOrDefault(paginatedHistory?.items)) }, diff --git a/src/styles/drilling_program.less b/src/styles/drilling_program.less index 60b2ff3..e41ca11 100755 --- a/src/styles/drilling_program.less +++ b/src/styles/drilling_program.less @@ -161,3 +161,14 @@ &:last-child { flex: @last; } // Относительная ширина второго столбца &:not(:last-child) { border-right: @border-style; } } + +.filter-group-heading { + display: flex; + gap: 5px; + flex-wrap: wrap; + margin-bottom: 10px; + + & > * { + flex: 1; + } +}