main #1

Merged
Dollerok merged 5 commits from CITKParus/P8-Panels:main into main 2024-08-21 17:09:22 +03:00
11 changed files with 2804 additions and 1960 deletions

View File

@ -58,7 +58,8 @@ const STYLES = {
GRID: { maxWidth: 1200, direction: "row", justifyContent: "left", alignItems: "stretch" }, GRID: { maxWidth: 1200, direction: "row", justifyContent: "left", alignItems: "stretch" },
GRID_PANEL_CARD: { maxWidth: 400, height: "100%", flexDirection: "column", display: "flex" }, GRID_PANEL_CARD: { maxWidth: 400, height: "100%", flexDirection: "column", display: "flex" },
GRID_PANEL_CARD_MEDIA: { height: 140 }, GRID_PANEL_CARD_MEDIA: { height: 140 },
GRID_PANEL_CARD_CONTENT_TITLE: { alignItems: "center" }, GRID_PANEL_CARD_CONTENT_TITLE: { alignItems: "flex-start" },
GRID_PANEL_CARD_CONTENT_TITLE_ICON: { paddingTop: "4px" },
GRID_PANEL_CARD_ACTIONS: { marginTop: "auto", display: "flex", justifyContent: "flex-end", alignItems: "flex-start" }, GRID_PANEL_CARD_ACTIONS: { marginTop: "auto", display: "flex", justifyContent: "flex-end", alignItems: "flex-start" },
DESKTOP_GROUP_HEADER: { fontWeight: "bold", fontFamily: "tahoma, arial, verdana, sans-serif!important", fontSize: "13px!important" }, DESKTOP_GROUP_HEADER: { fontWeight: "bold", fontFamily: "tahoma, arial, verdana, sans-serif!important", fontSize: "13px!important" },
DESKTOP_ITEM_BUTTON: { fontSize: "12px", textTransform: "none", "&:hover": { backgroundColor: "#c3e1ff" }, maxWidth: "150px" }, DESKTOP_ITEM_BUTTON: { fontSize: "12px", textTransform: "none", "&:hover": { backgroundColor: "#c3e1ff" }, maxWidth: "150px" },
@ -130,7 +131,7 @@ const getPanelsLinks = ({ variant, panels, selectedPanel, group, defaultGroupTyt
) : null} ) : null}
<CardContent> <CardContent>
<Stack gap={1} direction="row" sx={STYLES.GRID_PANEL_CARD_CONTENT_TITLE}> <Stack gap={1} direction="row" sx={STYLES.GRID_PANEL_CARD_CONTENT_TITLE}>
{panel.icon ? <Icon>{panel.icon}</Icon> : null} {panel.icon ? <Icon sx={STYLES.GRID_PANEL_CARD_CONTENT_TITLE_ICON}>{panel.icon}</Icon> : null}
<Typography variant="h5">{panel.caption}</Typography> <Typography variant="h5">{panel.caption}</Typography>
</Stack> </Stack>
<Typography variant="body2" color="text.secondary"> <Typography variant="body2" color="text.secondary">

View File

