Merge branch '250407_park'

This commit is contained in:
nevermoregb 2025-04-07 20:11:00 +09:00
commit 9e578109e1
4 changed files with 21 additions and 6 deletions

View File

@ -819,3 +819,7 @@ input:checked + .slider:before {
.font-bold {
font-weight: bold;
}
.pointer {
cursor: pointer;
}

View File

@ -25,6 +25,7 @@
:dinnerList="dinnerList"
:teaTimeList="teaTimeList"
:workShopList="workShopList"
@handle-click-vacation="handleClickVacation"
/>
</div>
</div>
@ -67,6 +68,7 @@
import { useToastStore } from '@s/toastStore';
import { useWeatherStore } from '@/stores/useWeatherStore';
import { storeToRefs } from 'pinia';
import router from '@/router';
import FullCalendar from '@fullcalendar/vue3';
import dayGridPlugin from '@fullcalendar/daygrid';
import interactionPlugin from '@fullcalendar/interaction';
@ -538,6 +540,10 @@
handleCloseModal();
};
const handleClickVacation = () => {
router.push({ path: 'Vacation' });
};
// ( )
watch(
() => fullCalendarRef.value?.getApi().currentData.viewTitle,

View File

@ -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">
@ -100,6 +102,8 @@
type: Array,
},
});
defineEmits(['handleClickVacation']);
</script>
<style scoped>

View File

@ -8,7 +8,7 @@ const routes = [
path: '/',
name: 'Home',
component: () => import('@v/MainView.vue'),
meta: { requiresAuth: true }
meta: { requiresAuth: true },
},
{
path: '/board',
@ -40,12 +40,12 @@ const routes = [
path: '/mypage',
name: 'MyPage',
component: () => import('@v/mypage/MyPage.vue'),
meta: { requiresAuth: true }
meta: { requiresAuth: true },
},
{
path: '/wordDict',
component: () => import('@v/wordDict/wordDict.vue'),
meta: { requiresAuth: true }
meta: { requiresAuth: true },
},
{
path: '/login',
@ -67,8 +67,9 @@ const routes = [
},
{
path: '/vacation',
name: 'Vacation',
component: () => import('@v/vacation/VacationManagement.vue'),
meta: { requiresAuth: true }
meta: { requiresAuth: true },
},
{
path: '/voteboard',
@ -88,12 +89,12 @@ const routes = [
{
path: '/projectlist',
component: () => import('@v/projectlist/TheProjectList.vue'),
meta: { requiresAuth: true }
meta: { requiresAuth: true },
},
{
path: '/commuters',
component: () => import('@v/commuters/TheCommuters.vue'),
meta: { requiresAuth: true }
meta: { requiresAuth: true },
},
{
path: '/authorization',