.

public/css/custom.css

@@ -24,7 +24,6 @@
     font-size: 18px;
 }
 
-
 @keyframes new {
     0% {
         background-color: #ffcc00;
@@ -43,7 +42,6 @@
 
 /* board end */
 
-
 /* Qeditor  */
 .ql-editor {
     min-height: 300px;
@@ -174,6 +172,9 @@
 .fc-toolbar-title {
     cursor: pointer;
 }
+.fc-today-button {
+    cursor: pointer !important;
+}
 /* 클릭 가능한 날짜 */
 .fc-daygrid-day.clickable {
     cursor: pointer;
@@ -430,8 +431,8 @@
 /* 작은 화면에서 버튼 크기 조정 */
 @media (max-width: 1700px) {
     .count-btn {
-        width: 28px;
-        height: 28px;
+        width: 26px;
+        height: 26px;
         font-size: 15px;
     }
     .count-container {
@@ -442,7 +443,7 @@
         margin-bottom: 8px;
     }
     .count-value {
-        font-size: 20px;
+        font-size: 15px;
     }
     .custom-button {
         width: 45px;
@@ -453,10 +454,10 @@
         font-size: 18px;
     }
     .vac-modal-text {
-        font-size: 13px;
+        font-size: 12px;
     }
     .vac-modal-title {
-        font-size: 17px;
+        font-size: 15px;
         margin-bottom: 10px;
     }
     .vacation-item {
@@ -465,8 +466,8 @@
         margin-bottom: 5px;
     }
     .vac-btn {
-        width: 50px;
-        height: 50px;
+        width: 40px;
+        height: 40px;
         font-size: 18px;
     }
     .vac-btn-success {
@@ -497,12 +498,12 @@
         margin-bottom: 5px;
     }
     .vac-btn {
-        width: 40px;
-        height: 40px;
-        font-size: 18px;
+        width: 10px;
+        height: 10px;
+        font-size: 12px;
     }
     .vac-btn-success {
-        font-size: 20px;
+        font-size: 15px;
         width: 40px;
         height: 40px;
     }
@@ -587,7 +588,7 @@
     scrollbar-width: none;
 }
 
-.fc-daygrid-day[data-has-commuters="true"] {
+.fc-daygrid-day[data-has-commuters='true'] {
     cursor: pointer;
 }
 
@@ -698,7 +699,6 @@
 /* Mobile end */
 /* media end */
 
-
 /* BoardComment */
 
 .beforeRotate {
@@ -722,6 +722,12 @@
     pointer-events: none;
 }
 
+.hidden-time-input {
+    position: absolute;
+    opacity: 0;
+    pointer-events: none;
+}
+
 /* 권한부여 */
 .user-card-container {
     display: flex;
@@ -769,22 +775,22 @@
     right: 0;
     bottom: 0;
     background-color: #ccc;
-    transition: .4s;
+    transition: 0.4s;
     border-radius: 24px;
 }
 .slider:before {
     position: absolute;
-    content: "";
+    content: '';
     height: 18px;
     width: 18px;
     left: 4px;
     bottom: 3px;
     background-color: white;
-    transition: .4s;
+    transition: 0.4s;
     border-radius: 50%;
 }
 input:checked + .slider {
-    background-color: #4CAF50;
+    background-color: #4caf50;
 }
 
 input:checked + .slider:before {
@@ -792,7 +798,6 @@ input:checked + .slider:before {
 }
 /* 권한부여 끝 */
 
-
 /* toast */
 
 .bs-toast {
@@ -802,6 +807,28 @@ input:checked + .slider:before {
 
 /* toast end */
 
-.cursor-none{
+.cursor-none {
     cursor: none !important;
-}
+}
+
+.ml-1 {
+    margin-left: 0.25rem !important;
+}
+.mr-1 {
+    margin-right: 0.25rem !important;
+}
+
+.nickname-ellipsis {
+    white-space: nowrap;
+    max-width: 100px;
+    vertical-align: middle;
+}
+
+/* font css */
+.font-bold {
+    font-weight: bold;
+}
+
+.pointer {
+    cursor: pointer;
+}

src/components/board/BoardComment.vue

@@ -12,6 +12,8 @@
             :isLike="!isLike"
             :isCommentPassword="isCommentPassword"
             :isCommentProfile="true"
+            :is-edit-pushed="isEditPushed"
+            :is-delete-pushed="isDeletePushed"
             @editClick="handleEditClick"
             @deleteClick="$emit('deleteClick', comment)"
             @updateReaction="handleUpdateReaction"
@@ -35,7 +37,7 @@
 
         <div class="mt-6">
             <template v-if="comment.isEditTextarea">
-                <textarea v-model="localEditedContent" class="form-control"></textarea>
+                <textarea v-model="localEditedContent" class="form-control" maxLength="500"></textarea>
                 <span v-if="editCommentAlert" class="invalid-feedback d-block text-start">{{ editCommentAlert }}</span>
                 <div class="mt-2 d-flex justify-content-end">
                     <SaveBtn class="btn btn-primary" @click="submitEdit" :isEnabled="disabled"></SaveBtn>
@@ -116,9 +118,20 @@
         password: {
             type: String,
         },
+        // isEditPushed: {
+        //     type: Boolean,
+        //     required: false,
+        // },
+        // isDeletePushed: {
+        //     type: Boolean,
+        //     required: false,
+        // },
         editCommentAlert: String,
     });
 
+    const isEditPushed = ref(false);
+    const isDeletePushed = ref(false);
+
     const displayName = computed(() => {
         return props.nickname ? props.nickname : props.comment.author;
     });
@@ -171,6 +184,24 @@
         emit('submitPassword', props.comment, props.password);
     };
 
+    const handleInject = inject('isBtnPushed');
+
+    // 수정, 삭제 버튼 활성화 상태값
+    watch(
+        () => handleInject.value,
+        (newValue, oldValue) => {
+            if (newValue) {
+                if (newValue.target == props.comment.commentId) {
+                    isEditPushed.value = newValue.isEditPushed;
+                    isDeletePushed.value = newValue.isDeletePushed;
+                } else {
+                    isEditPushed.value = false;
+                    isDeletePushed.value = false;
+                }
+            }
+        },
+    );
+
     watch(
         () => props.comment.isEditTextarea,
         newVal => {

src/components/board/BoardCommentArea.vue

@@ -41,6 +41,8 @@
                             v-model="nickname"
                             placeholder="닉네임"
                             @input="clearAlert('nickname')"
+                            @keypress="noSpace"
+                            :maxlength="6"
                         />
                         <!-- 닉네임 경고 메시지 -->
                         <div v-if="nicknameAlert" class="position-absolute text-danger small top-100 start-0">
@@ -109,6 +111,10 @@
         },
     });
 
+    const noSpace = (e) => {
+        if (e.key === ' ') e.preventDefault();
+    };
+
     const $common = inject('common');
     const comment = ref('');
     const password = ref('');

src/components/board/BoardCommentList.vue

@@ -13,6 +13,8 @@
                 :currentPasswordCommentId="currentPasswordCommentId"
                 :password="password"
                 :editCommentAlert="editCommentAlert[comment.commentId]"
+                :is-edit-pushed="comment.isEditPushed"
+                :is-delete-pushed="comment.isDeletePushed"
                 @editClick="handleEditClick"
                 @deleteClick="handleDeleteClick"
                 @submitPassword="submitPassword"
@@ -40,6 +42,8 @@
                                 :passwordCommentAlert="passwordCommentAlert"
                                 :password="password"
                                 :editCommentAlert="editCommentAlert[child.commentId]"
+                                :is-edit-pushed="child.isEditPushed"
+                                :is-delete-pushed="child.isDeletePushed"
                                 @editClick="handleReplyEditClick"
                                 @deleteClick="$emit('deleteClick', child)"
                                 @submitEdit="(comment, editedContent) => $emit('submitEdit', comment, editedContent, child.commentId)"
@@ -59,7 +63,7 @@
 </template>
 
 <script setup>
-    import { defineProps, defineEmits } from 'vue';
+    import { defineProps, defineEmits, watch } from 'vue';
     import BoardComment from './BoardComment.vue';
 
     const props = defineProps({

src/components/board/BoardProfile.vue

@@ -5,7 +5,7 @@
                 <img
                     :src="getProfileImage(profileImg)"
                     alt="user"
-                    class="rounded-circle"
+                    class="rounded-circle profile-img"
                     @error="setDefaultImage($event)"
                     @load="showImage($event)"
                 />
@@ -27,8 +27,14 @@
             <!-- 수정, 삭제 버튼 -->
             <template v-if="!isDeletedComment && (unknown || isCommentAuthor || isAuthor)">
                 <div class="float-end ms-1">
-                    <EditButton @click.stop="editClick" />
-                    <DeleteButton :class="'ms-1'" @click.stop="deleteClick" />
+                    <slot name="gobackBtn"></slot>
+                    <EditButton @click.stop="editClick" :is-pushed="isEditPushed" />
+                    <DeleteButton :class="'ms-1'" @click.stop="deleteClick" :is-pushed="isDeletePushed" />
+                </div>
+            </template>
+            <template v-else>
+                <div class="float-end ms-1">
+                    <slot name="gobackBtn"></slot>
                 </div>
             </template>
 
@@ -107,6 +113,14 @@
             type: String,
             default: false,
         },
+        isEditPushed: {
+            type: Boolean,
+            require: false,
+        },
+        isDeletePushed: {
+            type: Boolean,
+            require: false,
+        },
     });
 
     const emit = defineEmits(['updateReaction', 'editClick', 'deleteClick']);

src/components/button/BoardRecommendBtn.vue

@@ -16,7 +16,7 @@
 </template>
 
 <script setup>
-    import { ref, computed } from 'vue';
+    import { ref, computed, watch } from 'vue';
 
     const props = defineProps({
         comment: {
@@ -64,6 +64,11 @@
     const likeCount = computed(() => props.comment?.likeCount ?? props.likeCount);
     const dislikeCount = computed(() => props.comment?.dislikeCount ?? props.dislikeCount);
 
+    watch([() => props.likeClicked, () => props.dislikeClicked], ([likeNewval, dislikeNewval]) => {
+        likeClicked.value = likeNewval;
+        dislikeClicked.value = dislikeNewval;
+    });
+
     const handleLike = () => {
         const isLike = !likeClicked.value;
         const isDislike = false;

src/components/button/DeleteBtn.vue

@@ -1,13 +1,14 @@
 <template>
-    <button class="btn btn-label-primary btn-icon">
-        <i class='bx bx-trash' ></i>
+    <button class="btn btn-label-primary btn-icon" :class="{ active: props.isPushed }">
+        <i class="bx bx-trash"></i>
     </button>
 </template>
 
-<script>
-export default {
-    name: 'DeleteButton',
-    methods: {
-      },
-    };
+<script setup>
+    const props = defineProps({
+        isPushed: {
+            type: Boolean,
+            required: false,
+        },
+    });
 </script>

src/components/button/EditBtn.vue

@@ -1,10 +1,10 @@
 <template>
-    <button class="btn btn-label-primary btn-icon" @click="toggleText">
+    <button class="btn btn-label-primary btn-icon" :class="{ active: props.isPushed }" @click="toggleText">
         <i :class="buttonClass"></i>
     </button>
 </template>
 <script setup>
-    import { ref, watch, defineProps, defineEmits, watchEffect } from 'vue';
+    import { ref, watch, defineEmits, watchEffect } from 'vue';
     const props = defineProps({
         isToggleEnabled: {
             type: Boolean,
@@ -14,18 +14,22 @@
             type: Boolean,
             required: false,
         },
+        isPushed: {
+            type: Boolean,
+            required: false,
+        },
     });
-    const emit = defineEmits(["click"]);
+    const emit = defineEmits(['click']);
     const buttonClass = ref('bx bx-edit-alt');
     watchEffect(() => {
         buttonClass.value = props.isActive ? 'bx bx-x' : 'bx bx-edit-alt';
     });
-    const toggleText = (event) => {
+    const toggleText = event => {
         // 이벤트 객체를 매개변수로 받아옵니다
         if (props.isToggleEnabled) {
             buttonClass.value = buttonClass.value === 'bx bx-edit-alt' ? 'bx bx-x' : 'bx bx-edit-alt';
         }
-        emit("click", event); // 이벤트 객체를 같이 전달
+        emit('click', event); // 이벤트 객체를 같이 전달
     };
     const resetButton = () => {
         buttonClass.value = 'bx bx-edit-alt';

src/components/button/ScrollTopButton.vue

@@ -1,6 +1,7 @@
 <template>
     <!-- 뒤로가기 -->
     <button
+        v-if="canGoBack"
         @click="goBack"
         :disabled="!canGoBack"
         :class="{ 'shifted': showButton }"
@@ -26,7 +27,7 @@ const showButton = ref(false);
 const canGoBack = ref(false);
 const route = useRoute();
 const router = useRouter();
-const loginPage = "/login"; // 로그인 페이지 경로
+const loginPagePath = "/login"; // 로그인 페이지 기본 경로
 
 // 스크롤 이벤트 핸들러
 const handleScroll = () => {
@@ -50,7 +51,21 @@ const updateCanGoBack = () => {
     const historyBack = router.options.history.state.back;
     const previousPage = document.referrer;
 
-    canGoBack.value = !!historyBack && historyBack !== loginPage && !previousPage.includes(loginPage);
+    // URL에서 경로만 추출하는 함수
+    const getPath = (url) => {
+        try {
+            return new URL(url, window.location.origin).pathname; // 쿼리 제거
+        } catch {
+            return ""; // 잘못된 URL 처리
+        }
+    };
+
+    const previousPath = getPath(previousPage);
+
+    // 뒤로 갈 수 있는 조건:
+    canGoBack.value = !!historyBack
+        && getPath(historyBack) !== loginPagePath
+        && !previousPath.startsWith(loginPagePath);
 };
 
 // 마운트 시 한 번 실행

src/components/commuters/CommuterBtn.vue

@@ -45,7 +45,7 @@ const props = defineProps({
     }
 });
 
-const emit = defineEmits(['workTimeUpdated', 'leaveTimeUpdated', 'projectChangeComplete']);
+const emit = defineEmits(['workTimeUpdated', 'leaveTimeUpdated', 'projectChangeComplete', 'update:pendingProjectChange']);
 
 const workTime = ref(null);
 const leaveTime  = ref(null)
@@ -171,7 +171,6 @@ const setWorkTime = async () => {
     }).then(res => {
         if (res.status === 200) {
             todayCommuterInfo();
-
             emit('workTimeUpdated', true);
         }
     });
@@ -182,7 +181,8 @@ const setLeaveTime = async () => {
     // 현재 위치 주소 가져오기
     const address = await getLocation();
 
-    if (!address) {
+
+    if (!address && !leaveTime.value) {
         // 주소를 가져오지 못했을 때도 계속 진행할지 사용자에게 확인
         if (!confirm('위치 정보를 가져오지 못했습니다. 위치 없이 퇴근 처리하시겠습니까?')) {
             return;
@@ -198,6 +198,7 @@ const setLeaveTime = async () => {
         if (res.status === 200) {
             todayCommuterInfo();
             emit('leaveTimeUpdated');
+            emit('update:pendingProjectChange', null);
         }
     });
 };
@@ -209,10 +210,6 @@ watch(() => props.userId, async () => {
     }
 });
 
-watch(() => props.checkedInProject, () => {
-    // 프로젝트가 변경되면 필요한 처리 수행
-}, { deep: true });
-
 onMounted(async () => {
     await todayCommuterInfo();
 });

src/components/commuters/CommuterCalendar.vue

@@ -4,7 +4,7 @@
             <div class="row g-0">
                 <div class="col-3 border-end text-center" id="app-calendar-sidebar">
                     <div class="card-body">
-                        <img v-if="user" :src="`${baseUrl}upload/img/profile/${user.profile}`" alt="Profile Image" class="w-px-50 h-px-50 rounded-circle" @error="$event.target.src = '/img/icons/icon.png'"/>
+                        <img v-if="user" :src="`${baseUrl}upload/img/profile/${user.profile}`" alt="Profile Image" class="w-px-50 h-px-50 rounded-circle object-fit-cover" @error="$event.target.src = '/img/icons/icon.png'"/>
                         <p class="mt-2 fw-bold">
                             {{ user.name }}
                         </p>
@@ -13,6 +13,7 @@
                             :userId="user.id"
                             :checkedInProject="checkedInProject || {}"
                             :pendingProjectChange="pendingProjectChange"
+                            @update:pendingProjectChange="pendingProjectChange = $event"
                             @workTimeUpdated="handleWorkTimeUpdate"
                             @leaveTimeUpdated="handleLeaveTimeUpdate"
                             ref="workTimeComponentRef"
@@ -59,7 +60,7 @@
                     <div class="row my-2 d-flex align-items-center">
                         <div class="col-4">
                             <img :src="`${baseUrl}upload/img/profile/${commuter.profile}`"
-                            class="rounded-circle me-2 w-px-50 h-px-50"
+                            class="me-2 w-px-50 h-px-50 rounded-circle object-fit-cover"
                             @error="$event.target.src = '/img/icons/icon.png'">
 
                             <span class="fw-bold">{{ commuter.memberName }}</span>
@@ -178,8 +179,34 @@ const handleWorkTimeUpdate = () => {
     loadCommuters();
 };
 
-const handleLeaveTimeUpdate = () => {
-    todaysCommuter();
+const handleLeaveTimeUpdate = async () => {
+    await todaysCommuter(); // 최신 출근자 목록 다시 로드
+
+    // 현재 사용자의 퇴근 기록이 null인지 확인
+    const currentUserCommuter = commuters.value.find(c => c.MEMBERSEQ === user.value.id);
+    if (currentUserCommuter && !currentUserCommuter.COMMUTLVE) {
+        await projectStore.getMemberProjects();
+
+        if (projectStore.activeMemberProjectList.length > 0) {
+            const previousProject = projectStore.activeMemberProjectList.find(
+                p => commuters.value.some(c => c.MEMBERSEQ === user.value.id && c.PROJCTLVE === p.PROJCTSEQ)
+            ) || projectStore.activeMemberProjectList[0]; // 이전 출근 프로젝트가 없으면 첫 번째 프로젝트
+
+            if (previousProject) {
+                selectedProject.value = previousProject.PROJCTSEQ;
+                projectStore.setSelectedProject(previousProject);
+            } else if (projectStore.activeProjectList.length > 0) {
+                selectedProject.value = projectStore.activeProjectList[0].PROJCTSEQ;
+                projectStore.setSelectedProject(projectStore.activeProjectList[0]);
+            } else {
+                selectedProject.value = null;
+                projectStore.setSelectedProject(null);
+            }
+        } else {
+            selectedProject.value = null;
+            projectStore.setSelectedProject(null);
+        }
+    }
 };
 
 // 프로젝트 드롭 이벤트 핸들러 (ProjectList 컴포넌트에서 전달받음)
@@ -206,6 +233,11 @@ const handleProjectDrop = ({ event, targetProject }) => {
             ? { ...commuter, PROJCTNAM: targetProject.PROJCTNAM, PROJCTLVE: targetProject.PROJCTSEQ }
             : commuter
     );
+
+    // 드롭 후 CommuterBtn 컴포넌트의 상태를 업데이트 (출근/퇴근 버튼 상태 변경)
+    if (workTimeComponentRef.value && workTimeComponentRef.value.fetchWorkTime) {
+        workTimeComponentRef.value.fetchWorkTime();
+    }
 };
 
 // 오늘 출근 모든 사용자 조회
@@ -367,7 +399,7 @@ const loadCommuters = async () => {
                     // 프로필 이미지 생성
                     const profileImg = document.createElement('img');
                     profileImg.src = `${baseUrl}upload/img/profile/${commuter.profile}`;
-                    profileImg.className = 'rounded-circle w-px-20 h-px-20 mx-1 mb-1 position-relative z-5 m-auto';
+                    profileImg.className = 'rounded-circle w-px-20 h-px-20 mx-1 mb-1 position-relative z-5 m-auto object-fit-cover';
                     profileImg.style.border = `2px solid ${commuter.projctcolor}`;
                     profileImg.onerror = () => { profileImg.src = '/img/icons/icon.png'; };
 
@@ -431,12 +463,17 @@ watch(() => projectStore.selectedProject, (newProject) => {
     if (newProject) {
         selectedProject.value = newProject.PROJCTSEQ;
         checkedInProject.value = newProject;
+    } else {
+        selectedProject.value = null;
+        checkedInProject.value = null;
     }
 });
 
 // 모달 닫기
 const closeModal = () => {
     isModalOpen.value = false;
+
+    visiblePopover.value = { type: null, index: null };
 };
 
 // MapPopover에서 visible 상태 변경 이벤트 처리
@@ -465,10 +502,11 @@ onMounted(async () => {
     await todaysCommuter();
 
     // 저장된 선택 프로젝트 가져오기
-    const storedProject = projectStore.getSelectedProject();
-    if (storedProject) {
-        selectedProject.value = storedProject.PROJCTSEQ;
-        checkedInProject.value = storedProject;
+    if (projectStore.activeMemberProjectList.length > 0) {
+        const initialProject = projectStore.getSelectedProject() || projectStore.activeMemberProjectList[0];
+        selectedProject.value = initialProject?.PROJCTSEQ || null;
+        projectStore.setSelectedProject(initialProject);
+        checkedInProject.value = initialProject;
     }
 
     datePickerStore.initDatePicker(

src/components/commuters/CommuterProjectList.vue

@@ -23,7 +23,7 @@
                         <img
                             :src="`${baseUrl}upload/img/profile/${commuter.profile}`"
                             alt="User Profile"
-                            class="rounded-circle"
+                            class="rounded-circle object-fit-cover"
                             :class="isCurrentUser(commuter) ? 'cursor-pointer' : ''"
                             :draggable="isCurrentUser(commuter)"
                             @dragstart="isCurrentUser(commuter) ? dragStart($event, post) : null"

src/components/editor/QEditor.vue

@@ -41,6 +41,7 @@
 
             <button class="ql-link">Link</button>
             <button class="ql-image">Image</button>
+            <button class="ql-video">Video</button>
             <button class="ql-blockquote">Blockquote</button>
             <button class="ql-code-block">Code Block</button>
         </div>
@@ -54,8 +55,11 @@
 <script setup>
     import Quill from 'quill';
     import 'quill/dist/quill.snow.css';
-    import { onMounted, ref, watch, defineEmits, defineProps } from 'vue';
     import $api from '@api';
+    import { onMounted, ref, watch, defineEmits, defineProps } from 'vue';
+    import { useToastStore } from '@s/toastStore';
+
+    const toastStore = useToastStore();
 
     const props = defineProps({
         isAlert: {
@@ -131,6 +135,38 @@
             initCheckImageIndex();
         }
 
+        // 영상 넣기
+        quillInstance.getModule('toolbar').addHandler('video', () => {
+            const url = prompt('YouTube 영상 URL을 입력하세요:');
+            let src = '';
+            if (!url || url.trim() == '') return;
+
+            // 일반 youtube url
+            if (url.indexOf('watch?v=') !== -1) {
+                src = url.replace('watch?v=', 'embed/');
+
+                // youtu.be 단축 URL  (ex : https://youtu.be/CfiojceAaeQ?si=G7eM56sdDjIEw-Tz)
+            } else if (url.indexOf('youtu.be/') !== -1) {
+                const videoId = url.split('youtu.be/')[1].split('?')[0];
+                src = `https://www.youtube.com/embed/${videoId}`;
+
+                // iframe 주소
+            } else if (url.indexOf('<iframe') !== -1) {
+                // DOMParser를 사용하여 embeded url만 추출
+                const parser = new DOMParser();
+                const doc = parser.parseFromString(url, 'text/html');
+                const iframeEL = doc.querySelector('iframe');
+                src = iframeEL.getAttribute('src');
+            } else {
+                toastStore.onToast('지원하는 영상 타입 아님', 'e');
+                return;
+            }
+
+            const index = quillInstance.getSelection().index;
+            quillInstance.insertEmbed(index, 'video', src);
+            quillInstance.setSelection(index + 1);
+        });
+
         // 이미지 업로드 기능 처리
         let imageUrls = new Set(); // 업로드된 이미지 URL을 추적
         quillInstance.getModule('toolbar').addHandler('image', () => {

src/components/input/FormSelect.vue

@@ -4,28 +4,37 @@
             {{ title }}
             <span v-if="isEssential" class="link-danger">*</span>
         </label>
-        <div :class="isRow ? 'col-md-10' : 'col-md-12'" class="d-flex gap-2 align-items-center">
-            <select class="form-select" :id="name" v-model="selectData" :disabled="disabled" :style="isColor ? { color: selected } : {}" @blur="$emit('blur')">
-                <option v-for="(item, i) in data" :key="i" :value="isCommon ? item.value : i" :style="isColor ? { color: item.label } : {}">
-                    {{ isCommon ? item.label : item }}
-                </option>
-            </select>
-            <div v-if="isBtn" class="ms-2">
-                    <slot name="append"></slot>
+        <div :class="isRow ? 'col-md-10' : 'col-md-12'">
+            <div class="d-flex gap-2 align-items-center">
+                <select v-if="isColor && (!data || data.length === 0)" class="form-select" disabled>
+                    <option>사용가능한 컬러가 없습니다</option>
+                </select>
+
+                <!-- 데이터가 있는 경우 원래 select 표시 -->
+                <select v-else class="form-select" :id="name" v-model="selectData" :disabled="disabled" :style="isColor ? { color: selected } : {}" @blur="$emit('blur')">
+                    <option v-for="(item, i) in data" :key="i" :value="isCommon ? item.value : i" :style="isColor ? { color: item.label } : {}">
+                        {{ isCommon ? item.label : item }}
+                    </option>
+                </select>
+
+                <div v-if="isBtn" class="ms-2">
+                        <slot name="append"></slot>
+                </div>
+
+                <div v-if="isColor && selected"
+                        class="w-px-40 h-px-30"
+                        :style="{backgroundColor: selected}">
+                </div>
+
+                <img v-if="isMbti && selected"
+                    role="img"
+                    class="w-px-30 h-px-40"
+                    :src="`/img/mbti/${selected.toLowerCase()}.png`"
+                    alt="MBTI image"/>
             </div>
 
-            <div v-if="isColor && selected"
-                    class="w-px-40 h-px-30"
-                    :style="{backgroundColor: selected}">
-            </div>
-
-            <img v-if="isMbti && selected"
-                role="img"
-                class="w-px-30 h-px-40"
-                :src="`/img/mbti/${selected.toLowerCase()}.png`"
-                alt="MBTI image"/>
+            <div class="invalid-feedback" :class="isAlert ? 'd-block' : ''">{{ title }}를 확인해주세요.</div>
         </div>
-        <div v-if="isAlert" class="invalid-feedback">{{ title }}을 확인해주세요.</div>
     </div>
 </template>
 

src/components/input/UserFormInput.vue

@@ -14,7 +14,7 @@
                     :value="computedValue"
                     :disabled="disabled"
                     :maxLength="maxlength"
-                    :placeholder="title"
+                    :placeholder="placeholder ? placeholder : title"
                     @blur="$emit('blur')"
                 />
                 <span class="input-group-text">@ localhost.co.kr</span>
@@ -29,7 +29,7 @@
                     :value="computedValue"
                     :disabled="disabled"
                     :maxLength="maxlength"
-                    :placeholder="title"
+                    :placeholder="placeholder ? placeholder : title"
                     @blur="$emit('blur')"
                     @click="handleDateClick"
                     ref="inputElement"
@@ -89,6 +89,10 @@
             default: false,
             required: false,
         },
+        placeholder: {
+            type: String,
+            default: ''
+        },
     });
 
     const emits = defineEmits(['update:data', 'update:alert', 'blur']);

src/components/list/ProjectCard.vue

@@ -3,7 +3,7 @@
         <div class="row g-0">
             <div class="card-body">
                 <!-- 제목 -->
-                <div class="d-flex justify-content-between ">
+                <div class="d-flex justify-content-between">
                     <h5 class="card-title fw-bold">
                         {{ title }}
                     </h5>
@@ -12,42 +12,62 @@
                         <DeleteBtn v-if="isProjectCreator" @click.stop="handleDelete" class="ms-1"/>
                     </div>
                 </div>
+
                 <!-- 날짜 -->
-                <div class="d-flex flex-sm-row align-items-center pb-2">
-                    <i class="bx bx-calendar"></i>
-                    <div class="ms-2">날짜</div>
-                    <div class="ms-12">{{ strdate }} ~ {{ enddate }}</div>
-                </div>
-                <!-- 참여자 -->
-                <div class="d-flex flex-sm-row align-items-center pb-2">
-                    <i class="bx bxs-user"></i>
-                    <div class="ms-2">참여자</div>
-                    <UserList ref="userListRef" :projctSeq="projctSeq" :showOnlyActive="true" class="ms-8 mb-0" />
-                </div>
-                <!-- 설명 -->
-                <div class="d-flex flex-sm-row align-items-center pb-2">
-                    <i class="bx bx-detail"></i>
-                    <div class="ms-2">설명</div>
-                    <div class="ms-12">{{ description }}</div>
-                </div>
-                <!-- 주소 -->
-                <div class="d-flex flex-sm-row align-items-center pb-2">
-                    <MapPopover
-                        :address="address"
-                        :is-visible="isMapVisible"
-                        @update-visible="updatePopover"
-                    >
-                        <template #trigger>
-                            <div class="d-flex align-items-center cursor-pointer">
-                                <i class="bx bxs-map"></i>
-                                <div class="ms-2">주소</div>
-                            </div>
-                        </template>
-                    </MapPopover>
-                    <div class="ms-12">
-                        {{ address }} {{ addressdtail }}
+                <div class="row align-items-center pb-2">
+                    <div class="col-3 col-md-2 d-flex align-items-center">
+                        <i class="bx bx-calendar"></i>
+                        <div class="ms-2">날짜</div>
+                    </div>
+                    <div class="col-9 col-md-10">
+                        {{ strdate }} ~ {{ enddate }}
+                    </div>
+                </div>
+
+                <!-- 참여자 -->
+                <div class="row align-items-center pb-2">
+                    <div class="col-3 col-md-2 d-flex align-items-center">
+                        <i class="bx bxs-user"></i>
+                        <div class="ms-2">참여자</div>
+                    </div>
+                    <div class="col-9 col-md-10">
+                        <UserList ref="userListRef" :projctSeq="projctSeq" :showOnlyActive="true" class="mb-0" />
+                    </div>
+                </div>
+
+                <!-- 설명 -->
+                <div class="row align-items-center pb-2">
+                    <div class="col-3 col-md-2 d-flex align-items-center">
+                        <i class="bx bx-detail"></i>
+                        <div class="ms-2">설명</div>
+                    </div>
+                    <div class="col-9 col-md-10">
+                        {{ description || '-' }}
+                    </div>
+                </div>
+
+                <!-- 주소 -->
+                <div class="row align-items-center pb-2">
+                    <div class="col-3 col-md-2 d-flex align-items-center">
+                        <MapPopover
+                            :address="address"
+                            :is-visible="isMapVisible"
+                            @update-visible="updatePopover"
+                        >
+                            <template #trigger>
+                                <div class="d-flex align-items-center cursor-pointer">
+                                    <i class="bx bxs-map"></i>
+                                    <div class="ms-2">주소</div>
+                                </div>
+                            </template>
+                        </MapPopover>
+                    </div>
+                    <div class="col-9 col-md-10 d-flex justify-content-between align-items-center">
+                        <div>{{ address }} {{ addressdtail }}</div>
+                        <button type="button" class="btn text-white" :style="`background-color: ${projctColor} !important;`" @click.stop="openModal">
+                            <i class='bx bx-child'></i>
+                        </button>
                     </div>
-                    <button type="button" class="btn ms-auto text-white" :style="`background-color: ${projctColor} !important;`" @click.stop="openModal"><i class='bx bx-child'></i></button>
                 </div>
             </div>
         </div>
@@ -521,17 +541,19 @@ const handleUpdate = async () => {
 
 // 프로젝트 삭제
 const handleDelete = () => {
-    $api.patch('project/delete', {
-        projctSeq: props.projctSeq,
-        projctCol: props.projctCol,
-    })
-    .then(res => {
-        if (res.status === 200) {
-            toastStore.onToast('삭제가 완료되었습니다.', 's');
-            projectStore.getProjectList();
-            projectStore.getMemberProjects();
-        }
-    })
+    if (confirm('프로젝트를 삭제하시겠습니까?')) {
+        $api.patch('project/delete', {
+            projctSeq: props.projctSeq,
+            projctCol: props.projctCol,
+        })
+        .then(res => {
+            if (res.status === 200) {
+                toastStore.onToast('프로젝트가 삭제되었습니다.', 's');
+                projectStore.getProjectList();
+                projectStore.getMemberProjects();
+            }
+        })
+    }
 };
 
 // 컴포넌트 마운트 시 실행

src/components/main/BoardMain.vue

@@ -1,18 +1,27 @@
 <template>
 <div class="col-md-6 col-lg-4 col-xl-4 order-0 mb-6">
     <div class="card text-center h-100">
+        <!-- 더보기 버튼 -->
+        <div class="d-flex">
+            <router-link
+            :to="{ name: 'BoardList', query: { type: selectedBoard } }"
+            class="btn btn-primary mr-1 pe-1 ps-1 ms-auto my-auto h-50"
+            >
+            more
+            </router-link>
+        </div>
         <div class="card-body">
         <!-- 모달 본문 -->
-        <div class="modal-bod mt-3">
+        <div class="modal-body">
             <!-- 탭 버튼 영역 -->
-            <div class="btn-group mb-3" role="group">
+            <div class="btn-group mb-5" role="group">
                 <button
                     type="button"
                     class="btn"
                     :class="selectedBoard === 'notices' ? 'btn-primary' : 'btn-outline-primary'"
                     @click="changeBoard('notices')"
                 >
-                    공지사항
+                    공지
                 </button>
                 <button
                     type="button"
@@ -20,7 +29,7 @@
                     :class="selectedBoard === 'general' ? 'btn-primary' : 'btn-outline-primary'"
                     @click="changeBoard('general')"
                 >
-                    자유게시판
+                    자유
                 </button>
                 <button
                     type="button"
@@ -28,21 +37,25 @@
                     :class="selectedBoard === 'anonymous' ? 'btn-primary' : 'btn-outline-primary'"
                     @click="changeBoard('anonymous')"
                 >
-                    익명게시판
+                    익명
                 </button>
                 </div>
                 <!-- 게시글 미리보기 테이블 -->
                 <table class="table">
                 <thead>
                     <tr>
-                    <!-- 익명게시판은 'nickname', 나머지는 'writer' -->
-                    <th class="text-center" style="width: 20%;">
-                        {{ selectedBoard === 'anonymous' ? 'nickname' : 'writer' }}
+                    <!-- 익명게시판은 '닉네임', 나머지는 '작성자' -->
+                    <th class="text-start">
+                        <div class="ms-4">
+                        {{ selectedBoard === 'anonymous' ? '닉네임' : '작성자' }}
+                        </div>
                     </th>
-                    <!-- 제목 헤더는 왼쪽 정렬 -->
-                    <th class="text-start" style="width: 65%;">title</th>
-                    <th class="text-center" style="width: 15%;">views</th>
-                    </tr>
+                    <th class="text-start" style="width: 65%;">
+                        <div class="ms-4">
+                            제목
+                        </div>
+                    </th>
+                </tr>
                 </thead>
                 <tbody>
                     <tr
@@ -51,26 +64,31 @@
                     style="cursor: pointer;"
                     @click="goDetail(post.id, selectedBoard)"
                     >
-                    <td class="text-center">
+                    <td class="text-start nickname-ellipsis small">
+                        <div class="ms-4">
                         {{ selectedBoard === 'anonymous' ? post.nickname : post.author }}
+                        </div>
                     </td>
-                    <td class="text-start">
-                        <div>
+                    <td class="text-start fs-6">
+                        <div class="ms-4">
                         {{ truncateTitle(post.title) }}
-                        <span v-if="post.commentCount" class="text-danger ml-1">
+                        <span v-if="post.commentCount" class="text-danger ml-1 small">
                             [{{ post.commentCount }}]
                         </span>
-                        <i v-if="post.img" class="bi bi-image mx-1"></i>
+                        <i v-if="post.img" class="bi bi-image mx-1 small"></i>
                         <i
                         v-if="post.hasAttachment.length > 0"
-                        class="bi bi-paperclip ml-1"
+                        class="bi bi-paperclip ml-1 small"
                         ></i>
-                        </div>
-                        <div class="text-muted small">
+
+                        <div class="text-muted small small">
                         {{ post.date }}
+                        <span class="ms-1">
+                        <i class="fa-regular fa-eye small me-1"></i>{{post.views}}
+                        </span>
                         </div>
+                    </div>
                     </td>
-                    <td class="text-center">{{ post.views }}</td>
                     </tr>
                     <tr v-if="currentList.length === 0">
                     <td colspan="3" class="text-center text-muted">게시물이 없습니다.</td>
@@ -78,15 +96,6 @@
                 </tbody>
                 </table>
             </div>
-            <!-- 모달 푸터: 더보기 버튼 오른쪽 정렬 -->
-            <div class="modal-foote d-flex">
-                <router-link
-                :to="{ name: 'BoardList', query: { type: selectedBoard } }"
-                class="btn btn-primary mr-1 pe-1 ps-1 ms-auto my-auto h-50"
-                >
-                more
-                </router-link>
-            </div>
         </div>
     </div>
 </div>
@@ -119,97 +128,97 @@ const anonymousList = ref([]);
 
 // 선택된 게시판에 따른 미리보기 목록 computed
 const currentList = computed(() => {
-if (selectedBoard.value === 'notices') return noticeList.value;
-if (selectedBoard.value === 'general') return freeList.value;
-if (selectedBoard.value === 'anonymous') return anonymousList.value;
-return [];
+    if (selectedBoard.value === 'notices') return noticeList.value;
+    if (selectedBoard.value === 'general') return freeList.value;
+    if (selectedBoard.value === 'anonymous') return anonymousList.value;
+    return [];
 });
 
 // 날짜 포맷 함수: 오늘이면 HH:mm, 아니면 YYYY-MM-DD
 const formatDate = dateString => {
-const date = dayjs(dateString);
-return date.isToday() ? date.format('HH:mm') : date.format('YYYY-MM-DD');
+    const date = dayjs(dateString);
+    return date.isToday() ? date.format('HH:mm') : date.format('YYYY-MM-DD');
 };
 
 // 제목이 14글자 넘어가면 ... 처리하는 함수
 const truncateTitle = title => {
-return title.length > 8 ? title.slice(0, 8) + '...' : title;
+    return title.length > 7 ? title.slice(0, 7) + '...' : title;
 };
 
 // 공지사항 데이터 로드 (최대 5개)
 const fetchNoticePosts = async () => {
-try {
-    const { data } = await axios.get('board/notices', { params: { size: 5 } });
-    if (data?.data) {
-    noticeList.value = data.data.map(post => ({
-        id: post.id,
-        title: post.title,
-        date: formatDate(post.date),
-        rawDate: post.date,
-        views: post.cnt || 0,
-        commentCount: post.commentCount,
-        img: post.firstImageUrl,
-        author: post.author || '관리자',
-        nickname: post.nickname || '관리자',
-        hasAttachment: post.hasAttachment, // 첨부파일 유무
-    }));
+    try {
+        const { data } = await axios.get('board/notices', { params: { size: 8 } });
+        if (data?.data) {
+            noticeList.value = data.data.map(post => ({
+                id: post.id,
+                title: post.title,
+                date: formatDate(post.date),
+                rawDate: post.date,
+                views: post.cnt || 0,
+                commentCount: post.commentCount,
+                img: post.firstImageUrl,
+                author: post.author || '관리자',
+                nickname: post.nickname || '관리자',
+                hasAttachment: post.hasAttachment, // 첨부파일 유무
+            }));
+        }
+    } catch (error) {
     }
-} catch (error) {
-}
 };
 
 // board/general 게시글 로드 후 자유게시판과 익명게시판으로 분리 (최대 10개 조회 → 각각 최대 5개)
 const fetchGeneralPosts = async () => {
-try {
-    const { data } = await axios.get('board/general', { params: { size: 10 } });
-    if (data?.data && data.data.list) {
-    const freePosts = [];
-    const anonymousPosts = [];
-    data.data.list.forEach(post => {
-        if (post.nickname) {
-        // 닉네임이 있으면 익명게시판 데이터
-        anonymousPosts.push({
-            id: post.id,
-            title: post.title,
-            date: formatDate(post.date),
-            img: post.firstImageUrl,
-            rawDate: post.date,
-            views: post.cnt || 0,
-            commentCount: post.commentCount,
-            nickname: post.nickname,
-            hasAttachment: post.hasAttachment, // 첨부파일 유무
-        });
-        } else {
-        // 닉네임이 없으면 자유게시판 데이터
-        freePosts.push({
-            id: post.id,
-            title: post.title,
-            date: formatDate(post.date),
-            rawDate: post.date,
-            views: post.cnt || 0,
-            img: post.firstImageUrl,
-            commentCount: post.commentCount,
-            author: post.author || '익명',
-            hasAttachment: post.hasAttachment, // 첨부파일 유무
+    try {
+        const { data } = await axios.get('board/general', { params: { size: 16 } });
+        if (data?.data && data.data.list) {
+        const freePosts = [];
+        const anonymousPosts = [];
+        data.data.list.forEach(post => {
+            if (post.nickname) {
+            // 닉네임이 있으면 익명게시판 데이터
+            anonymousPosts.push({
+                id: post.id,
+                title: post.title,
+                date: formatDate(post.date),
+                img: post.firstImageUrl,
+                rawDate: post.date,
+                views: post.cnt || 0,
+                commentCount: post.commentCount,
+                nickname: post.nickname,
+                hasAttachment: post.hasAttachment, // 첨부파일 유무
+            });
+            } else {
+            // 닉네임이 없으면 자유게시판 데이터
+            freePosts.push({
+                id: post.id,
+                title: post.title,
+                date: formatDate(post.date),
+                rawDate: post.date,
+                views: post.cnt || 0,
+                img: post.firstImageUrl,
+                commentCount: post.commentCount,
+                author: post.author || '익명',
+                hasAttachment: post.hasAttachment, // 첨부파일 유무
+            });
+            }
         });
+        freeList.value = freePosts.slice(0, 8);
+        anonymousList.value = anonymousPosts.slice(0, 8);
         }
-    });
-    freeList.value = freePosts.slice(0, 5);
-    anonymousList.value = anonymousPosts.slice(0, 5);
+    } catch (error) {
+        console.error(error);
     }
-} catch (error) {
-    console.error(error);
-}
 };
 
 // 탭 변경 함수
 const changeBoard = type => {
-selectedBoard.value = type;
+    selectedBoard.value = type;
 };
 
 // 상세 페이지 이동 (게시판 타입 전달)
 const goDetail = (id, boardType) => {
-router.push({ name: 'BoardDetail', params: { id }, query: { type: boardType } });
+    router.push({ name: 'BoardDetail', params: { id }, query: { type: boardType } });
 };
 
 // 모달이 열릴 때 데이터 로드
@@ -219,12 +228,6 @@ fetchGeneralPosts();
 
 <style scoped>
 .table > :not(caption) > * > * {
-padding: 0 !important;
-}
-.ml-1 {
-margin-left: 0.25rem;
-}
-.mr-1{
-margin-right: 0.25rem;
+    padding: 0 !important;
 }
 </style>

src/components/main/EventModal.vue

@@ -28,10 +28,30 @@
                     placeholder="장소"
                     v-model="eventPlace"
                     maxlength="20"
+                    @input="handleChangeInput"
                 />
+                <span v-if="noInputAlert" class="invalid-feedback d-block" style="padding-left: 5px">{{ noInputAlert }}</span>
             </div>
             <div class="mb-2">
-                <input type="time" class="form-control form-control-sm py-1" style="height: 25px; font-size: 12px" v-model="eventTime" />
+                <div @click="focusPicker">
+                    <input
+                        type="time"
+                        class="form-control form-control-sm py-1"
+                        style="height: 0%; font-size: 12px"
+                        v-model="eventTime"
+                        @input="handleChangeInput2"
+                    />
+                </div>
+
+                <input
+                    ref="timeInput"
+                    type="time"
+                    class="hidden-time-input"
+                    style="height: 0%; font-size: 12px"
+                    v-model="eventTime"
+                    @input="handleChangeInput2"
+                />
+                <span v-if="noInputAlert2" class="invalid-feedback d-block" style="padding-left: 5px">{{ noInputAlert2 }}</span>
             </div>
             <div class="text-end">
                 <button class="btn btn-primary btn-sm py-1" style="font-size: 12px; height: 25px; line-height: 1" @click="handleSubmit">
@@ -70,6 +90,16 @@
     const selectedEventType = ref(null);
     const eventPlace = ref('');
     const eventTime = ref('');
+    const noInputAlert = ref(null);
+    const noInputAlert2 = ref(null);
+    const timeInput = ref(null);
+
+    const focusPicker = () => {
+        if (timeInput.value) {
+            timeInput.value.showPicker(); // 달력 자동 열기 (일부 브라우저에서 지원)
+            timeInput.value.focus(); // 포커스 이동
+        }
+    };
 
     const eventTypes = [
         { type: 'birthdayParty', code: '300203', title: '생일파티' },
@@ -79,8 +109,6 @@
     ];
 
     const getEventTitle = type => {
-        console.log('type: ', type);
-        console.log('event.type: ', eventTypes);
         return eventTypes.find(event => event.code === type)?.title || '';
     };
 
@@ -99,22 +127,50 @@
             }
         } else {
             selectedEventType.value = event.code;
+            noInputAlert.value = '';
+            noInputAlert2.value = '';
         }
     };
 
     const handleSubmit = () => {
-        if (!eventPlace.value || !eventTime.value) {
-            alert('장소와 시간을 모두 입력해주세요');
-            return;
+        if (isValid()) {
+            emit('insert', {
+                date: props.selectedDate,
+                code: selectedEventType.value,
+                title: getEventTitle(selectedEventType.value),
+                place: eventPlace.value.trim(),
+                time: eventTime.value,
+            });
+        }
+    };
+
+    // 유효성 검사
+    const isValid = () => {
+        let isValid = true;
+
+        if (!eventPlace.value.trim()) {
+            noInputAlert.value = '장소를 입력해 주세요';
+            isValid = false;
+        } else {
+            noInputAlert.value = '';
         }
 
-        emit('insert', {
-            date: props.selectedDate,
-            code: selectedEventType.value,
-            title: getEventTitle(selectedEventType.value),
-            place: eventPlace.value,
-            time: eventTime.value,
-        });
+        if (!eventTime.value) {
+            noInputAlert2.value = '시간을 입력해 주세요';
+            isValid = false;
+        } else {
+            noInputAlert2.value = '';
+        }
+
+        return isValid;
+    };
+
+    const handleChangeInput = () => {
+        noInputAlert.value = null;
+    };
+
+    const handleChangeInput2 = () => {
+        noInputAlert2.value = null;
     };
 
     const resetForm = () => {

src/components/main/MainEventBoard.vue

@@ -1,8 +1,8 @@
 <template>
-    <div class="ps-2">
-        <span class="d-flex align-items-center g-2 font_767"><i class="bx bx-map pe-1"></i>{{ place }}</span>
+    <div class="ps-2" style="font-size: 13px">
+        <span class="d-flex align-items-center g-2 font_767"><i class="bx bxs-map pe-1"></i>{{ place }}</span>
         <span class="d-flex align-items-center g-2 font_767"
-            ><i class="bx bx-time-five pe-1"></i>{{ $common.dateFormatter(time, 'T') }}</span
+            ><i class="bx bxs-time-five pe-1"></i>{{ $common.dateFormatter(time, 'T') }}</span
         >
     </div>
 </template>

src/components/main/MainEventCalendar.vue

@@ -5,16 +5,23 @@
                 <div class="card-body">
                     <img
                         v-if="user"
-                        :src="`${baseUrl}upload/img/profile/${user.profile}`"
+                        :src="`${profileImgUrl}profile/${user.profile}`"
                         alt="Profile Image"
-                        class="w-px-50 h-px-50 rounded-circle"
+                        class="w-px-50 h-px-50 rounded-circle profile-img"
                         @error="$event.target.src = '/img/icons/icon.png'"
                     />
                     <p class="mt-2 fw-bold">
                         {{ user.name }}
                     </p>
 
-                    <CommuterBtn :userId="user.id" :checkedInProject="checkedInProject || {}" ref="workTimeComponentRef" />
+                    <CommuterBtn
+                        ref="workTimeComponentRef"
+                        :userId="user.id"
+                        :checkedInProject="checkedInProject || {}"
+                        :pendingProjectChange="pendingProjectChange"
+                        @update:pendingProjectChange="pendingProjectChange = $event"
+                        @leaveTimeUpdated="handleLeaveTimeUpdate"
+                    />
 
                     <MainEventList
                         :categoryList="categoryList"
@@ -25,6 +32,7 @@
                         :dinnerList="dinnerList"
                         :teaTimeList="teaTimeList"
                         :workShopList="workShopList"
+                        @handle-click-vacation="handleClickVacation"
                     />
                 </div>
             </div>
@@ -40,6 +48,7 @@
                             class="flatpickr-calendar-only"
                         >
                         </full-calendar>
+                        <input ref="calendarDatepicker" type="text" class="d-none" />
                     </div>
                 </div>
             </div>
@@ -60,11 +69,15 @@
 </template>
 
 <script setup>
-    import { inject, onMounted, reactive, ref, watch } from 'vue';
+    import { inject, onMounted, reactive, ref, watch, nextTick } from 'vue';
     import { fetchHolidays } from '@c/calendar/holiday';
     import { useUserInfoStore } from '@/stores/useUserInfoStore';
     import { useProjectStore } from '@/stores/useProjectStore';
     import { useToastStore } from '@s/toastStore';
+    import { useWeatherStore } from '@/stores/useWeatherStore';
+    import { useDatePicker } from '@/stores/useDatePicker';
+    import { storeToRefs } from 'pinia';
+    import router from '@/router';
     import FullCalendar from '@fullcalendar/vue3';
     import dayGridPlugin from '@fullcalendar/daygrid';
     import interactionPlugin from '@fullcalendar/interaction';
@@ -76,17 +89,24 @@
     import '@/assets/css/app-calendar.css';
 
     const baseUrl = import.meta.env.VITE_DOMAIN;
+    const profileImgUrl = import.meta.env.VITE_SERVER_IMG_URL;
     const user = ref({});
     const userStore = useUserInfoStore();
     const projectStore = useProjectStore();
+    const weatherStore = useWeatherStore();
+    const datePickerStore = useDatePicker();
+    const { dailyWeatherList } = storeToRefs(weatherStore);
 
     const dayjs = inject('dayjs');
     const fullCalendarRef = ref(null);
     const workTimeComponentRef = ref(null);
     const calendarEvents = ref([]);
+    const calendarDatepicker = ref(null);
+    //const dailyWeatherList = ref([]);
 
     const selectedProject = ref(null);
     const checkedInProject = ref(null);
+    const pendingProjectChange = ref(null);
 
     // 이벤트 모달 관련
     const showModal = ref(false);
@@ -134,7 +154,7 @@
 
         // 기존의 공휴일 이벤트는 유지
         const holidayEvents = calendarEvents.value.filter(event => event.classNames?.includes('holiday-event'));
-        calendarEvents.value = [...holidayEvents];
+        calendarEvents.value = [...holidayEvents, ...dailyWeatherList.value];
 
         // 생일자
         if (res?.memberBirthdayList?.length) {
@@ -156,7 +176,7 @@
         monthBirthdayPartyList.value = [];
         monthDinnerList.value = [];
         monthTeaTimeList.value = [];
-        monthTeaTimeList.value = [];
+        monthWorkShopList.value = [];
 
         if (res?.eventList?.length) {
             res.eventList.forEach(item => {
@@ -292,7 +312,7 @@
     // 날짜 선택 가능 여부를 확인하는 공통 함수
     const isSelectableDate = date => {
         const checkDate = dayjs(date);
-        const isWeekend = checkDate.day() === 0 || checkDate.day() === 6;
+        const isWeekend = checkDate.day() === 0 || checkDate.day() === 6; // 주말체크
         // 공휴일 체크
         const isHoliday = calendarEvents.value.some(
             event =>
@@ -310,6 +330,9 @@
         // 선택 불가능한 날짜(과거, 주말, 공휴일)에 동일한 클래스 추가
         if (!isSelectableDate(cellDate)) {
             classes.push('fc-day-sat-sun');
+        } else {
+            // 선택 가능한 날짜 포인터 클래스 추가
+            classes.push('clickable');
         }
 
         return classes;
@@ -318,7 +341,7 @@
     // 날짜 클릭 이벤트 핸들러
     let todayEL = null;
     const handleDateClick = info => {
-        if (isSelectableDate(info)) {
+        if (isSelectableDate(info.date)) {
             if ($common.isToday(info.date)) {
                 // 오늘 날짜 클릭 시 클래스 제거하고 요소 저장
                 todayEL = info.dayEl;
@@ -333,6 +356,11 @@
         useFilterEventList(month, day);
     };
 
+    // 오늘 날짜 노란색 배경 복구
+    const colorToday = e => {
+        if (todayEL != null && !todayEL.classList.contains('fc-day-today')) todayEL.classList.add('fc-day-today');
+    };
+
     // 이벤트 모달 핸들러
     const handleMouseDown = (date, jsEvent) => {
         if (showModal.value) showModal.value = false;
@@ -490,10 +518,13 @@
         selectAllow: selectInfo => isSelectableDate(selectInfo.start),
         dateClick: handleDateClick,
         dayCellDidMount: arg => {
+            // 날씨 정보 업데이트
+            addWeatherInfo(arg);
             const dateCell = arg.el;
 
             // 마우스 홀드시 이벤트 모달
             dateCell.addEventListener('mousedown', e => {
+                if (!isSelectableDate(arg.date)) return; // 공휴일 제외
                 const date = $common.dateFormatter(arg.date, 'YMD');
                 handleMouseDown(date, e);
             });
@@ -520,6 +551,53 @@
         },
     });
 
+    // 날짜 정보 업데이트
+    const addWeatherInfo = arg => {
+        const dateStr = $common.dateFormatter(arg.date, 'YMD');
+        // 해당 셀의 날짜와 일치하는 데이터
+        const theDayWeatherInfo = dailyWeatherList.value.find(weather => weather.date === dateStr);
+        const dayTopEl = arg.el.querySelector('.fc-daygrid-day-top');
+        const isWeatherInfoExist = dayTopEl.getElementsByClassName('weather-icon').length > 0; // 중복 방지
+
+        if (theDayWeatherInfo && !isWeatherInfoExist) {
+            let weatherIconUrl = `https://openweathermap.org/img/wn/${theDayWeatherInfo.icon}.png`;
+            if (theDayWeatherInfo.icon === '01d' || theDayWeatherInfo.icon === '01n') {
+                weatherIconUrl = '/img/icons/sunny-custom.png';
+            }
+            // 날씨 이미지 세팅
+            const weatherEl = document.createElement('img');
+            weatherEl.src = weatherIconUrl;
+            weatherEl.alt = theDayWeatherInfo.description;
+            weatherEl.className = 'weather-icon';
+            weatherEl.style.width = '28px';
+            weatherEl.style.height = '28px';
+
+            // 해당 셀에 이미지 넣기
+            dayTopEl.classList.add('align-items-center');
+            dayTopEl.prepend(weatherEl); // 이상하게 가장 앞에 넣어야 일자 뒤에 나옴 reverse 옵션이 있는듯
+        }
+    };
+
+    // 날씨 데이터 변경 감지하여 날씨 정보 업데이트
+    watch(dailyWeatherList, async () => {
+        await nextTick(); // DOM이 업데이트된 후 실행
+        document.querySelectorAll('.fc-daygrid-day').forEach(dayCell => {
+            addWeatherInfo({
+                el: dayCell,
+                date: dayCell.dataset.date,
+            });
+        });
+    });
+
+    const handleWheelEvent = e => {
+        handleCloseModal();
+    };
+
+    // 선택한 날의 이벤트 중에 휴가자 항목을 누를때 휴가페이지 이동
+    const handleClickVacation = () => {
+        router.push('/vacation');
+    };
+
     // 달력 뷰 변경 감지 (월 변경 시 데이터 다시 가져오기)
     watch(
         () => fullCalendarRef.value?.getApi().currentData.viewTitle,
@@ -528,6 +606,55 @@
         },
     );
 
+    // selectbox 프로젝트 선택 변경 사항 감지
+    watch(
+        () => projectStore.selectedProject,
+        newProject => {
+            if (newProject) {
+                selectedProject.value = newProject.PROJCTSEQ;
+                checkedInProject.value = newProject;
+            } else {
+                selectedProject.value = null;
+                checkedInProject.value = null;
+            }
+        },
+    );
+
+    const handleLeaveTimeUpdate = async event => {
+        const memberSeq = user.value.id;
+        if (!memberSeq) return;
+
+        // 현 사용자 프로젝트 퇴근기록 확인
+        const { data } = await $api.post('main/getUserLeaveRecord', {
+            memberSeq: memberSeq,
+        });
+
+        const res = data?.data;
+        if (res && !res?.COMMUTLVE) {
+            await projectStore.getMemberProjects();
+
+            if (projectStore.activeMemberProjectList.length > 0) {
+                const previousProject =
+                    projectStore.activeMemberProjectList.find(p => res.MEMBERSEQ === user.value.id && res.PROJCTLVE === p.PROJCTSEQ) ||
+                    projectStore.activeMemberProjectList[0]; // 이전 출근 프로젝트가 없으면 첫 번째 프로젝트
+
+                if (previousProject) {
+                    selectedProject.value = previousProject.PROJCTSEQ;
+                    projectStore.setSelectedProject(previousProject);
+                } else if (projectStore.activeProjectList.length > 0) {
+                    selectedProject.value = projectStore.activeProjectList[0].PROJCTSEQ;
+                    projectStore.setSelectedProject(projectStore.activeProjectList[0]);
+                } else {
+                    selectedProject.value = null;
+                    projectStore.setSelectedProject(null);
+                }
+            } else {
+                selectedProject.value = null;
+                projectStore.setSelectedProject(null);
+            }
+        }
+    };
+
     onMounted(async () => {
         await userStore.userInfo();
         user.value = userStore.user;
@@ -551,35 +678,37 @@
         await fetchEventList(param);
         useFilterEventList(month, day);
 
-        // 이벤트모달 외부 클릭 감지
-        // document.addEventListener('click', e => {
-        //     if (showModal.value && !e.target.closest('.event-modal') && !e.target.closest('.fc-daygrid-day')) {
-        //         showModal.value = false;
-        //     }
-        // });
+        // 스크롤 감지 이벤트 리스너
+        window.addEventListener('wheel', handleWheelEvent);
+        window.addEventListener('click', colorToday);
+
+        datePickerStore.initDatePicker(fullCalendarRef, async (year, month, options) => {
+            // 데이터 다시 불러오기
+            await fetchData();
+        });
     });
 </script>
-<style>
-    .fc-h-event {
+<style scoped>
+    ::v-deep(.fc-h-event) {
         background-color: transparent;
     }
 
-    .event-modal {
+    ::v-deep(.event-modal) {
         padding: 8px;
         border: 1px solid #ddd;
     }
 
-    .event-icon-select:hover {
+    ::v-deep(.event-icon-select:hover) {
         transform: scale(1.1);
         transition: transform 0.2s;
     }
 
     /* 이벤트 모달 노출 시 텍스트 선택 방지 */
-    .fc-daygrid-day {
+    ::v-deep(.fc-daygrid-day) {
         user-select: none;
     }
 
-    .fc-daygrid-day-events {
+    ::v-deep(.fc-daygrid-day-events) {
         display: flex;
         flex-wrap: wrap;
         justify-content: center;
@@ -587,4 +716,9 @@
         align-items: center;
         text-align: center !important; */
     }
+
+    /* 공휴일만 가로로 넗게 나오게 */
+    ::v-deep(.fc-daygrid-event-harness:has(.holiday-event)) {
+        width: 100% !important;
+    }
 </style>

src/components/main/MainEventList.vue

@@ -10,6 +10,8 @@
                     (category.CMNCODVAL === 300205 && teaTimeList?.length) ||
                     (category.CMNCODVAL === 300206 && workShopList?.length)
                 "
+                @click="category.CMNCODVAL == 300202 ? $emit('handleClickVacation') : ''"
+                :class="category.CMNCODVAL == 300202 ? 'pointer' : ''"
                 class="border border-2 mt-3 card p-2"
             >
                 <div class="row g-2 position-relative">
@@ -22,18 +24,13 @@
                             />
                         </div>
                     </div>
-                    <div
-                        v-if="category.CMNCODVAL === 300201 || category.CMNCODVAL === 300202"
-                        class="col-9 mx-0 px-0 d-flex align-items-center"
-                    >
+                    <div class="col-9 mx-0 px-0 d-flex align-items-center">
                         <template v-if="category.CMNCODVAL === 300201">
                             <MainMemberProfile :members="birthdayList" :baseUrl="baseUrl" />
                         </template>
                         <template v-if="category.CMNCODVAL === 300202">
                             <MainMemberProfile :members="vacationList" :baseUrl="baseUrl" />
                         </template>
-                    </div>
-                    <div v-else class="col-9 mx-0 px-0 d-flex align-items-center">
                         <template v-if="category.CMNCODVAL === 300203">
                             <MainEventBoard :place="birthdayPartyList[0].LOCEVTPLC" :time="birthdayPartyList[0].LOCEVTTME" />
                         </template>
@@ -105,6 +102,8 @@
             type: Array,
         },
     });
+
+    defineEmits(['handleClickVacation']);
 </script>
 
 <style scoped>

src/components/main/MainMemberProfile.vue

@@ -2,12 +2,12 @@
     <div class="ms-2" style="flex: 1">
         <ul class="row gx-1 mb-0 list-inline">
             <li class="col-4 me-0" v-for="(member, index) in members" :key="index">
-                <div class="ratio ratio-1x1 mb-0 profile-list">
+                <div class="ratio ratio-1x1 mb-0">
                     <img
-                        :src="`${baseUrl}upload/img/profile/${member.MEMBERPRF}`"
+                        :src="`${profileImgUrl}profile/${member.MEMBERPRF}`"
                         :style="`border-color: ${member.usercolor} !important;`"
                         alt="User Profile"
-                        class="rounded-circle border border-2"
+                        class="rounded-circle border border-2 profile-img"
                         @error="$event.target.src = '/img/icons/icon.png'"
                     />
                 </div>
@@ -16,17 +16,17 @@
     </div>
 </template>
 
-<script>
-    export default {
-        props: {
-            members: {
-                type: Array,
-                required: true,
-            },
-            baseUrl: {
-                type: String,
-                required: true,
-            },
+<script setup>
+    const props = defineProps({
+        members: {
+            type: Array,
+            required: true,
         },
-    };
+        baseUrl: {
+            type: String,
+            required: true,
+        },
+    });
+
+    const profileImgUrl = import.meta.env.VITE_SERVER_IMG_URL;
 </script>

src/components/main/MainVote.vue

@@ -1,43 +1,8 @@
 <template>
 <div class="col-md-6 col-lg-4 col-xl-4 order-0 mb-6">
     <div class="card h-100">
-        <div class="card-header d-flex justify-content-between">
-            <div class="card-title mb-0">
-                <h5 class="mb-1 me-2">투표진행</h5>
-            </div>
-        </div>
-        <div class="card-body">
-            <ul class="p-0 m-0">
-                <li class="d-flex  mb-1" v-for="item in voteList" :key="item.LOCVOTSEQ">
-                    <div class="d-flex w-100 flex-wrap align-items-center justify-content-between gap-2">
-                        <div class="me-2 mb-3">
-                            <small class="card-subtitle">{{ item.localVote.formatted_LOCVOTEDT }}</small>
-                            <div class="d-flex flex-wrap align-items-center">
-                                <div class="avatar flex-shrink-0 me-1">
-                                    <img
-                                        style="cursor: auto;"
-                                        class="rounded-circle user-avatar"
-                                        :src="getProfileImage(item.localVote.MEMBERPRF)"
-                                        alt="최초 작성자"
-                                        :style="{ borderColor: item.localVote.usercolor }"
-                                        @error="setDefaultImage"
-                                    />
-                                </div>
-                                <div class="timeline-event ps-1"  style="cursor: pointer;" @click="goVoteList()" >
-                                    <div class="timeline-header ">
-                                        <small ><strong>{{ truncateTitle(item.localVote.LOCVOTTTL) }}</strong></small>
-                                    </div>
-                                    <small class="d-flex align-items-center lh-1 me-4 mb-4 mb-sm-0"><span class="badge badge-dot text-bg-warning  me-1">
-                                    </span> {{ getDaysAgo(item.localVote.formatted_LOCVOTEDT) }}</small>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </li>
-            </ul>
-        </div>
-        <!-- 모달 푸터: 더보기 버튼 오른쪽 정렬 -->
-        <div class="modal-foote d-flex">
+        <!-- 더보기 버튼-->
+        <div class="d-flex">
             <router-link
             to="/voteboard"
             class="btn btn-primary mr-1 pe-1 ps-1 ms-auto my-auto h-50"
@@ -45,15 +10,100 @@
             more
             </router-link>
         </div>
+        <div class="card-header d-flex justify-content-between">
+            <div class="card-title mb-0">
+                <h5 class="mb-1 me-2">투표진행</h5>
+            </div>
+        </div>
+        <div class="card-body" v-if="voteListData.length > 0">
+            <ul class="p-0 m-0">
+                <li class="d-flex  mb-1" v-for="item in voteListData" :key="item.LOCVOTSEQ">
+                    <div class="d-flex w-100 flex-wrap align-items-center justify-content-between gap-2">
+                        <div class="me-2 mb-3">
+                            <div class="text-muted small">{{ item.localVote.formatted_LOCVOTRDT }}</div>
+                            <div class="d-flex flex-wrap align-items-center">
+                                <div class="avatar flex-shrink-0 me-1">
+                                    <img
+                                        style="cursor: auto;"
+                                        class="rounded-circle user-avatar object-fit-cover"
+                                        :src="getProfileImage(item.localVote.MEMBERPRF)"
+                                        alt="최초 작성자"
+                                        :style="{ borderColor: item.localVote.usercolor }"
+                                        @error="setDefaultImage"
+                                    />
+                                </div>
+                                <div class="timeline-event ps-1"  style="cursor: pointer;" @click.stop="openModal(item.localVote.LOCVOTSEQ)" >
+                                    <div class="timeline-header ">
+                                        <small ><strong>{{ truncateTitle(item.localVote.LOCVOTTTL) }}</strong></small>
+                                    </div>
+                                    <small class="d-flex align-items-center lh-1 me-4 mb-4 mb-sm-0"
+                                    :style="{ color: getDaysAgo(item.localVote.formatted_LOCVOTEDT) == '금일 종료' ? 'red' : '' }">
+                                    ⏰{{getDaysAgo(item.localVote.formatted_LOCVOTEDT)}}({{item.localVote.total_voted}}/{{ item.localVote.total_votable }})
+                                    </small>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+        <div class="card-body" v-else>
+            진행중인 투표가 없습니다.
+        </div>
     </div>
 </div>
+<!--투표 모달 -->
+<CenterModal :display="isModalOpen" @close="closeModal">
+    <template #title> 투표 하기 </template>
+    <template #body>
+        <div>
+            <vote-list
+            :key="voteListKey"
+            :data="selectVoteDate"
+            @checkedNames="checkedNames"
+            @addContents="addContents"
+            @endVoteId="endVoteId"
+            @voteDelete="voteDelete"
+            />
+        </div>
+    </template>
+    <template #footer>
+        <BackButton @click="closeModal" />
+    </template>
+</CenterModal>
 </template>
 
 <script setup>
 import router from '@/router';
 import $api from '@api';
 import { onMounted, ref } from 'vue';
+import CenterModal from '@c/modal/CenterModal.vue';
+import BackButton from '@c/button/BackBtn.vue';
+import voteList from '@c/voteboard/voteCardList.vue';
+import { useToastStore } from '@s/toastStore';
 
+const toastStore = useToastStore();
+const currentPage = ref(1);
+const voteset = ref(0);
+const voteListData= ref([]);
+const voteListKey = ref(0); //초기화
+// 로그 모달 상태
+const isModalOpen = ref(false);
+const selectVoteDate = ref([]);
+// 로그 모달 열기
+const openModal = async (id) => {
+    isModalOpen.value = true;
+    if(id){
+        const selectData = voteListData.value.filter((item) => item.localVote.LOCVOTSEQ === id);
+        selectVoteDate.value = selectData;
+    }
+};
+// 로그 모달 닫기
+const closeModal = () => {
+    isModalOpen.value = false;
+    voteListKey.value++;
+};
 // 프로필 이미지
 const baseUrl = $api.defaults.baseURL.replace(/api\/$/, '');
 const defaultProfile = "/img/icons/icon.png";
@@ -64,9 +114,6 @@ const setDefaultImage = (event) => {
     event.target.src = defaultProfile;
 };
 
-const currentPage = ref(1);
-const voteset = ref(0);
-const voteList= ref([]);
 onMounted(() => {
     getvoteList();
 });
@@ -74,22 +121,94 @@ onMounted(() => {
 //투표목록
 const getvoteList = () => {
     $api.get('vote/getVoteList',{
-            //목록조회시 파라미터 전달
-            params:
-            {
-                page: 1
-                ,voteset:'2' //투표중
-                ,myVote:'2' //내가한 투표표
-            }
-        }).then(res => {
-            voteList.value = res.data.data.list;
-            voteList.value = res.data.data.list.slice(0, 5);
-        })
-    };
+        params:
+        {
+            page: 1
+            ,voteset:'2' //투표중
+            ,myVote:'2' //내가 안한 투표
+        }
+    }).then(res => {
+        voteListData.value = res.data.data.list;
+        voteListData.value = res.data.data.list.slice(0, 6);
+    })
+};
 
+//투표하기
+const checkedNames = (numList) => {
+    $api.post('vote/insertCheckedNums',{
+        checkedList :numList
+        ,votenum : numList[0].LOCVOTSEQ
+    }).then((res)=>{
+        if(res.data.status === 'OK'){
+            toastStore.onToast('투표가 완료되었습니다.', 's');
+            isModalOpen.value = false;
+            getvoteList();
+            voteListKey.value++;
+        }
+    })
+}
+//투표항목추가
+const addContents = (itemList, voteId) => {
+    $api.post('vote/insertWord',{
+        itemList :itemList
+        ,voteId :voteId
+    }).then((res)=>{
+        if(res.data.status === 'OK'){
+            toastStore.onToast('항목이 등록되었습니다.', 's');
+            getvoteList();
+            const updatedVote = selectVoteDate.value.find(vote => vote.localVote.LOCVOTSEQ === voteId);
+            if (updatedVote) {
+                if (!updatedVote.voteDetails) {
+                    updatedVote.voteDetails = [];
+                }
+                const maxSeq = updatedVote.voteDetails.reduce((max, item) => {
+                    return item.VOTDETSEQ > max ? item.VOTDETSEQ : max;
+                }, 0);
+                // 새 항목을 voteDetails에 추가
+                itemList.forEach(item => {
+                    updatedVote.voteDetails.push({
+                        VOTDETSEQ: maxSeq + 1,
+                        LOCVOTSEQ: voteId,
+                        LOCVOTCON: item.content,
+                        LOCVOTLIK: item.url,
+                        VOTE_COUNT: 0,
+                        yesvote: 0
+                    });
+                });
+            }
+        }
+    })
+}
+//투표종료
+const endVoteId = (endVoteId) => {
+    if(confirm('투표를 종료하시겠습니까?')){
+        $api.patch('vote/updateEndData',{
+            endVoteId :endVoteId
+            }).then((res)=>{
+                if(res.data.status === 'OK'){
+                    getvoteList();
+                    isModalOpen.value = false;
+                }
+            })
+    }
+}
+//투표 삭제
+const voteDelete =(id) =>{
+    if(confirm('투표를 삭제하시겠습니까?')){
+        $api.patch('vote/updateDeleteData',{
+            deleteVoteId :id
+            }).then((res)=>{
+                if(res.data.status === 'OK'){
+                    toastStore.onToast('투표가 삭제되었습니다.', 's');
+                    getvoteList();
+                    isModalOpen.value = false;
+                }
+            })
+    }
+}
 // 제목이 14글자 넘어가면 ... 처리하는 함수
 const truncateTitle = title => {
-return title.length > 10 ? title.slice(0, 10) + '...' : title;
+    return title.length > 10 ? title.slice(0, 10) + '...' : title;
 };
 
 //투표이동
@@ -97,7 +216,9 @@ const goVoteList = () =>{
     router.push({
         path: '/voteboard',
         query: {
-            voteset: '2',
+            voteset: '2' //투표중
+            ,myVote:'2' //내가 안한 투표
+            ,id:id
         }
     });
 }
@@ -105,12 +226,11 @@ const goVoteList = () =>{
 const getDaysAgo = (dateString) => {
     const inputDate = new Date(dateString); // 문자열을 Date 객체로 변환
     const today = new Date(); // 현재 날짜 가져오기
-
-    // 날짜 차이 계산 (밀리초 기준)
-    const timeDiff = today - inputDate;
-    const dayDiff = Math.floor(timeDiff / (1000 * 60 * 60 * 24))+1; // 일 단위 변환
-
-    // 오늘 날짜인 경우 "오늘" 반환
+    const input = new Date(inputDate.getFullYear(), inputDate.getMonth(), inputDate.getDate());
+    const now = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+    const timeDiff = now - input;
+    const dayDiff = Math.floor(timeDiff / (1000 * 60 * 60 * 24));
+    // 오늘 날짜인 경우
     if (dayDiff === 0) return "금일 종료";
 
     return `종료 ${Math.abs(dayDiff)}일 전`;
@@ -120,6 +240,5 @@ const getDaysAgo = (dateString) => {
 <style scoped>
 .user-avatar {
     border: 3px solid;
-    padding: 0.1px;
 }
 </style>

src/components/main/MainWordDict.vue

@@ -1,36 +1,8 @@
 <template>
 <div class="col-md-6 col-lg-4 col-xl-4 order-0 mb-6">
     <div class="card h-100">
-        <div class="card-header d-flex justify-content-between">
-            <div class="card-title mb-0">
-                <h5 class="mb-1 me-2">용어집</h5>
-            </div>
-        </div>
-        <div class="card-body">
-            <ul class="p-0 m-0" v-for="item in wordList" :key="item.WRDDICSEQ">
-                <small class="card-subtitle">{{$common.dateFormatter(item.lastEditor.updatedAt)}}</small>
-                <li class="d-flex  mb-1">
-                    <div class="avatar flex-shrink-0 me-1" >
-                                <img
-                                    style="cursor: auto;"
-                                    class="rounded-circle user-avatar"
-                                    :src="getProfileImage(item.lastEditor.profileImage)"
-                                    alt="최종 작성자"
-                                    :style="{ borderColor: item.lastEditor.color }"
-                                    @error="setDefaultImage"
-                                />
-                    </div>
-                    <div class="timeline-event ps-1"  style="cursor: pointer;" @click="goWordList(item.WRDDICCAT,item.WRDDICTTL)">
-                        <div class="timeline-header">
-                            <small class="text-primary text-uppercase">{{ item.category }}</small>
-                        </div>
-                        <h6  class="my-50">{{truncateTitle(item.WRDDICTTL) }}</h6>
-                    </div>
-                </li>
-            </ul>
-        </div>
-        <!-- 모달 푸터: 더보기 버튼 오른쪽 정렬 -->
-        <div class="modal-foote d-flex ">
+        <!-- 더보기 버튼 -->
+        <div class="d-flex ">
             <router-link
             to="/wordDict"
             class="btn btn-primary mr-1 pe-1 ps-1 ms-auto my-auto h-50"
@@ -38,6 +10,43 @@
             more
             </router-link>
         </div>
+        <div class="card-header d-flex justify-content-between">
+            <div class="card-title mb-0">
+                <h5 class="mb-1 me-2">용어집</h5>
+            </div>
+        </div>
+        <div class="card-body" v-if="wordList.length > 0">
+            <ul class="p-0 m-0" v-for="item in wordList" :key="item.WRDDICSEQ">
+                <li class="d-flex align-items-center mb-1">
+                    <!-- 프로필 이미지 -->
+                    <div class="avatar flex-shrink-0 me-2 d-flex align-items-center">
+                        <img
+                            class="rounded-circle user-avatar object-fit-cover"
+                            :src="getProfileImage(item.lastEditor.profileImage)"
+                            alt="최종 작성자"
+                            :style="{ borderColor: item.lastEditor.color }"
+                            @error="setDefaultImage"
+                        />
+                    </div>
+
+                    <!-- 텍스트 영역 -->
+                    <div class="timeline-event ps-1 flex-grow-1" style="cursor: pointer;" @click="goWordList(item.WRDDICCAT,item.WRDDICTTL)">
+                        <div class="timeline-header">
+                            <small class="text-primary text-uppercase">{{ item.category }}</small>
+                        </div>
+                        <h6 class="my-50 d-flex align-items-center">
+                            {{ truncateTitle(item.WRDDICTTL) }}
+                        </h6>
+                        <div class="text-muted small">{{$common.dateFormatter(item.lastEditor.updatedAt)}}</div>
+                    </div>
+                </li>
+
+            </ul>
+        </div>
+        <div class="card-body" v-else >
+            등록된 용어가 없습니다.
+        </div>
+
     </div>
 </div>
 </template>
@@ -73,7 +82,7 @@ const getwordList = (searchKeyword='', indexKeyword='', category='') => {
                 searchKeyword : searchKeyword,
                 indexKeyword :indexKeyword,
                 category : category,
-                pageNum:5
+                pageNum:6
             }
         })
         .then(res => {
@@ -112,7 +121,7 @@ const goWordList = (category, indexKeyword) => {
         path: '/wordDict',
         query: {
             indexKeyword: firstChar,
-            category: category
+            category: category,
         }
     });
 };
@@ -126,6 +135,5 @@ return title.length > 25 ? title.slice(0, 25) + '...' : title;
 <style scoped>
 .user-avatar {
     border: 3px solid;
-    padding: 0.1px;
 }
 </style>

src/components/main/MemberManagement.vue

@@ -13,19 +13,27 @@
                                     <img
                                         :src="`${imgURL}profile/${member.MEMBERPRF}`"
                                         alt="Profile Image"
-                                        class="img-fluid mx-auto d-block"
+                                        class="img-thumbnail mx-auto d-block"
+                                        style="max-height: 140px"
                                         @error="$event.target.src = '/img/icons/icon.png'"
                                     />
                                 </div>
                                 <div class="col-7">
-                                    <!-- 날짜 -->
                                     <div class="d-flex flex-sm-row align-items-center pb-2">
-                                        <div class="">{{ member.MEMBERNAM }}</div>
+                                        <div class="font-bold">{{ member.MEMBERNAM }}</div>
+                                        <div class="ms-2">
+                                            ({{ member.MBTI }})
+                                            <img
+                                                role="img"
+                                                class="w-px-30 h-px-40"
+                                                :src="`/img/mbti/${member.MBTI.toLowerCase()}.png`"
+                                                alt="MBTI image"
+                                            />
+                                        </div>
                                     </div>
-                                    <!-- 참여자 -->
                                     <div class="d-flex flex-sm-row align-items-center pb-2">
-                                        <i class="bx bxs-envelope"></i>
-                                        <div class="ms-2">{{ member.MEMBERIDS }}@local-host.co.kr</div>
+                                        <i class="bx bx-id-card"></i>
+                                        <div class="ms-2">{{ member.MEMBERIDS }}</div>
                                     </div>
                                     <div class="d-flex flex-sm-row align-items-center pb-2">
                                         <i class="bx bxs-phone"></i>
@@ -33,7 +41,7 @@
                                     </div>
                                     <div class="d-flex flex-sm-row align-items-center pb-2">
                                         <i class="bx bx-calendar"></i>
-                                        <div class="ms-2">{{ $common.dateFormatter(member.MEMBERRDT) }}</div>
+                                        <div class="ms-2">{{ $common.dateFormatter(member.MEMBERCDT) }}</div>
                                     </div>
                                 </div>
                                 <div class="col-2 d-flex align-items-center">
@@ -42,14 +50,15 @@
                                             <label class="switch"
                                                 ><input
                                                     type="checkbox"
-                                                    :checked="checked"
-                                                    @change="handleRegisterMember(member.MEMBERSEQ)" /><span class="slider round"></span
+                                                    :checked="member.checked"
+                                                    @click="handleRegisterMember($event, member)" />
+                                                <span class="slider round"></span
                                             ></label>
                                         </div>
                                         <button
                                             class="btn-close btn-close-sm"
                                             style="position: absolute; top: 10px; right: 10px"
-                                            @click="handleRejectMember(member.MEMBERSEQ)"
+                                            @click="handleRejectMember(member)"
                                         ></button>
                                     </div>
                                 </div>
@@ -68,30 +77,37 @@
     import $api from '@api';
 
     const memberList = ref([]);
-    const checked = ref(false);
     const toast = useToastStore();
     const imgURL = import.meta.env.VITE_SERVER_IMG_URL;
 
     // 조회 api
     const fetchRegisterMemberList = async () => {
         const { data } = await $api.get('main/registerMemberList');
-        if (data?.data) memberList.value = data.data;
+        if (data?.data) {
+            memberList.value = data.data.map(member => ({
+                ...member,
+                checked: false, // 각 항목에 checked 값 설정
+            }));
+        }
     };
 
     // 사원 등록 api
-    const handleRegisterMember = async memberSeq => {
-        const { data } = await $api.post('main/registerMember', { memberSeq: memberSeq });
+    const handleRegisterMember = async (e, member) => {
+        e.preventDefault();
+
+        const { data } = await $api.post('main/registerMember', { memberSeq: member.MEMBERSEQ });
         if (data?.data) {
+            member.checked = true;
             toast.onToast(data.data, 's');
             fetchRegisterMemberList();
         }
     };
 
     // 사원 등록 미승인 api
-    const handleRejectMember = async memberSeq => {
+    const handleRejectMember = async member => {
         if (!confirm('해당 사원 등록을 거절하시겠습니까?')) return;
 
-        const { data } = await $api.post('main/rejectMember', { memberSeq: memberSeq });
+        const { data } = await $api.post('main/rejectMember', { memberSeq: member.MEMBERSEQ });
         if (data?.data) {
             toast.onToast(data.data, 's');
             fetchRegisterMemberList();

src/components/projectlist/ProjectList.vue

@@ -56,6 +56,7 @@
                     :value="color"
                     :data="colorList"
                     @update:data="color = $event"
+                    :is-alert="colorAlert"
                 />
 
                 <div class="mb-2 row">
@@ -166,9 +167,11 @@
     const endDay = ref('');
     const description = ref('');
     const nameAlert = ref(false);
+    const colorAlert = ref(false);
     const addressAlert = ref(false);
     const startDayAlert = ref(false);
 
+
     const startDateInput = ref(null);
     const endDateInput = ref(null);
 
@@ -257,7 +260,9 @@
     const formReset = () => {
 
         name.value = '';
-        color.value = colorList.value[0].value;
+        if (colorList.value && colorList.value.length > 0) {
+            color.value = colorList.value[0].value;
+        }
         addressData.value = {
             postcode: '',
             address: '',
@@ -317,7 +322,11 @@
         startDayAlert.value = startDay.value.trim() === '';
         addressAlert.value = addressData.value.address.trim() === '';
 
-        if (nameAlert.value || startDayAlert.value || addressAlert.value) {
+        if (!colorList.value || colorList.value.length === 0) {
+            colorAlert.value = true;
+        }
+
+        if (nameAlert.value || startDayAlert.value || addressAlert.value || colorAlert.value)  {
             return;
         }
 

src/components/user/RegisterForm.vue

@@ -3,9 +3,9 @@
         <div class="text-center">
             <label
                 for="profilePic"
-                class="rounded-circle m-auto ui-bg-cover position-relative cursor-pointer"
+                class="rounded-circle m-auto ui-bg-cover position-relative cursor-pointer "
                 id="profileLabel"
-                style="width: 100px; height: 100px; background-image: url(img/avatars/default-Profile.jpg); background-repeat: no-repeat"
+                style="width: 100px; height: 100px; background-image: url(img/avatars/default-Profile.jpg); background-repeat: no-repeat; background-size: cover;"
             >
             </label>
 
@@ -25,6 +25,7 @@
                 @update:alert="idAlert = $event"
                 @blur="checkIdDuplicate"
                 :value="id"
+                @keypress="noSpace"
             />
             <span v-if="idError" class="invalid-feedback d-block">{{ idError }}</span>
 
@@ -37,6 +38,7 @@
                 @update:data="password = $event"
                 @update:alert="passwordAlert = $event"
                 :value="password"
+                @keypress="noSpace"
             />
             <span v-if="passwordError" class="invalid-feedback d-block">{{ passwordError }}</span>
 
@@ -49,6 +51,7 @@
                 @update:data="passwordcheck = $event"
                 @update:alert="passwordcheckAlert = $event"
                 :value="passwordcheck"
+                @keypress="noSpace"
             />
             <span v-if="passwordcheckError" class="invalid-feedback d-block">{{ passwordcheckError }}</span>
 
@@ -82,6 +85,7 @@
                     @update:data="name = $event"
                     @update:alert="nameAlert = $event"
                     :value="name"
+                    @keypress="noSpace"
                     class="me-2 w-50"
                 />
 
@@ -95,6 +99,7 @@
                     :is-color="true"
                     :data="colorList"
                     @update:data="handleColorUpdate"
+                    :is-alert="colorAlert"
                     class="w-50"
                 />
             </div>
@@ -143,13 +148,12 @@
                 name="phone"
                 :isEssential="true"
                 :is-alert="phoneAlert"
-                @update:data="phone = $event"
                 @update:alert="phoneAlert = $event"
                 @blur="checkPhoneDuplicate"
                 :maxlength="11"
                 :value="phone"
                 @keypress="onlyNumber"
-
+                @input="inputEvent"
             />
             <span v-if="phoneError" class="invalid-feedback d-block">{{ phoneError }}</span>
 
@@ -205,6 +209,7 @@
     const passwordcheckErrorAlert = ref(false); // 비밀번호 확인 오류 메시지
     const pwhintResAlert = ref(false);
     const nameAlert = ref(false);
+    const colorAlert = ref(false);
     const birthAlert = ref(false);
     const addressAlert = ref(false);
     const phoneAlert = ref(false);
@@ -213,6 +218,10 @@
 
     const toastStore = useToastStore();
 
+    const noSpace = (e) => {
+        if (e.key === ' ') e.preventDefault();
+    };
+
     // 프로필 체크
     const profileValid = (size, type) => {
         const maxSize = 5 * 1024 * 1024;
@@ -326,6 +335,12 @@
         }
     };
 
+    const inputEvent = (e) => {
+        const newValue = e.target.value.replace(/\D/g, ''); // 숫자만 남김
+        e.target.value = newValue;  // 입력 필드 즉시 반영
+        phone.value = newValue;     // Vue 반응형 상태 업데이트
+    };
+
     watch(id, (newValue) => {
         if (newValue && newValue.length >= 4) {
             idError.value = '';
@@ -337,6 +352,7 @@
     });
 
     watch(password, (newValue) => {
+
         if (newValue && newValue.length >= 4) {
             passwordErrorAlert.value = false;
             passwordError.value = '';
@@ -359,7 +375,6 @@
         }
     });
 
-
     // 회원가입
     const handleSubmit = async () => {
         await checkColorDuplicate();
@@ -373,6 +388,10 @@
         addressAlert.value = address.value.trim() === '';
         phoneAlert.value = phone.value.trim() === '';
 
+        if (!colorList.value || colorList.value.length === 0) {
+            colorAlert.value = true;
+        }
+
         // 아이디 길이 체크
         if (id.value && id.value.length < 4) {
             idErrorAlert.value = true;
@@ -386,8 +405,10 @@
         } else {
             passwordError.value = '';
         }
+        const phoneRegex = /^010\d{8}$/;
+        const isFormatValid = phoneRegex.test(phone.value);
 
-        if (!/^\d+$/.test(phone.value)) {
+        if (!/^\d+$/.test(phone.value) || !isFormatValid) {
             phoneAlert.value = true;
         } else {
             phoneAlert.value = false;
@@ -402,6 +423,7 @@
             profilAlert.value = false;
         }
 
+
         if (
             profilAlert.value ||
             idAlert.value ||
@@ -416,19 +438,20 @@
             addressAlert.value ||
             phoneAlert.value ||
             phoneErrorAlert.value ||
+            colorAlert.value ||
             colorErrorAlert.value
         ) {
             return;
         }
 
         const formData = new FormData();
-        formData.append('memberIds', id.value);
-        formData.append('memberPwd', password.value);
+        formData.append('memberIds', id.value.trim());
+        formData.append('memberPwd', password.value.trim());
         formData.append('memberPwh', pwhint.value);
-        formData.append('memberPwr', pwhintRes.value);
-        formData.append('memberNam', name.value);
+        formData.append('memberPwr', pwhintRes.value.trim());
+        formData.append('memberNam', name.value.trim());
         formData.append('memberArr', address.value);
-        formData.append('memberDtl', detailAddress.value);
+        formData.append('memberDtl', detailAddress.value.trim());
         formData.append('memberZip', postcode.value);
         formData.append('memberBth', birth.value);
         formData.append('memberTel', phone.value);

src/components/user/UserList.vue

@@ -1,9 +1,9 @@
 <template>
-    <ul class="list-unstyled users-list d-flex align-items-center gap-1 flex-wrap">
+    <ul v-if="displayedUserList && displayedUserList.length > 0" class="list-unstyled users-list d-flex align-items-center gap-1 flex-wrap">
         <li
             v-for="(user, index) in displayedUserList"
             :key="index"
-            class="avatar pull-up"
+            class="avatar pull-up "
             :class="{ 'opacity-100': isUserDisabled(user) }"
             @click.stop="showOnlyActive ? null : toggleDisable(index)"
             :style="showOnlyActive ? 'cursor: default' : ''"
@@ -14,7 +14,7 @@
             :data-bs-original-title="getTooltipTitle(user)"
         >
             <img
-                class="rounded-circle user-avatar border border-3"
+                class="user-avatar border border-3 rounded-circle object-fit-cover"
                 :class="{ 'grayscaleImg': isUserDisabled(user) }"
                 :src="`${baseUrl}upload/img/profile/${user.MEMBERPRF}`"
                 :style="`border-color: ${user.usercolor} !important;`"
@@ -23,12 +23,12 @@
             />
         </li>
     </ul>
+    <span v-else >-</span>
 </template>
 
 <script setup>
 import { onMounted, ref, nextTick, computed, watch } from 'vue';
 import { useUserStore } from '@s/userList';
-import { useProjectStore } from '@s/useProjectStore';
 import $api from '@api';
 import { useToastStore } from "@s/toastStore";
 

src/components/vacation/ProfileList.vue

@@ -17,7 +17,7 @@
                     class="start-50 translate-middle crown-icon"
                 />
                 <img
-                    class="rounded-circle profile-img"
+                    class="rounded-circle object-fit-cover"
                     :src="getUserProfileImage(user.MEMBERPRF)"
                     alt="user"
                     :style="getDynamicStyle(user)"

src/components/voteboard/voteCard.vue

@@ -4,7 +4,7 @@
             <h5 class="card-title mb-1">
                 <div class="list-unstyled users-list d-flex align-items-center gap-1">
                     <img
-                    class="rounded-circle user-avatar border border-3 w-px-40 h-px-40"
+                    class="object-fit-cover rounded-circle user-avatar border border-3 w-px-40 h-px-40"
                     :src="`${baseUrl}upload/img/profile/${data.localVote.MEMBERPRF}`"
                     :style="`border-color: ${data.localVote.usercolor} !important;`"
                     @error="$event.target.src = '/img/icons/icon.png'"
@@ -33,7 +33,7 @@
                     </div>
                 </div>
             </h5>
-            <h5 class="mb-1">{{ data.localVote.LOCVOTTTL }}
+            <h5 class="mb-0">{{ data.localVote.LOCVOTTTL }}
                 <i v-if="yesVotetotal != '0'" class="bx bxs-check-circle link-success"></i>
             </h5>
             <small >{{ data.localVote.formatted_LOCVOTRDT }} ~ {{ data.localVote.formatted_LOCVOTEDT }}</small>

src/components/voteboard/voteCompleteUserList.vue

@@ -3,7 +3,7 @@
     <ul class="list-group list-group-flush">
         <li class="list-group-item d-flex justify-content-between align-items-center flex-wrap border-top-0 p-0">
         <div class="d-flex flex-wrap align-items-center">
-            <ul class="list-unstyled users-list d-flex align-items-center avatar-group m-0 me-2">
+            <ul class="list-unstyled users-list d-flex align-items-center avatar-group">
                 <vote-complete-user-list-card :data="data"/>
             </ul>
         </div>

src/components/voteboard/voteCompleteUserListCard.vue

@@ -7,9 +7,9 @@
     :aria-label="data.MEMBERSEQ"
     :data-bs-original-title="getTooltipTitle(data)">
         <img
-            class="rounded-circle user-avatar border border-3"
+            class="rounded-circle user-avatar border border-3 object-fit-cover"
             :src="`${baseUrl}upload/img/profile/${data.MEMBERPRF}`"
-            :style="`border-color: ${data.usercolor} !important;`"
+            :style="`border-color: ${data.usercolor} !important; width: 90%; height: 90%;`"
             @error="$event.target.src = '/img/icons/icon.png'"
             alt="user"
         />

src/components/voteboard/voteInCompleteUserList.vue

@@ -3,7 +3,7 @@
         <ul class="list-group list-group-flush">
             <li class="list-group-item d-flex justify-content-between align-items-center flex-wrap border-top-0 p-0">
                 <div class="d-flex flex-wrap align-items-center">
-                    <ul class="list-unstyled users-list d-flex align-items-center avatar-group m-0 me-2">
+                    <ul class="list-unstyled users-list d-flex align-items-center avatar-group ">
                         <vote-in-complete-user-list-card :data="data" />
                     </ul>
                 </div>

src/components/voteboard/voteInCompleteUserListCard.vue

@@ -7,9 +7,9 @@
     :aria-label="data.MEMBERSEQ"
     :data-bs-original-title="getTooltipTitle(data)">
         <img
-            class="rounded-circle user-avatar border border-3"
+            class="rounded-circle user-avatar border border-3 object-fit-cover"
             :src="`${baseUrl}upload/img/profile/${data.MEMBERPRF}`"
-            :style="`border-color: ${data.usercolor} !important;`"
+            :style="`border-color: ${data.usercolor} !important;  width: 90%; height: 90%;`"
             @error="$event.target.src = '/img/icons/icon.png'"
             alt="user"
         />

src/components/voteboard/voteUserList.vue

@@ -2,7 +2,7 @@
 <div class="d-flex align-items-start mt-3">
     <!--투표한 사람 목록 -->
     <div class="d-flex align-items-center gap-2 flex-wrap">
-        <i class='bx bxs-user-check link-info fa-3x'></i>
+        <i class='bx bxs-user-check link-info fa-2x'></i>
         <vote-complete-user-list
         v-for="(item, index) in voetedUsers"
         :key="index"
@@ -11,7 +11,7 @@
     </div>
     <!-- 투표안한 사람 목록 -->
     <div class="d-flex align-items-center gap-2 ms-auto flex-wrap">
-        <i class='bx bxs-user-x link-danger fa-3x'></i>
+        <i class='bx bxs-user-x link-danger fa-2x'></i>
         <vote-in-complete-user-list
         v-for="(item, index) in noVoetedUsers"
         :key="index"

src/components/wordDict/DictCard.vue

@@ -1,5 +1,5 @@
 <template>
-    <li class="card p-5 mb-2">
+    <li class="card p-4 mb-2">
         <DictWrite
             v-if="writeStore.isItemActive(item.WRDDICSEQ)"
             @close="writeStore.closeAll();"
@@ -16,8 +16,9 @@
         <div v-else>
             <div class="d-flex align-items-center justify-content-between">
                 <div class="d-flex align-items-center">
-                    <span class="btn btn-primary pe-none">{{ item.category }}</span>
-                    <strong class="mx-2 w-75">{{ item.WRDDICTTL }}</strong>
+                    <span class="btn btn-primary pe-none m-2"
+                    style="writing-mode: horizontal-tb;">{{ item.category }}</span>
+                        {{ item.WRDDICTTL }}
                 </div>
                 <EditBtn
                     @click="toggleEdit"
@@ -31,7 +32,7 @@
                 <div class="d-flex flex-wrap align-items-center me-4">
                     <div class="avatar me-2">
                     <img
-                        class="rounded-circle user-avatar"
+                        class="rounded-circle user-avatar object-fit-cover"
                         :src="getProfileImage(item.author.profileImage)"
                         alt="최초 작성자"
                         :style="{ borderColor: item.author.color }"
@@ -50,7 +51,7 @@
                 >
                     <div class="avatar me-2">
                     <img
-                        class="rounded-circle user-avatar"
+                        class="rounded-circle user-avatar object-fit-cover"
                         :src="getProfileImage(item.lastEditor.profileImage)"
                         alt="최근 작성자"
                         :style="{ borderColor: item.lastEditor.color }"
@@ -163,7 +164,6 @@ const toggleEdit = async () => {
 
 .user-avatar {
     border: 3px solid;
-    padding: 0.1px;
 }
 
 .edit-btn {
@@ -178,4 +178,21 @@ const toggleEdit = async () => {
     top: -0.5rem;
     --bs-form-check-bg: #fff;
 }
+.btn.btn-primary {
+    writing-mode: horizontal-tb;
+}
+.dict-content-wrap {
+    max-width: 100%;
+    overflow-x: auto;
+    word-break: break-word;
+    word-wrap: break-word;
+    white-space: normal;
+    box-sizing: border-box;
+}
+.dict-content-wrap * {
+    max-width: 100% !important;
+    box-sizing: border-box !important;
+    word-break: break-word;
+    white-space: normal !important;
+}
 </style>

src/components/wordDict/DictWrite.vue

@@ -49,9 +49,9 @@
             @keyup="ValidHandler('title')"
         />
         <div>
-            <QEditor class="" @keyup="ValidHandler('content')"  @update:data="handleContentUpdate" @update:imageUrls="imageUrls = $event"  :is-alert="wordContentAlert" :initialData="contentValue"/>
+            <QEditor   class="q-editor-container"  @keyup="ValidHandler('content')"  @update:data="handleContentUpdate" @update:imageUrls="imageUrls = $event"  :is-alert="wordContentAlert" :initialData="contentValue"/>
             <div class="text-end mt-5">
-                <button class="btn btn-primary" @click="saveWord">
+                <button class="btn btn-primary" @click="saveWord" :disabled="titleValue ? !changed : false">
                     <i class="bx bx-check"></i>
                 </button>
             </div>
@@ -67,39 +67,6 @@ import FormSelect from '@/components/input/FormSelect.vue';
 import PlusBtn from '../button/PlusBtn.vue';
 import EditBtn from '../button/EditBtn.vue';
 import { useWriteVisibleStore } from '@s/writeVisible';
-
-const writeStore = useWriteVisibleStore();
-
-const emit = defineEmits(['close','addCategory','addWord', 'toggleEdit']);
-
-//용어제목
-const wordTitle = ref('');
-const addCategory = ref('');
-const content = ref('');
-const imageUrls = ref([]);
-
-//용어 Vaildation용
-const wordTitleAlert = ref(false);
-const wordContentAlert = ref(false);
-const addCategoryAlert = ref(false);
-
-//선택 카테고리
-const selectCategory = ref('');
-
-// 제목 상태
-const computedTitle = computed(() =>
-    wordTitle.value === '' ? props.titleValue : wordTitle.value
-);
-
-// 카테고리 상태
-const selectedCategory = computed(() =>
-    selectCategory.value === '' ? props.formValue : selectCategory.value
-
-);
-
-// 카테고리 입력 중복 ref
-const categoryInputRef = ref(null);
-
 const props = defineProps({
     dataList: {
         type: Array,
@@ -126,6 +93,38 @@ const props = defineProps({
     }
 });
 
+const writeStore = useWriteVisibleStore();
+
+const emit = defineEmits(['close','addCategory','addWord', 'toggleEdit']);
+
+//용어제목
+const wordTitle = ref('');
+const addCategory = ref('');
+const content = ref('');
+const imageUrls = ref([]);
+//용어 Vaildation용
+const wordTitleAlert = ref(false);
+const wordContentAlert = ref(false);
+const addCategoryAlert = ref(false);
+const  changed = ref(false);
+//선택 카테고리
+const selectCategory = ref('');
+
+// 제목 상태
+const computedTitle = computed(() =>
+    wordTitle.value === '' ? props.titleValue : wordTitle.value
+);
+
+// 카테고리 상태
+const selectedCategory = computed(() =>
+    selectCategory.value === '' ? props.formValue : selectCategory.value
+
+);
+
+// 카테고리 입력 중복 ref
+const categoryInputRef = ref(null);
+
+
 // 카테고리 입력 창
 const showInput = ref(false);
 
@@ -136,6 +135,7 @@ const toggleInput = () => {
 
 const onChange = (newValue) => {
     selectCategory.value = newValue.target.value;
+    changed.value = true;
 };
 
 const ValidHandler = (field) => {
@@ -144,11 +144,22 @@ const ValidHandler = (field) => {
     }
     if(field == 'content'){
         wordContentAlert.value = false;
+
     }
 
 }
 const handleContentUpdate = (newContent) => {
     content.value = newContent;
+
+    const oldContent = typeof props.contentValue === 'string'? JSON.parse(props.contentValue) : props.contentValue;
+    const newContentOps = newContent?.ops || [];
+
+    const oldContentJson = JSON.stringify(oldContent);
+    const newContentJson = JSON.stringify(newContentOps);
+
+    // 기존 데이터와 새 데이터가 다를 경우 changed = true;
+    changed.value = oldContentJson !== newContentJson;
+
     ValidHandler("content"); // 유효성 검사 실행
 };
 
@@ -221,3 +232,11 @@ const handleCategoryFocusout = (value) => {
 };
 
 </script>
+<style>
+.q-editor-container * {
+    max-width: 100% !important;
+    word-break: break-all !important;
+    box-sizing: border-box;
+    white-space: normal !important;
+}
+</style>

src/layouts/TheMenu.vue

@@ -80,12 +80,12 @@
                     <div class="text-truncate">Authorization</div>
                 </RouterLink>
             </li>
-            <!-- <li class="menu-item" :class="$route.path.includes('/sample') ? 'active' : ''">
-                <RouterLink class="menu-link" to="/sample"> <i class="bi "></i>
-                    <i class="menu-icon tf-icons bx bx-calendar"></i>
-                    <div class="text-truncate">Sample</div>
+            <li class="menu-item" :class="$route.path.includes('/people') ? 'active' : ''">
+                <RouterLink class="menu-link" to="/people"> <i class="bi "></i>
+                    <i class="menu-icon icon-base bi bi-people-fill"></i>
+                    <div class="text-truncate">people</div>
                 </RouterLink>
-            </li> -->
+            </li>
         </ul>
     </aside>
     <!-- / Menu -->
@@ -94,6 +94,7 @@
 <script setup>
 import { computed } from "vue";
 import { useUserInfoStore } from '@s/useUserInfoStore';
+import "bootstrap-icons/font/bootstrap-icons.css";
 
 const userStore = useUserInfoStore();
 const allowedUserId = 1;  // 특정 ID (변경필요!!)

src/layouts/TheTop.vue

@@ -9,15 +9,10 @@
         <!-- 날씨 정보 영역 -->
         <div class="navbar-nav align-items-center">
             <div class="d-flex align-items-center weather-box">
-                <img
-                v-if="weather.icon"
-                :src="customIconUrl"
-                :alt="weather.description"
-                :class="customIconClass"
-                />
+                <img v-if="weather.icon" :src="customIconUrl" :alt="weather.description" :class="customIconClass" />
                 <div class="d-flex flex-column">
                     <span class="weather-desc">{{ weather.description }}</span>
-                    <span class="weather-temp" v-if="weather.tempMin !== null && weather.tempMax !== null">
+                    <span class="weather-temp" v-if="weatherReady">
                         최저 {{ weather.tempMin }}° / 최고 {{ weather.tempMax }}°
                     </span>
                 </div>
@@ -26,7 +21,7 @@
 
         <div class="d-flex align-items-center ms-auto" id="navbar-collapse">
             <ul class="navbar-nav flex-row align-items-center ms-auto">
-                <select class="form-select py-1" id="name" v-model="selectedProject" @change="updateSelectedProject">
+                <select class="form-select py-1 cursor-pointer" id="name" v-model="selectedProject" @change="updateSelectedProject">
                     <!-- 내가 참여하고 있는 프로젝트 그룹 -->
                     <option v-for="item in myActiveProjects" :key="item.PROJCTSEQ" :value="item.PROJCTSEQ">
                         {{ item.PROJCTNAM }}
@@ -38,143 +33,41 @@
                     </option>
                 </select>
 
-                <!-- <button class="btn p-1" @click="switchToLightMode"><i class="bx bxs-sun link-warning"></i></button> -->
-                <!-- <button class="btn p-1" @click="switchToDarkMode"><i class="bx bxs-moon"></i></button> -->
-
-                <i class="bx bx-bell bx-md bx-log-out cursor-pointer p-3" @click="handleLogout"></i>
+                <i class="cursor-pointer p-2"></i>
 
                 <!-- Notification -->
                 <li class="nav-item dropdown-notifications navbar-dropdown dropdown me-3 me-xl-2 p-0">
                     <a
-                        class="nav-link dropdown-toggle hide-arrow p-0"
-                        href="javascript:void(0);"
-                        data-bs-toggle="dropdown"
-                        data-bs-auto-close="outside"
-                        aria-expanded="false"
+                    class="nav-link dropdown-toggle hide-arrow p-0"
+                    href="javascript:void(0);"
+                    data-bs-toggle="dropdown"
+                    data-bs-auto-close="outside"
+                    aria-expanded="false"
                     >
-                        <span class="position-relative">
-                            <i class="bx bx-bell bx-md"></i>
-                            <span class="badge rounded-pill bg-danger badge-dot badge-notifications border"></span>
-                        </span>
+                    <span class="position-relative">
+                        <i class="bx bx-bell bx-md"></i>
+                        <!-- 알림이 있을 경우에만 뱃지를 표시 -->
+                        <span
+                        v-if="notificationCount > 0"
+                        class="badge rounded-pill bg-danger badge-dot badge-notifications border"
+                        ></span>
+                    </span>
                     </a>
                     <ul class="dropdown-menu dropdown-menu-end p-0">
-                        <li class="dropdown-menu-header border-bottom">
-                            <div class="dropdown-header d-flex align-items-center py-3">
-                                <h6 class="mb-0 me-auto">Notification</h6>
-                                <div class="d-flex align-items-center h6 mb-0">
-                                    <span class="badge bg-label-primary me-2">8 New</span>
-                                    <a
-                                        href="javascript:void(0)"
-                                        class="dropdown-notifications-all p-2"
-                                        data-bs-toggle="tooltip"
-                                        data-bs-placement="top"
-                                        title="Mark all as read"
-                                        ><i class="bx bx-envelope-open text-heading"></i
-                                    ></a>
-                                </div>
-                            </div>
-                        </li>
-                        <li class="dropdown-notifications-list scrollable-container">
-                            <ul class="list-group list-group-flush">
-                                <li class="list-group-item list-group-item-action dropdown-notifications-item">
-                                    <div class="d-flex">
-                                        <div class="flex-shrink-0 me-3">
-                                            <div class="avatar">
-                                                <img src="/img/avatars/1.png" class="rounded-circle" />
-                                            </div>
-                                        </div>
-                                        <div class="flex-grow-1">
-                                            <h6 class="small mb-0">Congratulation Lettie 🎉</h6>
-                                            <small class="mb-1 d-block text-body">Won the monthly best seller gold badge</small>
-                                            <small class="text-muted">1h ago</small>
-                                        </div>
-                                        <div class="flex-shrink-0 dropdown-notifications-actions">
-                                            <a href="javascript:void(0)" class="dropdown-notifications-read"
-                                                ><span class="badge badge-dot"></span
-                                            ></a>
-                                            <a href="javascript:void(0)" class="dropdown-notifications-archive"
-                                                ><span class="bx bx-x"></span
-                                            ></a>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="list-group-item list-group-item-action dropdown-notifications-item">
-                                    <div class="d-flex">
-                                        <div class="flex-shrink-0 me-3">
-                                            <div class="avatar">
-                                                <span class="avatar-initial rounded-circle bg-label-danger">CF</span>
-                                            </div>
-                                        </div>
-                                        <div class="flex-grow-1">
-                                            <h6 class="small mb-0">Charles Franklin</h6>
-                                            <small class="mb-1 d-block text-body">Accepted your connection</small>
-                                            <small class="text-muted">12hr ago</small>
-                                        </div>
-                                        <div class="flex-shrink-0 dropdown-notifications-actions">
-                                            <a href="javascript:void(0)" class="dropdown-notifications-read"
-                                                ><span class="badge badge-dot"></span
-                                            ></a>
-                                            <a href="javascript:void(0)" class="dropdown-notifications-archive"
-                                                ><span class="bx bx-x"></span
-                                            ></a>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="list-group-item list-group-item-action dropdown-notifications-item marked-as-read">
-                                    <div class="d-flex">
-                                        <div class="flex-shrink-0 me-3">
-                                            <div class="avatar">
-                                                <img src="/img/avatars/2.png" class="rounded-circle" />
-                                            </div>
-                                        </div>
-                                        <div class="flex-grow-1">
-                                            <h6 class="small mb-0">New Message ✉️</h6>
-                                            <small class="mb-1 d-block text-body">You have new message from Natalie</small>
-                                            <small class="text-muted">1h ago</small>
-                                        </div>
-                                        <div class="flex-shrink-0 dropdown-notifications-actions">
-                                            <a href="javascript:void(0)" class="dropdown-notifications-read"
-                                                ><span class="badge badge-dot"></span
-                                            ></a>
-                                            <a href="javascript:void(0)" class="dropdown-notifications-archive"
-                                                ><span class="bx bx-x"></span
-                                            ></a>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="list-group-item list-group-item-action dropdown-notifications-item">
-                                    <div class="d-flex">
-                                        <div class="flex-shrink-0 me-3">
-                                            <div class="avatar">
-                                                <span class="avatar-initial rounded-circle bg-label-success"
-                                                    ><i class="bx bx-cart"></i
-                                                ></span>
-                                            </div>
-                                        </div>
-                                        <div class="flex-grow-1">
-                                            <h6 class="small mb-0">Whoo! You have new order 🛒</h6>
-                                            <small class="mb-1 d-block text-body">ACME Inc. made new order $1,154</small>
-                                            <small class="text-muted">1 day ago</small>
-                                        </div>
-                                        <div class="flex-shrink-0 dropdown-notifications-actions">
-                                            <a href="javascript:void(0)" class="dropdown-notifications-read"
-                                                ><span class="badge badge-dot"></span
-                                            ></a>
-                                            <a href="javascript:void(0)" class="dropdown-notifications-archive"
-                                                ><span class="bx bx-x"></span
-                                            ></a>
-                                        </div>
-                                    </div>
-                                </li>
-                            </ul>
-                        </li>
-                        <li class="border-top">
-                            <div class="d-grid p-4">
-                                <a class="btn btn-primary btn-sm d-flex" href="javascript:void(0);">
-                                    <small class="align-middle">View all notifications</small>
-                                </a>
-                            </div>
-                        </li>
+                    <li class="dropdown-notifications-list scrollable-container p-3">
+                        <!-- 알림이 없으면 "알림이 없습니다." 메시지 표시 -->
+                        <div v-if="notificationCount === 0">
+                        알림이 없습니다.
+                        </div>
+                        <!-- 알림이 있을 때 목록 렌더링-->
+                        <div v-else>
+                        <ul>
+                            <li v-for="notification in notifications" :key="notification.id">
+                            {{ notification.text }}
+                            </li>
+                        </ul>
+                        </div>
+                    </li>
                     </ul>
                 </li>
                 <!--/ Notification -->
@@ -185,30 +78,12 @@
                             v-if="user"
                             :src="`${baseUrl}upload/img/profile/${user.profile}`"
                             alt="Profile Image"
-                            class="w-px-40 h-px-40 rounded-circle border border-3"
+                            class="w-px-40 h-px-40 rounded-circle border border-3 object-fit-cover"
                             :style="`border-color: ${user.usercolor} !important;`"
                             @error="$event.target.src = '/img/icons/icon.png'"
                         />
                     </a>
                     <ul class="dropdown-menu dropdown-menu-end">
-                        <li>
-                            <a class="dropdown-item" href="pages-account-settings-account.html">
-                                <div class="d-flex">
-                                    <div class="flex-shrink-0 me-3">
-                                        <div class="avatar avatar-online">
-                                            <img src="/img/avatars/1.png" class="w-px-40 h-auto rounded-circle" />
-                                        </div>
-                                    </div>
-                                    <div class="flex-grow-1">
-                                        <h6 class="mb-0">John Doe</h6>
-                                        <small class="text-muted">Admin</small>
-                                    </div>
-                                </div>
-                            </a>
-                        </li>
-                        <li>
-                            <div class="dropdown-divider my-1"></div>
-                        </li>
                         <li>
                             <a class="dropdown-item" href="javascript:void(0)" @click="goToMyPage">
                                 <i class="bx bx-user bx-md me-3"></i><span>My Page</span>
@@ -219,28 +94,6 @@
                                 <i class="bx bx-cog bx-md me-3"></i><span>Settings</span>
                             </a>
                         </li>
-                        <li>
-                            <a class="dropdown-item" href="pages-account-settings-billing.html">
-                                <span class="d-flex align-items-center align-middle">
-                                    <i class="flex-shrink-0 bx bx-credit-card bx-md me-3"></i
-                                    ><span class="flex-grow-1 align-middle">Billing Plan</span>
-                                    <span class="flex-shrink-0 badge rounded-pill bg-danger">4</span>
-                                </span>
-                            </a>
-                        </li>
-                        <li>
-                            <div class="dropdown-divider my-1"></div>
-                        </li>
-                        <li>
-                            <a class="dropdown-item" href="pages-pricing.html">
-                                <i class="bx bx-dollar bx-md me-3"></i><span>Pricing</span>
-                            </a>
-                        </li>
-                        <li>
-                            <a class="dropdown-item" href="pages-faq.html">
-                                <i class="bx bx-help-circle bx-md me-3"></i><span>FAQ</span>
-                            </a>
-                        </li>
                         <li>
                             <div class="dropdown-divider my-1"></div>
                         </li>
@@ -251,23 +104,17 @@
                         </li>
                     </ul>
                 </li>
-                <!--/ User -->
             </ul>
         </div>
-
-        <!-- Search Small Screens -->
-        <div class="navbar-search-wrapper search-input-wrapper d-none">
-            <input type="text" class="form-control search-input container-xxl border-0" placeholder="Search..." aria-label="Search..." />
-            <i class="bx bx-x bx-md search-toggler cursor-pointer"></i>
-        </div>
     </nav>
 </template>
 <script setup>
     import { useAuthStore } from '@s/useAuthStore';
     import { useUserInfoStore } from '@/stores/useUserInfoStore';
     import { useProjectStore } from '@/stores/useProjectStore';
-    import { useRouter } from 'vue-router';
+    import { useRouter, useRoute } from 'vue-router';
     import { useThemeStore } from '@s/darkmode';
+    import { useWeatherStore } from '@/stores/useWeatherStore';
     import { computed, onMounted, ref, watch } from 'vue';
     import axios from '@api';
 
@@ -277,9 +124,24 @@
     const userStore = useUserInfoStore();
     const projectStore = useProjectStore();
     const router = useRouter();
+    const route = useRoute();
+    const weatherStore = useWeatherStore();
 
     const user = ref(null);
     const selectedProject = ref(null);
+    const weather = ref({});
+    const dailyWeatherList = ref([]);
+    const notifications = ref([]);
+    const notificationCount = ref(0);
+
+    const weatherReady = computed(() => {
+        return (
+            weather.value &&
+            weather.value.tempMin !== null &&
+            weather.value.tempMax !== null &&
+            !!weather.value.description
+        );
+    });
 
     // 내가 참여하고 있는 진행 중인 프로젝트 목록
     const myActiveProjects = computed(() => {
@@ -302,9 +164,7 @@
         if (!selectedProject.value) return;
 
         // 모든 진행 중인 프로젝트 리스트에서 선택된 프로젝트 찾기
-        let selected = projectStore.activeProjectList.find(
-            project => project.PROJCTSEQ === selectedProject.value
-        );
+        let selected = projectStore.activeProjectList.find(project => project.PROJCTSEQ === selectedProject.value);
 
         if (selected) {
             projectStore.setSelectedProject(selected);
@@ -312,15 +172,40 @@
     };
 
     // 선택된 프로젝트 변경 감지
-    watch(() => projectStore.selectedProject, (newProject) => {
-    if (newProject) {
-        selectedProject.value = newProject.PROJCTSEQ;
-    }
+    watch(
+        () => projectStore.selectedProject,
+        newProject => {
+            if (newProject) {
+                selectedProject.value = newProject.PROJCTSEQ;
+            }
+        },
+    );
+
+    const customIconUrl = computed(() => {
+        if (weather.value.icon === '01d' || weather.value.icon === '01n') {
+            return '/img/icons/sunny-custom.png';
+        }
+        return `https://openweathermap.org/img/wn/${weather.value.icon}@2x.png`;
     });
 
+    const customIconClass = computed(() => {
+        if (weather.value.icon === '01d' || weather.value.icon === '01n') {
+            return 'custom-sunny-icon';
+        }
+        return 'weather-icon';
+    });
 
     // const { isDarkMode, switchToDarkMode, switchToLightMode } = useThemeStore();
 
+    const handleLogout = async () => {
+        await authStore.logout();
+        router.push('/login');
+    };
+
+    const goToMyPage = () => {
+        router.push('/mypage');
+    };
+
     onMounted(async () => {
         // if (isDarkMode) {
         //     switchToDarkMode();
@@ -342,115 +227,59 @@
             projectStore.setSelectedProject(firstProject);
         }
 
+        // 로그인 페이지가 아닐 때만 날씨 정보를 가져오도록
+        if (route.name !== 'login' && route.name !== undefined) {
+            // 날씨 정보 갱신
+            await weatherStore.getWeatherInfoWithCache();
+            weather.value = weatherStore.weather; // 오늘 날씨
+            dailyWeatherList.value = weatherStore.dailyWeatherList; // 주간 날씨
+        }
     });
-
-    const weather = ref({
-        icon: '',
-        description: '',
-        tempMin: null,
-        tempMax: null,
-    });
-
-    const customIconUrl = computed(() => {
-    if (weather.value.icon === "01d" || weather.value.icon === "01n") {
-        return "/img/icons/sunny-custom.png";
-    }
-        return `https://openweathermap.org/img/wn/${weather.value.icon}@2x.png`;
-    });
-
-    const customIconClass = computed(() => {
-    if (weather.value.icon === "01d" || weather.value.icon === "01n") {
-        return "custom-sunny-icon";
-    }
-        return "weather-icon";
-    });
-
-    const weatherKorean = computed(() => weather.value.description || '날씨 정보 없음');
-
-    onMounted(() => {
-        navigator.geolocation.getCurrentPosition(async (position) => {
-            const lat = position.coords.latitude;
-            const lon = position.coords.longitude;
-
-            try {
-            const res = await axios.get(`/weather`, {
-                params: { lat, lon },
-                withCredentials: true,
-            });
-
-            const raw = res.data;
-            const data = JSON.parse(raw.data);
-
-            if (!data || !Array.isArray(data.list) || data.list.length === 0) {
-                console.error('날씨 데이터 형식 오류 또는 없음:', data);
-                return;
-            }
-
-            const now = new Date();
-            const closest = data.list.reduce((prev, curr) => {
-                const prevTime = new Date(prev.dt_txt).getTime();
-                const currTime = new Date(curr.dt_txt).getTime();
-                const nowTime = now.getTime();
-                const prevDiff = Math.abs(prevTime - nowTime);
-                const currDiff = Math.abs(currTime - nowTime);
-                return prevDiff < currDiff ? prev : curr;
-            });
-
-            weather.value.icon = closest.weather[0].icon.replace(/n$/, 'd');
-            weather.value.description = closest.weather[0].description;
-            weather.value.tempMin = Math.round(closest.main.temp_min);
-            weather.value.tempMax = Math.round(closest.main.temp_max);
-            } catch (e) {
-            console.error('날씨 정보 가져오기 실패:', e);
-            }
-        });
-    });
-
-    const handleLogout = async () => {
-        await authStore.logout();
-        router.push('/login');
-    };
-
-    const goToMyPage = () => {
-        router.push('/mypage');
-    };
-
 </script>
 <style scoped>
-.weather-icon {
-    width: 40%;
-    height: 40%;
-}
-.weather-desc {
-    font-size: 14px;
-    font-weight: 500;
-    line-height: 1.6;
-}
-.weather-temp {
-    font-size: 13px;
-    color: #888;
-    line-height: 1.2;
-}
-.weather-box {
-    display: flex;
-    align-items: center;
-    flex-shrink: 0;
-    max-width: 3000px;
-    white-space: nowrap;
-    overflow: hidden;
-}
-.custom-sunny-icon {
-    width: 5%;
-    height: auto;
-}
-@media (max-width: 1200px) {
-    .custom-sunny-icon {
-        width: 6%;
+    .weather-icon {
+        width: 40%;
+        height: 40%;
     }
-}
-@media (max-width: 1100px) {
-    .custom-sunny-icon {
-        width: 14%;
+    .weather-desc {
+        font-size: 14px;
+        font-weight: 500;
+        line-height: 1.6;
+    }
+    .weather-temp {
+        font-size: 13px;
+        color: #888;
+        line-height: 1.2;
+    }
+    /* .weather-box {
+        display: flex;
+        align-items: center;
+        flex-shrink: 0;
+        max-width: 3000px;
+        white-space: nowrap;
+        overflow: hidden;
+    } */
+    .custom-sunny-icon {
+        width: 50px;
+        height: 50px;
+        object-fit: contain;
+        flex-shrink: 0;
+    }
+    .weather-box {
+        display: flex;
+        align-items: center;
+        white-space: nowrap;
+        gap: 10px;
+        min-width: 160px; /* 필요시 */
+    }
+    @media (max-width: 1200px) {
+        .custom-sunny-icon {
+            width: 40px;
+        }
+    }
+    @media (max-width: 1100px) {
+        .custom-sunny-icon {
+            width: 30px;
+        }
     }
-}
 </style>

src/main.js

@@ -1,31 +1,31 @@
-import { createApp } from 'vue'
-import { createPinia } from 'pinia'
-import piniaPersist from 'pinia-plugin-persist'
-import App from './App.vue'
-import router from '@/router'
-import dayjs from '@p/dayjs'
+import { createApp } from 'vue';
+import { createPinia } from 'pinia';
+import piniaPersist from 'pinia-plugin-persist';
+import App from './App.vue';
+import router from '@/router';
+import dayjs from '@p/dayjs';
 import ToastModal from '@c/modal/ToastModal.vue';
-import common from '@/common/common.js'
-import { useKakao } from 'vue3-kakao-maps/@utils'
+import common from '@/common/common.js';
+import { useKakao } from 'vue3-kakao-maps/@utils';
 
-const pinia = createPinia()
-pinia.use(piniaPersist)
+const pinia = createPinia();
+pinia.use(piniaPersist);
 
 const kakaoApiKey = import.meta.env.VITE_KAKAO_MAP_KEY;
 
-useKakao(kakaoApiKey, ['services'])
+useKakao(kakaoApiKey, ['services']);
 
-const app = createApp(App)
-app.use(router)
-    .use(pinia)
-    .use(common)
-    .use(dayjs)
-    .component('ToastModal',ToastModal)
-    .mount('#app')
+const app = createApp(App);
+app.use(router).use(pinia).use(common).use(dayjs).component('ToastModal', ToastModal);
 
-if (import.meta.env.MODE === "prod") {
+// 라우트 로딩 후 앱 마우트
+router.isReady().then(() => {
+    app.mount('#app');
+});
+
+if (import.meta.env.MODE === 'prod') {
     const console = window.console || {};
-    console.log = function no_console() { }; // console log 막기
-    console.warn = function no_console() { }; // console warning 막기
-    console.error = function () { }; // console error 막기
+    console.log = function no_console() {}; // console log 막기
+    console.warn = function no_console() {}; // console warning 막기
+    console.error = function () {}; // console error 막기
 }

src/router/index.js

@@ -8,7 +8,7 @@ const routes = [
         path: '/',
         name: 'Home',
         component: () => import('@v/MainView.vue'),
-        meta: { requiresAuth: true }
+        meta: { requiresAuth: true },
     },
     {
         path: '/board',
@@ -22,6 +22,7 @@ const routes = [
             },
             {
                 path: 'write',
+                name: 'BoardWrite',
                 component: () => import('@v/board/BoardWrite.vue'),
             },
             {
@@ -40,12 +41,13 @@ const routes = [
         path: '/mypage',
         name: 'MyPage',
         component: () => import('@v/mypage/MyPage.vue'),
-        meta: { requiresAuth: true }
+        meta: { requiresAuth: true },
     },
     {
         path: '/wordDict',
+        name: 'WordDict',
         component: () => import('@v/wordDict/wordDict.vue'),
-        meta: { requiresAuth: true }
+        meta: { requiresAuth: true },
     },
     {
         path: '/login',
@@ -67,39 +69,52 @@ const routes = [
     },
     {
         path: '/vacation',
+        name: 'Vacation',
         component: () => import('@v/vacation/VacationManagement.vue'),
-        meta: { requiresAuth: true }
+        meta: { requiresAuth: true },
     },
     {
         path: '/voteboard',
+        name: 'VoteBoard',
         component: () => import('@v/voteboard/TheVoteBoard.vue'),
         meta: { requiresAuth: true },
         children: [
             {
                 path: '',
+                name: 'VoteBoardList',
                 component: () => import('@v/voteboard/voteBoardList.vue'),
             },
             {
                 path: 'write',
+                name: 'VoteboardWrite',
                 component: () => import('@v/voteboard/voteboardWrite.vue'),
             },
         ],
     },
     {
         path: '/projectlist',
+        name: 'Projectlist',
         component: () => import('@v/projectlist/TheProjectList.vue'),
-        meta: { requiresAuth: true }
+        meta: { requiresAuth: true },
     },
     {
         path: '/commuters',
+        name: 'Commuters',
         component: () => import('@v/commuters/TheCommuters.vue'),
-        meta: { requiresAuth: true }
+        meta: { requiresAuth: true },
     },
     {
         path: '/authorization',
+        name: 'Authorization',
         component: () => import('@v/admin/TheAuthorization.vue'),
         meta: { requiresAuth: true },
     },
+    {
+        path: '/people',
+        name: 'people',
+        component: () => import('@v/people/PeopleList.vue'),
+        meta: { requiresAuth: true },
+    },
     {
         path: '/error/400',
         name: 'Error400',
@@ -139,7 +154,7 @@ router.beforeEach(async (to, from, next) => {
 
     // Authorization 페이지는 ID가 26이 아니면 접근 차단
     if (to.path === '/authorization' && userId !== allowedUserId) {
-        return next('/');
+        return next();
     }
 
     // 비로그인 사용자만 접근 가능한 페이지인데 로그인된 경우 → 홈으로 이동

src/stores/useWeatherStore.js

@@ -0,0 +1,122 @@
+/*
+    작성자 : 서지희
+    작성일 : 2025-04-04
+    수정일 : 2025-04-07
+    설명   : 위치 기반으로 날씨를 조회하고, 10분 단위 캐시로 저장합니다.
+*/
+import { ref } from 'vue';
+import { defineStore } from 'pinia';
+import $api from '@api';
+
+export const useWeatherStore = defineStore('weather', () => {
+    const weather = ref({
+        icon: '',
+        description: '',
+        tempMin: null,
+        tempMax: null,
+    });
+
+    const dailyWeatherList = ref([]);
+
+    const getWeatherInfo = async () => {
+        return new Promise((resolve, reject) => {
+            navigator.geolocation.getCurrentPosition(async position => {
+                const lat = position.coords.latitude;
+                const lon = position.coords.longitude;
+
+                try {
+                    const res = await $api.get(`/weather`, {
+                        params: { lat, lon },
+                        withCredentials: true,
+                    });
+
+                    if (!res?.data?.data) return;
+
+                    const resData = res.data.data;
+                    const raw = resData.weatherInfo;
+                    const data = JSON.parse(raw);
+                    if (!data || !Array.isArray(data.list)) {
+                        console.error('날씨 데이터 형식 오류');
+                        return;
+                    }
+
+                    // 검은색 태양 아이콘 변경
+                    dailyWeatherList.value = resData.dailyWeatherList.map(w => {
+                        return {
+                            ...w,
+                            icon: w.icon.replace(/n$/, 'd'),
+                        };
+                    });
+
+                    const now = new Date();
+                    const todayStr = now.toISOString().split('T')[0];
+                    const nowTime = now.getTime();
+
+                    const todayList = data.list.filter(item => item.dt_txt.startsWith(todayStr));
+                    if (todayList.length > 0) {
+                        const minTemp = Math.min(...todayList.map(i => i.main.temp_min));
+                        const maxTemp = Math.max(...todayList.map(i => i.main.temp_max));
+                        weather.value.tempMin = Math.round(minTemp);
+                        weather.value.tempMax = Math.round(maxTemp);
+                    }
+
+                    const closest = data.list.reduce((prev, curr) => {
+                        const prevDiff = Math.abs(new Date(prev.dt_txt).getTime() - nowTime);
+                        const currDiff = Math.abs(new Date(curr.dt_txt).getTime() - nowTime);
+                        return currDiff < prevDiff ? curr : prev;
+                    });
+
+                    weather.value.icon = closest.weather[0].icon.replace(/n$/, 'd');
+                    weather.value.description = closest.weather[0].description;
+
+                    resolve({ weather: weather.value, dailyWeatherList: dailyWeatherList.value });
+                } catch (e) {
+                    console.error('날씨 정보 가져오기 실패:', e);
+                    reject(e);
+                }
+            }, reject);
+        });
+    };
+
+    const getWeatherInfoWithCache = async () => {
+        const now = new Date();
+        const pad = n => String(n).padStart(2, '0');
+        const key = `weather_${pad(now.getMonth() + 1)}${pad(now.getDate())}${pad(now.getHours())}${pad(Math.floor(now.getMinutes() / 10) * 10)}`;
+        const cached = localStorage.getItem(key);
+        if (cached) {
+            const parsed = JSON.parse(cached);
+            weather.value = parsed.weather;
+            dailyWeatherList.value = parsed.dailyWeatherList;
+            return;
+        }
+
+        try {
+            const { weather: w, dailyWeatherList: d } = await getWeatherInfo();
+
+            // 기존 캐시 삭제
+            Object.keys(localStorage).forEach(k => {
+                if (k.startsWith('weather_')) localStorage.removeItem(k);
+            });
+
+            localStorage.setItem(key, JSON.stringify({ weather: w, dailyWeatherList: d }));
+        } catch (e) {
+            console.error('날씨 API 호출 실패, 캐시 fallback 시도 중...');
+            const oldKey = Object.keys(localStorage)
+                .filter(k => k.startsWith('weather_'))
+                .sort()
+                .pop();
+            if (oldKey) {
+                const fallback = JSON.parse(localStorage.getItem(oldKey));
+                weather.value = fallback.weather;
+                dailyWeatherList.value = fallback.dailyWeatherList;
+            }
+        }
+    };
+
+    return {
+        weather,
+        dailyWeatherList,
+        getWeatherInfo,
+        getWeatherInfoWithCache,
+    };
+});

src/views/MainView.vue

@@ -2,7 +2,7 @@
     <div class="container-xxl flex-grow-1 container-p-y pb-0">
         <MainEventCalendar />
         <MemberManagement v-if="isAdmin" />
-        <div class="row mt-4">
+        <div class="row g-4 mt-2">
             <!-- 게시판 -->
             <BoardMain />
             <!-- 용어집 -->
@@ -21,18 +21,18 @@
     import MainVote from '@c/main/MainVote.vue';
     import { useUserInfoStore } from '@/stores/useUserInfoStore';
     import { onMounted, ref } from 'vue';
+    import $api from '@api';
 
     const userStore = useUserInfoStore();
-    const user = ref();
     const isAdmin = ref(false);
 
-    const checkAdmin = user => {
-        return user?.value?.role === 'ROLE_ADMIN' ? true : false;
+    const checkAdmin = async user => {
+        const { data } = await $api.post('user/authCheck', { memberId: user.loginId });
+        return data.data === 'ROLE_ADMIN' ? true : false;
     };
 
     onMounted(async () => {
         await userStore.userInfo();
-        user.value = userStore.user;
-        isAdmin.value = await checkAdmin(user);
+        isAdmin.value = await checkAdmin(userStore.user);
     });
 </script>

src/views/admin/TheAuthorization.vue

@@ -1,26 +1,35 @@
 <template>
-    <div class="container text-center flex-grow-1 container-p-y">
-        <div class="card">
-            <div class="card-header d-flex flex-column">
-                <h3>관리자 권한 부여</h3>
-                <div class="user-card-container">
-                    <div v-for="user in users" :key="user.id" class="user-card">
-                        <!-- 프로필 사진 -->
-                        <img :src="getProfileImage(user.photo)" class="profile-img" alt="프로필 사진" @error="setDefaultImage" />
-                        <!-- 사용자 정보 -->
-                        <div class="user-info">
-                            <h5>{{ user.name }}</h5>
-                        </div>
-                        <!-- 권한 토글 버튼 -->
-                        <label class="switch me-0">
-                            <input type="checkbox" :checked="user.isAdmin" @change="toggleAdmin(user)" />
-                            <span class="slider round"></span>
-                        </label>
-                    </div>
-                </div>
+<div class="container text-center flex-grow-1 container-p-y">
+    <div class="card">
+    <div class="card-header d-flex flex-column">
+        <h3>관리자 권한 부여</h3>
+        <div class="user-card-container">
+        <div v-for="user in users" :key="user.id" class="user-card">
+            <!-- 프로필 사진 -->
+            <img
+            :src="getProfileImage(user.photo)"
+            class="user-avatar2"
+            alt="프로필 사진"
+            @error="setDefaultImage"
+            />
+            <!-- 사용자 정보 -->
+            <div class="user-info">
+            <h5>{{ user.name }}</h5>
             </div>
+            <!-- 권한 토글 버튼 (기본 동작 막고 클릭시 직접 토글 처리) -->
+            <label class="switch me-0">
+            <input
+                type="checkbox"
+                :checked="user.isAdmin"
+                @click="handleToggle($event, user)"
+            />
+            <span class="slider round"></span>
+            </label>
+        </div>
         </div>
     </div>
+    </div>
+</div>
 </template>
 
 <script setup>
@@ -32,65 +41,80 @@ const users = ref([]);
 const toastStore = useToastStore();
 const baseUrl = axios.defaults.baseURL.replace(/api\/$/, "");
 const defaultProfile = "/img/icons/icon.png";
-const allowedUserId = 1;  // 특정 ID (변경필요!!)
+const allowedUserId = 1; // 특정 ID (필요에 따라 변경)
+
 // 사용자 목록 가져오기
 async function fetchUsers() {
-    try {
-        const response = await axios.get('admin/users'); // API 경로 확인 필요
-
-        // API 응답 구조 확인 후 데이터가 배열인지 체크
-        if (!response.data || !Array.isArray(response.data.data)) {
-            throw new Error("올바른 데이터 형식이 아닙니다.");
-        }
-
-        // MEMBERSEQ가 1이 아닌 회원만 필터링하여 데이터 매핑
-        users.value = response.data.data
-            .filter(user => user.MEMBERSEQ !== allowedUserId) // MEMBERSEQ가 1이면 제외
-            .map(user => ({
-                id: user.MEMBERSEQ,
-                name: user.MEMBERNAM,
-                photo: user.MEMBERPRF ? `${baseUrl}upload/img/profile/${user.MEMBERPRF}` : defaultProfile,
-                color: user.MEMBERCOL,
-                isAdmin: user.MEMBERROL === 'ROLE_ADMIN',
-            }));
-
-    } catch (error) {
-        toastStore.onToast('사용자 목록을 불러오지 못했습니다.', 'e');
+try {
+    const response = await axios.get('admin/users'); // API 경로 확인
+    if (!response.data || !Array.isArray(response.data.data)) {
+    throw new Error("올바른 데이터 형식이 아닙니다.");
     }
+    users.value = response.data.data
+    .filter(user => user.MEMBERSEQ !== allowedUserId)
+    .map(user => ({
+        id: user.MEMBERSEQ,
+        name: user.MEMBERNAM,
+        photo: user.MEMBERPRF ? `${baseUrl}upload/img/profile/${user.MEMBERPRF}` : defaultProfile,
+        color: user.MEMBERCOL,
+        isAdmin: user.MEMBERROL === 'ROLE_ADMIN',
+    }));
+} catch (error) {
+    toastStore.onToast('사용자 목록을 불러오지 못했습니다.', 'e');
+}
 }
 
 // 프로필 이미지 가져오기
 function getProfileImage(photo) {
-    return photo || defaultProfile;
+return photo || defaultProfile;
 }
 
 // 이미지 로드 오류 시 기본 이미지 설정
 function setDefaultImage(event) {
-    event.target.src = defaultProfile;
+event.target.src = defaultProfile;
 }
 
-// 관리자 권한 토글 함수
-async function toggleAdmin(user) {
-    const requestData = {
-        id: user.id,
-        role: user.isAdmin ? 'MEMBER' : 'ADMIN'
-    };
-    try {
-        const response = await axios.put('admin/role', requestData);
+// 권한 토글 시 기본 동작 막고 직접 제어하는 함수
+async function handleToggle(event, user) {
+// Prevent the default checkbox toggle behavior
+event.preventDefault();
 
-        if (response.status === 200) {
-            user.isAdmin = !user.isAdmin;
-            toastStore.onToast(`'${user.name}'의 권한이 '${requestData.role}'(으)로 변경되었습니다.`, 's');
-        } else {
-            throw new Error('권한 변경 실패');
-        }
-    } catch (error) {
-        toastStore.onToast('권한 변경에 실패했습니다.', 'e');
+// 저장: 현재 상태를 기반으로 변경 요청 (체크박스는 아직 변하지 않았음)
+const originalState = user.isAdmin;
+const newState = !originalState;
+
+const requestData = {
+    id: user.id,
+    role: originalState ? 'MEMBER' : 'ADMIN'
+};
+
+try {
+    const response = await axios.put('admin/role', requestData);
+    if (response.status === 200) {
+    // 서버 요청 성공 시에만 상태를 업데이트
+    user.isAdmin = newState;
+    toastStore.onToast(`'${user.name}'의 권한이 '${requestData.role}'(으)로 변경되었습니다.`, 's');
+    } else {
+    throw new Error('권한 변경 실패');
     }
+} catch (error) {
+    // 에러 발생 시 상태를 변경하지 않음
+    toastStore.onToast('권한 변경에 실패했습니다.', 'e');
+}
 }
 
 onMounted(fetchUsers);
 </script>
 
 <style scoped>
+.user-avatar2 {
+    width: 160px;
+    height: 200px;
+    object-fit: cover;
+    border-radius: 50%;
+    display: block;
+    margin: 1rem auto 0 auto;
+    margin-top: 0px;
+    margin-bottom: 10px;
+}
 </style>

src/views/board/BoardEdit.vue

@@ -99,7 +99,7 @@
 
     // 상태 변수
     const title = ref('');
-    const content = ref('');
+    const content = ref({ ops: [] });
     const autoIncrement = ref(0);
 
     // 경고 상태
@@ -130,10 +130,9 @@
     // 최초 업데이트 감지 여부
     const isFirstContentUpdate = ref(true);
 
-    // 에디터에서 데이터 업데이트 시
+    // 에디터 데이터 업데이트 시 처리 (최초 데이터 저장)
     const handleEditorDataUpdate = data => {
         content.value = data;
-
         if (isFirstContentUpdate.value) {
             originalContent.value = structuredClone(data);
             isFirstContentUpdate.value = false;
@@ -141,23 +140,28 @@
         }
     };
 
+    // isDeltaChanged 함수 수정 (내장 diff 대신 텍스트, 이미지, 비디오 각각을 직접 비교)
     function isDeltaChanged(current, original) {
         const Delta = Quill.import('delta');
         const currentDelta = new Delta(current || []);
         const originalDelta = new Delta(original || []);
 
-        const diff = originalDelta.diff(currentDelta);
-        if (!diff || diff.ops.length === 0) return false;
-
-        // 텍스트만 비교해서 완전 동일한지 확인
+        // 텍스트 추출
         const getPlainText = delta =>
             (delta.ops || [])
                 .filter(op => typeof op.insert === 'string')
                 .map(op => op.insert)
                 .join('');
-
+        // 이미지 URL 추출
         const getImages = delta =>
-            (delta.ops || []).filter(op => typeof op.insert === 'object' && op.insert.image).map(op => op.insert.image);
+            (delta.ops || [])
+                .filter(op => typeof op.insert === 'object' && op.insert.image)
+                .map(op => op.insert.image);
+        // 비디오 URL 추출
+        const getVideos = delta =>
+            (delta.ops || [])
+                .filter(op => typeof op.insert === 'object' && op.insert.video)
+                .map(op => op.insert.video);
 
         const textCurrent = getPlainText(currentDelta);
         const textOriginal = getPlainText(originalDelta);
@@ -165,36 +169,36 @@
         const imgsCurrent = getImages(currentDelta);
         const imgsOriginal = getImages(originalDelta);
 
-        const textEqual = textCurrent === textOriginal;
-        const imageEqual = JSON.stringify(imgsCurrent) === JSON.stringify(imgsOriginal);
+        const vidsCurrent = getVideos(currentDelta);
+        const vidsOriginal = getVideos(originalDelta);
 
-        return !(textEqual && imageEqual); // 둘 다 같아야 false
+        const textEqual = textCurrent === textOriginal;
+        const imageEqual = imgsCurrent.length === imgsOriginal.length && imgsCurrent.every((val, idx) => val === imgsOriginal[idx]);
+        const videoEqual = vidsCurrent.length === vidsOriginal.length && vidsCurrent.every((val, idx) => val === vidsOriginal[idx]);
+
+        return !(textEqual && imageEqual && videoEqual);
     }
 
+    // 게시물 변경 여부 계산
     const isChanged = computed(() => {
         if (!contentInitialized.value) return false;
         const isTitleChanged = title.value !== originalTitle.value;
         const isContentChanged = isDeltaChanged(content.value, originalContent.value);
         const isFilesChanged =
-            attachFiles.value.some(f => !f.id) || // id 없는 새 파일이 있는 경우
+            attachFiles.value.some(f => !f.id) || // 신규 파일 존재
             delFileIdx.value.length > 0 || // 삭제된 파일이 있는 경우
             !isSameFiles(
-                attachFiles.value.filter(f => f.id), // 기존 파일(id 있는 것만)
-                originalFiles.value,
+                attachFiles.value.filter(f => f.id), // 기존 파일만 비교
+                originalFiles.value
             );
         return isTitleChanged || isContentChanged || isFilesChanged;
     });
-    watch(isChanged, val => {
-        console.log('🔄 isChanged changed:', val);
-    });
 
     // 파일 비교 함수
     function isSameFiles(current, original) {
         if (current.length !== original.length) return false;
-
         const sortedCurrent = [...current].sort((a, b) => a.id - b.id);
         const sortedOriginal = [...original].sort((a, b) => a.id - b.id);
-
         return sortedCurrent.every((file, idx) => {
             return file.id === sortedOriginal[idx].id && file.name === sortedOriginal[idx].name;
         });
@@ -202,31 +206,24 @@
 
     // 게시물 데이터 로드
     const fetchBoardDetails = async () => {
-        // 수정 데이터 전송
         let password = accessStore.password;
         const params = {
             password: `${password}` || '',
         };
-        //const response = await axios.get(`board/${currentBoardId.value}`);
         const { data } = await axios.post(`board/${currentBoardId.value}`, params);
-
         if (data.code !== 200) {
-            //toastStore.onToast(data.message, 'e');
             alert(data.message, 'e');
             router.back();
             return;
         }
         const boardData = data.data;
-        // 기존 첨부파일 추가
         if (boardData.hasAttachment && boardData.attachments.length > 0) {
             const formatted = addDisplayFileName([...boardData.attachments]);
             attachFiles.value = formatted;
             originalFiles.value = formatted;
         }
-
-        // 데이터 설정
         title.value = boardData.title || '제목 없음';
-        content.value = boardData.content || '내용 없음';
+        content.value = boardData.content || { ops: [] };
         originalTitle.value = title.value;
         originalContent.value = structuredClone(boardData.content);
         contentInitialized.value = true;
@@ -245,38 +242,34 @@
     const addDisplayFileName = fileInfos =>
         fileInfos.map(file => ({
             ...file,
-            name: `${file.originalName}.${file.extension}`,
+            name: `${file.originalName}.${file.extension}`
         }));
 
-    // 상세 페이지로 이동
+    // 상세 페이지 이동
     const goList = () => {
         accessStore.$reset();
-
-        // 목록으로 바로 이동시 필터 유지
-        // const getFilter = localStorage.getItem(`boardList_${currentBoardId.value}`);
-        // if (getFilter) {
-        //     router.push({
-        //         path: '/board',
-        //         query: JSON.parse(getFilter),
-        //     });
-        // } else {
-        //     router.push('/board');
-        // }
-
         router.back();
     };
 
-    // 전 페이지로 이동
+    // 전 페이지 이동
     const goBack = () => {
         accessStore.$reset();
         router.back();
     };
 
-    // 유효성 확인
-    const checkValidation = () => {
-        contentAlert.value = $common.isNotValidContent(content);
-        titleAlert.value = $common.isNotValidInput(title.value);
+    // 로컬 유효성 검사 함수 (에디터 내용: 텍스트, 이미지, 비디오 중 하나라도 있으면 유효)
+    const isNotValidContent = delta => {
+        if (!delta?.ops?.length) return true;
+        const hasText = delta.ops.some(op => typeof op.insert === 'string' && op.insert.trim().length > 0);
+        const hasImage = delta.ops.some(op => op.insert && typeof op.insert === 'object' && op.insert.image);
+        const hasVideo = delta.ops.some(op => op.insert && typeof op.insert === 'object' && op.insert.video);
+        return !(hasText || hasImage || hasVideo);
+    };
 
+    // 유효성 확인 함수
+    const checkValidation = () => {
+        contentAlert.value = isNotValidContent(content.value);
+        titleAlert.value = $common.isNotValidInput(title.value);
         if (titleAlert.value || contentAlert.value || !isFileValid.value) {
             if (titleAlert.value) {
                 title.value = '';
@@ -292,7 +285,6 @@
 
     const handleFileUpload = files => {
         const validFiles = files.filter(file => file.size <= maxSize);
-
         if (files.some(file => file.size > maxSize)) {
             fileError.value = '파일 크기가 10MB를 초과할 수 없습니다.';
             return;
@@ -303,13 +295,11 @@
         }
         fileError.value = '';
         attachFiles.value = [...attachFiles.value, ...validFiles].slice(0, maxFiles);
-
         autoIncrement.value++;
     };
 
     const removeFile = (index, file) => {
         if (file.id) delFileIdx.value.push(file.id);
-
         attachFiles.value.splice(index, 1);
         if (attachFiles.value.length <= maxFiles) {
             fileError.value = '';
@@ -327,55 +317,41 @@
     };
     ////////////////// fileSection[E] ////////////////////
 
-    /** `content` 변경 감지하여 자동 유효성 검사 실행 */
+    /** content 변경 감지 (deep 옵션 추가) */
     watch(content, () => {
-        contentAlert.value = $common.isNotValidContent(content);
-    });
+        contentAlert.value = isNotValidContent(content.value);
+    }, { deep: true });
 
-    // 글 제목 유효성
+    // 글 제목 유효성 검사
     const validateTitle = () => {
         titleAlert.value = title.value.trim().length === 0;
     };
 
-    // 게시물 수정
+    // 게시물 수정 함수
     const updateBoard = async () => {
         if (checkValidation()) return;
-
-        // 수정 데이터 전송
         const boardData = {
             LOCBRDTTL: title.value.trim(),
             LOCBRDCON: JSON.stringify(content.value),
-            LOCBRDSEQ: currentBoardId.value,
+            LOCBRDSEQ: currentBoardId.value
         };
-
-        // 업로드 된 첨부파일의 삭제목록
         if (delFileIdx.value && delFileIdx.value.length > 0) {
             boardData.delFileIdx = [...delFileIdx.value];
         }
-
-        // 에디터에 업로드 된 이미지 인덱스 목록
         if (editorUploadedImgList.value && editorUploadedImgList.value.length > 0) {
             boardData.editorUploadedImgList = [...editorUploadedImgList.value];
         }
-
-        // 삭제할 에디터 이미지 인덱스
         if (editorDeleteImgList.value && editorDeleteImgList.value.length > 0) {
             boardData.editorDeleteImgList = [...editorDeleteImgList.value];
         }
-
         const fileArray = newFileFilter(attachFiles);
         const formData = new FormData();
-
-        // formData에 boardData 추가
         Object.entries(boardData).forEach(([key, value]) => {
             formData.append(key, value);
         });
-
-        // formData에 새로 추가한 파일 추가
         fileArray.forEach((file, idx) => {
             formData.append('files', file);
         });
-
         const { data } = await axios.put(`board/${currentBoardId.value}`, formData, { isFormData: true });
         if (data.code === 200) {
             toastStore.onToast('게시물이 수정되었습니다.', 's');

src/views/board/BoardList.vue

@@ -47,7 +47,7 @@
                             <tr>
                                 <th style="width: 11%" class="text-center fw-bold">번호</th>
                                 <th style="width: 45%" class="text-center fw-bold">제목</th>
-                                <th style="width: 10%" class="text-center fw-bold">작성자</th>
+                                <th style="width: 10%" class="text-strat fw-bold">작성자</th>
                                 <th style="width: 15%" class="text-center fw-bold">작성일</th>
                                 <th style="width: 9%" class="text-center fw-bold">조회수</th>
                             </tr>
@@ -63,7 +63,7 @@
                                 >
                                     <td class="text-center">공지</td>
                                     <td class="cursor-pointer">
-                                        <div class="d-flex align-items-center">
+                                        <div class="d-flex flex-wrap align-items-center">
                                             <span class="me-1">📌</span>
                                             <span>{{ truncateTitle(notice.title) }}</span>
 
@@ -80,7 +80,7 @@
                                             <span v-if="isNewPost(notice.rawDate)" class="box-new badge text-white ms-2 fs-tiny"> N </span>
                                         </div>
                                     </td>
-                                    <td class="text-center">{{ notice.author }}</td>
+                                    <td class="text-start">{{ notice.author }}</td>
                                     <td class="text-center">{{ notice.date }}</td>
                                     <td class="text-center">{{ notice.views }}</td>
                                 </tr>
@@ -94,9 +94,9 @@
                             >
                                 <td class="text-center">{{ post.id }}</td>
                                 <td class="cursor-pointer">
-                                    <div class="d-flex align-items-center">
+                                    <div class="d-flex flex-wrap align-items-center">
                                         {{ truncateTitle(post.title) }}
-                                        <span v-if="post.commentCount" class="comment-count">[ {{ post.commentCount }} ]</span>
+                                        <span v-if="post.commentCount" class="comment-count text-danger">[ {{ post.commentCount }} ]</span>
                                         <i v-if="post.img" class="bi bi-image mx-1"></i>
                                         <i
                                             v-if="Array.isArray(post.hasAttachment) && post.hasAttachment.length > 0"
@@ -105,7 +105,7 @@
                                         <span v-if="isNewPost(post.rawDate)" class="box-new badge text-white ms-2 fs-tiny">N</span>
                                     </div>
                                 </td>
-                                <td class="text-center">{{ post.nickname ? post.nickname : post.author }}</td>
+                                <td class="text-start nickname-ellipsis">{{ post.nickname ? post.nickname : post.author }}</td>
                                 <td class="text-center">{{ post.date }}</td>
                                 <td class="text-center">{{ post.views }}</td>
                             </tr>
@@ -178,7 +178,7 @@
     };
 
     const truncateTitle = title => {
-        return title.length > 28 ? title.slice(0, 28) + '...' : title;
+        return title.length > 19 ? title.slice(0, 19) + '...' : title;
     };
 
     // 로컬 스토리지 필터 저장
@@ -190,9 +190,9 @@
             searchText: searchText.value,
             showNotice: showNotices.value,
         };
-
+        //localStorage.removeItem
         // 목록으로 바로 보낼때 필터 유지값
-        //localStorage.setItem(`boardList_${seq}`, JSON.stringify(query));
+        localStorage.setItem(`boardList_${seq}`, JSON.stringify(query));
     };
 
     // 스토리지 초기화

src/views/board/BoardView.vue

@@ -17,9 +17,18 @@
                                 :date="formattedBoardDate"
                                 :isLike="false"
                                 :isAuthor="isAuthor"
+                                :is-edit-pushed="isEditPushed"
+                                :is-delete-pushed="isDeletePushed"
                                 @editClick="editClick"
                                 @deleteClick="deleteClick"
-                            />
+                            >
+                                <!-- 목록으로 버튼 -->
+                                <template #gobackBtn>
+                                    <button class="btn btn-label-primary btn-icon me-1" @click="goList">
+                                        <i class="bx bx-left-arrow-alt"></i>
+                                    </button>
+                                </template>
+                            </BoardProfile>
 
                             <!-- 비밀번호 입력창 (익명일 경우) -->
                             <div v-if="isPassword && unknown" class="mt-3 w-px-200 ms-auto">
@@ -92,7 +101,7 @@
                                 @updateReaction="handleUpdateReaction"
                             />
                         </div>
-                        <div v-if="!type" >
+                        <div v-if="!type">
                             <!-- 댓글 입력 영역 -->
                             <BoardCommentArea
                                 :profileName="profileName"
@@ -142,7 +151,7 @@
     import BoardCommentList from '@c/board/BoardCommentList.vue';
     import BoardRecommendBtn from '@c/button/BoardRecommendBtn.vue';
     import Pagination from '@c/pagination/Pagination.vue';
-    import { ref, onMounted, computed, inject } from 'vue';
+    import { ref, onMounted, computed, inject, provide } from 'vue';
     import { useRoute, useRouter } from 'vue-router';
     import { useUserInfoStore } from '@/stores/useUserInfoStore';
     import { useToastStore } from '@s/toastStore';
@@ -165,6 +174,8 @@
     const attachment = ref(false);
     const comments = ref([]);
     const profileImg = ref('');
+    const isEditPushed = ref(false);
+    const isDeletePushed = ref(false);
 
     const route = useRoute();
     const router = useRouter();
@@ -319,6 +330,9 @@
         });
 
         fetchComments(pagination.value.currentPage);
+        closeAllEditTextareas();
+        closeAllPasswordAreas();
+        activeCommentBtnClass();
     };
 
     // 댓글 목록 조회
@@ -444,6 +458,7 @@
             passwordAlert.value = '';
             commentAlert.value = '';
             await fetchComments();
+            activeCommentBtnClass();
         } else {
             alert('댓글 작성을 실패했습니다.');
         }
@@ -475,6 +490,9 @@
         const isUnknown = unknown?.unknown ?? false;
 
         if (isUnknown) {
+            closeAllEditTextareas();
+            closeAllPasswordAreas();
+            activeCommentBtnClass();
             togglePassword('edit');
         } else {
             router.push({ name: 'BoardEdit', params: { id: currentBoardId.value } });
@@ -486,6 +504,9 @@
         const isUnknown = unknown?.unknown ?? false;
 
         if (isUnknown) {
+            closeAllEditTextareas();
+            closeAllPasswordAreas();
+            activeCommentBtnClass();
             togglePassword('delete');
         } else {
             deletePost();
@@ -505,11 +526,36 @@
         return null;
     };
 
+    const btnState = ref({});
+    provide('isBtnPushed', btnState);
+
+    const activeCommentBtnClass = (targetComment = null, type = 3) => {
+        const target = targetComment?.commentId;
+        let editPush = false;
+        let deletePush = false;
+
+        if (targetComment) {
+            if (type == 1) {
+                editPush = true;
+                deletePush = false;
+            } else if (type == 2) {
+                editPush = false;
+                deletePush = true;
+            }
+        }
+
+        btnState.value = {
+            target: target,
+            isEditPushed: editPush,
+            isDeletePushed: deletePush,
+        };
+    };
     // 댓글 수정 클릭 시 이벤트(대댓글 포함)
     const editComment = comment => {
+        acitveButtonType(); //게시글 버튼 클릭 클래스 제거
+
         password.value = '';
         passwordCommentAlert.value = '';
-        //currentPasswordCommentId.value = null;
         isPassword.value = false; // 상단 프로필 비밀번호
 
         const targetComment = findCommentById(comment.commentId, comments.value);
@@ -522,27 +568,20 @@
         if (isMyComment) {
             if (targetComment.isEditTextarea) {
                 // 수정창이 열려 있는 상태에서 다시 수정 버튼을 누르면 초기화
-
                 targetComment.isEditTextarea = false;
-
                 currentPasswordCommentId.value = comment.commentId;
+                activeCommentBtnClass(targetComment, 3);
             } else {
-                // 다른 모든 댓글의 수정창 닫기
-                closeAllEditTextareas();
-                currentPasswordCommentId.value = null;
-                // 현재 댓글만 수정 모드 활성화
-                targetComment.isEditTextarea = true;
+                closeAllEditTextareas(); // 다른 모든 댓글의 수정창 닫기
+                currentPasswordCommentId.value = null; // 현재 댓글만 수정 모드 활성화
+                targetComment.isEditTextarea = true; // 선택 버튼 활성화 상태 제어
+                activeCommentBtnClass(targetComment, 1);
             }
         } else if (isAnonymous) {
             if (currentPasswordCommentId.value === comment.commentId) {
-                // 이미 비밀번호 입력 중이면 유지
-                toggleCommentPassword(comment, 'edit');
-                return;
+                toggleCommentPassword(comment, 'edit'); // 이미 비밀번호 입력 중이면 유지
             } else {
-                // 다른 모든 댓글의 수정창 닫기
-                closeAllEditTextareas();
-
-                // 비밀번호 입력
+                closeAllEditTextareas(); // 다른 모든 댓글의 수정창 닫기
                 targetComment.isEditTextarea = false;
                 toggleCommentPassword(comment, 'edit');
             }
@@ -551,6 +590,28 @@
         }
     };
 
+    // 댓글 삭제 버튼 클릭
+    const deleteComment = async comment => {
+        acitveButtonType(); //게시글 버튼 클릭 클래스 제거
+        closeAllEditTextareas();
+        const isMyComment = comment.authorId === currentUserId.value;
+
+        // 익명인 경우
+        if (unknown.value && !isMyComment) {
+            // 수정 에디터 열려있을때
+            if (comment.isEditTextarea) {
+                comment.isEditTextarea = false;
+                comment.isCommentPassword = true;
+                toggleCommentPassword(comment, 'delete');
+            } else {
+                activeCommentBtnClass(comment, 3);
+                toggleCommentPassword(comment, 'delete');
+            }
+        } else {
+            deleteReplyComment(comment);
+        }
+    };
+
     // 모든 댓글의 수정 창 닫기
     const closeAllEditTextareas = () => {
         comments.value.forEach(comment => {
@@ -568,30 +629,20 @@
         passwordCommentAlert.value = '';
     };
 
-    // 댓글 삭제 버튼 클릭
-    const deleteComment = async comment => {
-        const isMyComment = comment.authorId === currentUserId.value;
-
-        if (unknown.value && !isMyComment) {
-            if (comment.isEditTextarea) {
-                comment.isEditTextarea = false;
-                comment.isCommentPassword = true;
-                toggleCommentPassword(comment, 'delete');
-            } else {
-                toggleCommentPassword(comment, 'delete');
-            }
-        } else {
-            deleteReplyComment(comment);
-        }
-    };
-
     // 익명 댓글 비밀번호 창 토글
     const toggleCommentPassword = (comment, button) => {
         if (lastCommentClickedButton.value === button && currentPasswordCommentId.value === comment.commentId) {
             currentPasswordCommentId.value = null; // 비밀번호 창 닫기
             password.value = '';
             passwordCommentAlert.value = '';
+            activeCommentBtnClass(comment, 3);
         } else {
+            if (button == 'edit') {
+                activeCommentBtnClass(comment, 1);
+            } else if (button == 'delete') {
+                activeCommentBtnClass(comment, 2);
+            }
+
             currentPasswordCommentId.value = comment.commentId; // 비밀번호 창 열기
             password.value = '';
             passwordCommentAlert.value = '';
@@ -608,17 +659,48 @@
             isPassword.value = false;
             boardPasswordAlert.value = '';
             password.value = '';
+            acitveButtonType();
             return;
         }
         closeAllPasswordAreas();
         if (lastClickedButton.value === button) {
             isPassword.value = !isPassword.value;
             boardPasswordAlert.value = '';
+            acitveButtonType();
         } else {
             isPassword.value = true;
-        }
 
-        lastClickedButton.value = button;
+            if (button == 'edit') {
+                acitveButtonType(1);
+            } else if (button == 'delete') {
+                acitveButtonType(2);
+            } else {
+                acitveButtonType();
+            }
+        }
+    };
+
+    // 선택한 게시글 버튼 핸들링(수정, 삭제 버튼)
+    const acitveButtonType = type => {
+        // 수정
+        if (type == 1) {
+            isEditPushed.value = true;
+            isDeletePushed.value = false;
+            lastClickedButton.value = 'edit';
+
+            // 삭제
+        } else if (type == 2) {
+            isEditPushed.value = false;
+            isDeletePushed.value = true;
+            lastClickedButton.value = 'delete';
+
+            // 비활성화
+        } else {
+            isEditPushed.value = false;
+            isDeletePushed.value = false;
+            lastClickedButton.value = '';
+            isPassword.value = false;
+        }
     };
 
     // 게시글 비밀번호 제출
@@ -738,6 +820,7 @@
             if (response.data.code === 200) {
                 await fetchComments(pagination.value.currentPage);
                 closeAllPasswordAreas();
+                activeCommentBtnClass();
 
                 if (targetComment) {
                     // 댓글 내용만 "삭제된 댓글입니다."로 변경하고, 구조는 유지
@@ -766,6 +849,7 @@
         if (response.status === 200) {
             togglePassword('close');
             fetchComments(pagination.value.currentPage);
+            activeCommentBtnClass();
             return;
             // const targetComment = findCommentById(comment.commentId, comments.value);
 
@@ -807,6 +891,16 @@
         }
     };
 
+    // 게시글 목록 이동 버튼
+    const goList = () => {
+        // 목록으로 바로 이동시 필터 유지
+        const getFilter = localStorage.getItem(`boardList_${currentBoardId.value}`);
+        router.push({
+            name: 'BoardList',
+            query: getFilter ? JSON.parse(getFilter) : '',
+        });
+    };
+
     // 댓글 삭제 (대댓글 포함)
     const handleCommentDeleted = deletedCommentId => {
         // 댓글 삭제
@@ -836,9 +930,14 @@
 
     const formattedBoardDate = computed(() => formattedDate(date.value));
 
+    const scrollToTop = () => {
+        window.scrollTo({ top: 0 });
+    };
+
     // 컴포넌트 마운트 시 데이터 로드
     onMounted(() => {
         fetchBoardDetails();
         fetchComments();
+        scrollToTop();
     });
 </script>

src/views/board/BoardWrite.vue

@@ -37,7 +37,9 @@
                                 </label>
                             </div>
                         </div>
-                        <div class="invalid-feedback" :class="categoryAlert ? 'd-block' : 'd-none'">카테고리를 선택해주세요.</div>
+                        <div class="invalid-feedback" :class="categoryAlert ? 'd-block' : 'd-none'">
+                            카테고리를 선택해주세요.
+                        </div>
                     </div>
 
                     <!-- 비밀번호 필드 (익명게시판 선택 시 활성화) -->
@@ -50,6 +52,8 @@
                             v-model="nickname"
                             @update:alert="nicknameAlert = $event"
                             @input="validateNickname"
+                            @keypress="noSpace"
+                            :maxlength="6"
                         />
                         <FormInput
                             title="비밀번호"
@@ -99,11 +103,14 @@
                                 @update:deleteImgIndexList="handleDeleteEditorImg"
                             />
                         </div>
-                        <div class="invalid-feedback mt-1" :class="contentAlert ? 'd-block' : 'd-none'">내용을 입력해주세요.</div>
+                        <div class="invalid-feedback mt-1" :class="contentAlert ? 'd-block' : 'd-none'">
+                            내용을 입력해주세요.
+                        </div>
                     </div>
 
                     <div class="mb-4 d-flex justify-content-end">
                         <BackButton @click="goList" />
+                        <!-- 저장 버튼은 항상 활성화 -->
                         <SaveButton @click="write" :isEnabled="isFileValid" />
                     </div>
                 </div>
@@ -113,7 +120,7 @@
 </template>
 
 <script setup>
-    import { ref, onMounted, getCurrentInstance, watch, computed } from 'vue';
+    import { ref, onMounted, watch, computed } from 'vue';
     import QEditor from '@c/editor/QEditor.vue';
     import FormInput from '@c/input/FormInput.vue';
     import FormFile from '@c/input/FormFile.vue';
@@ -146,6 +153,10 @@
     const editorUploadedImgList = ref([]);
     const editorDeleteImgList = ref([]);
 
+    const noSpace = (e) => {
+        if (e.key === ' ') e.preventDefault();
+    };
+
     const fetchCategories = async () => {
         const response = await axios.get('board/categories');
         categoryList.value = response.data.data;
@@ -163,10 +174,12 @@
 
     const fileCount = computed(() => attachFiles.value.length);
 
+    // 업데이트된 에디터 이미지 목록 업데이트
     const handleUpdateEditorImg = item => {
         editorUploadedImgList.value = item;
     };
 
+    // 삭제된 에디터 이미지 목록 업데이트
     const handleDeleteEditorImg = item => {
         editorDeleteImgList.value = item;
     };
@@ -181,10 +194,8 @@
             fileError.value = `최대 ${maxFiles}개의 파일만 업로드할 수 있습니다.`;
             return;
         }
-
         fileError.value = '';
         attachFiles.value = [...attachFiles.value, ...validFiles].slice(0, maxFiles);
-
         autoIncrement.value++;
     };
 
@@ -206,7 +217,8 @@
 
     const validateNickname = () => {
         if (categoryValue.value === 300102) {
-            nicknameAlert.value = nickname.value.trim().length === 0;
+            nickname.value = nickname.value.replace(/\s/g, ''); // 공백 제거
+            nicknameAlert.value = nickname.value.length === 0;
         } else {
             nicknameAlert.value = false;
         }
@@ -221,19 +233,28 @@
         }
     };
 
+    /**
+     * validateContent:
+     *  - 내용이 없으면 contentAlert를 true로 설정
+     *  - 텍스트, 이미지, 비디오 중 하나라도 존재하면 유효한 콘텐츠로 판단
+     */
     const validateContent = () => {
         if (!content.value?.ops?.length) {
             contentAlert.value = true;
             return;
         }
 
-        // 이미지 포함 여부 확인
-        const hasImage = content.value.ops.some(op => op.insert && typeof op.insert === 'object' && op.insert.image);
-        // 텍스트 포함 여부 확인
-        const hasText = content.value.ops.some(op => typeof op.insert === 'string' && op.insert.trim().length > 0);
+        const hasText = content.value.ops.some(
+            op => typeof op.insert === 'string' && op.insert.trim().length > 0
+        );
+        const hasImage = content.value.ops.some(
+            op => op.insert && typeof op.insert === 'object' && op.insert.image
+        );
+        const hasVideo = content.value.ops.some(
+            op => op.insert && typeof op.insert === 'object' && op.insert.video
+        );
 
-        // 텍스트 또는 이미지가 하나라도 있으면 유효한 내용
-        contentAlert.value = !(hasText || hasImage);
+        contentAlert.value = !(hasText || hasImage || hasVideo);
     };
 
     /** 글쓰기 */
@@ -257,7 +278,7 @@
 
         try {
             const boardData = {
-                LOCBRDTTL: title.value,
+                LOCBRDTTL: title.value.trim(),
                 LOCBRDCON: JSON.stringify(content.value), // Delta 포맷을 JSON으로 변환
                 LOCBRDNIC: categoryValue.value === 300102 ? nickname.value : null,
                 LOCBRDPWD: categoryValue.value === 300102 ? password.value : null,
@@ -287,10 +308,10 @@
                         formData.append('CMNFLEORG', fileNameWithoutExt);
                         formData.append('CMNFLEEXT', file.name.split('.').pop());
                         formData.append('CMNFLESIZ', file.size);
-                        formData.append('file', file); // 📌 실제 파일 추가
+                        formData.append('file', file);
 
                         await axios.post(`board/${boardId}/attachments`, formData, { isFormData: true });
-                    }),
+                    })
                 );
             }
 
@@ -306,8 +327,8 @@
         router.push('/board');
     };
 
-    /** `content` 변경 감지하여 자동 유효성 검사 실행 */
+    /** content 변경 감지 (deep 옵션 추가) */
     watch(content, () => {
         validateContent();
-    });
+    }, { deep: true });
 </script>

src/views/mypage/MyPage.vue

@@ -1,127 +1,331 @@
 <template>
 <div class="container-xxl flex-grow-1 container-p-y">
     <div class="card shadow-sm rounded-lg p-6 max-w-2xl mx-auto">
-    <h2 class="text-2xl font-semibold mb-6 text-center">마이페이지</h2>
+    <h3 class="text-2xl font-semibold mb-3 text-center">마이 페이지</h3>
+    <form @submit.prevent="handleSubmit">
+        <div class="text-center">
+        <label
+            for="profilePic"
+            class="rounded-circle cursor-pointer"
+            id="profileLabel"
+            :style="profilePreviewStyle"
+        ></label>
+        <input type="file" id="profilePic" class="d-none object-fit-cover" @change="profileUpload" />
+        <span v-if="profilerr" class="invalid-feedback d-block">{{ profilerr }}</span>
+        </div>
 
-    <!-- 사용자 정보 표시 -->
-    <div class="mb-6 text-center">
-        <p class="text-gray-700 font-medium">안녕하세요, <span class="font-bold text-blue-600">{{ userInfo?.name }}</span> 님</p>
-        <p class="text-sm text-gray-500">사원번호: {{ userInfo?.employeeNo }}</p>
-    </div>
+        <div class="col-xl-12">
+            <div class="d-flex">
+            <div class="w-50 me-2">
+                <UserFormInput
+                title="입사일"
+                name="entryDate"
+                type="date"
+                :value="form.entryDate"
+                @update:data="form.entryDate = $event"
+                />
+            </div>
 
-    <!-- MBTI 선택 -->
-    <label class="block font-medium mb-1">MBTI *</label>
-    <select v-model="form.mbti" class="border border-gray-300 rounded w-full p-2 mb-4">
-        <option disabled value="">선택하세요</option>
-        <option v-for="mbti in mbtiList" :key="mbti.code" :value="mbti.code">{{ mbti.name }}</option>
-    </select>
+            <div class="d-flex flex-column w-50">
+                <FormSelect
+                title="컬러"
+                name="color"
+                :is-row="false"
+                :is-label="true"
+                :is-common="true"
+                :is-color="true"
+                :data="colorList"
+                :value="form.color"
+                @update:data="handleColorUpdate"
+                />
+                <span v-if="colorDuplicated" class="text-danger invalid-feedback mt-1 d-block">
+                이미 사용 중인 컬러입니다.
+                </span>
+            </div>
+            </div>
 
-    <!-- 컬러 선택 -->
-    <label class="block font-medium mb-1">컬러 *</label>
-    <select v-model="form.color" class="border border-gray-300 rounded w-full p-2 mb-1" @change="checkColor">
-        <option disabled value="">선택하세요</option>
-        <option v-for="color in colorList" :key="color.code" :value="color.code">{{ color.name }}</option>
-    </select>
-    <p v-if="colorDuplicated" class="text-red-500 text-sm mb-4">이미 사용 중인 색상입니다.</p>
+        <div class="d-flex">
+            <UserFormInput title="생년월일" name="birth" type="date"
+            :value="form.birth" @update:data="form.birth = $event" class="me-2 w-50" />
+            <FormSelect title="MBTI" name="mbti" :is-row="false" :is-label="true"
+            :is-common="true" :is-mbti="true" :data="mbtiList"
+            :value="form.mbti" @update:data="form.mbti = $event" class="w-50" />
+        </div>
 
-    <!-- 전화번호 -->
-    <label class="block font-medium mb-1">전화번호 *</label>
-    <input v-model="form.phone" class="border border-gray-300 rounded w-full p-2 mb-1" @blur="checkPhone" />
-    <p v-if="phoneDuplicated" class="text-red-500 text-sm mb-4">이미 등록된 전화번호입니다.</p>
+        <ArrInput title="주소" name="address" v-model="form.address" :disabled="true" />
 
-    <!-- 비밀번호 변경 -->
-    <label class="block font-medium mb-1">현재 비밀번호</label>
-    <input type="password" v-model="form.currentPassword" class="border border-gray-300 rounded w-full p-2 mb-4" />
+        <UserFormInput title="전화번호" name="phone" :value="form.phone"
+            @update:data="form.phone = $event" @blur="checkPhoneDuplicateAndFormat"
+            :maxlength="11" @keypress="onlyNumber" />
+        <span v-if="phoneFormatError" class="text-danger invalid-feedback mt-1 d-block">
+            전화번호 형식이 올바르지 않습니다.
+        </span>
+        <span v-if="phoneDuplicated" class="text-danger invalid-feedback mt-1 d-block">
+            이미 사용 중인 전화번호입니다.
+        </span>
 
-    <label class="block font-medium mb-1">새 비밀번호</label>
-    <input type="password" v-model="form.newPassword" class="border border-gray-300 rounded w-full p-2 mb-1" @input="validatePassword" />
-    <p v-if="passwordWarning" class="text-red-500 text-sm mb-1">비밀번호는 8자 이상, 특수문자/영어/숫자를 포함해야 합니다.</p>
+        <!-- 기존 비밀번호 입력 -->
+        <UserFormInput title="비밀번호 재설정" placeholder="기존 비밀번호를 입력하세요" name="currentPw" type="password"
+            :value="password.current" @update:data="password.current = $event"
+            @blur="checkCurrentPassword" @keypress="noSpace" />
+        <span v-if="passwordError" class="text-danger invalid-feedback mt-1 d-block">
+            비밀번호가 일치하지 않습니다.
+        </span>
 
-    <label class="block font-medium mb-1">비밀번호 확인</label>
-    <input type="password" v-model="form.newPasswordConfirm" class="border border-gray-300 rounded w-full p-2 mb-1" />
-    <p v-if="form.newPassword !== form.newPasswordConfirm" class="text-red-500 text-sm mb-4">비밀번호가 일치하지 않습니다.</p>
+        <!-- 비밀번호 재설정 -->
+        <div v-if="showResetPw">
+            <UserFormInput title="새 비밀번호" name="newPw" type="password"
+            :value="password.new" @update:data="password.new = $event" @keypress="noSpace" />
+            <span v-if="password.new && password.new.length < 4"
+            class="text-danger invalid-feedback mt-1 d-block">
+            새 비밀번호는 최소 4자리 이상이어야 합니다.
+            </span>
+            <span v-if="password.new === password.current"
+            class="text-danger invalid-feedback mt-1 d-block">
+            기존 비밀번호와 다르게 설정해주세요.
+            </span>
 
-    <button class="w-full bg-blue-600 hover:bg-blue-700 text-white font-bold py-2 rounded" @click="submit">
-        변경완료
-    </button>
+            <UserFormInput title="비밀번호 확인" name="confirmPw" type="password"
+            :value="password.confirm" @update:data="password.confirm = $event" @keypress="noSpace" />
+            <span v-if="password.confirm && password.confirm !== password.new"
+            class="text-danger invalid-feedback mt-1 d-block">
+            새 비밀번호와 일치하지 않습니다.
+            </span>
+
+            <div class="d-flex justify-content-end mt-2">
+            <button type="button" class="btn btn-sm btn-outline-primary"
+                :disabled="!canResetPassword"
+                @click="handlePasswordReset">
+                비밀번호 변경
+            </button>
+            </div>
+        </div>
+
+        <div class="d-flex mt-5">
+            <button type="submit" class="btn btn-primary w-100"
+            :disabled="!isChanged || phoneDuplicated || phoneFormatError   || colorDuplicated">
+            정보 수정
+            </button>
+        </div>
+        </div>
+    </form>
     </div>
 </div>
 </template>
 
-<script>
-import $api from "@api";
+<script setup>
+import { ref, computed, onMounted, watch} from 'vue';
+import $api from '@api';
+import UserFormInput from '@c/input/UserFormInput.vue';
+import FormSelect from '@c/input/FormSelect.vue';
+import ArrInput from '@c/input/ArrInput.vue';
+import { useToastStore } from '@s/toastStore';
 
-export default {
-  data() {
-    return {
-      userInfo: null, // 사원 정보 저장용
-      form: {
-        mbti: '',
-        color: '',
-        phone: '',
-        currentPassword: '',
-        newPassword: '',
-        newPasswordConfirm: ''
-      },
-      mbtiList: [],
-      colorList: [],
-      colorDuplicated: false,
-      phoneDuplicated: false,
-      passwordWarning: false
-    };
-  },
-  mounted() {
-    this.loadUserInfo();
-    this.loadMBTI();
-    this.loadColor();
-  },
-  methods: {
-    loadUserInfo() {
-      $api.get('/api/user/info').then(res => {
-        this.userInfo = res.data.result;
+const toastStore = useToastStore();
 
-        // 폼에 사원 데이터 반영 (전화번호, mbti, color 등)
-        this.form.phone = this.userInfo.phone;
-        this.form.mbti = this.userInfo.mbti;
-        this.form.color = this.userInfo.color;
-      });
-    },
-    loadMBTI() {
-      $api.get('/api/user/mbti').then(res => this.mbtiList = res.data.result);
-    },
-    loadColor() {
-      $api.get('/api/user/color', { params: { type: 'main' } }).then(res => this.colorList = res.data.result);
-    },
-    checkColor() {
-      $api.get('/api/user/checkColor', { params: { memberCol: this.form.color } })
-        .then(res => this.colorDuplicated = res.data.result);
-    },
-    checkPhone() {
-      $api.get('/api/user/checkPhone', { params: { memberTel: this.form.phone } })
-        .then(res => this.phoneDuplicated = !res.data.result);
-    },
-    validatePassword() {
-      const regex = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[!@#$%^&*()_+]).{8,}$/;
-      this.passwordWarning = !regex.test(this.form.newPassword);
-    },
-    submit() {
-      if (this.colorDuplicated || this.phoneDuplicated || this.passwordWarning || this.form.newPassword !== this.form.newPasswordConfirm) {
-        alert('입력값을 다시 확인해주세요.');
-        return;
-      }
-
-      $api.post('/api/user/checkPassword', {
-        currentPassword: this.form.currentPassword
-      }).then(res => {
-        if (res.data.result) {
-          $api.patch('/api/user/pwNew', {
-            newPassword: this.form.newPassword
-          }).then(() => alert('비밀번호가 변경되었습니다.'));
-        } else {
-          alert('현재 비밀번호가 일치하지 않습니다.');
-        }
-      });
-    }
-  }
+const noSpace = (e) => {
+    if (e.key === ' ') e.preventDefault();
 };
+
+const form = ref({
+entryDate: '', birth: '', phone: '', color: '', mbti: '',
+address: { address: '', detailAddress: '', postcode: '' },
+id: ''
+});
+const originalData = ref({});
+const profile = ref('');
+const uploadedFile = ref(null);
+const profileChanged = ref(false);
+const profilerr = ref('');
+const currentBlobUrl = ref('');
+const colorDuplicated = ref(false);
+const phoneDuplicated = ref(false);
+const mbtiList = ref([]);
+const colorList = ref([]);
+
+const password = ref({ current: '', new: '', confirm: '' });
+const passwordError = ref(false);
+const phoneFormatError = ref(false);
+const showResetPw = ref(false);
+
+const canResetPassword = computed(() => {
+return (
+    password.value.new.length >= 4 &&
+    password.value.new !== password.value.current &&
+    password.value.new === password.value.confirm
+);
+});
+
+watch(
+    () => form.value.address.detailAddress,
+    (newVal) => {
+        if (newVal !== newVal.trim()) {
+        form.value.address.detailAddress = newVal.trim();
+        }
+    }
+);
+
+const isChanged = computed(() => {
+    const f = form.value;
+    const o = originalData.value;
+    return (
+        f.entryDate !== o.entryDate || f.birth !== o.birth || f.phone !== o.phone ||
+        f.color !== o.color || f.mbti !== o.mbti || profileChanged.value ||
+        f.address.address !== o.address.address ||
+        f.address.detailAddress !== o.address.detailAddress ||
+        f.address.postcode !== o.address.postcode
+    );
+});
+
+const baseUrl = $api.defaults.baseURL.replace(/api\/$/, '');
+const defaultProfile = "/img/icons/icon.png";
+const getProfileImageUrl = (profilePath) =>
+    profilePath && profilePath.trim() ? `${baseUrl}upload/img/profile/${profilePath}` : defaultProfile;
+const profilePreviewStyle = computed(() => ({
+    width: '100px',
+    height: '100px',
+    backgroundImage: `url(${profile.value})`,
+    backgroundRepeat: 'no-repeat',
+    backgroundSize: 'cover',
+    backgroundPosition: 'center'
+}));
+
+const profileUpload = (e) => {
+    const file = e.target.files[0];
+    if (!file) return;
+    if (file.size > 5 * 1024 * 1024 || !['image/jpeg', 'image/png'].includes(file.type)) {
+        profilerr.value = '5MB 이하의 JPG/PNG 파일만 업로드 가능합니다.';
+        return;
+    }
+    profilerr.value = '';
+    if (currentBlobUrl.value) URL.revokeObjectURL(currentBlobUrl.value);
+    uploadedFile.value = file;
+    const newBlobUrl = URL.createObjectURL(file);
+    profile.value = newBlobUrl;
+    currentBlobUrl.value = newBlobUrl;
+    profileChanged.value = true;
+};
+
+const onlyNumber = (e) => {
+    if (!/[0-9]/.test(e.key)) e.preventDefault();
+};
+
+const checkPhoneDuplicateAndFormat = async () => {
+    const currentPhone = form.value.phone.trim();
+
+    // 형식 검사 (010으로 시작 + 숫자 8자리)
+    const phoneRegex = /^010\d{8}$/;
+    const isFormatValid = phoneRegex.test(currentPhone);
+
+    phoneFormatError.value = !isFormatValid;
+
+    // 중복 체크는 형식이 맞을 때만 수행
+    if (isFormatValid) {
+        const response = await $api.get('/user/checkPhone', {
+        params: { memberTel: currentPhone },
+        });
+
+        // true면 사용 가능하다는 의미니까 → 중복 아님
+        // false면 중복된 번호라는 의미니까 → 중복됨
+        phoneDuplicated.value = currentPhone !== originalData.value.phone && !response.data.data;
+    } else {
+        // 형식이 맞지 않으면 중복 여부는 무시 (false로 초기화)
+        phoneDuplicated.value = false;
+    }
+};
+
+const handleColorUpdate = async (colorVal) => {
+    form.value.color = colorVal;
+    colorDuplicated.value = colorVal !== originalData.value.color &&
+        (await $api.get('/user/checkColor', { params: { memberCol: colorVal } })).data.data;
+};
+
+const checkCurrentPassword = async () => {
+    if (!password.value.current) return;
+        const res = await $api.post('/user/checkPassword', {
+            id: form.value.id,
+            password: password.value.current
+        });
+    passwordError.value = res.data.data;
+    showResetPw.value = !res.data.data;
+};
+const handlePasswordReset = async () => {
+    const res = await $api.patch('/user/pwNew', {
+        id: form.value.id,
+        password: password.value.new
+    });
+    if (res.data.data) {
+        toastStore.onToast('비밀번호가 변경되었습니다.', 's');
+        password.value = { current: '', new: '', confirm: '' };
+        showResetPw.value = false;
+        passwordError.value = false;
+    } else {
+        toastStore.onToast('비밀번호 변경 실패', 'e');
+    }
+};
+
+const formatDate = (isoDate) => isoDate?.split('T')[0] || '';
+
+const loadInitialData = async () => {
+    const user = (await $api.get('/user/userInfo')).data.data;
+    const serverColors = (await $api.get('/user/color', { params: { type: 'YON' } })).data.data.map(c => ({
+        value: c.CMNCODVAL, label: c.CMNCODNAM
+}));
+const matchedColor = serverColors.find(c => c.label === user.usercolor);
+const colorCode = matchedColor ? matchedColor.value : user.color;
+colorList.value = serverColors.some(c => c.value === colorCode)
+    ? serverColors
+    : [{ value: colorCode, label: user.usercolor }, ...serverColors];
+
+const initData = {
+    id: user.loginId,
+    entryDate: formatDate(user.isCdt),
+    birth: formatDate(user.birth),
+    phone: user.phone || '',
+    color: colorCode,
+    mbti: user.mbit || '',
+    address: {
+    address: user.address || '',
+    detailAddress: user.addressDetail || '',
+    postcode: user.zipcode || ''
+    }
+};
+form.value = { ...initData };
+originalData.value = { ...initData };
+profile.value = getProfileImageUrl(user.profile);
+profileChanged.value = false;
+
+const mbtiRes = await $api.get('/user/mbti');
+    mbtiList.value = mbtiRes.data.data.map(m => ({ value: m.CMNCODVAL, label: m.CMNCODNAM }));
+};
+
+const handleSubmit = async () => {
+    const formData = new FormData();
+    Object.entries(form.value).forEach(([k, v]) => {
+        if (typeof v === 'object') {
+            formData.append('address', v.address);
+            formData.append('detailAddress', v.detailAddress);
+            formData.append('postcode', v.postcode);
+        } else {
+        formData.append(k, v);
+        }
+    });
+    if (uploadedFile.value) formData.append('profileFile', uploadedFile.value);
+
+    if (form.value.color !== originalData.value.color) {
+        if (form.value.color) await $api.patch('/user/updateColorYon', { color: form.value.color, type: 'YON' });
+        if (originalData.value.color) await $api.patch('/user/updateColorChange', { color: originalData.value.color, type: 'YON' });
+    }
+
+    await $api.patch('/user/updateInfo', formData, { isFormData: true });
+    originalData.value = { ...form.value };
+    profileChanged.value = false;
+    location.reload();
+    toastStore.onToast('정보가 수정되었습니다.', 's');
+};
+
+onMounted(() => loadInitialData());
 </script>
+
+<style scoped>
+</style>

src/views/people/PeopleList.vue

@@ -0,0 +1,318 @@
+<template>
+<div class="container-xxl flex-grow-1 container-p-y">
+    <div class="card">
+    <!-- 사원 목록이 없을 경우 표시 -->
+    <div v-if="allUserList.length === 0" class="text-center my-4">
+        <p class="text-muted">등록된 사원이 없습니다.</p>
+    </div>
+
+    <!-- 사원 카드 리스트 영역 -->
+    <div class="card-body">
+        <div class="card-list">
+        <div
+            v-for="(person, index) in allUserList"
+            :key="index"
+            class="person-card"
+            @click="openModal(person)"
+        >
+            <div>
+            <img
+                class="rounded-circle user-avatar pointer"
+                :src="getProfileImage(person.MEMBERPRF)"
+                :style="{ borderColor: person.usercolor }"
+                @error="setDefaultImage"
+            />
+            </div>
+            <div class="card-body">
+            <h3 class="person-name">{{ person.MEMBERNAM }}</h3>
+            <p class="person-email">{{ person.MEMBERIDS }}@local-host.co.kr</p>
+            <p class="person-phone">{{ person.MEMBERTEL }}</p>
+            <small>
+                {{ person.MEMBERARR }} {{ person.MEMBERDTL }}
+            </small>
+            </div>
+        </div>
+        </div>
+    </div>
+
+    <!-- 상세보기 Modal -->
+    <div v-if="showModal" class="modal-overlay" @click.self="closeModal">
+        <div class="modal-content">
+        <button class="close-btn" @click="closeModal">×</button>
+        <div class="modal-body">
+            <img
+            class="user-avatar2"
+            :src="getProfileImage(selectedPerson.MEMBERPRF)"
+            :style="{ borderColor: selectedPerson.usercolor }"
+            @error="setDefaultImage"
+            />
+            <h4>{{ selectedPerson.MEMBERNAM }}</h4>
+            <p>{{ selectedPerson.MEMBERIDS }}@local-host.co.kr</p>
+            <p>{{ selectedPerson.MEMBERTEL }}</p>
+            <p>{{ selectedPerson.MEMBERARR }} {{ selectedPerson.MEMBERDTL }}</p>
+            <hr />
+            <!-- 추가 정보: 사용자가 속한 프로젝트 목록 -->
+            <h5>참여 프로젝트</h5>
+            <div v-if="memberProjects.length > 0" class="project-list-container">
+            <ul>
+                <li
+                v-for="(project, idx) in memberProjects"
+                :key="idx"
+                class="project-item"
+                >
+                <span class="project-name">{{ project.PROJCTNAM }}</span>
+                <span class="project-period">
+                    <!-- projectEndDate가 있는 경우 -->
+                    <!-- <template v-if="project.projectEndDate"> -->
+                    {{ project.userStartDate ? project.userStartDate : project.projectStartDate }} ~
+                    {{ project.userEndDate ? project.userEndDate : project.projectEndDate }}
+                    <!-- </template> -->
+                    <!-- 없으면 종료일 표시 안함 -->
+                    <!-- <template v-else>
+                    {{ project.userStartDate ? project.userStartDate : project.projectStartDate }} ~
+                    </template> -->
+                </span>
+                </li>
+            </ul>
+            </div>
+            <div v-else>
+            <p>참여중인 프로젝트가 없습니다.</p>
+            </div>
+        </div>
+        </div>
+    </div>
+
+    </div>
+</div>
+</template>
+
+<script>
+import axios from '@api' // API 호출용 Axios 인스턴스
+import { ref, onMounted } from 'vue'
+import SearchBar from '@c/search/SearchBar.vue'
+
+export default {
+name: 'PeopleList',
+components: { SearchBar },
+setup() {
+    const allUserList = ref([])   // 전체 사원 목록
+    const user = ref({})          // 현재 로그인한 사용자 (필요 시 사용)
+    const showModal = ref(false)  // 모달 표시 여부
+    const selectedPerson = ref({})// 모달에 표시할 선택된 사원 정보
+    const memberProjects = ref([])// 선택된 사원의 프로젝트 목록
+
+    onMounted(async () => {
+    try {
+        const response = await axios.get('user/allUserList')
+        allUserList.value = response.data.data.allUserList
+        user.value = response.data.data.user
+    } catch (error) {
+        console.error('사원 목록 조회 실패:', error)
+    }
+    })
+
+    const baseUrl = axios.defaults.baseURL.replace(/api\/$/, '')
+    const defaultProfile = '/img/icons/icon.png'
+
+    const getProfileImage = (profilePath) => {
+    return profilePath && profilePath.trim()
+        ? `${baseUrl}upload/img/profile/${profilePath}`
+        : defaultProfile
+    }
+
+    const setDefaultImage = (event) => {
+    event.target.src = defaultProfile
+    }
+
+    // 참여 프로젝트 조회 API
+    const fetchMemberProjects = async (memberSeq) => {
+    try {
+        const res = await axios.get(`project/people/${memberSeq}`)
+        memberProjects.value = res.data.data
+    } catch (error) {
+        console.error('프로젝트 조회 실패:', error)
+        memberProjects.value = []
+    }
+    }
+
+    const openModal = (person) => {
+    selectedPerson.value = person
+    fetchMemberProjects(person.MEMBERSEQ)
+    showModal.value = true
+    }
+
+    const closeModal = () => {
+    showModal.value = false
+    }
+
+    return {
+    allUserList,
+    user,
+    showModal,
+    selectedPerson,
+    memberProjects,
+    openModal,
+    closeModal,
+    getProfileImage,
+    defaultProfile,
+    setDefaultImage
+    }
+}
+}
+</script>
+
+<style scoped>
+.container-xxl {
+padding: 1rem;
+}
+
+.card-list {
+display: flex;
+flex-wrap: wrap;
+gap: 1rem;
+justify-content: center;
+}
+
+.person-card {
+width: 280px;
+border: 1px solid #eee;
+border-radius: 8px;
+overflow: hidden;
+cursor: pointer;
+background: #fff;
+transition: box-shadow 0.2s ease-in-out;
+}
+
+.person-card:hover {
+box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+}
+
+.person-card .card-header {
+width: 100%;
+height: 120px;
+overflow: hidden;
+display: flex;
+align-items: center;
+justify-content: center;
+background: #f8f9fa;
+}
+
+.user-avatar {
+    width: 160px;
+    height: 200px;
+    object-fit: cover;
+    border-radius: 50%;
+    border: 2px solid #ddd;
+    display: block;
+    margin: 1rem auto 0 auto;
+}
+
+.user-avatar2 {
+    width: 160px;
+    height: 200px;
+    object-fit: cover;
+    border-radius: 50%;
+    display: block;
+    margin: 1rem auto 0 auto;
+    margin-top: 0px;
+    margin-bottom: 10px;
+}
+
+.person-card .card-body {
+padding: 0.75rem;
+}
+
+.person-name {
+margin: 0;
+font-size: 1.1rem;
+font-weight: 600;
+}
+
+.person-email,
+.person-phone {
+margin: 0;
+font-size: 0.9rem;
+color: #555;
+}
+
+/* 모달 스타일 */
+.modal-overlay {
+position: fixed;
+top: 0;
+left: 0;
+width: 100%;
+height: 111%;
+background-color: rgba(0, 0, 0, 0.4);
+display: flex;
+justify-content: center;
+align-items: center;
+z-index: 999;
+}
+
+.modal-content {
+position: relative;
+width: 400px;
+background: #fff;
+padding: 1.5rem;
+border-radius: 8px;
+animation: slideDown 0.3s ease forwards;
+}
+
+.close-btn {
+background: transparent;
+border: none;
+font-size: 1.5rem;
+position: absolute;
+top: 0.5rem;
+right: 0.5rem;
+cursor: pointer;
+}
+
+.modal-body {
+text-align: center;
+}
+
+.modal-img {
+width: 50%;
+height: 50%;
+border-radius: 50%;
+margin-bottom: 1rem;
+object-fit: cover;
+}
+
+/* 프로젝트 리스트 스타일 */
+.project-list-container {
+max-height: 200px; /* 필요에 따라 높이 조절 */
+overflow-y: auto;
+margin-top: 1rem;
+}
+
+.project-item {
+display: flex;
+align-items: center;
+list-style: none;
+font-size: 0.9rem;
+padding: 0.25rem 0;
+}
+
+.project-name {
+font-weight: 600;
+}
+
+.project-period {
+font-size: 1rem;
+color: #888;
+margin-left: 10px;
+}
+
+@keyframes slideDown {
+0% {
+    transform: translateY(-15%);
+    opacity: 0;
+}
+100% {
+    transform: translateY(0);
+    opacity: 1;
+}
+}
+</style>

src/views/vacation/VacationManagement.vue

@@ -586,30 +586,45 @@ function updateCalendarEvents() {
         const todayElement = document.querySelector(`.fc-daygrid-day[data-date="${todayStr}"]`);
 
         if (todayElement) {
-            // 오늘 날짜가 선택된 경우 배경 제거
             if (selectedDates.value.has(todayStr)) {
-                todayElement.classList.remove("fc-day-today"); // 기본 스타일 제거
-                todayElement.classList.add("selected-event"); // 선택된 날짜 스타일 적용
+                todayElement.style.backgroundColor = 'transparent'; // 노란 배경 제거
+                todayElement.classList.add("selected-event");
 
-                // 🔹 오전 반차일 경우 'half-day-am' 클래스 추가
-                if (selectedDates.value.get(todayStr) === "700101") {
-                    todayElement.classList.add("half-day-am");
-                    todayElement.classList.remove("half-day-pm");
+                // 기존 오버레이 제거
+                const existingOverlay = todayElement.querySelector('.half-day-overlay');
+                if (existingOverlay) {
+                    todayElement.removeChild(existingOverlay);
                 }
-                // 🔹 오후 반차일 경우 'half-day-pm' 클래스 추가
-                else if (selectedDates.value.get(todayStr) === "700102") {
-                    todayElement.classList.add("half-day-pm");
-                    todayElement.classList.remove("half-day-am");
+
+                const overlay = document.createElement('div');
+                overlay.classList.add('half-day-overlay');
+
+                const type = selectedDates.value.get(todayStr);
+                if (type === "700101") {
+                    overlay.classList.add('am');
+                } else if (type === "700102") {
+                    overlay.classList.add('pm');
                 } else {
-                    todayElement.classList.remove("half-day-am", "half-day-pm");
+                    // 전체 연차는 배경 전체 덮기
+                    overlay.style.width = '100%';
+                    overlay.style.borderRadius = '4px';
                 }
+
+                todayElement.appendChild(overlay);
             } else {
-                todayElement.classList.add("fc-day-today"); // 기본 스타일 복원
-                todayElement.classList.remove("selected-event", "half-day-am", "half-day-pm"); // 선택된 상태 해제
+                // 선택 해제 시 원상복구
+                todayElement.classList.remove("selected-event", "half-day-am", "half-day-pm");
+                todayElement.style.backgroundColor = ''; // 배경 복원
+
+                const existingOverlay = todayElement.querySelector('.half-day-overlay');
+                if (existingOverlay) {
+                    todayElement.removeChild(existingOverlay);
+                }
             }
         }
     });
 }
+
 // 휴가 종류에 따른 클래스명
 const getVacationTypeClass = (type) => {
     if (type === "700101") return "half-day-am";

src/views/voteboard/voteBoardList.vue

@@ -72,11 +72,13 @@ const ischeked = ref(false);
 const selectedVote = ref({}); // 선택된 투표 데이터
 const router = useRouter();
 const route = useRoute();
-
+const myVote = ref('2');
 onMounted(() => {
     const maincvoteset = route.query.voteset || '0';
+    const maincmyVote = route.query.myVote || '0';
     voteset.value =maincvoteset;
     category.value = maincvoteset;
+    myVote.value = maincmyVote;
     getvoteList();
 });
 //글작성
@@ -91,16 +93,16 @@ const changeCheck = () =>{
 //투표목록
 const getvoteList = () => {
     $api.get('vote/getVoteList',{
-            //목록조회시 파라미터 전달
             params:
             {
                 page: currentPage.value
                 ,voteset:voteset.value
-                ,myVote:ischeked.value ? '1':'0'
+                ,myVote:myVote.value == '2' ? myVote.value : ischeked.value ? '1':'0'
             }
         }).then(res => {
             PageData.value = res.data.data;
             voteListCardData.value = res.data.data.list;
+            myVote.value = '';
         })
     };
 
@@ -136,13 +138,15 @@ const checkedNames = (numList) => {
 }
 //투표종료
 const endVoteId = (endVoteId) => {
-    $api.patch('vote/updateEndData',{
-        endVoteId :endVoteId
-        }).then((res)=>{
-            if(res.data.status === 'OK'){
-                getvoteList();
-            }
-        })
+    if(confirm('투표를 종료하시겠습니까?')){
+        $api.patch('vote/updateEndData',{
+            endVoteId :endVoteId
+            }).then((res)=>{
+                if(res.data.status === 'OK'){
+                    getvoteList();
+                }
+            })
+    }
 }
 //기한 지난 투표 종료
 const voteEnded = async (id) =>{
@@ -150,14 +154,16 @@ const voteEnded = async (id) =>{
 }
 //투표 삭제
 const voteDelete =(id) =>{
-    $api.patch('vote/updateDeleteData',{
-        deleteVoteId :id
-        }).then((res)=>{
-            if(res.data.status === 'OK'){
-                toastStore.onToast('투표가 삭제되었습니다.', 's');
-                getvoteList();
-            }
-        })
+    if(confirm('투표를 삭제하시겠습니까?')){
+        $api.patch('vote/updateDeleteData',{
+            deleteVoteId :id
+            }).then((res)=>{
+                if(res.data.status === 'OK'){
+                    toastStore.onToast('투표가 삭제되었습니다.', 's');
+                    getvoteList();
+                }
+            })
+    }
 }
 //랜덤 1위 뽑기
 const randomList = (data,id) =>{

src/views/voteboard/voteboardWrite.vue

@@ -244,4 +244,14 @@ const goList = () => {
 .item-input {
     max-width: 200px;
 }
+.hidden-date-input {
+    display: block; /* 한 줄 차지 */
+    margin-top: 19.5px; /* form-input과 붙게 조정 */
+    border: none;
+    padding: 0;
+    height: 0;
+    opacity: 0;
+    pointer-events: none; /* 사용자 클릭 못하게 */
+    position: absolute; /* 시각적으로 띄워두기 */
+}
 </style>

src/views/wordDict/wordDict.vue

@@ -7,7 +7,7 @@
         <div class="d-flex">
         <!-- 단어 갯수, 작성하기 -->
             <!-- 왼쪽 사이드바 -->
-            <div class="sidebar position-sticky" style="top: 100px; max-width: 250px; min-width: 250px;">
+            <div v-if="cateList.length>0" class="sidebar position-sticky" style="top: 100px; max-width: 250px; min-width: 250px;">
                 <WriteButton ref="writeButton" @click="writeStore.toggleItem(999999)" :isToggleEnabled="true"
                 :isActive="writeStore.activeItemId === 999999"/>
                 <!-- ㄱ ㄴ ㄷ ㄹ -->
@@ -17,8 +17,12 @@
                     <CategoryBtn :lists="cateList" @update:data="handleSelectedCategoryChange" :showAll="true" :selectedCategory="selectedCategory"  />
                 </div>
             </div>
+            <div v-else>
+                <WriteButton ref="writeButton" @click="writeStore.toggleItem(999999)" :isToggleEnabled="true"
+                :isActive="writeStore.activeItemId === 999999"/>
+            </div>
 
-            <!-- 용어 리스트 컨텐츠 -->
+                <!-- 용어 리스트 컨텐츠 -->
             <div class="flex-grow-1">
                 <!-- 작성 -->
                 <div v-if="writeStore.isItemActive(999999)" class="ms-3 card p-5 mb-2">
@@ -29,8 +33,9 @@
                     <!-- 에러 메시지 -->
                     <div v-if="error" class="fw-bold text-danger">{{ error }}</div>
                     <!-- 단어 목록 -->
-                    <ul v-if="total > 0" class="ms-3 list-unstyled" style="overflow-x: hidden; word-wrap: break-word;">
+                    <ul v-if="total > 0"  class="ms-3 list-unstyled">
                         <DictCard
+                            class="q-editor-container"
                             v-for="item in wordList"
                             :key="item.WRDDICSEQ"
                             :item="item"
@@ -118,7 +123,9 @@ import { useRoute } from 'vue-router';
         const maincategory = route.query.category || '';
         selectedAlphabet.value = mainindexKeyword;
         selectedCategory.value = maincategory;
-        getwordList('', selectedAlphabet.value, selectedCategory.value );
+        if(mainindexKeyword){
+            getwordList('', selectedAlphabet.value, selectedCategory.value );
+        }
     });
 
     const refreshWordList = (category) => {
@@ -140,7 +147,7 @@ import { useRoute } from 'vue-router';
                  // 용어 목록 저장
                 wordList.value = res.data.data.data;
                  // 총 개수 저장
-                total.value = res.data.data.total;
+                total.value = res.data.data.data.length;
             })
             .catch(err => {
                 console.error('데이터 로드 오류:', err);
@@ -221,6 +228,7 @@ import { useRoute } from 'vue-router';
         sendWordRequest(category, wordData, newCodName);
     };
     const sendWordRequest = (category, wordData, data) => {
+
         const payload = {
             WRDDICCAT: category,
             WRDDICTTL: wordData.title,
@@ -235,13 +243,15 @@ import { useRoute } from 'vue-router';
                         writeButton.value.resetButton();
                     }
                     selectedCategory.value = category;
+                    const firstChar = getFirstCharacter(wordData.title[0]); // 첫 글자 변환
+                    selectedAlphabet.value = firstChar;
+
                     getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
                     getIndex();
                     if(res.data.data == '2'){
                         const newCategory = { label: data, value: category };
                         cateList.value = [...cateList.value,newCategory];
                     }
-                    selectedAlphabet.value = '';
                 }
             });
     };
@@ -283,6 +293,32 @@ import { useRoute } from 'vue-router';
 
     };
 
+    //초성 /알파벳 변환
+    const getFirstCharacter = (char) => {
+        const CHOSUNG_LIST = [
+            'ㄱ', 'ㄲ', 'ㄴ', 'ㄷ', 'ㄸ', 'ㄹ', 'ㅁ', 'ㅂ', 'ㅃ', 'ㅅ',
+            'ㅆ', 'ㅇ', 'ㅈ', 'ㅉ', 'ㅊ', 'ㅋ', 'ㅌ', 'ㅍ', 'ㅎ'
+        ];
+
+        if (!char || char.length === 0) return '';
+
+        const code = char.charCodeAt(0);
+
+        // 한글 범위 (가~힣) → 초성 변환
+        if (code >= 0xAC00 && code <= 0xD7A3) {
+            const index = Math.floor((code - 0xAC00) / (21 * 28));
+            return CHOSUNG_LIST[index];
+        }
+
+        // 영어 소문자 → 대문자로 변환
+        if (char.match(/[a-zA-Z]/)) {
+            return char.toLowerCase();
+        }
+
+        // 기타 문자 (숫자, 특수문자) 그대로 반환
+        return char;
+    };
+
 </script>
 
 <style scoped>
@@ -300,4 +336,11 @@ import { useRoute } from 'vue-router';
     height: fit-content;
 }
 
+.q-editor-container {
+    max-width: 100%; /* 영역이 넘치지 않게 */
+    overflow: auto; /* 넘치는 내용은 스크롤로 처리 */
+    word-wrap: break-word; /* 긴 단어는 자동으로 줄바꿈 */
+    white-space: normal; /* 내용이 길어지면 자동으로 줄바꿈 */
+}
+
 </style>