From 6904902755692efacf221caba490e5ab76c65a96 Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Thu, 6 Mar 2025 15:02:15 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=ED=9C=B4=EA=B0=80=20css=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/custom.css | 5 +- src/layouts/NormalLayout.vue | 13 +- src/layouts/TheChat.vue | 43 + src/layouts/TheTop.vue | 3 +- src/views/vacation/VacationManagement.vue | 1018 ++++++++++----------- 5 files changed, 565 insertions(+), 517 deletions(-) create mode 100644 src/layouts/TheChat.vue diff --git a/public/css/custom.css b/public/css/custom.css index b950985..2003a9d 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -113,18 +113,17 @@ opacity: 0.6; /* 흐려 보이게 */ background: none !important; box-shadow: none !important; display: flex; - align-items: center; + align-items: flex-end; justify-content: center; width: 100%; height: 100%; + padding-bottom: 20px; } - /* 모달 본문 스타일 */ .vac-modal-content { background: #fff; border-radius: 8px; box-shadow: 0px -4px 10px rgba(0, 0, 0, 0.1); /* 위쪽 그림자만 적용 */ - padding: 20px; max-width: 500px; width: 100%; position: relative; diff --git a/src/layouts/NormalLayout.vue b/src/layouts/NormalLayout.vue index 08cef90..eb86bbe 100644 --- a/src/layouts/NormalLayout.vue +++ b/src/layouts/NormalLayout.vue @@ -14,6 +14,7 @@
+ @@ -27,6 +28,7 @@ import TheTop from './TheTop.vue'; import TheFooter from './TheFooter.vue'; import TheMenu from './TheMenu.vue'; + import TheChat from './TheChat.vue'; import { nextTick } from 'vue'; import { wait } from '@/common/utils'; @@ -45,4 +47,13 @@ loadScript('/js/main.js'); }); - + diff --git a/src/layouts/TheChat.vue b/src/layouts/TheChat.vue new file mode 100644 index 0000000..21beb52 --- /dev/null +++ b/src/layouts/TheChat.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/src/layouts/TheTop.vue b/src/layouts/TheTop.vue index 2e530ef..4c1d281 100644 --- a/src/layouts/TheTop.vue +++ b/src/layouts/TheTop.vue @@ -265,4 +265,5 @@ router.push('/login'); }; - + diff --git a/src/views/vacation/VacationManagement.vue b/src/views/vacation/VacationManagement.vue index d5fa758..ee00125 100644 --- a/src/views/vacation/VacationManagement.vue +++ b/src/views/vacation/VacationManagement.vue @@ -1,569 +1,518 @@ + - - + } + From 04bcbcb78175d9fd0494558d53350354e9998631 Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Thu, 6 Mar 2025 15:03:26 +0900 Subject: [PATCH 2/7] . --- src/layouts/NormalLayout.vue | 2 +- src/layouts/TheChat.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/NormalLayout.vue b/src/layouts/NormalLayout.vue index eb86bbe..89a1893 100644 --- a/src/layouts/NormalLayout.vue +++ b/src/layouts/NormalLayout.vue @@ -49,7 +49,7 @@ diff --git a/src/layouts/TheChat.vue b/src/layouts/TheChat.vue index ea2aa5b..8102d8d 100644 --- a/src/layouts/TheChat.vue +++ b/src/layouts/TheChat.vue @@ -27,7 +27,7 @@ const sendMessage = () => { From 21fb66bafe28e794021150b1c6639b057e940f8f Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Thu, 6 Mar 2025 16:23:29 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EB=B0=98=EC=9D=91?= =?UTF-8?q?=ED=98=95=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/modal/VacationGrantModal.vue | 297 ++++++++++++++------ src/components/vacation/ProfileList.vue | 121 ++++---- src/views/vacation/VacationManagement.vue | 3 +- 3 files changed, 288 insertions(+), 133 deletions(-) diff --git a/src/components/modal/VacationGrantModal.vue b/src/components/modal/VacationGrantModal.vue index 82f8f72..9cb093f 100644 --- a/src/components/modal/VacationGrantModal.vue +++ b/src/components/modal/VacationGrantModal.vue @@ -1,129 +1,266 @@ - +}, { deep: true }); +onMounted(async () => { + if (props.isOpen && props.targetUser?.MEMBERSEQ) { + await fetchSentVacationCount(); + } +}); + diff --git a/src/components/vacation/ProfileList.vue b/src/components/vacation/ProfileList.vue index 9e06036..5ed4142 100644 --- a/src/components/vacation/ProfileList.vue +++ b/src/components/vacation/ProfileList.vue @@ -1,6 +1,6 @@ - - const getDynamicStyle = (user) => ({ - width: profileSize.value, - height: profileSize.value, - borderWidth: "4px", - borderColor: user.usercolor || "#ccc", - borderStyle: "solid", - }); - - - + diff --git a/src/views/vacation/VacationManagement.vue b/src/views/vacation/VacationManagement.vue index b166c3e..d3c4fae 100644 --- a/src/views/vacation/VacationManagement.vue +++ b/src/views/vacation/VacationManagement.vue @@ -15,24 +15,24 @@ /> @@ -554,8 +554,8 @@ onMounted(async () => { const dpEl = calendarDatepicker.value; dpEl.style.display = 'block'; dpEl.style.position = 'fixed'; - dpEl.style.top = '22%'; - dpEl.style.left = '66%'; + dpEl.style.top = '25%'; + dpEl.style.left = '50%'; dpEl.style.transform = 'translate(-50%, -50%)'; dpEl.style.zIndex = '9999'; dpEl.style.border = 'none'; @@ -568,11 +568,4 @@ onMounted(async () => { }) From a64cab08eb13e917a67d5910f5c3792dc8d1b9be Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Fri, 7 Mar 2025 12:12:58 +0900 Subject: [PATCH 7/7] Merge branch 'main' into vacation-css