-
- ![Avatar]()
+
+ ![Avatar]()
@@ -60,10 +60,6 @@
type: String,
default: '',
},
- profilePath: {
- type: String,
- default: '',
- },
unknown: {
type: Boolean,
default: true,
@@ -94,6 +90,10 @@
type: Boolean,
default: false,
},
+ profileImg: {
+ type: String,
+ default: false,
+ },
});
const emit = defineEmits(['updateReaction', 'editClick', 'deleteClick']);
@@ -122,7 +122,7 @@
};
// 프로필 이미지 경로 설정
- const getProfileImage = profilePath => {
- return profilePath && profilePath.trim() ? `${baseUrl}upload/img/profile/${profilePath}` : defaultProfile;
+ const getProfileImage = profileImg => {
+ return profileImg && profileImg != '' ? `${baseUrl}upload/img/profile/${profileImg}` : defaultProfile;
};
diff --git a/src/components/button/HalfDayButtons.vue b/src/components/button/HalfDayButtons.vue
index 08cc241..858731f 100644
--- a/src/components/button/HalfDayButtons.vue
+++ b/src/components/button/HalfDayButtons.vue
@@ -1,27 +1,30 @@
-
-
-
-
-
-
-
-
diff --git a/src/components/modal/VacationModal.vue b/src/components/modal/VacationModal.vue
index 59f0380..b8f3439 100644
--- a/src/components/modal/VacationModal.vue
+++ b/src/components/modal/VacationModal.vue
@@ -1,7 +1,7 @@
-
📅 내 연차 상세 내역
+📅 내 연차 내역
@@ -57,26 +57,34 @@ const emit = defineEmits(["close"]);
// 사용한 휴가(선물,연차사용)
let globalCounter = 0;
+
const usedVacations = computed(() => {
- return props.myVacations.flatMap((v) => {
- const count = v.used_quota || 1;
- return Array.from({ length: count }, (_, i) => ({
+ const data = props.myVacations.flatMap((v) => {
+
+ const count = v.used_quota
+ return Array.from({ length: Math.ceil(count) }, (_, i) => ({
...v,
category: "used",
code: v.LOCVACTYP,
+ used_quota: count, // 반차 강제 포함
_expandIndex: globalCounter++,
}));
});
+ return data;
});
// 받은 휴가
-const receivedVacations = computed(() =>
- props.receivedVacations.map((v) => ({
- ...v,
- category: "received",
- }))
-);
-
+const receivedVacations = computed(() => {
+ const data = props.receivedVacations.flatMap((v) => {
+ const count = v.received_quota ?? 1;
+ return Array.from({ length: Math.ceil(count) }, (_, i) => ({
+ ...v,
+ category: "received",
+ _expandIndex: globalCounter++,
+ }));
+ });
+ return data;
+});
// 필터링
const sortedUsedVacationsAsc = computed(() => {
return [...usedVacations.value].sort((a, b) => {
diff --git a/src/components/search/SearchBar.vue b/src/components/search/SearchBar.vue
index ad0fcf7..392a6b0 100644
--- a/src/components/search/SearchBar.vue
+++ b/src/components/search/SearchBar.vue
@@ -1,31 +1,42 @@
-
-
+
+
diff --git a/src/components/vacation/ProfileList.vue b/src/components/vacation/ProfileList.vue
index b5d5007..5ad55f7 100644
--- a/src/components/vacation/ProfileList.vue
+++ b/src/components/vacation/ProfileList.vue
@@ -1,28 +1,30 @@
-
-
-
-
-
-
+
+@@ -110,9 +112,7 @@ if (windowWidth.value >= 1850) { }); const getDynamicStyle = (user) => ({ -width: profileSize.value, -height: profileSize.value, -borderWidth: "4px", +borderWidth: "3px", borderColor: user.usercolor || "#ccc", borderStyle: "solid", }); diff --git a/src/components/voteboard/voteCard.vue b/src/components/voteboard/voteCard.vue index 44a346a..143bfe0 100644 --- a/src/components/voteboard/voteCard.vue +++ b/src/components/voteboard/voteCard.vue @@ -1,5 +1,5 @@ --
+
-
+ +{{ remainingVacationData[user.MEMBERSEQ] || 0 }} -
+
-
+@@ -59,7 +60,7 @@ 첨부파일 ({{ attachments.length }}개) -@@ -15,21 +15,22 @@@@ -54,7 +55,7 @@- -+ > ++-+ { return props.data.voteDetails.reduce((sum, item) => sum + item.yesvote, 0); }); + // 가장 많은 투표를 받은 항목들 (1위) +const topVoters = computed(() => { + // 가장 높은 VOTE_COUNT 찾기 + const maxVoteCount = Math.max(...props.data.voteDetails.map(item => item.VOTE_COUNT)); + // VOTE_COUNT가 가장 높은 항목들 필터링 + return props.data.voteDetails.filter(item => item.VOTE_COUNT === maxVoteCount); +}); + const baseUrl = $api.defaults.baseURL.replace(/api\/$/, ''); const userStore = useUserInfoStore(); const currentDate = new Date(); @@ -104,7 +113,6 @@ voteEndDate.setDate(voteEndDate.getDate() + 1); const isVoteEnded = computed(() => { return currentDate > voteEndDate; }); - const emit = defineEmits(['addContents','checkedNames','endVoteId','voteEnded','randomList','voteDelete','updateVote']); onMounted(() => { if (isVoteEnded.value && !props.data.localVote.LOCVOTDDT) { diff --git a/src/components/voteboard/voteResultList.vue b/src/components/voteboard/voteResultList.vue index 5a8e4d0..b763c3f 100644 --- a/src/components/voteboard/voteResultList.vue +++ b/src/components/voteboard/voteResultList.vue @@ -2,7 +2,7 @@ -@@ -24,6 +24,10 @@ const props = defineProps({ type: String, required: false, }, + locvotreg: { + type: Number, + required: false, + }, }); // 가장 많은 투표를 받은 항목들 (1위) const topVoters = computed(() => { diff --git a/src/components/voteboard/voteResultRandom.vue b/src/components/voteboard/voteResultRandom.vue index a1bf519..90ac2cf 100644 --- a/src/components/voteboard/voteResultRandom.vue +++ b/src/components/voteboard/voteResultRandom.vue @@ -16,9 +16,8 @@ random.. - +- {{ passwordAlert }} + {{ boardPasswordAlert }}-@@ -26,6 +25,7 @@ import voteResultRandomList from "@c/voteboard/voteResultRandomList.vue" import voteResultCard from '@c/voteboard/voteResultCard.vue'; import { ref, watch } from "vue"; +import { useUserInfoStore } from "@s/useUserInfoStore"; const emit = defineEmits(['randomList']); const props = defineProps({ data: { @@ -36,7 +36,12 @@ const props = defineProps({ type: String, required: false, }, + locvotreg: { + type: Number, + required: false, + }, }); +const userStore = useUserInfoStore(); const isRandom = ref(false); const randomList = () =>{ isRandom.value = true; diff --git a/src/views/board/BoardView.vue b/src/views/board/BoardView.vue index 10d9a31..09b9b19 100644 --- a/src/views/board/BoardView.vue +++ b/src/views/board/BoardView.vue @@ -10,6 +10,7 @@ :boardId="currentBoardId" :profileName="profileName" :unknown="unknown" + :profileImg="profileImg" :views="views" :commentNum="commentNum" :date="formattedBoardDate" @@ -35,7 +36,7 @@ /> -
+