From c61691249fc65878a39b003ac72622e9aabb764a Mon Sep 17 00:00:00 2001 From: clz Date: Sun, 18 Jan 2026 20:17:48 +0800 Subject: [PATCH] =?UTF-8?q?fix(web):=20=E4=BF=AE=E5=A4=8D=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E8=A3=81=E5=88=87/=E5=AE=BD=E5=BA=A6=E4=B8=8E?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yaml | 2 +- .../analysis/CategoryRanking.svelte | 2 +- .../analysis/DailyTrendChart.svelte | 2 +- .../date-range-picker.svelte | 6 +- .../ui/dialog/dialog-content.svelte | 2 +- .../ui/drawer/drawer-content.svelte | 4 +- web/src/lib/config/theme.ts | 4 +- web/src/routes/+page.svelte | 55 +++++++++---------- web/src/routes/review/+page.svelte | 4 +- 9 files changed, 40 insertions(+), 41 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 1e35953..cedd96f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -145,7 +145,7 @@ services: # 挂载 Docker Socket 以支持容器操作 - /var/run/docker.sock:/var/run/docker.sock # 挂载仓库目录 - - /path/to/billai:/app + - ./:/app working_dir: /app healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9000/health"] diff --git a/web/src/lib/components/analysis/CategoryRanking.svelte b/web/src/lib/components/analysis/CategoryRanking.svelte index f76b767..ebe96c9 100644 --- a/web/src/lib/components/analysis/CategoryRanking.svelte +++ b/web/src/lib/components/analysis/CategoryRanking.svelte @@ -199,7 +199,7 @@ - + diff --git a/web/src/lib/components/analysis/DailyTrendChart.svelte b/web/src/lib/components/analysis/DailyTrendChart.svelte index 1e4580b..4de384d 100644 --- a/web/src/lib/components/analysis/DailyTrendChart.svelte +++ b/web/src/lib/components/analysis/DailyTrendChart.svelte @@ -836,7 +836,7 @@ - + diff --git a/web/src/lib/components/ui/date-range-picker/date-range-picker.svelte b/web/src/lib/components/ui/date-range-picker/date-range-picker.svelte index ed727ac..56f4882 100644 --- a/web/src/lib/components/ui/date-range-picker/date-range-picker.svelte +++ b/web/src/lib/components/ui/date-range-picker/date-range-picker.svelte @@ -18,7 +18,7 @@ let { startDate = $bindable(), endDate = $bindable(), onchange, class: className }: Props = $props(); // 将 YYYY-MM-DD 字符串转换为 CalendarDate - function parseDate(dateStr: string): DateValue | undefined { + function parseDate(dateStr?: string): DateValue | undefined { if (!dateStr) return undefined; const [year, month, day] = dateStr.split('-').map(Number); return new CalendarDate(year, month, day); @@ -101,7 +101,11 @@ diff --git a/web/src/lib/components/ui/dialog/dialog-content.svelte b/web/src/lib/components/ui/dialog/dialog-content.svelte index 5c6ee6d..52975e0 100644 --- a/web/src/lib/components/ui/dialog/dialog-content.svelte +++ b/web/src/lib/components/ui/dialog/dialog-content.svelte @@ -27,7 +27,7 @@ bind:ref data-slot="dialog-content" class={cn( - "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg", + "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-4 left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-0 gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg max-h-[calc(100dvh-2rem)] overflow-y-auto md:top-[50%] md:translate-y-[-50%] md:max-h-[85vh]", className )} {...restProps} diff --git a/web/src/lib/components/ui/drawer/drawer-content.svelte b/web/src/lib/components/ui/drawer/drawer-content.svelte index f11d1d7..62cc136 100644 --- a/web/src/lib/components/ui/drawer/drawer-content.svelte +++ b/web/src/lib/components/ui/drawer/drawer-content.svelte @@ -20,14 +20,14 @@ {#if isMobile.current}
{@render children?.()} {:else} - + {@render children?.()} {/if} diff --git a/web/src/lib/config/theme.ts b/web/src/lib/config/theme.ts index 5150a0f..614c637 100644 --- a/web/src/lib/config/theme.ts +++ b/web/src/lib/config/theme.ts @@ -1,13 +1,13 @@ import Monitor from '@lucide/svelte/icons/monitor'; import Sun from '@lucide/svelte/icons/sun'; import Moon from '@lucide/svelte/icons/moon'; -import type { ComponentType } from 'svelte'; +import type { Component } from 'svelte'; export type ThemeMode = 'system' | 'light' | 'dark'; export interface ThemeOption { label: string; - icon: ComponentType; + icon: Component; } export const themeConfig: Record = { diff --git a/web/src/routes/+page.svelte b/web/src/routes/+page.svelte index a563903..4451522 100644 --- a/web/src/routes/+page.svelte +++ b/web/src/routes/+page.svelte @@ -23,35 +23,44 @@ let isUploading = $state(false); let uploadResult: UploadResponse | null = $state(null); let errorMessage = $state(''); + + type StatTrend = 'up' | 'down'; + interface StatCard { + title: string; + value: string; + change: string; + trend: StatTrend; + description: string; + } // 实时统计数据 - let stats = $state([ + let stats = $state([ { title: '本月支出', value: '¥0.00', change: '+0%', - trend: 'up' as const, + trend: 'up', description: '加载中...' }, { title: '本月收入', value: '¥0.00', change: '+0%', - trend: 'up' as const, + trend: 'up', description: '加载中...' }, { title: '待复核', value: '0', change: '+0%', - trend: 'up' as const, + trend: 'up', description: '需要人工确认' }, { title: '已处理账单', value: '0', change: '+0%', - trend: 'up' as const, + trend: 'up', description: '累计处理记录' }, ]); @@ -66,62 +75,49 @@ const lastMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1); const previousMonth = `${lastMonth.getFullYear()}-${String(lastMonth.getMonth() + 1).padStart(2, '0')}`; - console.log('Current month:', currentMonth); - console.log('Previous month:', previousMonth); - // 获取月度统计数据 const monthlyResponse = await fetchMonthlyStats(); - console.log('Monthly response:', monthlyResponse); const monthlyStats = monthlyResponse.data || []; - console.log('Monthly stats:', monthlyStats); // 获取待复核统计 const reviewResponse = await fetchReviewStats(); - console.log('Review response:', reviewResponse); const reviewTotal = reviewResponse.data?.total || 0; - console.log('Review total:', reviewTotal); // 获取已处理账单数量 const billsResponse = await fetchBills({ page_size: 1 }); - console.log('Bills response:', billsResponse); const billTotal = billsResponse.data?.total || 0; - console.log('Bill total:', billTotal); // 提取当月和上月的数据 const currentData = monthlyStats.find(m => m.month === currentMonth); const previousData = monthlyStats.find(m => m.month === previousMonth); - console.log('Current data:', currentData); - console.log('Previous data:', previousData); - // 计算支出变化百分比 const currentExpense = currentData?.expense || 0; const previousExpense = previousData?.expense || 0; const expenseChange = previousExpense > 0 - ? ((currentExpense - previousExpense) / previousExpense * 100).toFixed(1) + ? (currentExpense - previousExpense) / previousExpense * 100 : 0; - const expenseTrend = parseFloat(expenseChange.toString()) >= 0 ? 'up' : 'down'; + const expenseTrend: StatTrend = expenseChange >= 0 ? 'up' : 'down'; // 计算收入变化百分比 const currentIncome = currentData?.income || 0; const previousIncome = previousData?.income || 0; const incomeChange = previousIncome > 0 - ? ((currentIncome - previousIncome) / previousIncome * 100).toFixed(1) + ? (currentIncome - previousIncome) / previousIncome * 100 : 0; - const incomeTrend = parseFloat(incomeChange.toString()) >= 0 ? 'up' : 'down'; + const incomeTrend: StatTrend = incomeChange >= 0 ? 'up' : 'down'; // 格式化金额 const formatAmount = (amount: number) => { return `¥${amount.toFixed(2)}`; }; - const formatChange = (change: number | string) => { - const changeNum = typeof change === 'string' ? parseFloat(change) : change; - const sign = changeNum >= 0 ? '+' : ''; - return `${sign}${changeNum.toFixed(1)}%`; + const formatChange = (change: number) => { + const sign = change >= 0 ? '+' : ''; + return `${sign}${change.toFixed(1)}%`; }; - const newStats = [ + const newStats: StatCard[] = [ { title: '本月支出', value: formatAmount(currentExpense), @@ -140,19 +136,18 @@ title: '待复核', value: reviewTotal.toString(), change: '+0%', - trend: 'up' as const, + trend: 'up', description: '需要人工确认' }, { title: '已处理账单', value: billTotal.toString(), change: '+0%', - trend: 'up' as const, + trend: 'up', description: '累计处理记录' }, ]; - - console.log('New stats:', newStats); + stats = newStats; } catch (err) { console.error('Failed to load stats:', err); diff --git a/web/src/routes/review/+page.svelte b/web/src/routes/review/+page.svelte index 80f5e01..ab80566 100644 --- a/web/src/routes/review/+page.svelte +++ b/web/src/routes/review/+page.svelte @@ -14,8 +14,8 @@ let isLoading = $state(true); let errorMessage = $state(''); - let reviewStats: ReviewData | null = $state(null); - let allBills: CleanedBill[] = $state([]); + let reviewStats = $state(null); + let allBills = $state([]); let filterLevel = $state<'all' | 'HIGH' | 'LOW'>('all'); onMount(() => {