diff --git a/app/app/(admin)/admin/ana/page.tsx b/app/app/(admin)/admin/ana/page.tsx index 54cbb4ac7..440b90d21 100644 --- a/app/app/(admin)/admin/ana/page.tsx +++ b/app/app/(admin)/admin/ana/page.tsx @@ -1,4 +1,3 @@ -import { Grid, Col } from "@tremor/react"; import UsageByModel from "./usage-by-model-chart"; import UserByMap from "./user-by-map"; import { getSession } from "@/lib/auth"; diff --git a/app/app/(admin)/admin/ana/usage-by-model-chart.tsx b/app/app/(admin)/admin/ana/usage-by-model-chart.tsx index a6b5edd0d..7ba79ba98 100644 --- a/app/app/(admin)/admin/ana/usage-by-model-chart.tsx +++ b/app/app/(admin)/admin/ana/usage-by-model-chart.tsx @@ -9,12 +9,22 @@ import React, { } from "react"; import * as echarts from "echarts"; -import { DatePicker } from "@tremor/react"; -import { zhCN } from "date-fns/locale"; +// import { DatePicker } from "@tremor/react"; +import { DatePicker } from "antd"; +import { Col, Row } from "antd"; + +import locale from "antd/es/date-picker/locale/zh_CN"; +import "dayjs/locale/zh-cn"; +import dayjs from "dayjs"; + import { EChartsOption } from "echarts"; import { essos } from "@/lib/charts_theme"; import { subDays, addDays } from "date-fns"; +// import customParseFormat from 'dayjs/plugin/customParseFormat'; +// dayjs.extend(customParseFormat); +// const dateFormat = 'YYYY-MM-DD'; + interface ComponentProps { currentDate: Date; setCurrentDate: Dispatch>; @@ -64,14 +74,15 @@ function DateSelectComponent({ currentDate, setCurrentDate }: ComponentProps) { }, [changeCurrentDate, currentDate]); return ( - d && changeCurrentDate(d)} - maxDate={maxDate} - /> +
+ d && changeCurrentDate(d.toDate())} + maxDate={dayjs(maxDate)} + /> +
); } @@ -148,14 +159,18 @@ export default function UsageByModelChart() { return (
- - + + + + + +
); } diff --git a/app/app/(admin)/admin/layout.tsx b/app/app/(admin)/admin/layout.tsx index 007c748a6..c60375cf8 100644 --- a/app/app/(admin)/admin/layout.tsx +++ b/app/app/(admin)/admin/layout.tsx @@ -52,7 +52,7 @@ function MainLayout({ children }: { children: ReactNode }) { { - const errorMessage = Array.isArray(error) ? error.pop() : error; - errorMessage && toast.error(errorMessage); - }, [error]); + // const error = searchParams?.get("error"); + // + // useEffect(() => { + // const errorMessage = Array.isArray(error) ? error.pop() : error; + // errorMessage && toast.error(errorMessage); + // }, [error]); return (