Merge branch '250407_park'
This commit is contained in:
commit
9e578109e1
@ -819,3 +819,7 @@ input:checked + .slider:before {
|
|||||||
.font-bold {
|
.font-bold {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.pointer {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|||||||
@ -25,6 +25,7 @@
|
|||||||
:dinnerList="dinnerList"
|
:dinnerList="dinnerList"
|
||||||
:teaTimeList="teaTimeList"
|
:teaTimeList="teaTimeList"
|
||||||
:workShopList="workShopList"
|
:workShopList="workShopList"
|
||||||
|
@handle-click-vacation="handleClickVacation"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -67,6 +68,7 @@
|
|||||||
import { useToastStore } from '@s/toastStore';
|
import { useToastStore } from '@s/toastStore';
|
||||||
import { useWeatherStore } from '@/stores/useWeatherStore';
|
import { useWeatherStore } from '@/stores/useWeatherStore';
|
||||||
import { storeToRefs } from 'pinia';
|
import { storeToRefs } from 'pinia';
|
||||||
|
import router from '@/router';
|
||||||
import FullCalendar from '@fullcalendar/vue3';
|
import FullCalendar from '@fullcalendar/vue3';
|
||||||
import dayGridPlugin from '@fullcalendar/daygrid';
|
import dayGridPlugin from '@fullcalendar/daygrid';
|
||||||
import interactionPlugin from '@fullcalendar/interaction';
|
import interactionPlugin from '@fullcalendar/interaction';
|
||||||
@ -538,6 +540,10 @@
|
|||||||
handleCloseModal();
|
handleCloseModal();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleClickVacation = () => {
|
||||||
|
router.push({ path: 'Vacation' });
|
||||||
|
};
|
||||||
|
|
||||||
// 달력 뷰 변경 감지 (월 변경 시 데이터 다시 가져오기)
|
// 달력 뷰 변경 감지 (월 변경 시 데이터 다시 가져오기)
|
||||||
watch(
|
watch(
|
||||||
() => fullCalendarRef.value?.getApi().currentData.viewTitle,
|
() => fullCalendarRef.value?.getApi().currentData.viewTitle,
|
||||||
|
|||||||
@ -10,6 +10,8 @@
|
|||||||
(category.CMNCODVAL === 300205 && teaTimeList?.length) ||
|
(category.CMNCODVAL === 300205 && teaTimeList?.length) ||
|
||||||
(category.CMNCODVAL === 300206 && workShopList?.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"
|
class="border border-2 mt-3 card p-2"
|
||||||
>
|
>
|
||||||
<div class="row g-2 position-relative">
|
<div class="row g-2 position-relative">
|
||||||
@ -100,6 +102,8 @@
|
|||||||
type: Array,
|
type: Array,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
defineEmits(['handleClickVacation']);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|||||||
@ -8,7 +8,7 @@ const routes = [
|
|||||||
path: '/',
|
path: '/',
|
||||||
name: 'Home',
|
name: 'Home',
|
||||||
component: () => import('@v/MainView.vue'),
|
component: () => import('@v/MainView.vue'),
|
||||||
meta: { requiresAuth: true }
|
meta: { requiresAuth: true },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/board',
|
path: '/board',
|
||||||
@ -40,12 +40,12 @@ const routes = [
|
|||||||
path: '/mypage',
|
path: '/mypage',
|
||||||
name: 'MyPage',
|
name: 'MyPage',
|
||||||
component: () => import('@v/mypage/MyPage.vue'),
|
component: () => import('@v/mypage/MyPage.vue'),
|
||||||
meta: { requiresAuth: true }
|
meta: { requiresAuth: true },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/wordDict',
|
path: '/wordDict',
|
||||||
component: () => import('@v/wordDict/wordDict.vue'),
|
component: () => import('@v/wordDict/wordDict.vue'),
|
||||||
meta: { requiresAuth: true }
|
meta: { requiresAuth: true },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/login',
|
path: '/login',
|
||||||
@ -67,8 +67,9 @@ const routes = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/vacation',
|
path: '/vacation',
|
||||||
|
name: 'Vacation',
|
||||||
component: () => import('@v/vacation/VacationManagement.vue'),
|
component: () => import('@v/vacation/VacationManagement.vue'),
|
||||||
meta: { requiresAuth: true }
|
meta: { requiresAuth: true },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/voteboard',
|
path: '/voteboard',
|
||||||
@ -88,12 +89,12 @@ const routes = [
|
|||||||
{
|
{
|
||||||
path: '/projectlist',
|
path: '/projectlist',
|
||||||
component: () => import('@v/projectlist/TheProjectList.vue'),
|
component: () => import('@v/projectlist/TheProjectList.vue'),
|
||||||
meta: { requiresAuth: true }
|
meta: { requiresAuth: true },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/commuters',
|
path: '/commuters',
|
||||||
component: () => import('@v/commuters/TheCommuters.vue'),
|
component: () => import('@v/commuters/TheCommuters.vue'),
|
||||||
meta: { requiresAuth: true }
|
meta: { requiresAuth: true },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/authorization',
|
path: '/authorization',
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user