From 41a59b9477eacfee2fcf324229f3cd6693f21052 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Tue, 18 Mar 2025 20:17:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D0=B4=D1=83=D1=80=D1=83?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=80=D0=B0=D1=88=D0=B8=D0=B2=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=D0=BE=D0=B3=D0=BE=20=D0=BF=D1=80=D0=BE=D0=B3=D0=BD=D0=BE?= =?UTF-8?q?=D0=B7=D0=B0=20=D0=B2=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B8=20?= =?UTF-8?q?(=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D1=81=D0=BA=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- panels/eqs_tech_cond_forecast/admin_tab.js | 3 ++- panels/eqs_tech_cond_forecast/admin_tab_layout.js | 13 ++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/panels/eqs_tech_cond_forecast/admin_tab.js b/panels/eqs_tech_cond_forecast/admin_tab.js index 6e17fea..fc83ec1 100644 --- a/panels/eqs_tech_cond_forecast/admin_tab.js +++ b/panels/eqs_tech_cond_forecast/admin_tab.js @@ -281,7 +281,8 @@ const AdminTab = ({ dataSelection = DS_RN_DEFAULT, dataSelectionClassMachine = n args: { NPRN: equipDataSelectionClassMachine, STASK: values.task, - NDATASET_ID: values.dataset ? parseInt(values.dataset) : null + NDATASET_ID: values.dataset ? parseInt(values.dataset) : null, + SUSERPROCS_FRCST_DATA: values.userprocsForecastData } }); setDialogs(pv => ({ ...pv, dataSelectionClassMachineModelIU: false })); diff --git a/panels/eqs_tech_cond_forecast/admin_tab_layout.js b/panels/eqs_tech_cond_forecast/admin_tab_layout.js index 7323af4..74861e5 100644 --- a/panels/eqs_tech_cond_forecast/admin_tab_layout.js +++ b/panels/eqs_tech_cond_forecast/admin_tab_layout.js @@ -517,9 +517,13 @@ const EquipDataSelectionClassMachineModelIU = ({ classMachine, onOk, onCancel }) //Собственное состояние - значения формы const [values, setValues] = useState({ task: "RUL", - dataset: null + dataset: null, + userprocsForecastData: null }); + //Подключение к контексту приложения + const { pOnlineShowDictionary } = useContext(ApplicationСtx); + //Доступные выборки данных const { equipDataSelectionClassMachineDataSetsList } = useEquipDataSelectionClassMachineDataSetsList(classMachine); @@ -545,6 +549,13 @@ const EquipDataSelectionClassMachineModelIU = ({ classMachine, onOk, onCancel }) onChange={handleValueChanged} list={equipDataSelectionClassMachineDataSetsList} /> + selectUserProcsData(pOnlineShowDictionary, "userprocsForecastData", callBack)} + />