diff --git a/apps/web-antd/src/api/mall/statistics/product.ts b/apps/web-antd/src/api/mall/statistics/product.ts index 834ae27d1..2e83f945a 100644 --- a/apps/web-antd/src/api/mall/statistics/product.ts +++ b/apps/web-antd/src/api/mall/statistics/product.ts @@ -41,14 +41,14 @@ export namespace MallProductStatisticsApi { } /** 获得商品统计分析 */ -export function getProductStatisticsAnalyse(params: PageParam) { +export function getProductStatisticsAnalyse(params: any) { return requestClient.get< DataComparisonRespVO >('/statistics/product/analyse', { params }); } /** 获得商品状况明细 */ -export function getProductStatisticsList(params: PageParam) { +export function getProductStatisticsList(params: any) { return requestClient.get( '/statistics/product/list', { params }, @@ -56,7 +56,7 @@ export function getProductStatisticsList(params: PageParam) { } /** 导出获得商品状况明细 Excel */ -export function exportProductStatisticsExcel(params: PageParam) { +export function exportProductStatisticsExcel(params: any) { return requestClient.download('/statistics/product/export-excel', { params }); } diff --git a/apps/web-antd/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue b/apps/web-antd/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue index f6a010187..e5ff39990 100644 --- a/apps/web-antd/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue +++ b/apps/web-antd/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue @@ -19,8 +19,8 @@ const times = ref<[Dayjs, Dayjs]>(); // 日期范围 const rangePickerProps = getRangePickerDefaultProps(); const timeRangeOptions = [ rangePickerProps.presets[3]!, // 昨天 - rangePickerProps.presets[4]!, // 最近 7 天 - rangePickerProps.presets[5]!, // 最近 30 天 + rangePickerProps.presets[1]!, // 最近 7 天 + rangePickerProps.presets[2]!, // 最近 30 天 ]; const timeRangeType = ref(timeRangeOptions[1]!.label); // 默认选中第一个选项 diff --git a/apps/web-antd/src/views/mall/statistics/product/modules/product-summary-card.vue b/apps/web-antd/src/views/mall/statistics/product/modules/product-summary-card.vue index 93ccc17af..603307426 100644 --- a/apps/web-antd/src/views/mall/statistics/product/modules/product-summary-card.vue +++ b/apps/web-antd/src/views/mall/statistics/product/modules/product-summary-card.vue @@ -11,9 +11,9 @@ import { onMounted, ref } from 'vue'; import { SummaryCard } from '@vben/common-ui'; import { IconifyIcon } from '@vben/icons'; import { EchartsUI, useEcharts } from '@vben/plugins/echarts'; -import { fenToYuan } from '@vben/utils'; +import { fenToYuan, isSameDay } from '@vben/utils'; -import { Button, Card, Col, message, Row, Skeleton } from 'ant-design-vue'; +import { Button, Card, Col, message, Row, Spin } from 'ant-design-vue'; import dayjs from 'dayjs'; import * as ProductStatisticsApi from '#/api/mall/statistics/product'; @@ -24,12 +24,11 @@ import { getProductSummaryChartOptions } from './product-summary-chart-options'; /** 商品概况 */ defineOptions({ name: 'ProductSummaryCard' }); -// 消息弹窗 - const trendLoading = ref(true); // 商品状态加载中 const exportLoading = ref(false); // 导出的加载中 const trendSummary = ref>(); // 商品状况统计数据 +// TODO @AI：searchTimes；参考 /Users/yunai/Java/yudao-ui-admin-vben-v5/apps/web-antd/src/views/mall/statistics/product/modules/rank-card.vue；这样，可以去掉 shortcutDateRangePicker const shortcutDateRangePicker = ref(); const chartRef = ref(); @@ -39,7 +38,9 @@ const { renderEcharts } = useEcharts(chartRef); const calculateRelativeRate = (value?: number, reference?: number): string => { const refValue = Number(reference || 0); const curValue = Number(value || 0); - if (!refValue || refValue === 0) return '0.00'; + if (!refValue || refValue === 0) { + return '0.00'; + } return (((curValue - refValue) / refValue) * 100).toFixed(2); }; @@ -47,14 +48,12 @@ const calculateRelativeRate = (value?: number, reference?: number): string => { const getProductTrendData = async (times?: [Dayjs, Dayjs]) => { trendLoading.value = true; try { + // 处理时间: 开始与截止在同一天的, 折线图出不来, 需要延长一天 let queryTimes = times; if (!queryTimes && shortcutDateRangePicker.value?.times) { queryTimes = shortcutDateRangePicker.value.times; } - - // 1. 处理时间: 开始与截止在同一天的, 折线图出不来, 需要延长一天 if (queryTimes && isSameDay(queryTimes[0], queryTimes[1])) { - // 前天 queryTimes[0] = dayjs(queryTimes[0]).subtract(1, 'd'); } @@ -68,13 +67,9 @@ const getProductTrendData = async (times?: [Dayjs, Dayjs]) => { } }; -/** 判断是否同一天 */ -const isSameDay = (date1: Dayjs, date2: Dayjs): boolean => { - return date1.format('YYYY-MM-DD') === date2.format('YYYY-MM-DD'); -}; - /** 查询商品状况数据统计 */ const getProductTrendSummary = async (times?: [Dayjs, Dayjs]) => { + // TODO @AI：是不是 queryTimes 直接使用 searchTimes 完事？！ const queryTimes = times ? [ times[0].format('YYYY-MM-DD HH:mm:ss'), @@ -88,6 +83,7 @@ const getProductTrendSummary = async (times?: [Dayjs, Dayjs]) => { /** 查询商品状况数据列表 */ const getProductStatisticsList = async (times?: [Dayjs, Dayjs]) => { + // TODO @AI：是不是 queryTimes 直接使用 searchTimes 完事？！ // 查询数据 const queryTimes = times ? [ @@ -98,18 +94,12 @@ const getProductStatisticsList = async (times?: [Dayjs, Dayjs]) => { const list: MallProductStatisticsApi.ProductStatistics[] = await ProductStatisticsApi.getProductStatisticsList({ times: queryTimes }); - // 处理数据 - const processedList = list.map((item) => ({ - ...item, - orderPayPrice: Number(fenToYuan(item.orderPayPrice)), - afterSaleRefundPrice: Number(fenToYuan(item.afterSaleRefundPrice)), - })); - - // 更新 Echarts 数据 - await renderEcharts(getProductSummaryChartOptions(processedList)); + // 更新 Echarts 数据，数据转换由图表配置处理 + await renderEcharts(getProductSummaryChartOptions(list)); }; /** 导出按钮操作 */ +// TODO @AI：导出有问题，参考别的模块的 confirm 更好； const handleExport = async () => { try { // 导出的二次确认 @@ -175,7 +165,7 @@ onMounted(async () => { - + { " /> - - + { /> - + { " /> - - + { " /> - - + { /> - + { - - - + + + diff --git a/apps/web-antd/src/views/mall/statistics/product/modules/product-summary-chart-options.ts b/apps/web-antd/src/views/mall/statistics/product/modules/product-summary-chart-options.ts index 7e64c78e6..ec6e474e1 100644 --- a/apps/web-antd/src/views/mall/statistics/product/modules/product-summary-chart-options.ts +++ b/apps/web-antd/src/views/mall/statistics/product/modules/product-summary-chart-options.ts @@ -1,7 +1,12 @@ -import type { EChartsOption } from 'echarts'; - /** 商品统计折线图配置 */ -export function getProductSummaryChartOptions(data: any[]): EChartsOption { +export function getProductSummaryChartOptions(data: any[]): any { + // 处理数据：将金额从分转换为元 + const processedData = data.map((item) => ({ + ...item, + orderPayPrice: Number((item.orderPayPrice / 100).toFixed(2)), + afterSaleRefundPrice: Number((item.afterSaleRefundPrice / 100).toFixed(2)), + })); + return { dataset: { dimensions: [ @@ -11,7 +16,7 @@ export function getProductSummaryChartOptions(data: any[]): EChartsOption { 'orderPayPrice', 'afterSaleRefundPrice', ], - source: data, + source: processedData, }, grid: { left: 20, diff --git a/apps/web-antd/src/views/mall/statistics/product/modules/rank-card.vue b/apps/web-antd/src/views/mall/statistics/product/modules/rank-card.vue index af7da2583..a2f9fdea5 100644 --- a/apps/web-antd/src/views/mall/statistics/product/modules/rank-card.vue +++ b/apps/web-antd/src/views/mall/statistics/product/modules/rank-card.vue @@ -119,7 +119,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ multiple: false, }, toolbarConfig: { - refresh: false, + enabled: false, }, } as VxeTableGridOptions, }); diff --git a/packages/@core/base/shared/src/utils/index.ts b/packages/@core/base/shared/src/utils/index.ts index e24456f91..2a545447d 100644 --- a/packages/@core/base/shared/src/utils/index.ts +++ b/packages/@core/base/shared/src/utils/index.ts @@ -23,4 +23,4 @@ export * from './window'; export { default as cloneDeep } from 'lodash.clonedeep'; export { default as get } from 'lodash.get'; export { default as isEqual } from 'lodash.isequal'; -export { default as set } from 'lodash.set'; \ No newline at end of file +export { default as set } from 'lodash.set';