From 34bdb4248826c5c954596293e22490dd3a16ef04 Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Tue, 1 Nov 2022 18:11:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=86=D0=B2=D0=B5=D1=82=20=D0=B7=D0=B0=D0=B4=D0=BD=D0=B5=D0=B3?= =?UTF-8?q?=D0=BE=20=D1=84=D0=BE=D0=BD=D0=B0=20=D0=B0=D0=B2=D1=82=D0=B0?= =?UTF-8?q?=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/BaseAvatar.vue | 4 ++-- src/pages/calendar/components/CalendarColumn.vue | 2 +- src/pages/calendar/components/CalendarSidebar.vue | 4 ++-- src/pages/clients/components/ClientsTableRow.vue | 2 +- src/pages/clients/components/cells/TableCellBodyName.vue | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/components/base/BaseAvatar.vue b/src/components/base/BaseAvatar.vue index f995457..474d562 100644 --- a/src/components/base/BaseAvatar.vue +++ b/src/components/base/BaseAvatar.vue @@ -13,7 +13,7 @@ export default { }, color: { type: String, - default: "#D3D4DC", + default: "d3d4dc", }, }, @@ -23,7 +23,7 @@ export default { width: this.size + "px", height: this.size + "px", minWidth: this.size + "px", - backgroundColor: this.color, + backgroundColor: "#" + this.color, }; }, }, diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue index ee70129..93bcfd0 100644 --- a/src/pages/calendar/components/CalendarColumn.vue +++ b/src/pages/calendar/components/CalendarColumn.vue @@ -2,7 +2,7 @@ .calendar-column-wrapper.flex.flex-col .header.flex.items-center.justify-between.py-2.px-6.top-0 .flex.items-center - base-avatar.mr-2(:size="32") + base-avatar.mr-2(:size="32" :color="ownerData.color") img(:src="ownerData.avatar" alt="Team member" v-if="ownerData.avatar") span(v-if="!ownerData.avatar") {{ defaultAvatar }} span.owner-name.font-medium.text-base.mr-6 {{ ownerName }} diff --git a/src/pages/calendar/components/CalendarSidebar.vue b/src/pages/calendar/components/CalendarSidebar.vue index 49b3e85..e4b1070 100644 --- a/src/pages/calendar/components/CalendarSidebar.vue +++ b/src/pages/calendar/components/CalendarSidebar.vue @@ -11,7 +11,7 @@ .flex.flex-col.items-center.gap-y-2.justify-center base-button.mb-2(left-icon="icon-plus", rounded, :size="24", :icon-left-size="10", secondary ) .team-card(v-for="teammate in teamData" :key="teammate.id") - base-avatar(:size="32") + base-avatar(:size="32" :color="teammate.color") img(:src="teammate.avatar" alt="Team member" v-if="teammate.avatar") span(v-if="!teammate.avatar") {{`${teammate.last_name[0]}${teammate.first_name[0]}`}} .sidebar-content.items-center.flex.flex-col.gap-y-8.px-4.py-19px(v-else) @@ -36,7 +36,7 @@ v-for="teammate in teamData" :key="teammate.id") .flex.items-center - base-avatar(:size="32") + base-avatar(:size="32" :color="teammate.color") img(:src="teammate.avatar" alt="Team member" v-if="teammate.avatar") span(v-if="!teammate.avatar") {{`${teammate.last_name[0]}${teammate.first_name[0]}`}} .flex.ml-2.not-italic.font-medium.text-xxs {{ changeName(teammate.last_name, teammate.first_name, teammate.patronymic) }} diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue index de13ddf..ef15ce6 100644 --- a/src/pages/clients/components/ClientsTableRow.vue +++ b/src/pages/clients/components/ClientsTableRow.vue @@ -3,7 +3,7 @@ .row-body.flex.w-full.cursor-pointer(:id="id" @dblclick="(e) => openDetailInfo(e)") .check-box.flex.justify-center.items-center clients-table-checkbox(:id="id" :check="check" :is-check="isCheck") - table-cell-body-name(:value="dataClient" :avatar="dataClient.avatar" :is-open-change="isOpenChange" :width="columnBody.find(el => el.name === 'fullName').width") + table-cell-body-name(:value="dataClient" :avatar="dataClient.avatar" :avatar-color="dataClient.color" :is-open-change="isOpenChange" :width="columnBody.find(el => el.name === 'fullName').width") table-cell-body-age(:value="dataClient" :is-open-change="isOpenChange" :width="columnBody.find(el => el.name === 'age').width") table-cell-body-priority(:value="dataClient.priority" :choose-priority="choosePriority" :is-open-change="isOpenChange" :width="columnBody.find(el => el.name === 'priority').width") table-cell-body-phone(:value="dataClient" :is-open-change="isOpenChange" :width="columnBody.find(el => el.name === 'phone').width") diff --git a/src/pages/clients/components/cells/TableCellBodyName.vue b/src/pages/clients/components/cells/TableCellBodyName.vue index c4c0141..5814af6 100644 --- a/src/pages/clients/components/cells/TableCellBodyName.vue +++ b/src/pages/clients/components/cells/TableCellBodyName.vue @@ -1,6 +1,6 @@ @@ -17,6 +17,7 @@ export default { width: Number, imgUrl: String, isOpenChange: Boolean, + avatarColor: String, }, };