Merge remote-tracking branch 'origin/ervu/tmp_makets' into develop

This commit is contained in:
Булат Хайруллин 2024-12-03 17:56:02 +03:00
commit 08157cd996
3 changed files with 917 additions and 787 deletions

View file

@ -4193,6 +4193,7 @@
<componentRootId>3447ab1c-24c9-435a-9e23-1e0ab39404ab</componentRootId> <componentRootId>3447ab1c-24c9-435a-9e23-1e0ab39404ab</componentRootId>
<name>ГК второй ряд показателей</name> <name>ГК второй ряд показателей</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -6456,7 +6457,6 @@
<componentRootId>ea4d0df5-9e4f-48b2-bf91-3a72d3a90640</componentRootId> <componentRootId>ea4d0df5-9e4f-48b2-bf91-3a72d3a90640</componentRootId>
<name>ГК третий ряд показателей</name> <name>ГК третий ряд показателей</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -6738,6 +6738,16 @@
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
<entry>
<key>cssClasses</key>
<value>
<item id="6a58216d-e271-46bd-a119-d27e1a89d1e5" removed="false">
<value>
<simple>"graph-row-left"</simple>
</value>
</item>
</value>
</entry>
<entry> <entry>
<key>style</key> <key>style</key>
<value> <value>

View file

@ -2470,6 +2470,7 @@
<componentRootId>201e300c-2785-4181-ac47-a98d0e0de4ce</componentRootId> <componentRootId>201e300c-2785-4181-ac47-a98d0e0de4ce</componentRootId>
<name>ВК ГИР ВУ</name> <name>ВК ГИР ВУ</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -2519,7 +2520,6 @@
<componentRootId>084c5f24-cf36-4796-945d-c2367e1a260a</componentRootId> <componentRootId>084c5f24-cf36-4796-945d-c2367e1a260a</componentRootId>
<name>Vbox_50%</name> <name>Vbox_50%</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -2780,6 +2780,12 @@
<simple>null</simple> <simple>null</simple>
</value> </value>
</entry> </entry>
<entry>
<key>label</key>
<value>
<simple>"2400"</simple>
</value>
</entry>
</properties> </properties>
</scripts> </scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/> <scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
@ -2929,6 +2935,12 @@
<simple>null</simple> <simple>null</simple>
</value> </value>
</entry> </entry>
<entry>
<key>label</key>
<value>
<simple>"1450"</simple>
</value>
</entry>
</properties> </properties>
</scripts> </scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/> <scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
@ -3080,6 +3092,12 @@
<simple>null</simple> <simple>null</simple>
</value> </value>
</entry> </entry>
<entry>
<key>label</key>
<value>
<simple>"670"</simple>
</value>
</entry>
</properties> </properties>
</scripts> </scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/> <scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
@ -4827,6 +4845,7 @@
<componentRootId>1d6eb28d-9c1f-4dc4-bf37-49eb7a2e4d37</componentRootId> <componentRootId>1d6eb28d-9c1f-4dc4-bf37-49eb7a2e4d37</componentRootId>
<name>ГК Второй ряд</name> <name>ГК Второй ряд</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -7048,7 +7067,6 @@
<componentRootId>482b189e-cdd8-411e-be62-b9e9e2a92c1f</componentRootId> <componentRootId>482b189e-cdd8-411e-be62-b9e9e2a92c1f</componentRootId>
<name>ВК ЕПГУ</name> <name>ВК ЕПГУ</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -7069,6 +7087,7 @@
<componentRootId>c0d0788b-b8a1-4af0-be0f-577b16592e00</componentRootId> <componentRootId>c0d0788b-b8a1-4af0-be0f-577b16592e00</componentRootId>
<name>ГК Первый ряд</name> <name>ГК Первый ряд</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -9597,6 +9616,7 @@
<componentRootId>573b1036-01ae-4575-8ba1-142280e58adf</componentRootId> <componentRootId>573b1036-01ae-4575-8ba1-142280e58adf</componentRootId>
<name>Вертикальный контейнер</name> <name>Вертикальный контейнер</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -12610,6 +12630,7 @@
<componentRootId>8bdb833c-9ed1-473e-8023-e4694a3b47c9</componentRootId> <componentRootId>8bdb833c-9ed1-473e-8023-e4694a3b47c9</componentRootId>
<name>ГК Второй ряд</name> <name>ГК Второй ряд</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -13861,7 +13882,6 @@
<componentRootId>2473aa4c-ca4a-429d-82eb-8913a811e25e</componentRootId> <componentRootId>2473aa4c-ca4a-429d-82eb-8913a811e25e</componentRootId>
<name>ВК Плашка</name> <name>ВК Плашка</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -14179,6 +14199,7 @@
<componentRootId>4f2a680c-d1c4-4326-94fd-d48145a2e8af</componentRootId> <componentRootId>4f2a680c-d1c4-4326-94fd-d48145a2e8af</componentRootId>
<name>ГК Третий ряд</name> <name>ГК Третий ряд</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>
@ -22160,6 +22181,7 @@
<componentRootId>8ce33491-362c-4be8-b964-2abec01f4e30</componentRootId> <componentRootId>8ce33491-362c-4be8-b964-2abec01f4e30</componentRootId>
<name>Постановка в 18 лет и старше</name> <name>Постановка в 18 лет и старше</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5"> <scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties> <properties>
@ -29000,7 +29022,6 @@
<componentRootId>62e2055e-ccf0-4878-9420-5aa4c2cd0a0c</componentRootId> <componentRootId>62e2055e-ccf0-4878-9420-5aa4c2cd0a0c</componentRootId>
<name>ВК ЕПГУ</name> <name>ВК ЕПГУ</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"> <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties> <properties>