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

@ -2342,7 +2342,6 @@
<componentRootId>b3bfb047-b436-4db7-a676-5bef32bdad08</componentRootId>
<name>ВК Принятые обращения граждан</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -2551,105 +2550,7 @@
<componentRootId>c5c2a064-40fb-42e4-8f58-5d8644c8c085</componentRootId>
<name>ГК Показатель</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="a6b4665d-b5e4-4dff-8d3b-ef785512fb60" removed="true"/>
</value>
</entry>
</properties>
</scripts>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
<scripts id="fe04d7fb-6c5b-46c4-b723-667732d81f4f"/>
<scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
<scripts id="3171b2e1-b4af-4335-95fa-1b2592604b84"/>
<children id="ebb8731c-f7c1-40a1-9d40-a331e450a6ee">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>ebb8731c-f7c1-40a1-9d40-a331e450a6ee</componentRootId>
<name>7 000</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c"/>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048">
<properties>
<entry>
<key>defaultValueColumn</key>
<value>
<simple>{"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"count_accepted_to_consideration"}</simple>
</value>
</entry>
<entry>
<key>loadType</key>
<value>
<simple>"BY_COLUMN"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127">
<properties>
<entry>
<key>loadType</key>
<value>
<simple>"BY_COLUMN"</simple>
</value>
</entry>
<entry>
<key>valueByEventColumn</key>
<value>
<simple>{"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"count_accepted_to_consideration"}</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
</children>
<children id="c4943a79-1baa-4378-9a6d-bfb1521fee13">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>c4943a79-1baa-4378-9a6d-bfb1521fee13</componentRootId>
<name>принято на рассмотреное, в т.ч.:</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="98d10d30-19c4-4d19-b98a-48908ead5588" removed="false">
<value>
<simple>"section-header"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>initialValue</key>
<value>
<simple>"принято на рассмотреное, в т.ч.:"</simple>
</value>
</entry>
<entry>
<key>label</key>
<value>
<simple>null</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
</children>
<removed>true</removed>
</children>
<children id="34f448ce-c75c-4e76-ab6e-7f68d11334bf">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
@ -2675,11 +2576,51 @@
<name>Вертикальный контейнер</name>
<container>true</container>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="27b4d7d8-a790-424c-83b6-0c3808afdc56" removed="false">
<value>
<simple>"graph-row-left"</simple>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
<scripts id="87f3fefa-b77b-4137-aab6-b2bcd83ce380"/>
<scripts id="ef21ca22-3f81-4484-ba6f-58d670c12d4f"/>
<scripts id="277e6fbc-9e2e-4080-bf20-5d8be18e6764"/>
<children id="8402b9d1-ddc0-44cb-8de9-9c2b435c7a28">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>8402b9d1-ddc0-44cb-8de9-9c2b435c7a28</componentRootId>
<name>Текст</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="c06c2a88-f8ef-47ae-b182-ac8cbf257be3" removed="false">
<value>
<simple>"graph-text-hidden"</simple>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
</children>
<children id="0fe10cff-66c2-4e87-9199-f3b58bb407d1">
<prototypeId>85eb12aa-f878-4e29-b109-9d31af0fefb4</prototypeId>
<componentRootId>0fe10cff-66c2-4e87-9199-f3b58bb407d1</componentRootId>
@ -3118,19 +3059,179 @@
<componentRootId>eac8fba9-50a6-40b6-9578-945c9c2e9d1f</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<removed>true</removed>
</children>
<children id="8d66019b-b1f8-41bd-8725-d9f3767130f7">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>8d66019b-b1f8-41bd-8725-d9f3767130f7</componentRootId>
<name>Вертикальный контейнер</name>
<container>true</container>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="3bf948c8-062b-431d-a047-e37317499d47" removed="false">
<item id="9628491f-ad2c-49d2-b618-6d648e0dbca3" removed="false">
<value>
<simple>"graph-legend-right"</simple>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
<scripts id="87f3fefa-b77b-4137-aab6-b2bcd83ce380"/>
<scripts id="ef21ca22-3f81-4484-ba6f-58d670c12d4f"/>
<scripts id="277e6fbc-9e2e-4080-bf20-5d8be18e6764"/>
<children id="c5c2a064-40fb-42e4-8f58-5d8644c8c085">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
<componentRootId>c5c2a064-40fb-42e4-8f58-5d8644c8c085</componentRootId>
<name>ГК Показатель</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="a6b4665d-b5e4-4dff-8d3b-ef785512fb60" removed="true"/>
</value>
</entry>
</properties>
</scripts>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
<scripts id="fe04d7fb-6c5b-46c4-b723-667732d81f4f"/>
<scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
<scripts id="3171b2e1-b4af-4335-95fa-1b2592604b84"/>
<children id="ebb8731c-f7c1-40a1-9d40-a331e450a6ee">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>ebb8731c-f7c1-40a1-9d40-a331e450a6ee</componentRootId>
<name>7 000</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c"/>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048">
<properties>
<entry>
<key>defaultValueColumn</key>
<value>
<simple>{"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"count_accepted_to_consideration"}</simple>
</value>
</entry>
<entry>
<key>loadType</key>
<value>
<simple>"BY_COLUMN"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127">
<properties>
<entry>
<key>loadType</key>
<value>
<simple>"BY_COLUMN"</simple>
</value>
</entry>
<entry>
<key>valueByEventColumn</key>
<value>
<simple>{"schema":"metrics","table":"view_citizen_appeals","entity":"view_citizen_appeals","name":"count_accepted_to_consideration"}</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
</children>
<children id="c4943a79-1baa-4378-9a6d-bfb1521fee13">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>c4943a79-1baa-4378-9a6d-bfb1521fee13</componentRootId>
<name>принято на рассмотреное, в т.ч.:</name>
<container>false</container>
<removed>true</removed>
</children>
<children id="85fd3b99-59b6-494a-8294-4fd25e0a6ae6">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>85fd3b99-59b6-494a-8294-4fd25e0a6ae6</componentRootId>
<name>Вертикальный контейнер</name>
<container>true</container>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="291c46c3-b5bf-4a5a-9fee-a8359ad112ca" removed="false">
<value>
<simple>"text-wrap"</simple>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
<scripts id="87f3fefa-b77b-4137-aab6-b2bcd83ce380"/>
<scripts id="ef21ca22-3f81-4484-ba6f-58d670c12d4f"/>
<scripts id="277e6fbc-9e2e-4080-bf20-5d8be18e6764"/>
<children id="c4943a79-1baa-4378-9a6d-bfb1521fee13">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>c4943a79-1baa-4378-9a6d-bfb1521fee13</componentRootId>
<name>принято на рассмотреное, в т.ч.:</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="98d10d30-19c4-4d19-b98a-48908ead5588" removed="true"/>
</value>
</entry>
<entry>
<key>initialValue</key>
<value>
<simple>"принято на рассмотреное, в т.ч.:"</simple>
</value>
</entry>
<entry>
<key>label</key>
<value>
<simple>null</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
</scripts>
</children>
</children>
</children>
<children id="eac8fba9-50a6-40b6-9578-945c9c2e9d1f">
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
<componentRootId>eac8fba9-50a6-40b6-9578-945c9c2e9d1f</componentRootId>
<name>Горизонтальный контейнер</name>
<container>true</container>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="3bf948c8-062b-431d-a047-e37317499d47" removed="true"/>
</value>
</entry>
</properties>
</scripts>
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@ -3505,7 +3606,6 @@
<componentRootId>7989b38e-af82-4f05-96fe-15af5cace7a0</componentRootId>
<name>ВК значение</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
@ -3730,7 +3830,6 @@
<componentRootId>e24485d0-aa06-4160-b24d-c783cb035bdd</componentRootId>
<name>ВК текст</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -3870,6 +3969,7 @@
</children>
</children>
</children>
</children>
<children id="b5fff15c-5fbd-4fd0-b85a-e68f14ed0532">
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
<componentRootId>b5fff15c-5fbd-4fd0-b85a-e68f14ed0532</componentRootId>
@ -3898,7 +3998,6 @@
<componentRootId>a7e60d27-aaf5-4845-8119-5699dacd7232</componentRootId>
<name>ГК Второй ряд</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>

View file

@ -4193,6 +4193,7 @@
<componentRootId>3447ab1c-24c9-435a-9e23-1e0ab39404ab</componentRootId>
<name>ГК второй ряд показателей</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -6456,7 +6457,6 @@
<componentRootId>ea4d0df5-9e4f-48b2-bf91-3a72d3a90640</componentRootId>
<name>ГК третий ряд показателей</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -6738,6 +6738,16 @@
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<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>
<key>style</key>
<value>

View file

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