@ -434,7 +434,7 @@ P8PTableColumnFilterDialog.propTypes = {
//Сводный фильтр //Сводный фильтр
const P8PTableFiltersChips = ({ filters, columnsDef, valueFromCaption, valueToCaption, onFilterChipClick, onFilterChipDelete, valueFormatter }) => { const P8PTableFiltersChips = ({ filters, columnsDef, valueFromCaption, valueToCaption, onFilterChipClick, onFilterChipDelete, valueFormatter }) => {
return ( return (
<Stack direction="row" spacing={1} pb={2}> <Stack direction="row" spacing={1} p={1}>
{filters.map((filter, i) => { {filters.map((filter, i) => {
const columnDef = columnsDef.find(columnDef => columnDef.name == filter.name); const columnDef = columnsDef.find(columnDef => columnDef.name == filter.name);
return ( return (

1691
dist/p8-panels.js vendored

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 365 KiB

After

Width:  |  Height:  |  Size: 844 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 365 KiB

View File

@ -24,7 +24,7 @@
<MenuItem parent="{BA073333-DFBC-4BA3-8EA7-172F3F6B4FEE}" name="ShowMechRecPanelDeptCostProdPlans" caption="Производственный план цеха" panelName="MechRecDeptCostProdPlans"/> <MenuItem parent="{BA073333-DFBC-4BA3-8EA7-172F3F6B4FEE}" name="ShowMechRecPanelDeptCostProdPlans" caption="Производственный план цеха" panelName="MechRecDeptCostProdPlans"/>
<MenuItem parent="{BA073333-DFBC-4BA3-8EA7-172F3F6B4FEE}" name="ShowMechRecPanelDeptCostJobsManage" caption="Выдача сменного задания" panelName="MechRecCostJobsManage"/> <MenuItem parent="{BA073333-DFBC-4BA3-8EA7-172F3F6B4FEE}" name="ShowMechRecPanelDeptCostJobsManage" caption="Выдача сменного задания" panelName="MechRecCostJobsManage"/>
<MenuItem parent="{BA073333-DFBC-4BA3-8EA7-172F3F6B4FEE}" name="ShowMechRecPanelDeptCostJobs" caption="Загрузка цеха" panelName="MechRecDeptCostJobs"/> <MenuItem parent="{BA073333-DFBC-4BA3-8EA7-172F3F6B4FEE}" name="ShowMechRecPanelDeptCostJobs" caption="Загрузка цеха" panelName="MechRecDeptCostJobs"/>
<MenuItem parent="{BA073333-DFBC-4BA3-8EA7-172F3F6B4FEE}" name="ShowMechRecPanelAssemblyMon" caption=" Мониторинг сборки изделий" panelName="MechRecAssemblyMon"/> <MenuItem parent="{BA073333-DFBC-4BA3-8EA7-172F3F6B4FEE}" name="ShowMechRecPanelAssemblyMon" caption="Мониторинг сборки изделий" panelName="MechRecAssemblyMon"/>
</App> </App>
</MenuItems> </MenuItems>
<Panels urlBase="Modules/p8-panels/#/"> <Panels urlBase="Modules/p8-panels/#/">
@ -97,7 +97,7 @@
path="mech_rec_dept_cost_prod_plans" path="mech_rec_dept_cost_prod_plans"
icon="free_cancellation" icon="free_cancellation"
showInPanelsList="true" showInPanelsList="true"
preview="./img/mech_rec_cost_prod_plans.jpg"/> preview="./img/mech_rec_dept_cost_prod_plans.jpg"/>
<Panel <Panel
name="MechRecCostJobsManage" name="MechRecCostJobsManage"
group="Планирование и учёт в дискретном производстве" group="Планирование и учёт в дискретном производстве"
@ -107,7 +107,7 @@
path="mech_rec_cost_jobs_manage" path="mech_rec_cost_jobs_manage"
icon="psychology" icon="psychology"
showInPanelsList="true" showInPanelsList="true"
preview="./img/mech_rec_cost_prod_plans.jpg"/> preview="./img/mech_rec_cost_jobs_manage.jpg"/>
<Panel <Panel
name="MechRecDeptCostJobs" name="MechRecDeptCostJobs"
group="Планирование и учёт в дискретном производстве" group="Планирование и учёт в дискретном производстве"
@ -117,7 +117,7 @@
path="mech_rec_dept_cost_jobs" path="mech_rec_dept_cost_jobs"
icon="factory" icon="factory"
showInPanelsList="true" showInPanelsList="true"
preview="./img/mech_rec_cost_prod_plans.jpg"/> preview="./img/mech_rec_dept_cost_jobs.jpg"/>
<Panel <Panel
name="MechRecAssemblyMon" name="MechRecAssemblyMon"
group="Планирование и учёт в дискретном производстве" group="Планирование и учёт в дискретном производстве"
@ -125,9 +125,9 @@
desc="Отображение текущего состояния комплектации и сборки изделий производственными подразделениями" desc="Отображение текущего состояния комплектации и сборки изделий производственными подразделениями"
url="mech_rec_assembly_mon" url="mech_rec_assembly_mon"
path="mech_rec_assembly_mon" path="mech_rec_assembly_mon"
icon="build" icon="monitor_heart"
showInPanelsList="true" showInPanelsList="true"
preview="./img/mech_rec_cost_prod_plans.jpg"/> preview="./img/mech_rec_assembly_mon.jpg"/>
<Panel <Panel
name="Samples" name="Samples"
group="" group=""

3051
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -23,7 +23,8 @@
"@babel/preset-react": "^7.22.5", "@babel/preset-react": "^7.22.5",
"@emotion/react": "^11.11.1", "@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0", "@emotion/styled": "^11.11.0",
"@mui/material": "^5.14.4", "@mui/material": "^5.16.4",
"@mui/x-tree-view": "^7.11.0",
"babel-loader": "^9.1.3", "babel-loader": "^9.1.3",
"chart.js": "^4.4.0", "chart.js": "^4.4.0",
"dayjs": "^1.11.9", "dayjs": "^1.11.9",