From 75e4b9cecb211da890f0104c8f7abbc42e150600 Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Tue, 20 Dec 2022 19:03:19 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D1=82=D0=B8=D0=BB=D0=B8=20=D0=B8=20=D1=84=D0=BE?= =?UTF-8?q?=D1=80=D0=BC=D1=83=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=86=D1=83=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 109c6319a07ae73dc761c8c7fc2ddc7887d27161) --- src/components/base/BaseCustomSelect.vue | 7 +- src/pages/schedule/TheSchedule.vue | 72 ++------- .../schedule/components/FormChangeShift.vue | 64 ++++++++ src/pages/schedule/components/ScheduleBar.vue | 131 ++++++++++++++++ .../schedule/components/ScheduleBody.vue | 143 ++++++++++++++++++ .../schedule/components/ScheduleHeader.vue | 70 +++++++++ 6 files changed, 429 insertions(+), 58 deletions(-) create mode 100644 src/pages/schedule/components/FormChangeShift.vue create mode 100644 src/pages/schedule/components/ScheduleBar.vue create mode 100644 src/pages/schedule/components/ScheduleBody.vue create mode 100644 src/pages/schedule/components/ScheduleHeader.vue diff --git a/src/components/base/BaseCustomSelect.vue b/src/components/base/BaseCustomSelect.vue index 6fc85ba..1074b18 100644 --- a/src/components/base/BaseCustomSelect.vue +++ b/src/components/base/BaseCustomSelect.vue @@ -18,7 +18,8 @@ ) .item.py-2.px-4.cursor-pointer( v-for="item in items", - :key="item.id" + :key="item.id", + :class="{'center': center}", @click="clickItem(item.id, item.label)" ) {{ item.label }} @@ -38,6 +39,7 @@ export default { borderNone: Boolean, separator: Boolean, placeholderOpacity: Boolean, + center: Boolean, }, emits: ["update:modelValue"], data() { @@ -117,4 +119,7 @@ export default { height: 24px width: 1px border-radius: 1px +.center + display: flex + justify-content: center diff --git a/src/pages/schedule/TheSchedule.vue b/src/pages/schedule/TheSchedule.vue index 4da978c..cada80e 100644 --- a/src/pages/schedule/TheSchedule.vue +++ b/src/pages/schedule/TheSchedule.vue @@ -1,48 +1,33 @@ @@ -56,31 +41,4 @@ export default { .schedule-wrapper background-color: var(--default-white) height: calc(100vh - 64px) - -.schedule - border: 1.5px solid var(--border-light-grey-color-1) - border-radius: 4px - min-height: 87px - -.schedule-header - height: 50px - background-color: #D7D9FF - border-bottom: 1.5px solid var(--border-light-grey-color-1) - border-top-left-radius: 2px - border-top-right-radius: 2px - -.column-wrapper - max-width: 1080px - overflow: auto - -.text - color: var(--btn-blue-color) - -.name - min-width: 255px - max-width: 255px - border-right: 1.5px solid var(--border-light-grey-color-1) - -.edit - border-right: 1.5px solid var(--border-light-grey-color-1) diff --git a/src/pages/schedule/components/FormChangeShift.vue b/src/pages/schedule/components/FormChangeShift.vue new file mode 100644 index 0000000..d997a00 --- /dev/null +++ b/src/pages/schedule/components/FormChangeShift.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/src/pages/schedule/components/ScheduleBar.vue b/src/pages/schedule/components/ScheduleBar.vue new file mode 100644 index 0000000..89e06a3 --- /dev/null +++ b/src/pages/schedule/components/ScheduleBar.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/src/pages/schedule/components/ScheduleBody.vue b/src/pages/schedule/components/ScheduleBody.vue new file mode 100644 index 0000000..97c758a --- /dev/null +++ b/src/pages/schedule/components/ScheduleBody.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/src/pages/schedule/components/ScheduleHeader.vue b/src/pages/schedule/components/ScheduleHeader.vue new file mode 100644 index 0000000..95cb6bd --- /dev/null +++ b/src/pages/schedule/components/ScheduleHeader.vue @@ -0,0 +1,70 @@ + + + + +