From f7ca508a9cca330caeb63371bcdd4514b4b8195b Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Thu, 13 Feb 2025 16:25:20 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=ED=9C=B4=EA=B0=80=EA=B0=80=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=AA=A8=EB=8B=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/modal/VacationModal.vue | 165 ++++++++++++++++++++++ src/components/vacation/ProfileList.vue | 91 ++++++------ src/views/vacation/VacationManagement.vue | 42 +++++- 3 files changed, 252 insertions(+), 46 deletions(-) create mode 100644 src/components/modal/VacationModal.vue diff --git a/src/components/modal/VacationModal.vue b/src/components/modal/VacationModal.vue new file mode 100644 index 0000000..6e90f44 --- /dev/null +++ b/src/components/modal/VacationModal.vue @@ -0,0 +1,165 @@ + + + + + diff --git a/src/components/vacation/ProfileList.vue b/src/components/vacation/ProfileList.vue index ba4d594..32ffdd5 100644 --- a/src/components/vacation/ProfileList.vue +++ b/src/components/vacation/ProfileList.vue @@ -1,67 +1,71 @@ diff --git a/src/views/vacation/VacationManagement.vue b/src/views/vacation/VacationManagement.vue index 5b9d8f1..bb11afd 100644 --- a/src/views/vacation/VacationManagement.vue +++ b/src/views/vacation/VacationManagement.vue @@ -5,8 +5,17 @@
- +
+ { + try { + console.log(`๐Ÿ” ${user.MEMBERSEQ}๋‹˜์˜ ์—ฐ์ฐจ ๋‚ด์—ญ ์š”์ฒญ ์ค‘...`); + const response = await axios.get(`vacation/history`); + + if (response.status === 200 && response.data) { + console.log("โœ… ์—ฐ์ฐจ ๋‚ด์—ญ ์‘๋‹ต:", response.data); + myVacations.value = response.data.data.usedVacations || []; + receivedVacations.value = response.data.data.receivedVacations || []; + + console.log("๐Ÿ“Œ myVacations:", myVacations.value); + console.log("๐Ÿ“Œ receivedVacations:", receivedVacations.value); + + isModalOpen.value = true; + } else { + console.warn("โŒ ์—ฐ์ฐจ ๋‚ด์—ญ์„ ๋ถˆ๋Ÿฌ์˜ค์ง€ ๋ชปํ–ˆ์Šต๋‹ˆ๋‹ค."); + } + } catch (error) { + console.error("๐Ÿšจ ์—ฐ์ฐจ ๋ฐ์ดํ„ฐ ๋ถˆ๋Ÿฌ์˜ค๊ธฐ ์‹คํŒจ:", error); + } +}; + const fetchUserList = async () => { try { await userStore.fetchUserList(); From d71db81856d47e7473a625c97a6db90ea52b6031 Mon Sep 17 00:00:00 2001 From: Dang Date: Fri, 14 Feb 2025 11:02:45 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=EC=9A=A9=EC=96=B4=EC=A7=91=20=EC=B9=B4?= =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EB=93=B1=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/wordDict/DictWrite.vue | 14 +++++++------- src/views/wordDict/wordDict.vue | 25 +++++++++++++++++++------ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/components/wordDict/DictWrite.vue b/src/components/wordDict/DictWrite.vue index 985c69d..3f4fc83 100644 --- a/src/components/wordDict/DictWrite.vue +++ b/src/components/wordDict/DictWrite.vue @@ -5,7 +5,7 @@ - props.dataList.map(item => ({ - label: item.CMNCODNAM, - value: item.CMNCODVAL - })) -); +// const formattedDataList = computed(() => +// props.dataList.map(item => ({ +// label: item.CMNCODNAM, +// value: item.CMNCODVAL +// })) +// ); // ์นดํ…Œ๊ณ ๋ฆฌ ์ž…๋ ฅ ์ฐฝ const showInput = ref(false); diff --git a/src/views/wordDict/wordDict.vue b/src/views/wordDict/wordDict.vue index 11cb320..fefb2ee 100644 --- a/src/views/wordDict/wordDict.vue +++ b/src/views/wordDict/wordDict.vue @@ -45,9 +45,9 @@
@@ -69,7 +69,7 @@ import DictCard from '@/components/wordDict/DictCard.vue'; import DictWrite from '@/components/wordDict/DictWrite.vue'; import DictAlphabetFilter from '@/components/wordDict/DictAlphabetFilter.vue'; - import commonApi from '@/common/commonApi' + import commonApi from '@/common/commonApi'; import { useToastStore } from '@s/toastStore'; const { appContext } = getCurrentInstance(); @@ -88,8 +88,12 @@ const total = ref(0); // ์นดํ…Œ๊ณ ๋ฆฌ - const { cateList } = commonApi(); + const { cateList } = commonApi({ + loadCateList: true + }); const selectedCategory = ref(''); + const selectCategory = ref(''); + //์„ ํƒ๋œ ์•ŒํŒŒ๋ฒณ const selectedAlphabet = ref(''); @@ -156,15 +160,24 @@ const addCategory = (data) =>{ const lastCategory = cateList.value[cateList.value.length - 1]; const newValue = lastCategory ? parseInt(lastCategory.CMNCODVAL) + 1 : 600101; + console.log('lastCategory',lastCategory) + console.log('newValue',newValue) + axios.post('worddict/insertCategory',{ CMNCODNAM: data }).then(res => { if(res.data.data == '1'){ + console.log('res.data.data',res.data.data) + toastStore.onToast('์นดํ…Œ๊ณ ๋ฆฌ๊ฐ€ ์ถ”๊ฐ€ ๋“ฑ๋ก ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.', 's'); const newCategory = { CMNCODNAM: data, CMNCODVAL: newValue.toString() }; - cateList.value.unshift(newCategory); + console.log('newCategory',newCategory) + + cateList.value.unshift(newCategory.CMNCODNAM); selectCategory.value = newCategory.CMNCODVAL; + console.log(' selectCategory.value', selectCategory.value) + } }) } From 8e438ff9005c7b48836cfd99c8ffac5a2dc9b20d Mon Sep 17 00:00:00 2001 From: khj0414 Date: Fri, 14 Feb 2025 12:16:24 +0900 Subject: [PATCH 3/8] =?UTF-8?q?t=EC=9A=A9=EC=96=B4=EC=A7=91=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wordDict/wordDict.vue | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/views/wordDict/wordDict.vue b/src/views/wordDict/wordDict.vue index fefb2ee..f030567 100644 --- a/src/views/wordDict/wordDict.vue +++ b/src/views/wordDict/wordDict.vue @@ -61,7 +61,7 @@ diff --git a/src/components/button/SaveBtn.vue b/src/components/button/SaveBtn.vue new file mode 100644 index 0000000..7c8068a --- /dev/null +++ b/src/components/button/SaveBtn.vue @@ -0,0 +1,23 @@ + + + diff --git a/src/components/modal/VacationGrantModal.vue b/src/components/modal/VacationGrantModal.vue new file mode 100644 index 0000000..4d66368 --- /dev/null +++ b/src/components/modal/VacationGrantModal.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/src/components/modal/VacationModal.vue b/src/components/modal/VacationModal.vue index 6e90f44..3a183c3 100644 --- a/src/components/modal/VacationModal.vue +++ b/src/components/modal/VacationModal.vue @@ -87,7 +87,7 @@ align-items: center; /* ์Šคํฌ๋กค ๊ฐ€๋Šฅํ•œ ๋ชจ๋‹ฌ */ .modal-content { -max-height: 80vh; +max-height: 60vh; overflow-y: auto; padding: 20px; width: 75%; diff --git a/src/components/vacation/ProfileList.vue b/src/components/vacation/ProfileList.vue index 32ffdd5..a0f267e 100644 --- a/src/components/vacation/ProfileList.vue +++ b/src/components/vacation/ProfileList.vue @@ -17,6 +17,9 @@ @error="setDefaultImage" @load="showImage" /> + + {{ remainingVacationData[user.MEMBERSEQ] || 0 }} +
@@ -30,6 +33,10 @@ defineEmits(["profileClick"]); + defineProps({ + remainingVacationData: Object, +}); + const userStore = useUserStore(); const userListStore = useUserListStore(); @@ -53,7 +60,6 @@ // ์‚ฌ์šฉ์ž๋ณ„ ์ƒ‰์ƒ ์ €์žฅ userList.value.forEach(user => { userColors.value[user.MEMBERSEQ] = user.usercolor || "#ccc"; - console.log(userColors.value[user.MEMBERSEQ]) }); nextTick(() => { @@ -109,4 +115,12 @@ diff --git a/src/views/board/BoardList.vue b/src/views/board/BoardList.vue index 59f6e90..a5e4135 100644 --- a/src/views/board/BoardList.vue +++ b/src/views/board/BoardList.vue @@ -55,14 +55,14 @@