From 689a6bf0b6c0855d8be7599dcc6a17d8f508cce2 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Tue, 15 Aug 2023 16:32:46 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=D0=B0=20=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B5=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medcards/components/MedicalCardSearch.vue |  2 +-
 .../components/MedicalCardSearchList.vue      | 22 ++----------
 src/pages/medcards/utils/medcardsConfig.js    | 35 ++++---------------
 3 files changed, 10 insertions(+), 49 deletions(-)

diff --git a/src/pages/medcards/components/MedicalCardSearch.vue b/src/pages/medcards/components/MedicalCardSearch.vue
index c3135f9..61b1911 100644
--- a/src/pages/medcards/components/MedicalCardSearch.vue
+++ b/src/pages/medcards/components/MedicalCardSearch.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  .medical-wrapper.rounded
+  .medical-wrapper.rounded.h-full
     list-header(@search="getMedcards")
     list-contents(
       :medicalCards="medicalCards",
diff --git a/src/pages/medcards/components/MedicalCardSearchList.vue b/src/pages/medcards/components/MedicalCardSearchList.vue
index 5ef3c3e..dc3f44a 100644
--- a/src/pages/medcards/components/MedicalCardSearchList.vue
+++ b/src/pages/medcards/components/MedicalCardSearchList.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   .scroll-wrapper
-    .list-wrapper.rounded.w-full.bg-white(id="listWrapper")
+    .list-wrapper.rounded.w-full.bg-white.h-full
       .w-full.h-full.flex.items-center.justify-center(v-if="dataStatus.title !== 'found'")
         .flex.flex-col.gap-y-2.h-96.items-center
           img.image(:src="dataStatus.img")
@@ -12,7 +12,6 @@
             :key="field.title",
             :style="headerStyle(field)"
           ) {{ field.title }}
-          .h-full.w-8(v-if="scrollPresence")
         .body.w-full
           row(
             v-for="medcard in medicalCards",
@@ -38,24 +37,10 @@ export default {
       headerConfig: searchListConfig,
     };
   },
-  computed: {
-    scrollPresence() {
-      const listWrapper = document.getElementById("listWrapper");
-      return listWrapper?.offsetHeight - 56 * this.medicalCards?.length < 0;
-    },
-  },
   methods: {
     headerStyle(field) {
-      const advancedScreen =
-        window.innerWidth === 1920 && window.innerHeight === 1080;
-      let width;
-      if (this.scrollPresence)
-        width = advancedScreen
-          ? field.advancedScrollWidth
-          : field.compressedScrollWidth;
-      else width = advancedScreen ? field.advancedWidth : field.compressedWidth;
       return {
-        width: width,
+        width: field.width,
         "justify-content": field.title === "Do" ? "center" : "",
       };
     },
@@ -69,9 +54,6 @@ export default {
   overflow-y: hidden
 .list-wrapper
   overflow: hidden
-  height: calc(100vh - 16px - 56px - 72px)
-  //display: flex
-  //flex-direction: column
   min-width: min-content
 .header
   background-color: var(--gray-thirdly)
diff --git a/src/pages/medcards/utils/medcardsConfig.js b/src/pages/medcards/utils/medcardsConfig.js
index a663d02..d3ac0ac 100644
--- a/src/pages/medcards/utils/medcardsConfig.js
+++ b/src/pages/medcards/utils/medcardsConfig.js
@@ -1,52 +1,31 @@
 export const searchListConfig = [
   {
     title: "ФИО",
-    advancedScrollWidth: "518px",
-    advancedWidth: "550px",
-    compressedScrollWidth: "400px",
-    compressedWidth: "400px",
+    width: "550px",
   },
   {
     title: "Дата рождения",
-    advancedScrollWidth: "220px",
-    advancedWidth: "220px",
-    compressedScrollWidth: "170px",
-    compressedWidth: "160px",
+    width: "220px",
   },
   {
     title: "Приоритет",
-    advancedScrollWidth: "220px",
-    advancedWidth: "220px",
-    compressedScrollWidth: "140px",
-    compressedWidth: "140px",
+    width: "220px",
   },
   {
     title: "№ медкарты",
-    advancedScrollWidth: "280px",
-    advancedWidth: "280px",
-    compressedScrollWidth: "194px",
-    compressedWidth: "220px",
+    width: "280px",
   },
   {
     title: "Дата создания",
-    advancedScrollWidth: "215px",
-    advancedWidth: "215px",
-    compressedScrollWidth: "170px",
-    compressedWidth: "160px",
+    width: "215px",
   },
   {
     title: "Процент заполнения",
-    advancedScrollWidth: "295px",
-    advancedWidth: "295px",
-    compressedScrollWidth: "194px",
-    compressedWidth: "220px",
+    width: "295px",
   },
   {
     title: "Do",
-    advancedScrollWidth: "60px",
-    advancedWidth: "60px",
-    compressedScrollWidth: "60px",
-    compressedWidth: "60px",
+    width: "60px",
   },
 ];