diff --git a/apps/web-antd/env.d.ts b/apps/web-antd/env.d.ts new file mode 100644 index 0000000..cf87c62 --- /dev/null +++ b/apps/web-antd/env.d.ts @@ -0,0 +1,3 @@ +declare module "*.js"; + +declare module 'vuejs-heatmap'; diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index e9107c8..64a2681 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -42,8 +42,10 @@ "@vben/utils": "workspace:*", "@vueuse/core": "catalog:", "ant-design-vue": "catalog:", + "cal-heatmap": "^4.2.4", "dayjs": "catalog:", "pinia": "catalog:", + "prettier-eslint": "^16.4.2", "vue": "catalog:", "vue-router": "catalog:", "vxe-table": "^4.6.25" diff --git a/apps/web-antd/src/api/core/log.ts b/apps/web-antd/src/api/core/log.ts index cfcb97f..51a7edc 100644 --- a/apps/web-antd/src/api/core/log.ts +++ b/apps/web-antd/src/api/core/log.ts @@ -24,7 +24,10 @@ export interface UserLogOrder{ Diff: number, ChessId: string, } - +export interface heatType { + date :string; + value : number; +} export interface UserLogInfo{ AreaId : number, Charge:number, @@ -39,6 +42,7 @@ export interface UserLogInfo{ TodayCumulative: number, Bonus?: number, Order:UserLogOrder[], + Heatmap?: heatType[], } diff --git a/apps/web-antd/src/api/core/user.ts b/apps/web-antd/src/api/core/user.ts index bbe0ab8..05aa94d 100644 --- a/apps/web-antd/src/api/core/user.ts +++ b/apps/web-antd/src/api/core/user.ts @@ -14,6 +14,8 @@ export interface UserListParam { pageSize: number; currentPage: number; } + + /** * 获取用户信息 */ @@ -33,4 +35,5 @@ export async function userGmApi(data : object) { + \ No newline at end of file diff --git a/apps/web-antd/src/component/calendar/event-table.vue b/apps/web-antd/src/component/calendar/event-table.vue new file mode 100644 index 0000000..ef892b3 --- /dev/null +++ b/apps/web-antd/src/component/calendar/event-table.vue @@ -0,0 +1,144 @@ + + + diff --git a/apps/web-antd/src/component/calendar/index.vue b/apps/web-antd/src/component/calendar/index.vue new file mode 100644 index 0000000..b7fddba --- /dev/null +++ b/apps/web-antd/src/component/calendar/index.vue @@ -0,0 +1,100 @@ + + + + + + diff --git a/apps/web-antd/src/component/index.ts b/apps/web-antd/src/component/index.ts new file mode 100644 index 0000000..d9fa07a --- /dev/null +++ b/apps/web-antd/src/component/index.ts @@ -0,0 +1,5 @@ +import eventTable from "./calendar/event-table.vue"; +import calendar from "./calendar/index.vue"; +import type {dataType} from "./calendar/index.vue"; +export { eventTable, calendar }; +export type { dataType }; diff --git a/apps/web-antd/src/views/dashboard/analytics/index.vue b/apps/web-antd/src/views/dashboard/analytics/index.vue index 8433405..891e9ea 100644 --- a/apps/web-antd/src/views/dashboard/analytics/index.vue +++ b/apps/web-antd/src/views/dashboard/analytics/index.vue @@ -85,7 +85,6 @@ const chartTabs: TabOption[] = [