diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass index eb70ee6..b0adb93 100644 --- a/src/assets/sass/variables.sass +++ b/src/assets/sass/variables.sass @@ -94,4 +94,5 @@ --surface-blue-big: #ecf0fe --gray-scondary: #dddde8 --system-color-red: #f34549 + --system-color-green: #21ba72 diff --git a/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue b/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue index 6ad92e0..c1d8093 100644 --- a/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue +++ b/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue @@ -1,14 +1,130 @@ - + diff --git a/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue b/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue index f15038c..4fd7027 100644 --- a/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue +++ b/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue @@ -16,7 +16,7 @@ .text-m.font-bold {{patient.time.from + " - " + patient.time.to}} .grey-color.font-medium.text-smm( :class="{'red-color': !index}" - ) {{index ? "Время посещения" : "Скоро прием" }} + ) {{index ? "Время посещения" : "Скоро прием" }} .flex .gradient-name.flex.absolute(v-if="isGradient") diff --git a/src/pages/newCalendar/utils/calendarConfig.js b/src/pages/newCalendar/utils/calendarConfig.js index 8ca6ad6..2520152 100644 --- a/src/pages/newCalendar/utils/calendarConfig.js +++ b/src/pages/newCalendar/utils/calendarConfig.js @@ -120,7 +120,12 @@ export const patientList = [ avatar: personImage, check: false, reception: "25.07.2023", - time: { from: "12:00", to: "14:00" }, + time: { from: "12:00", to: "23:00" }, + priority: 1, + phone: "+7 (910) 623–32–23", + email: "gaevaia@yandex.ru", + company: "ООО «АльфаСтрахование»", + policy: "№ 2131-1331-4142", }, { id: 1, @@ -132,6 +137,11 @@ export const patientList = [ check: false, reception: "25.07.2023", time: { from: "11:00", to: "12:00" }, + priority: 1, + phone: "+7 (910) 623–32–23", + email: "gaevaia@yandex.ru", + company: "ООО «АльфаСтрахование»", + policy: "№ 2131-1331-4142", }, { id: 2, @@ -142,7 +152,12 @@ export const patientList = [ avatar: personImage, check: false, reception: "25.07.2023", - time: { from: "09:00", to: "11:00" }, + time: { from: "14:00", to: "16:00" }, + priority: 1, + phone: "+7 (910) 623–32–23", + email: "gaevaia@yandex.ru", + company: "ООО «АльфаСтрахование»", + policy: "№ 2131-1331-4142", }, { id: 3, @@ -154,6 +169,11 @@ export const patientList = [ check: false, reception: "27.07.2023", time: { from: "12:00", to: "14:00" }, + priority: 1, + phone: "+7 (910) 623–32–23", + email: "gaevaia@yandex.ru", + company: "ООО «АльфаСтрахование»", + policy: "№ 2131-1331-4142", }, { id: 4, @@ -165,6 +185,11 @@ export const patientList = [ check: false, reception: "27.07.2023", time: { from: "11:00", to: "14:00" }, + priority: 1, + phone: "+7 (910) 623–32–23", + email: "gaevaia@yandex.ru", + company: "ООО «АльфаСтрахование»", + policy: "№ 2131-1331-4142", }, { id: 5, @@ -176,6 +201,11 @@ export const patientList = [ check: false, reception: "28.07.2023", time: { from: "18:00", to: "19:00" }, + priority: 1, + phone: "+7 (910) 623–32–23", + email: "gaevaia@yandex.ru", + company: "ООО «АльфаСтрахование»", + policy: "№ 2131-1331-4142", }, { id: 6, @@ -187,6 +217,11 @@ export const patientList = [ check: false, reception: "25.07.2023", time: { from: "16:00", to: "17:00" }, + priority: 0, + phone: "+7 (910) 623–32–23", + email: "gaevaia@yandex.ru", + company: "ООО «АльфаСтрахование»", + policy: "№ 2131-1331-4142", }, { id: 7, @@ -198,6 +233,11 @@ export const patientList = [ check: false, reception: "25.07.2023", time: { from: "20:00", to: "21:00" }, + priority: 1, + phone: "+7 (910) 623–32–23", + email: "gaevaia@yandex.ru", + company: "ООО «АльфаСтрахование»", + policy: "№ 2131-1331-4142", }, { id: 8, @@ -209,6 +249,11 @@ export const patientList = [ check: false, reception: "31.06.2023", time: { from: "12:00", to: "14:00" }, + priority: 1, + phone: "+7 (910) 623–32–23", + email: "gaevaia@yandex.ru", + company: "ООО «АльфаСтрахование»", + policy: "№ 2131-1331-4142", }, { id: 9, @@ -220,6 +265,11 @@ export const patientList = [ check: false, reception: "30.07.2023", time: { from: "12:00", to: "14:00" }, + priority: 1, + phone: "+7 (910) 623–32–23", + email: "gaevaia@yandex.ru", + company: "ООО «АльфаСтрахование»", + policy: "№ 2131-1331-4142", }, { id: 10, @@ -231,6 +281,11 @@ export const patientList = [ check: false, reception: "27.07.2023", time: { from: "09:00", to: "10:00" }, + priority: 1, + phone: "+7 (910) 623–32–23", + email: "gaevaia@yandex.ru", + company: "ООО «АльфаСтрахование»", + policy: "№ 2131-1331-4142", }, ], choice: false, diff --git a/tailwind.config.js b/tailwind.config.js index 066ab8c..e1fd109 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -21,6 +21,7 @@ module.exports = { lg: ["18px", { lineHeight: "21px" }], lgx: ["22px", { lineHeight: "25.83px" }], xl: ["20px", { lineHeight: "23px" }], + xll: ["20px", { lineHeight: "24px" }], xxl: ["24px", { lineHeight: "26px" }], "2xl": ["28px", { lineHeight: "33px" }], "3xl": ["60px", { lineHeight: "70px" }],