diff --git a/src/pages/member/learn.module.less b/src/pages/member/learn.module.less index 725f821..c1354f0 100644 --- a/src/pages/member/learn.module.less +++ b/src/pages/member/learn.module.less @@ -11,5 +11,4 @@ width: 100%; height: 320px; box-sizing: border-box; - padding-top: 24px; } diff --git a/src/pages/member/learn.tsx b/src/pages/member/learn.tsx index cac04e0..8550c52 100644 --- a/src/pages/member/learn.tsx +++ b/src/pages/member/learn.tsx @@ -7,6 +7,7 @@ import { dateFormat } from "../../utils/index"; import { user as member } from "../../api/index"; import * as echarts from "echarts"; import type { ColumnsType } from "antd/es/table"; +import { duration } from "moment"; interface DataType { id: React.Key; @@ -58,10 +59,21 @@ const MemberLearnPage = () => { }); }; + const minuteFormat = (duration: number) => { + if (duration === 0) { + return 0; + } + let h = Math.trunc(duration / 3600); + let m = Math.trunc((duration % 3600) / 60); + let s = Math.trunc((duration % 3600) % 60); + return h + "小时" + m + "分"; + }; + const renderView = (params: any) => { const timeData: any = []; const valueData: any = []; params.map((item: any) => { + let time = minuteFormat(item.value / 1000); timeData.push(item.key); valueData.push(item.value / 1000); }); @@ -91,9 +103,10 @@ const MemberLearnPage = () => { }, series: [ { - name: "每日学习时长(秒)", + name: "每日学习时长", type: "line", data: valueData, + color: "#ff4d4f", }, ], }); @@ -278,7 +291,6 @@ const MemberLearnPage = () => {