davay-popozhe/P8-Panels
1
0
Fork 0
forked from CITKParus/P8-Panels
Code Issues Pull Requests Projects Releases Wiki Activity

ЦИТК-791

Browse Source
This commit is contained in:
Vladislav 2024-04-11 20:19:01 +03:00
parent e6d78ee8fe
commit 289ff67e7b
3 changed files with 155 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
app/panels/eqs_prfrm/eqs_prfrm.js
View File

@ -49,33 +49,62 @@ const EqsPrfrm = () => {
reload: false reload: false
}); });
// const [filter, setFilter] = useState({
// belong: "Демопример",
// prodObj: "К2",
// techServ: "",
// respDep: "",
// fromMonth: 1,
// fromYear: 2024,
// toMonth: 12,
// toYear: 2024
// });
const [filter, setFilter] = useState({ const [filter, setFilter] = useState({
belong: "Демопример", belong: "",
prodObj: "К2", prodObj: "",
techServ: "", techServ: "",
respDep: "", respDep: "",
fromMonth: 1, fromMonth: 1,
fromYear: 2024, fromYear: 1990,
toMonth: 12, toMonth: 1,
toYear: 2024 toYear: 1990
}); });
// const [filter, setFilter] = useState({ const [activeRef, setActiveRef] = useState();
// belong: "", const [refIsDeprecated, setRidFlag] = useState(true);
// prodObj: "",
// techServ: "", useEffect(() => {
// respDep: "", if (!refIsDeprecated) {
// fromMonth: "", if (activeRef) {
// fromYear: "", var cellRect = activeRef.getBoundingClientRect();
// toMonth: "", //console.log(window.scrollX + cellRect.left + activeRef.clientWidth / 2 - window.innerWidth / 2);
// toYear: ""}); window.scrollTo(window.scrollX + cellRect.left + activeRef.clientWidth / 2 - window.innerWidth / 2, 0);
setRidFlag(true);
}
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [refIsDeprecated]);
const handleClick = (e, ref) => {
const curCell = ref.current;
//console.log(curCell.children);
if (e.target.type == "button" || e.target.offsetParent.type == "button") {
setActiveRef(curCell);
setRidFlag(false);
}
};
const [info, setInfo] = useState({ cntP: 0, sumP: 0, cntF: 0, sumF: 0 }); const [info, setInfo] = useState({ cntP: 0, sumP: 0, cntF: 0, sumF: 0 });
//Подключение к контексту приложения //Подключение к контексту приложения
const { pOnlineShowDictionary } = useContext(ApplicationСtx); const { pOnlineShowDictionary } = useContext(ApplicationСtx);
const [filterOpen, setFilterOpen] = useState(false); const [filterOpen, setFilterOpen] = useState(true);
const [defaultLoaded, setDefaultLoaded] = useState(false);
const [filterCopy, setFilterCopy] = useState({ ...filter }); const [filterCopy, setFilterCopy] = useState({ ...filter });
@ -117,6 +146,17 @@ const EqsPrfrm = () => {
//Подключение к контексту взаимодействия с сервером //Подключение к контексту взаимодействия с сервером
const { executeStored } = useContext(BackEndСtx); const { executeStored } = useContext(BackEndСtx);
//Загрузка значений фильра по умолчанию
const loadDefaultFilter = useCallback(async () => {
const data = await executeStored({
stored: "PKG_P8PANELS_EQUIPSRV.GET_DEAFULT_FP",
respArg: "COUT"
});
setFilter(pv => ({ ...pv, belong: data.JURPERS, fromMonth: data.MONTH, fromYear: data.YEAR, toMonth: data.MONTH, toYear: data.YEAR }));
setDefaultLoaded(true);
}, [executeStored]);
//Загрузка данных таблицы с сервера //Загрузка данных таблицы с сервера
const loadData = useCallback(async () => { const loadData = useCallback(async () => {
if (dataGrid.reload) { if (dataGrid.reload) {
@ -144,12 +184,15 @@ const EqsPrfrm = () => {
data.XROWS.map(row => { data.XROWS.map(row => {
properties = []; properties = [];
Object.entries(row).forEach(([key, value]) => properties.push({ name: key, data: value })); Object.entries(row).forEach(([key, value]) => properties.push({ name: key, data: value }));
if (properties[1].data == "Факт" || properties[2].data == "План") { let info2 = properties.find(element => {
if (properties[2].data == "План") { return element.name === "SINFO2";
});
if (info2 != undefined) {
if (info2.data == "План") {
properties.map(p => { properties.map(p => {
if (DAY_NAME_REG_EXP.test(p.name)) cP = cP + 1; if (DAY_NAME_REG_EXP.test(p.name)) cP = cP + 1;
}); });
} else if (properties[1].data == "Факт") { } else if (info2.data == "Факт") {
properties.map(p => { properties.map(p => {
if (DAY_NAME_REG_EXP.test(p.name)) cF = cF + 1; if (DAY_NAME_REG_EXP.test(p.name)) cF = cF + 1;
}); });
@ -185,17 +228,20 @@ const EqsPrfrm = () => {
}, [dataGrid.reload, filter, executeStored]); }, [dataGrid.reload, filter, executeStored]);
//пользовательский параметр JuridicalPerson системы //пользовательский параметр JuridicalPerson системы
const getJurPers = useCallback(async () => { // const getJurPers = useCallback(async () => {
const data = await executeStored({ // const data = await executeStored({
stored: "PKG_P8PANELS_EQUIPSRV.GET_JUR_PERS_PRM", // stored: "PKG_P8PANELS_EQUIPSRV.GET_JUR_PERS_PRM",
respArg: "CRES" // respArg: "CRES"
}); // });
setFilter(pv => ({ ...pv, belong: data })); // setFilter(pv => ({ ...pv, belong: data }));
}, [executeStored]); // }, [executeStored]);
useEffect(() => { useEffect(() => {
if (filterOpen) { if (filterOpen) {
{
setFilterCopy({ ...filter }); setFilterCopy({ ...filter });
if (!defaultLoaded) loadDefaultFilter();
}
} }
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [filterOpen]); }, [filterOpen]);
@ -254,26 +300,11 @@ const EqsPrfrm = () => {
aria-describedby="belong-outlined-helper-text" aria-describedby="belong-outlined-helper-text"
label="Принадлежность" label="Принадлежность"
/> />
<Grid container>
<Grid item xs={6}>
{filter.belong ? null : ( {filter.belong ? null : (
<FormHelperText id="belong-outlined-helper-text" sx={{ color: "red" }}> <FormHelperText id="belong-outlined-helper-text" sx={{ color: "red" }}>
*Обязательное поле *Обязательное поле
</FormHelperText> </FormHelperText>
)} )}
</Grid>
<Grid item xs={6} sx={{ textAlign: "end" }}>
<Link
component="button"
variant="body2"
id="belong-outlined-link-btn"
sx={{ fontSize: "0.75rem", marginRight: "35px" }}
onClick={getJurPers}
>
Значение по умолчанию
</Link>
</Grid>
</Grid>
</FormControl> </FormControl>
</Box> </Box>
<Box component="section" sx={{ p: 1 }}> <Box component="section" sx={{ p: 1 }}>
@ -498,10 +529,10 @@ const EqsPrfrm = () => {
closeFilter(); closeFilter();
}} }}
> >
Сформировать отчёт Сформировать
</Button> </Button>
<Button variant="contained" onClick={clearFilter}> <Button variant="contained" onClick={clearFilter}>
Очистить фильтр Очистить
</Button> </Button>
<Button <Button
variant="contained" variant="contained"
@ -509,7 +540,7 @@ const EqsPrfrm = () => {
setFilter(filterCopy); setFilter(filterCopy);
}} }}
> >
Отменить изменения Отмена
</Button> </Button>
</DialogActions> </DialogActions>
</Dialog> </Dialog>
@ -536,7 +567,9 @@ const EqsPrfrm = () => {
rows={dataGrid.rows} rows={dataGrid.rows}
size={P8P_DATA_GRID_SIZE.LARGE} size={P8P_DATA_GRID_SIZE.LARGE}
reloading={dataGrid.reload} reloading={dataGrid.reload}
headCellRender={prms => headCellRender({ ...prms }, filter.techServ, info.cntP, info.sumP, info.cntF, info.sumF)} headCellRender={prms =>
headCellRender({ ...prms }, handleClick, filter.techServ, info.cntP, info.sumP, info.cntF, info.sumF)
}
dataCellRender={prms => dataCellRender({ ...prms })} dataCellRender={prms => dataCellRender({ ...prms })}
groupCellRender={prms => groupCellRender({ ...prms })} groupCellRender={prms => groupCellRender({ ...prms })}
showCellRightBorder={true} showCellRightBorder={true}

119
app/panels/eqs_prfrm/layouts.js
View File

@ -7,8 +7,8 @@
//Подключение библиотек //Подключение библиотек
//--------------------- //---------------------
import React, { createRef } from "react"; //Классы React
import { Grid, Stack } from "@mui/material"; import { Grid, Stack } from "@mui/material";
import React from "react"; //Классы React
//--------- //---------
//Константы //Константы
@ -25,6 +25,7 @@ let x = 0;
//----------- //-----------
//Тело модуля //Тело модуля
//----------- //-----------
const formatDate = date => { const formatDate = date => {
const [year, month, day] = date.substring(1).split("_"); const [year, month, day] = date.substring(1).split("_");
let nd; let nd;
@ -33,76 +34,96 @@ const formatDate = date => {
return nd; return nd;
}; };
export const headCellRender = ({ columnDef }, podr, cntP, sumP, cntF, sumF) => { // eslint-disable-next-line no-unused-vars
export const headCellRender = ({ columnDef }, hClick, podr, cntP, sumP, cntF, sumF) => {
let cellStyle = { border: "1px solid rgba(0, 0, 0)", textAlign: "center" }; let cellStyle = { border: "1px solid rgba(0, 0, 0)", textAlign: "center" };
let cellProps = {}; let cellProps = {};
let stackStyle = {};
let data = columnDef.caption; let data = columnDef.caption;
if (columnDef.expandable) { if (columnDef.expandable) {
// поменять расположение + для развёртывания const ref = createRef();
cellStyle = { ...cellStyle, padding: "5px" };
cellProps = {
...cellProps,
ref: ref,
onClick: e => {
hClick(e, ref);
}
};
stackStyle = { flexDirection: "column" };
} }
if (columnDef.name == "STEST") cellStyle = { display: "none" }; if (columnDef.name == "STEST") cellStyle = { display: "none" };
if (columnDef.name == "SINFO" || columnDef.name == "SINFO2") { if (columnDef.name == "SINFO" || columnDef.name == "SINFO2") {
cellProps = { colSpan: 2 }; cellProps = { colSpan: 2 };
if (columnDef.name == "SINFO") { if (columnDef.name == "SINFO") cellProps = { ...cellProps, rowSpan: 2 };
cellStyle = { ...cellStyle, padding: "unset" }; //if (columnDef.name == "SINFO") {
data = ( //cellStyle = { display: "none" };
<Stack sx={{ justifyContent: "center" }} direction="row" width={300}> // cellStyle = { ...cellStyle, padding: "unset" };
<Grid container> // data = (
<Grid item xs={4}> // <Stack sx={{ justifyContent: "center" }} direction="row" width={300}>
Подразделение: // <Grid container>
</Grid> // <Grid item xs={4}>
<Grid item xs={8}> // Подразделение:
{podr} // </Grid>
</Grid> // <Grid item xs={8}>
<Grid item xs={4}> // {podr}
Кол-во ремонтов, план: // </Grid>
</Grid> // <Grid item xs={4}>
<Grid item xs={2}> // Кол-во ремонтов, план:
{cntP} // </Grid>
</Grid> // <Grid item xs={2}>
<Grid item xs={4}> // {cntP}
Трудоемкость, час. план: // </Grid>
</Grid> // <Grid item xs={4}>
<Grid item xs={2}> // Трудоемкость, час. план:
{sumP} // </Grid>
</Grid> // <Grid item xs={2}>
<Grid item xs={4}> // {sumP}
Кол-во ремонтов, факт: // </Grid>
</Grid> // <Grid item xs={4}>
<Grid item xs={2}> // Кол-во ремонтов, факт:
{cntF} // </Grid>
</Grid> // <Grid item xs={2}>
<Grid item xs={4}> // {cntF}
Трудоемкость, час. факт: // </Grid>
</Grid> // <Grid item xs={4}>
<Grid item xs={2}> // Трудоемкость, час. факт:
{sumF} // </Grid>
</Grid> // <Grid item xs={2}>
</Grid> // {sumF}
</Stack> // </Grid>
); // </Grid>
} // </Stack>
// );
//}
} }
if (columnDef.name == "SINFO2") cellStyle = { display: "none" };
if (columnDef.visible && DAY_NAME_REG_EXP.test(columnDef.name)) { if (columnDef.visible && DAY_NAME_REG_EXP.test(columnDef.name)) {
cellStyle = { ...cellStyle, paddingLeft: "5px", paddingRight: "5px", minWidth: "25px", maxWidth: "25px" }; cellStyle = { ...cellStyle, padding: "5px", minWidth: "25px", maxWidth: "25px" };
stackStyle = { justifyContent: "center" };
} }
return { cellStyle, cellProps, data }; return { cellStyle, cellProps, stackStyle, data };
}; };
export const dataCellRender = ({ row, columnDef }) => { export const dataCellRender = ({ row, columnDef }) => {
let cellStyle = { let cellStyle = {
padding: "2px", padding: "2px",
border: "1px solid rgba(0, 0, 0)", border: "1px solid rgba(0, 0, 0) !important",
textAlign: "center" textAlign: "center"
}; };
let cellProps = {}; let cellProps = {};
let data = " "; let data = " ";
if (row["SINFO2"] == undefined) { if (row["SINFO2"] == undefined) {
if (columnDef.name == "STEST") cellProps = { colSpan: 2 }; if (columnDef.name == "STEST") {
cellProps = { colSpan: 2 };
cellStyle = { ...cellStyle, textAlign: "right", fontWeight: "bold" };
}
if (columnDef.name == "SINFO2") cellStyle = { display: "none" }; if (columnDef.name == "SINFO2") cellStyle = { display: "none" };
if (columnDef.parent == "" && columnDef.expandable == true && columnDef.expanded == false) { if (columnDef.parent == "" && columnDef.expandable == true && columnDef.expanded == false) {
curParent = columnDef.name; curParent = columnDef.name;
@ -130,15 +151,15 @@ export const dataCellRender = ({ row, columnDef }) => {
switch (row[columnDef.name]) { switch (row[columnDef.name]) {
case "blue": case "blue":
cellStyle = { ...cellStyle, backgroundColor: "royalblue", border: "1px solid rgba(0, 0, 0)" }; cellStyle = { ...cellStyle, backgroundColor: "royalblue", border: "1px solid rgba(0, 0, 0) !important" };
cellProps = { title: formatDate(columnDef.name) }; cellProps = { title: formatDate(columnDef.name) };
return { cellStyle, cellProps, data }; return { cellStyle, cellProps, data };
case "green": case "green":
cellStyle = { ...cellStyle, backgroundColor: "lawngreen", border: "1px solid rgba(0, 0, 0)" }; cellStyle = { ...cellStyle, backgroundColor: "lawngreen", border: "1px solid rgba(0, 0, 0) !important" };
cellProps = { title: formatDate(columnDef.name) }; cellProps = { title: formatDate(columnDef.name) };
return { cellStyle, cellProps, data }; return { cellStyle, cellProps, data };
case "red": case "red":
cellStyle = { ...cellStyle, backgroundColor: "crimson", border: "1px solid rgba(0, 0, 0)" }; cellStyle = { ...cellStyle, backgroundColor: "crimson", border: "1px solid rgba(0, 0, 0) !important" };
cellProps = { title: formatDate(columnDef.name) }; cellProps = { title: formatDate(columnDef.name) };
return { cellStyle, cellProps, data }; return { cellStyle, cellProps, data };
case "green red": case "green red":

4
dist/p8-panels.js vendored
View File

File diff suppressed because one or more lines are too long