From ca87c6cfbac24528d146e55eba82d94c6d19d5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=90=D0=BD=D0=B0=D1=81=D1=82=D0=B0=D1=81=D0=B8=D1=8F=20=D0=9D?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5=D0=B2=D0=BD=D0=B0?=
 <a.zelenskaya@svs-tech.pro>
Date: Tue, 18 Jun 2024 10:44:20 +0300
Subject: [PATCH] ral

---
 components/modal.vue |  23 -----
 components/ral.ts    | 218 +++++++++++++++++++++----------------------
 2 files changed, 109 insertions(+), 132 deletions(-)

diff --git a/components/modal.vue b/components/modal.vue
index 195e6ce..f4d784c 100644
--- a/components/modal.vue
+++ b/components/modal.vue
@@ -125,28 +125,6 @@ const total = computed(() => {
             <template v-else>
                 <h2>данные расчета</h2>
                 <div class="flex gap-4 flex-col mb-4">
-<<<<<<< HEAD
-                    <div>
-                        Ламелей в одной секции: {{ lamelles_count }}
-                    </div>
-                    <div>
-                        Длина секции: {{ fence_section * 1000 }} мм
-                    </div>
-                    <div>
-                        общая длина: {{ total_length }} м
-                    </div>
-
-                    <div>
-                        Секций: {{ section_count }} шт
-                    </div>
-                    
-                    <div>
-                        Цвет столба: {{ getColorNameFromRal(pillar_color) }}
-                    </div>
-                    <div>
-                        Цвет ламелей: {{ getColorNameFromRal(lamelle_color) }}
-                    </div>
-=======
                     <p>Ламелей: {{ lamelles_count }}<br />
                         Длина секции: {{ fence_section * 1000 }}<br />
                         Общая длина: {{ total_length }}<br />
@@ -156,7 +134,6 @@ const total = computed(() => {
                     <p>
                         <template v-for="i in total">{{ i }}<br /></template>
                     </p>
->>>>>>> ba62bb0ffa821cda603bdee91922c79da69d166d
                 </div>
                 <div class="flex gap-4">
                     <button class="not-prose" @click="openForm">Данные верны</button>
diff --git a/components/ral.ts b/components/ral.ts
index c952215..82ab4af 100644
--- a/components/ral.ts
+++ b/components/ral.ts
@@ -31,7 +31,7 @@ export const ralClassicPallette = {
     },
     "1003": {
         "code": "1003",
-        "name": "Сигнальный",
+        "name": "Сигнальный жёлтый",
         "hex": "#F7BA0B",
         "groupId": "ral_classic_1"
     },
@@ -79,19 +79,19 @@ export const ralClassicPallette = {
     },
     "1014": {
         "code": "1014",
-        "name": "Слоновая",
+        "name": "Слоновая кость",
         "hex": "#DED09F",
         "groupId": "ral_classic_1"
     },
     "1015": {
         "code": "1015",
-        "name": "Светлая",
+        "name": "Светлая слоновая кость",
         "hex": "#EADEBD",
         "groupId": "ral_classic_1"
     },
     "1016": {
         "code": "1016",
-        "name": "Жёлтая",
+        "name": "Жёлтая сера",
         "hex": "#EAF044",
         "groupId": "ral_classic_1"
     },
@@ -133,19 +133,19 @@ export const ralClassicPallette = {
     },
     "1024": {
         "code": "1024",
-        "name": "Охра",
+        "name": "Охра жёлтая",
         "hex": "#B89C50",
         "groupId": "ral_classic_1"
     },
     "1026": {
         "code": "1026",
-        "name": "Люминесцентный",
+        "name": "Люминесцентный жёлтый",
         "hex": "#F5FF00",
         "groupId": "ral_classic_1"
     },
     "1027": {
         "code": "1027",
-        "name": "Карри",
+        "name": "Карри жёлтый",
         "hex": "#A38C15",
         "groupId": "ral_classic_1"
     },
@@ -157,7 +157,7 @@ export const ralClassicPallette = {
     },
     "1032": {
         "code": "1032",
-        "name": "Жёлтый",
+        "name": "Жёлтый ракитник",
         "hex": "#DDB20F",
         "groupId": "ral_classic_1"
     },
@@ -223,13 +223,13 @@ export const ralClassicPallette = {
     },
     "2005": {
         "code": "2005",
-        "name": "Люминесцентный",
+        "name": "Люминесцентный оранжевый",
         "hex": "#FF2300",
         "groupId": "ral_classic_2"
     },
     "2007": {
         "code": "2007",
-        "name": "Люминесцентный",
+        "name": "Люминесцентный ярко-оранжевый",
         "hex": "#FFA421",
         "groupId": "ral_classic_2"
     },
@@ -241,19 +241,19 @@ export const ralClassicPallette = {
     },
     "2009": {
         "code": "2009",
-        "name": "Транспортный",
+        "name": "Транспортный оранжевый",
         "hex": "#E15501",
         "groupId": "ral_classic_2"
     },
     "2010": {
         "code": "2010",
-        "name": "Сигнальный",
+        "name": "Сигнальный оранжевый",
         "hex": "#D4652F",
         "groupId": "ral_classic_2"
     },
     "2011": {
         "code": "2011",
-        "name": "Насыщенный",
+        "name": "Насыщенный оранжевый",
         "hex": "#EC7C25",
         "groupId": "ral_classic_2"
     },
@@ -277,7 +277,7 @@ export const ralClassicPallette = {
     },
     "3001": {
         "code": "3001",
-        "name": "Сигнальный",
+        "name": "Сигнальный красный",
         "hex": "#A02128",
         "groupId": "ral_classic_3"
     },
@@ -313,7 +313,7 @@ export const ralClassicPallette = {
     },
     "3009": {
         "code": "3009",
-        "name": "Оксид",
+        "name": "Оксид красный",
         "hex": "#703731",
         "groupId": "ral_classic_3"
     },
@@ -337,7 +337,7 @@ export const ralClassicPallette = {
     },
     "3014": {
         "code": "3014",
-        "name": "Розовый",
+        "name": "Розовый антик",
         "hex": "#D47479",
         "groupId": "ral_classic_3"
     },
@@ -367,7 +367,7 @@ export const ralClassicPallette = {
     },
     "3020": {
         "code": "3020",
-        "name": "Транспортный",
+        "name": "Транспортный красный",
         "hex": "#C1121C",
         "groupId": "ral_classic_3"
     },
@@ -379,13 +379,13 @@ export const ralClassicPallette = {
     },
     "3024": {
         "code": "3024",
-        "name": "Люминесцентный",
+        "name": "Люминесцентный красный",
         "hex": "#F70000",
         "groupId": "ral_classic_3"
     },
     "3026": {
         "code": "3026",
-        "name": "Люминесцентный",
+        "name": "Люминесцентный ярко-красный",
         "hex": "#FF0000",
         "groupId": "ral_classic_3"
     },
@@ -403,7 +403,7 @@ export const ralClassicPallette = {
     },
     "3031": {
         "code": "3031",
-        "name": "Ориент",
+        "name": "Ориент красный",
         "hex": "#AC323B",
         "groupId": "ral_classic_3"
     },
@@ -451,7 +451,7 @@ export const ralClassicPallette = {
     },
     "4006": {
         "code": "4006",
-        "name": "Транспортный",
+        "name": "Транспортный пурпурный",
         "hex": "#992572",
         "groupId": "ral_classic_4"
     },
@@ -463,7 +463,7 @@ export const ralClassicPallette = {
     },
     "4008": {
         "code": "4008",
-        "name": "Сигнальный",
+        "name": "Сигнальный фиолетовый",
         "hex": "#904684",
         "groupId": "ral_classic_4"
     },
@@ -523,7 +523,7 @@ export const ralClassicPallette = {
     },
     "5005": {
         "code": "5005",
-        "name": "Сигнальный",
+        "name": "Сигнальный синий",
         "hex": "#154889",
         "groupId": "ral_classic_5"
     },
@@ -583,7 +583,7 @@ export const ralClassicPallette = {
     },
     "5017": {
         "code": "5017",
-        "name": "Транспортный",
+        "name": "Транспортный синий",
         "hex": "#0E518D",
         "groupId": "ral_classic_5"
     },
@@ -595,25 +595,25 @@ export const ralClassicPallette = {
     },
     "5019": {
         "code": "5019",
-        "name": "Капри",
+        "name": "Капри синий",
         "hex": "#1A5784",
         "groupId": "ral_classic_5"
     },
     "5020": {
         "code": "5020",
-        "name": "Океанская",
+        "name": "Океанская синь",
         "hex": "#0B4151",
         "groupId": "ral_classic_5"
     },
     "5021": {
         "code": "5021",
-        "name": "Водная",
+        "name": "Водная синь",
         "hex": "#07737A",
         "groupId": "ral_classic_5"
     },
     "5022": {
         "code": "5022",
-        "name": "Ночной",
+        "name": "Ночной синий",
         "hex": "#2F2A5A",
         "groupId": "ral_classic_5"
     },
@@ -629,18 +629,18 @@ export const ralClassicPallette = {
         "hex": "#6A93B0",
         "groupId": "ral_classic_5"
     },
-    // "5025": {
-    //     "code": "5025",
-    //     "name": "Перламутровый",
-    //     "hex": "#296478",
-    //     "groupId": "ral_classic_5"
-    // },
-    // "5026": {
-    //     "code": "5026",
-    //     "name": "Перламутровый",
-    //     "hex": "#102C54",
-    //     "groupId": "ral_classic_5"
-    // },
+    "5025": {
+        "code": "5025",
+        "name": "Перламутровый горечавково-синий",
+        "hex": "#296478",
+        "groupId": "ral_classic_5"
+    },
+    "5026": {
+        "code": "5026",
+        "name": "Перламутровый ночной синий",
+        "hex": "#102C54",
+        "groupId": "ral_classic_5"
+    },
     "6000": {
         "code": "6000",
         "name": "Патиново-зелёный",
@@ -673,7 +673,7 @@ export const ralClassicPallette = {
     },
     "6005": {
         "code": "6005",
-        "name": "Зелёный",
+        "name": "Зелёный мох",
         "hex": "#0F4336",
         "groupId": "ral_classic_6"
     },
@@ -697,13 +697,13 @@ export const ralClassicPallette = {
     },
     "6009": {
         "code": "6009",
-        "name": "Пихтовый",
+        "name": "Пихтовый зелёный",
         "hex": "#26392F",
         "groupId": "ral_classic_6"
     },
     "6010": {
         "code": "6010",
-        "name": "Травяной",
+        "name": "Травяной зелёный",
         "hex": "#3E753B",
         "groupId": "ral_classic_6"
     },
@@ -745,7 +745,7 @@ export const ralClassicPallette = {
     },
     "6017": {
         "code": "6017",
-        "name": "Майский",
+        "name": "Майский зелёный",
         "hex": "#468641",
         "groupId": "ral_classic_6"
     },
@@ -763,7 +763,7 @@ export const ralClassicPallette = {
     },
     "6020": {
         "code": "6020",
-        "name": "Хромовый",
+        "name": "Хромовый зелёный",
         "hex": "#354733",
         "groupId": "ral_classic_6"
     },
@@ -781,7 +781,7 @@ export const ralClassicPallette = {
     },
     "6024": {
         "code": "6024",
-        "name": "Транспортный",
+        "name": "Транспортный зелёный",
         "hex": "#008754",
         "groupId": "ral_classic_6"
     },
@@ -793,7 +793,7 @@ export const ralClassicPallette = {
     },
     "6026": {
         "code": "6026",
-        "name": "Опаловый",
+        "name": "Опаловый зелёный",
         "hex": "#005D52",
         "groupId": "ral_classic_6"
     },
@@ -805,7 +805,7 @@ export const ralClassicPallette = {
     },
     "6028": {
         "code": "6028",
-        "name": "Сосновый",
+        "name": "Сосновый зелёный",
         "hex": "#2D5546",
         "groupId": "ral_classic_6"
     },
@@ -817,7 +817,7 @@ export const ralClassicPallette = {
     },
     "6032": {
         "code": "6032",
-        "name": "Сигнальный",
+        "name": "Сигнальный зелёный",
         "hex": "#0F8558",
         "groupId": "ral_classic_6"
     },
@@ -839,12 +839,12 @@ export const ralClassicPallette = {
         "hex": "#1B542C",
         "groupId": "ral_classic_6"
     },
-    // "6036": {
-    //     "code": "6036",
-    //     "name": "Перламутровый",
-    //     "hex": "#005D4C",
-    //     "groupId": "ral_classic_6"
-    // },
+    "6036": {
+        "code": "6036",
+        "name": "Перламутровый опаловый зелёный",
+        "hex": "#005D4C",
+        "groupId": "ral_classic_6"
+    },
     "6037": {
         "code": "6037",
         "name": "Зелёный",
@@ -853,13 +853,13 @@ export const ralClassicPallette = {
     },
     "6038": {
         "code": "6038",
-        "name": "Люминесцентный",
+        "name": "Люминесцентный зелёный",
         "hex": "#00BB2E",
         "groupId": "ral_classic_6"
     },
     "7000": {
         "code": "7000",
-        "name": "Серая",
+        "name": "Серая белка",
         "hex": "#7E8B92",
         "groupId": "ral_classic_7"
     },
@@ -877,13 +877,13 @@ export const ralClassicPallette = {
     },
     "7003": {
         "code": "7003",
-        "name": "Серый",
+        "name": "Серый мох",
         "hex": "#7A7B6D",
         "groupId": "ral_classic_7"
     },
     "7004": {
         "code": "7004",
-        "name": "Сигнальный",
+        "name": "Сигнальный серый",
         "hex": "#9EA0A1",
         "groupId": "ral_classic_7"
     },
@@ -901,7 +901,7 @@ export const ralClassicPallette = {
     },
     "7008": {
         "code": "7008",
-        "name": "Серое",
+        "name": "Серое хаки",
         "hex": "#746643",
         "groupId": "ral_classic_7"
     },
@@ -955,25 +955,25 @@ export const ralClassicPallette = {
     },
     "7022": {
         "code": "7022",
-        "name": "Серая",
+        "name": "Серая умбра",
         "hex": "#4B4D46",
         "groupId": "ral_classic_7"
     },
     "7023": {
         "code": "7023",
-        "name": "Серый",
+        "name": "Серый бетон",
         "hex": "#818479",
         "groupId": "ral_classic_7"
     },
     "7024": {
         "code": "7024",
-        "name": "Графитовый",
+        "name": "Графитовый серый",
         "hex": "#474A50",
         "groupId": "ral_classic_7"
     },
     "7026": {
         "code": "7026",
-        "name": "Гранитовый",
+        "name": "Гранитовый серый",
         "hex": "#374447",
         "groupId": "ral_classic_7"
     },
@@ -991,7 +991,7 @@ export const ralClassicPallette = {
     },
     "7032": {
         "code": "7032",
-        "name": "Галечный",
+        "name": "Галечный серый",
         "hex": "#B9B9A8",
         "groupId": "ral_classic_7"
     },
@@ -1027,64 +1027,64 @@ export const ralClassicPallette = {
     },
     "7038": {
         "code": "7038",
-        "name": "Агатовый",
+        "name": "Агатовый серый",
         "hex": "#B4B8B0",
         "groupId": "ral_classic_7"
     },
     "7039": {
         "code": "7039",
-        "name": "Кварцевый",
+        "name": "Кварцевый серый",
         "hex": "#6B695F",
         "groupId": "ral_classic_7"
     },
     "7040": {
         "code": "7040",
-        "name": "Серое",
+        "name": "Серое окно",
         "hex": "#9DA3A6",
         "groupId": "ral_classic_7"
     },
     "7042": {
         "code": "7042",
-        "name": "Транспортный",
+        "name": "Транспортный серый A",
         "hex": "#8F9695",
         "groupId": "ral_classic_7"
     },
     "7043": {
         "code": "7043",
-        "name": "Транспортный",
+        "name": "Транспортный серый B",
         "hex": "#4E5451",
         "groupId": "ral_classic_7"
     },
     "7044": {
         "code": "7044",
-        "name": "Серый",
+        "name": "Серый шёлк",
         "hex": "#BDBDB2",
         "groupId": "ral_classic_7"
     },
     "7045": {
         "code": "7045",
-        "name": "Телегрей",
+        "name": "Телегрей 1",
         "hex": "#91969A",
         "groupId": "ral_classic_7"
     },
     "7046": {
         "code": "7046",
-        "name": "Телегрей",
+        "name": "Телегрей 2",
         "hex": "#82898E",
         "groupId": "ral_classic_7"
     },
     "7047": {
         "code": "7047",
-        "name": "Телегрей",
+        "name": "Телегрей 4",
         "hex": "#CFD0CF",
         "groupId": "ral_classic_7"
     },
-    // "7048": {
-    //     "code": "7048",
-    //     "name": "Перламутровый",
-    //     "hex": "#888175",
-    //     "groupId": "ral_classic_7"
-    // },
+    "7048": {
+        "code": "7048",
+        "name": "Перламутровый мышино-серый",
+        "hex": "#888175",
+        "groupId": "ral_classic_7"
+    },
     "8000": {
         "code": "8000",
         "name": "Зелёно-коричневый",
@@ -1093,19 +1093,19 @@ export const ralClassicPallette = {
     },
     "8001": {
         "code": "8001",
-        "name": "Охра",
+        "name": "Охра коричневая",
         "hex": "#9C6B30",
         "groupId": "ral_classic_8"
     },
     "8002": {
         "code": "8002",
-        "name": "Сигнальный",
+        "name": "Сигнальный коричневый",
         "hex": "#7B5141",
         "groupId": "ral_classic_8"
     },
     "8003": {
         "code": "8003",
-        "name": "Глиняный",
+        "name": "Глиняный коричневый",
         "hex": "#80542F",
         "groupId": "ral_classic_8"
     },
@@ -1117,7 +1117,7 @@ export const ralClassicPallette = {
     },
     "8007": {
         "code": "8007",
-        "name": "Олень",
+        "name": "Олень коричневый",
         "hex": "#6F4A2F",
         "groupId": "ral_classic_8"
     },
@@ -1141,7 +1141,7 @@ export const ralClassicPallette = {
     },
     "8014": {
         "code": "8014",
-        "name": "Сепия",
+        "name": "Сепия коричневый",
         "hex": "#49392D",
         "groupId": "ral_classic_8"
     },
@@ -1153,7 +1153,7 @@ export const ralClassicPallette = {
     },
     "8016": {
         "code": "8016",
-        "name": "Махагон",
+        "name": "Махагон коричневый",
         "hex": "#4C2F26",
         "groupId": "ral_classic_8"
     },
@@ -1199,12 +1199,12 @@ export const ralClassicPallette = {
         "hex": "#4E3B2B",
         "groupId": "ral_classic_8"
     },
-    // "8029": {
-    //     "code": "8029",
-    //     "name": "Перламутровый",
-    //     "hex": "#773C27",
-    //     "groupId": "ral_classic_8"
-    // },
+    "8029": {
+        "code": "8029",
+        "name": "Перламутровый медный",
+        "hex": "#773C27",
+        "groupId": "ral_classic_8"
+    },
     "9001": {
         "code": "9001",
         "name": "Кремово-белый",
@@ -1219,19 +1219,19 @@ export const ralClassicPallette = {
     },
     "9003": {
         "code": "9003",
-        "name": "Сигнальный",
+        "name": "Сигнальный белый",
         "hex": "#F4F8F4",
         "groupId": "ral_classic_9"
     },
     "9004": {
         "code": "9004",
-        "name": "Сигнальный",
+        "name": "Сигнальный чёрный",
         "hex": "#2E3032",
         "groupId": "ral_classic_9"
     },
     "9005": {
         "code": "9005",
-        "name": "Чёрный",
+        "name": "Чёрный янтарь",
         "hex": "#0A0A0D",
         "groupId": "ral_classic_9"
     },
@@ -1261,13 +1261,13 @@ export const ralClassicPallette = {
     },
     "9016": {
         "code": "9016",
-        "name": "Транспортный",
+        "name": "Транспортный белый",
         "hex": "#F7FBF5",
         "groupId": "ral_classic_9"
     },
     "9017": {
         "code": "9017",
-        "name": "Транспортный",
+        "name": "Транспортный чёрный",
         "hex": "#2A2D2F",
         "groupId": "ral_classic_9"
     },
@@ -1277,18 +1277,18 @@ export const ralClassicPallette = {
         "hex": "#CFD3CD",
         "groupId": "ral_classic_9"
     },
-    // "9022": {
-    //     "code": "9022",
-    //     "name": "Перламутровый",
-    //     "hex": "#9C9C9C",
-    //     "groupId": "ral_classic_9"
-    // },
-    // "9023": {
-    //     "code": "9023",
-    //     "name": "Перламутровый",
-    //     "hex": "#7E8182",
-    //     "groupId": "ral_classic_9"
-    // }
+    "9022": {
+        "code": "9022",
+        "name": "Перламутровый светло-серый",
+        "hex": "#9C9C9C",
+        "groupId": "ral_classic_9"
+    },
+    "9023": {
+        "code": "9023",
+        "name": "Перламутровый тёмно-серый",
+        "hex": "#7E8182",
+        "groupId": "ral_classic_9"
+    }
 }
 export type ralTypes = keyof typeof ralClassicPallette
 export const getColorHexFromRal = (col: keyof typeof ralClassicPallette) => {