diff --git a/src/common/axios-interceptor.js b/src/common/axios-interceptor.js index 2706750..c4163dd 100644 --- a/src/common/axios-interceptor.js +++ b/src/common/axios-interceptor.js @@ -37,7 +37,7 @@ $api.interceptors.response.use( }, function (error) { const toastStore = useToastStore(); - //const currentPage = error.config.headers['X-Page-Route']; + const currentPage = error.config.headers['X-Page-Route']; // 오류 응답 처리 if (error.response) { switch (error.response.status) { diff --git a/src/components/list/ProjectCard.vue b/src/components/list/ProjectCard.vue index a690309..7ea65c0 100644 --- a/src/components/list/ProjectCard.vue +++ b/src/components/list/ProjectCard.vue @@ -63,7 +63,7 @@ - +}; + diff --git a/src/components/wordDict/DictCard.vue b/src/components/wordDict/DictCard.vue index 8004a55..36825f5 100644 --- a/src/components/wordDict/DictCard.vue +++ b/src/components/wordDict/DictCard.vue @@ -87,7 +87,7 @@ const localCateList = ref([...props.cateList]); const selectedCategory = ref(''); // cateList emit -const emit = defineEmits(['update:cateList']); +const emit = defineEmits(['update:cateList','refreshWordList']); // 글 수정 상태 const isWriteVisible = ref(false); @@ -126,6 +126,7 @@ const addCategory = (data) => { } } + // 용어집 수정 const editWord = (data) => { console.log('📌 수정할 데이터:', data); @@ -142,15 +143,15 @@ const editWord = (data) => { axios.patch('worddict/updateWord', { WRDDICSEQ: data.id, - WRDDICCAT: 600104, + WRDDICCAT: data.category, WRDDICTTL: data.title, - WRDDICRIK: $common.deltaAsJson(data.content), + WRDDICCON: $common.deltaAsJson(data.content), }) .then((res) => { - if (res.data.data === '1') { + if (res.data.data === 1) { toastStore.onToast('✅ 용어가 수정되었습니다.', 's'); - isWriteVisible.value = false; // 성공 시에만 닫기 - // getwordList(); // 목록 갱신 + isWriteVisible.value = false; + emit('refreshWordList'); } else { console.warn('⚠️ 서버 응답이 예상과 다릅니다:', res.data); toastStore.onToast('용어 수정이 정상적으로 처리되지 않았습니다.', 'e'); diff --git a/src/components/wordDict/DictWrite.vue b/src/components/wordDict/DictWrite.vue index b6dd169..65bdceb 100644 --- a/src/components/wordDict/DictWrite.vue +++ b/src/components/wordDict/DictWrite.vue @@ -73,6 +73,11 @@ const addCategoryAlert = ref(false); //선택 카테고리 const selectCategory = ref(''); +// 카테고리 상태 +const selectedCategory = computed(() => + selectCategory.value === '' ? props.formValue : selectCategory.value +); + const props = defineProps({ dataList: { type: Array, @@ -133,7 +138,7 @@ const saveWord = () => { const wordData = { id: props.NumValue || null, title: wordTitle.value, - category: selectCategory.value, + category: selectedCategory.value, content: content.value, }; diff --git a/src/views/vacation/VacationManagement.vue b/src/views/vacation/VacationManagement.vue index 86e1346..bfb72c6 100644 --- a/src/views/vacation/VacationManagement.vue +++ b/src/views/vacation/VacationManagement.vue @@ -99,6 +99,7 @@ const handleProfileClick = async (user) => { if (user.MEMBERSEQ === userStore.user.id) { // 내 프로필을 클릭한 경우 const response = await axios.get(`vacation/history`); + console.log(response) if (response.status === 200 && response.data) { myVacations.value = response.data.data.usedVacations || []; diff --git a/src/views/wordDict/wordDict.vue b/src/views/wordDict/wordDict.vue index 9e083fe..68a060b 100644 --- a/src/views/wordDict/wordDict.vue +++ b/src/views/wordDict/wordDict.vue @@ -49,6 +49,7 @@ :key="item.WRDDICSEQ" :item="item" :cateList="cateList" + @refreshWordList="getwordList" />