From dac9bc4ea2b2989bbb4470a2fbf313a497cdaadd Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Thu, 16 Jan 2025 15:41:12 +0300 Subject: [PATCH] =?UTF-8?q?WEBAPP:=20=D0=9E=D0=B1=D1=89=D0=B5=D1=81=D0=B8?= =?UTF-8?q?=D1=81=D1=82=D0=B5=D0=BC=D0=BD=D1=8B=D0=B5=20=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=BB=D0=B8=20=D0=BF=D0=BE=D0=BB=D0=BE=D1=81=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=BA=D1=80=D1=83=D1=82=D0=BA=D0=B8=20=D0=B2=20"=D0=B2?= =?UTF-8?q?=D1=8B=D0=B4=D0=B2=D0=B8=D0=B6=D0=BD=D1=8B=D1=85=20=D0=BF=D0=B0?= =?UTF-8?q?=D0=BD=D0=B5=D0=BB=D1=8F=D1=85"=20=D0=B4=D0=BB=D1=8F=20=D0=BF?= =?UTF-8?q?=D0=B0=D0=BD=D0=B5=D0=BB=D0=B5=D0=B9=20=D0=9F=D0=A3=D0=9F=D0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/panels/mech_rec_assembly_mon/mech_rec_assembly_mon.js | 4 +++- .../mech_rec_cost_jobs_manage/mech_rec_cost_jobs_manage.js | 3 ++- .../mech_rec_cost_prod_plans/mech_rec_cost_prod_plans.js | 7 ++++--- .../mech_rec_dept_cost_prod_plans.js | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/panels/mech_rec_assembly_mon/mech_rec_assembly_mon.js b/app/panels/mech_rec_assembly_mon/mech_rec_assembly_mon.js index 46225a3..90fcf63 100644 --- a/app/panels/mech_rec_assembly_mon/mech_rec_assembly_mon.js +++ b/app/panels/mech_rec_assembly_mon/mech_rec_assembly_mon.js @@ -27,6 +27,7 @@ import { Icon } from "@mui/material"; //Интерфейсные элементы import { ThemeProvider } from "@mui/material/styles"; //Подключение темы +import { APP_STYLES } from "../../../app.styles"; //Типовые стили import { PlanSpecsList } from "./components/plans_list"; //Список планов import { PlanSpecDetail } from "./components/plan_detail"; //Детали плана import { lightTheme, darkTheme } from "./styles/themes"; //Стиль темы @@ -63,7 +64,8 @@ const STYLES = { display: "inline-block", boxSizing: "border-box", backgroundColor: "background.plans_drawer_paper", - color: "text.plans_finder.fontColor" + color: "text.plans_finder.fontColor", + ...APP_STYLES.SCROLL } }, PLANS_LIST_BOX: { paddingTop: "20px" }, diff --git a/app/panels/mech_rec_cost_jobs_manage/mech_rec_cost_jobs_manage.js b/app/panels/mech_rec_cost_jobs_manage/mech_rec_cost_jobs_manage.js index 5d97e7d..ae7643b 100644 --- a/app/panels/mech_rec_cost_jobs_manage/mech_rec_cost_jobs_manage.js +++ b/app/panels/mech_rec_cost_jobs_manage/mech_rec_cost_jobs_manage.js @@ -10,6 +10,7 @@ import React, { useContext, useState } from "react"; //Классы React import PropTypes from "prop-types"; //Контроль свойств компонента import { Drawer, Fab, Box, List, ListItemButton, ListItemText, Typography, TextField } from "@mui/material"; //Интерфейсные элементы +import { APP_STYLES } from "../../../app.styles"; //Типовые стили import { MessagingСtx } from "../../context/messaging"; //Контекст сообщений import { CostJobsSpecsDataGrid } from "./fcjobssp"; //Собственные хуки таблиц import { useCostJobs, useFilteredFcjobs } from "./hooks"; //Вспомогательные хуки @@ -35,7 +36,7 @@ const STYLES = { width: "350px", display: "inline-block", flexShrink: 0, - [`& .MuiDrawer-paper`]: { width: "350px", display: "inline-block", boxSizing: "border-box" } + [`& .MuiDrawer-paper`]: { width: "350px", display: "inline-block", boxSizing: "border-box", ...APP_STYLES.SCROLL } }, CONTAINER: { textAlign: "center" } }; diff --git a/app/panels/mech_rec_cost_prod_plans/mech_rec_cost_prod_plans.js b/app/panels/mech_rec_cost_prod_plans/mech_rec_cost_prod_plans.js index ea989a4..8c009b2 100644 --- a/app/panels/mech_rec_cost_prod_plans/mech_rec_cost_prod_plans.js +++ b/app/panels/mech_rec_cost_prod_plans/mech_rec_cost_prod_plans.js @@ -43,11 +43,12 @@ import { MessagingСtx } from "../../context/messaging"; //Контекст со import { NavigationCtx } from "../../context/navigation"; //Контекст навигации import { P8P_GANTT_CONFIG_PROPS } from "../../config_wrapper"; //Подключение компонентов к настройкам приложения import { APP_BAR_HEIGHT } from "../../components/p8p_app_workspace"; //Заголовок страницы +import { APP_STYLES } from "../../../app.styles"; //Типовые стили import { P8PGantt, taskLegendDesc } from "../../components/p8p_gantt"; //Диаграмма Ганта import { xml2JSON, formatDateJSONDateOnly, formatDateRF, hasValue } from "../../core/utils"; //Вспомогательные функции import { useFilteredPlanCtlgs } from "./hooks"; //Вспомогательные хуки -import { CostRouteListsDataGrid } from "./datagrids/fcroutlst"; -import { IncomFromDepsDataGrid } from "./datagrids/incomefromdeps"; +import { CostRouteListsDataGrid } from "./datagrids/fcroutlst"; //Таблица "Маршрутные листы" +import { IncomFromDepsDataGrid } from "./datagrids/incomefromdeps"; //Таблица "Приходы из подразделений" //--------- //Константы @@ -72,7 +73,7 @@ const STYLES = { width: "350px", display: "inline-block", flexShrink: 0, - [`& .MuiDrawer-paper`]: { width: "350px", display: "inline-block", boxSizing: "border-box" } + [`& .MuiDrawer-paper`]: { width: "350px", display: "inline-block", boxSizing: "border-box", ...APP_STYLES.SCROLL } }, GANTT_CONTAINER: { height: `calc(100vh - ${APP_BAR_HEIGHT})`, width: "100vw", paddingTop: "24px" }, GANTT_TITLE: { paddingLeft: "250px", paddingRight: "250px" }, diff --git a/app/panels/mech_rec_dept_cost_prod_plans/mech_rec_dept_cost_prod_plans.js b/app/panels/mech_rec_dept_cost_prod_plans/mech_rec_dept_cost_prod_plans.js index 4dbde82..f037bb1 100644 --- a/app/panels/mech_rec_dept_cost_prod_plans/mech_rec_dept_cost_prod_plans.js +++ b/app/panels/mech_rec_dept_cost_prod_plans/mech_rec_dept_cost_prod_plans.js @@ -41,7 +41,7 @@ const STYLES = { width: "350px", display: "inline-block", flexShrink: 0, - [`& .MuiDrawer-paper`]: { width: "350px", display: "inline-block", boxSizing: "border-box" } + [`& .MuiDrawer-paper`]: { width: "350px", display: "inline-block", boxSizing: "border-box", ...APP_STYLES.SCROLL } }, CONTAINER: { textAlign: "center" }, TITLE: { height: TITLE_HEIGHT, overflow: "hidden", paddingTop: TITLE_PADDING_TOP, paddingBottom: TITLE_PADDING_BOTTOM, display: "inline-table" },