diff --git a/src/App.vue b/src/App.vue index c328c79230f5a7d87d1c951e054bb418f6490202..43c739a5359d97d84adb980cb21f5f25eb6aaf9b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -14,13 +14,10 @@ provide('drawer', drawer) </script> <template> <v-container fluid style="background-color: #7E9CD3; min-height: 100vh;"> - <!-- <FullLayout v-if="route.meta.layout === 'FullLayout'"></FullLayout> - <MainLayout v-if="route.meta.layout === 'MainLayout'"></MainLayout> --> <component :is="route.meta.layout === 'MainLayout' ? MainLayout : FullLayout"></component> <LoadingDialog></LoadingDialog> <LoginMessage /> </v-container> - </template> <style scoped></style> diff --git a/src/components/GanttChart/GanttChart.vue b/src/components/GanttChart/GanttChart.vue index be1272a7921379c4614dd29c419774bdf93024d4..d30c1c8f1011c569ac2177925859602b9dcfaedc 100644 --- a/src/components/GanttChart/GanttChart.vue +++ b/src/components/GanttChart/GanttChart.vue @@ -81,7 +81,7 @@ <!-- Pagination --> <div class="pagination-container"> - <div class="pagination"> + <transition-group name="fade" tag="div" class="pagination"> <button v-for="p in pages" :key="p" @@ -101,7 +101,7 @@ <button class="page-btn add-page" @click="addPage" :disabled="pages.length >= 10"> + </button> - </div> + </transition-group> <div class="pagination-right"> <v-btn class="add-page-btn" @click="openAddQueueDialog" icon> <v-icon>mdi-plus</v-icon> diff --git a/src/components/GanttChart/SettingBtn.vue b/src/components/GanttChart/SettingBtn.vue index 238cb4787cecf719e8f3f49fb3224919f0ca5b80..3d3c132e7b78e15111deb4ae3b69cc4ff5555adb 100644 --- a/src/components/GanttChart/SettingBtn.vue +++ b/src/components/GanttChart/SettingBtn.vue @@ -7,13 +7,14 @@ </v-btn> </template> - <v-list> + <v-list style="background-color: #4F5473"> <v-list-item + style="background-color: #4F5473" v-for="(item, index) in items" :key="index" @click="handleMenuClick(index)" > - <v-list-item-title>{{ item.title }}</v-list-item-title> + <v-list-item-title style="color: white">{{ item.title }}</v-list-item-title> </v-list-item> </v-list> </v-menu> diff --git a/src/components/GanttChart/ganttChart.css b/src/components/GanttChart/ganttChart.css index 0175699eee7875d35e5826eac8b042843d4f7e54..320645291d500c1d4e535f0fbfbc37125bcf68b5 100644 --- a/src/components/GanttChart/ganttChart.css +++ b/src/components/GanttChart/ganttChart.css @@ -183,6 +183,17 @@ position: relative; } +.fade-enter-active, +.fade-leave-active { + transition: all 0.4s ease; +} + +.fade-enter-from, +.fade-leave-to { + opacity: 0; + transform: scale(0.8); +} + .page-btn.active { background: #007bff; border-radius: 6px;