From 7a5c5250b66cc6faffbcac9e192073473c50f79f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 八月 2026 17:02:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/crm/statistics/performance/index.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/crm/statistics/performance/index.vue b/src/views/crm/statistics/performance/index.vue
index 8155271..2c66fc3 100644
--- a/src/views/crm/statistics/performance/index.vue
+++ b/src/views/crm/statistics/performance/index.vue
@@ -1,14 +1,14 @@
<script lang="ts" setup>
-import type { EchartsUIType } from '..\..\..\..\packages\effects\plugins\src\echarts';
+import type { EchartsUIType } from '@vben/plugins/echarts';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { CrmStatisticsCustomerApi } from '#/api/crm/statistics/customer';
import { onMounted, ref } from 'vue';
-import { ContentWrap, Page } from '..\..\..\..\packages\effects\common-ui\src';
-import { EchartsUI, useEcharts } from '..\..\..\..\packages\effects\plugins\src\echarts';
-import { beginOfDay, endOfDay, formatDateTime } from '..\..\..\..\packages\utils\src';
+import { ContentWrap, Page } from '@vben/common-ui';
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+import { beginOfDay, endOfDay, formatDateTime } from '@vben/utils';
import { Tabs } from 'ant-design-vue';
@@ -131,7 +131,7 @@
tableData[2][`field${index}`] = item.lastYearCount;
tableData[3][`field${index}`] =
item.lastMonthCount === 0
- ? 'NULL'
+ ? (item.currentMonthCount > 0 ? 100 : 0).toFixed(2)
: (
((item.currentMonthCount - item.lastMonthCount) /
item.lastMonthCount) *
@@ -139,7 +139,7 @@
).toFixed(2);
tableData[4][`field${index}`] =
item.lastYearCount === 0
- ? 'NULL'
+ ? (item.currentMonthCount > 0 ? 100 : 0).toFixed(2)
: (
((item.currentMonthCount - item.lastYearCount) /
item.lastYearCount) *
--
Gitblit v1.9.3