diff --git a/frontend/src/views/admin/DashboardView.vue b/frontend/src/views/admin/DashboardView.vue index f86b54c5..82aa23a5 100644 --- a/frontend/src/views/admin/DashboardView.vue +++ b/frontend/src/views/admin/DashboardView.vue @@ -323,15 +323,12 @@ const formatLocalDate = (date: Date): string => { return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}` } -// Initialize date range immediately -const now = new Date() -const weekAgo = new Date(now) -weekAgo.setDate(weekAgo.getDate() - 6) +const getTodayLocalDate = () => formatLocalDate(new Date()) // Date range const granularity = ref<'day' | 'hour'>('day') -const startDate = ref(formatLocalDate(weekAgo)) -const endDate = ref(formatLocalDate(now)) +const startDate = ref(getTodayLocalDate()) +const endDate = ref(getTodayLocalDate()) // Granularity options for Select component const granularityOptions = computed(() => [ diff --git a/frontend/src/views/admin/UsageView.vue b/frontend/src/views/admin/UsageView.vue index beb9bf11..5001ae95 100644 --- a/frontend/src/views/admin/UsageView.vue +++ b/frontend/src/views/admin/UsageView.vue @@ -135,8 +135,8 @@ const formatLD = (d: Date) => { const day = String(d.getDate()).padStart(2, '0') return `${year}-${month}-${day}` } -const now = new Date(); const weekAgo = new Date(); weekAgo.setDate(weekAgo.getDate() - 6) -const startDate = ref(formatLD(weekAgo)); const endDate = ref(formatLD(now)) +const getTodayLocalDate = () => formatLD(new Date()) +const startDate = ref(getTodayLocalDate()); const endDate = ref(getTodayLocalDate()) const filters = ref({ user_id: undefined, model: undefined, group_id: undefined, request_type: undefined, billing_type: null, start_date: startDate.value, end_date: endDate.value }) const pagination = reactive({ page: 1, page_size: 20, total: 0 }) @@ -191,7 +191,7 @@ const loadChartData = async () => { } const applyFilters = () => { pagination.page = 1; loadLogs(); loadStats(); loadChartData() } const refreshData = () => { loadLogs(); loadStats(); loadChartData() } -const resetFilters = () => { startDate.value = formatLD(weekAgo); endDate.value = formatLD(now); filters.value = { start_date: startDate.value, end_date: endDate.value, request_type: undefined, billing_type: null }; granularity.value = 'day'; applyFilters() } +const resetFilters = () => { startDate.value = getTodayLocalDate(); endDate.value = getTodayLocalDate(); filters.value = { start_date: startDate.value, end_date: endDate.value, request_type: undefined, billing_type: null }; granularity.value = 'day'; applyFilters() } const handlePageChange = (p: number) => { pagination.page = p; loadLogs() } const handlePageSizeChange = (s: number) => { pagination.page_size = s; pagination.page = 1; loadLogs() } const cancelExport = () => exportAbortController?.abort()