diff --git a/src/utils/resize.ts b/src/utils/resize.ts deleted file mode 100644 index 343bb0f3..00000000 --- a/src/utils/resize.ts +++ /dev/null @@ -1,73 +0,0 @@ -import { ref } from 'vue'; -export default function () { - const chart = ref(); - const sidebarElm = ref(); - - const chartResizeHandler = () => { - if (chart.value) { - chart.value.resize(); - } - }; - - const sidebarResizeHandler = (e: TransitionEvent) => { - if (e.propertyName === 'width') { - chartResizeHandler(); - } - }; - - const initResizeEvent = () => { - window.addEventListener('resize', chartResizeHandler, {passive:true}); - }; - - const destroyResizeEvent = () => { - window.removeEventListener('resize', chartResizeHandler); - }; - - const initSidebarResizeEvent = () => { - sidebarElm.value = document.getElementsByClassName('sidebar-container')[0]; - if (sidebarElm.value) { - sidebarElm.value.addEventListener( - 'transitionend', - sidebarResizeHandler as EventListener, - {passive:true} - ); - } - }; - - const destroySidebarResizeEvent = () => { - if (sidebarElm.value) { - sidebarElm.value.removeEventListener( - 'transitionend', - sidebarResizeHandler as EventListener - ); - } - }; - - const mounted = () => { - initResizeEvent(); - initSidebarResizeEvent(); - }; - - const beforeDestroy = () => { - destroyResizeEvent(); - destroySidebarResizeEvent(); - }; - - const activated = () => { - initResizeEvent(); - initSidebarResizeEvent(); - }; - - const deactivated = () => { - destroyResizeEvent(); - destroySidebarResizeEvent(); - }; - - return { - chart, - mounted, - beforeDestroy, - activated, - deactivated - }; -} diff --git a/src/views/dashboard/components/BarChart.vue b/src/views/dashboard/components/BarChart.vue index 9d0ec5c9..860d5449 100644 --- a/src/views/dashboard/components/BarChart.vue +++ b/src/views/dashboard/components/BarChart.vue @@ -7,16 +7,7 @@ diff --git a/src/views/dashboard/components/FunnelChart.vue b/src/views/dashboard/components/FunnelChart.vue index 44206d21..3903d3a7 100644 --- a/src/views/dashboard/components/FunnelChart.vue +++ b/src/views/dashboard/components/FunnelChart.vue @@ -4,15 +4,7 @@ - - diff --git a/src/views/dashboard/components/PieChart.vue b/src/views/dashboard/components/PieChart.vue index ae708be5..0f71ba50 100644 --- a/src/views/dashboard/components/PieChart.vue +++ b/src/views/dashboard/components/PieChart.vue @@ -7,15 +7,7 @@ - - diff --git a/src/views/dashboard/components/RadarChart.vue b/src/views/dashboard/components/RadarChart.vue index 027f7027..f9350369 100644 --- a/src/views/dashboard/components/RadarChart.vue +++ b/src/views/dashboard/components/RadarChart.vue @@ -7,15 +7,7 @@ - - diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 28d31782..6dbffd92 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -20,7 +20,7 @@ const date: Date = new Date(); const greetings = computed(() => { if (date.getHours() >= 6 && date.getHours() < 8) { return '晨起披衣出草堂,轩窗已自喜微凉🌅!'; - } else if (date.getHours() >= 8 && date.getHours() < 18) { + } else if (date.getHours() >= 8 && date.getHours() < 12) { return '上午好🌞!'; } else if (date.getHours() >= 12 && date.getHours() < 18) { return '下午好☕!'; @@ -209,5 +209,8 @@ const greetings = computed(() => { display: flex; justify-content: space-between; } + .svg-icon { + fill: currentColor !important; + } }