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-28 05:59:20 +05:00
parent 7731dfe8e7
commit 40d3a77c1c
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/Well/DrillingProgram/CategoryHistory.jsx
View File

@ -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 [begin, end] = range?.length > 1 ? [range[0].toISOString(), range[1].toISOString()] : [null, null]
const skip = (page - 1) * pageSize 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) setTotal(paginatedHistory?.count ?? 0)
setData(arrayOrDefault(paginatedHistory?.items)) setData(arrayOrDefault(paginatedHistory?.items))
}, },

11
src/styles/drilling_program.less
View File

@ -161,3 +161,14 @@
&:last-child { flex: @last; } // Относительная ширина второго столбца &:last-child { flex: @last; } // Относительная ширина второго столбца
&:not(:last-child) { border-right: @border-style; } &:not(:last-child) { border-right: @border-style; }
} }
.filter-group-heading {
display: flex;
gap: 5px;
flex-wrap: wrap;
margin-bottom: 10px;
& > * {
flex: 1;
}
}