From c3fafd56456e99ade3ed0c361ba85e2388202946 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Fri, 19 Jul 2024 14:27:34 +0300
Subject: [PATCH] group data in front

---
 front/assets/main.scss      |  4 ++
 front/pages/table/index.vue | 77 ++++++++++++++++++++++++-------------
 front/types/index.d.ts      |  1 +
 3 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/front/assets/main.scss b/front/assets/main.scss
index 45694b7..381db1a 100644
--- a/front/assets/main.scss
+++ b/front/assets/main.scss
@@ -54,4 +54,8 @@
         }
 
     }
+}
+
+th.tmc {
+    @apply min-w-[800px];
 }
\ No newline at end of file
diff --git a/front/pages/table/index.vue b/front/pages/table/index.vue
index 82964a3..0b936f9 100644
--- a/front/pages/table/index.vue
+++ b/front/pages/table/index.vue
@@ -5,7 +5,13 @@ const pagination = ref({ total: 10, pageCount: 10 })
 
 const loadData = async () => {
     const items_data = await apiCall<ApiPaged<TgItem>>(`tgbot/?page=${page.value}`)
-    items.value = items_data.results
+    const res = items_data.results
+    res.map(item => {
+        const uniq = [...new Set(item.tmc.map(el => el.tmc.id))]
+        const uniq_tmc = uniq.map(id => item.tmc.filter(el => el.tmc.id == id))
+        item.uniq = uniq_tmc
+    })
+    items.value = res
     pagination.value.total = items_data.count
     pagination.value.pageCount = items_data.per_page
 }
@@ -17,7 +23,7 @@ const columns = [
         label: 'Название'
     },
     {
-
+        class: 'tmc',
         key: 'tmc',
         label: 'ТМЦ'
     },
@@ -39,22 +45,24 @@ const columns = [
                 Обновлено: {{ new Date(row.updated_at).toLocaleString('ru-RU') }}
             </template>
             <template #tmc-data="{ row }">
-                <div class="inv_item" v-for="item in row.tmc">
-                    <strong>{{ item.tmc.name }}</strong>
-                    <ul class="inv_list">
-                        <li v-for="el in item.field" class="inv_item">
-                            <span class="inv_item_name">
-                                {{ el.field.name }}:
-                            </span>
-                            <span :class="['inv_item_text', { 'inv_item__error': !el.text }]">
-                                {{ el.text || 'Нет расшифровки' }}
-                            </span>
-                            <span :class="['inv_item_image', { 'inv_item__error': !el.file_id }]">
-                                <GetImage :file_id="el.file_id" v-if="el.file_id" />
-                                <span v-else>Нет изображения</span>
-                            </span>
-                        </li>
-                    </ul>
+                <div v-for="uniq_tmc in row.uniq" class="inv_element">
+                    <h3>{{ uniq_tmc[0].tmc.name }}</h3>
+                    <div class="inv_item" v-for="item in uniq_tmc">
+                        <ul class="inv_list">
+                            <li v-for="el in item.field" class="inv_inner">
+                                <span class="inv_inner_name">
+                                    {{ el.field.name }}:
+                                </span>
+                                <span :class="['inv_inner_text', { 'inv_inner__error': !el.text }]">
+                                    {{ el.text || 'Нет расшифровки' }}
+                                </span>
+                                <span :class="['inv_inner_image', { 'inv_inner__error': !el.file_id }]">
+                                    <GetImage :file_id="el.file_id" v-if="el.file_id" />
+                                    <span v-else>Нет изображения</span>
+                                </span>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
             </template>
             <template #user_id-data="{ row }">
@@ -69,20 +77,29 @@ const columns = [
 table {
     max-width: 100%;
 }
-.inv_item {
-    @apply mb-2;
-}
-.inv_list {
-    // @apply flex flex-col gap-2;
+
+.inv_element {
+    counter-reset: inv;
 }
+
 .inv_item {
-    @apply break-all;
-    >*{
+    @apply flex align-top gap-1;
+
+    &::before {
+        counter-increment: inv;
+        content: counter(inv) "."
+    }
+}
+.inv_inner {
+    >* {
         @apply mr-2;
     }
+
     &_name {}
 
-    &_text {}
+    &_text {
+        @apply break-all;
+    }
 
     &_image {}
 
@@ -90,4 +107,12 @@ table {
         @apply text-red-400 dark:text-red-800;
     }
 }
+
+.inv_list {
+    // @apply flex flex-col gap-2;
+}
+
+.inv_item {
+    @apply mb-2;
+}
 </style>
\ No newline at end of file
diff --git a/front/types/index.d.ts b/front/types/index.d.ts
index 0e2d715..fdb74f0 100644
--- a/front/types/index.d.ts
+++ b/front/types/index.d.ts
@@ -40,6 +40,7 @@ declare global {
         created_at: string
         updated_at: string
         tmc: number[]
+        uniq?: any[]
     }
 
     type ApiPaged<T> = {