From 950e1332f89e3d18a8f4b415bd4fe274dce1e954 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 28 八月 2026 16:16:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/crm/statistics/performance/chartOptions.ts | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/crm/statistics/performance/chartOptions.ts b/src/views/crm/statistics/performance/chartOptions.ts
index 073c625..cef5b8e 100644
--- a/src/views/crm/statistics/performance/chartOptions.ts
+++ b/src/views/crm/statistics/performance/chartOptions.ts
@@ -47,7 +47,7 @@
yAxisIndex: 1,
data: res.map((s: any) =>
s.lastMonthCount === 0
- ? 'NULL'
+ ? (s.currentMonthCount > 0 ? 100 : 0).toFixed(2)
: (
((s.currentMonthCount - s.lastMonthCount) /
s.lastMonthCount) *
@@ -61,7 +61,7 @@
yAxisIndex: 1,
data: res.map((s: any) =>
s.lastYearCount === 0
- ? 'NULL'
+ ? (s.currentMonthCount > 0 ? 100 : 0).toFixed(2)
: (
((s.currentMonthCount - s.lastYearCount) /
s.lastYearCount) *
@@ -166,7 +166,7 @@
yAxisIndex: 1,
data: res.map((s: any) =>
s.lastMonthCount === 0
- ? 'NULL'
+ ? (s.currentMonthCount > 0 ? 100 : 0).toFixed(2)
: (
((s.currentMonthCount - s.lastMonthCount) /
s.lastMonthCount) *
@@ -180,7 +180,7 @@
yAxisIndex: 1,
data: res.map((s: any) =>
s.lastYearCount === 0
- ? 'NULL'
+ ? (s.currentMonthCount > 0 ? 100 : 0).toFixed(2)
: (
((s.currentMonthCount - s.lastYearCount) /
s.lastYearCount) *
@@ -290,7 +290,7 @@
yAxisIndex: 1,
data: res.map((s: any) =>
s.lastMonthCount === 0
- ? 'NULL'
+ ? (s.currentMonthCount > 0 ? 100 : 0).toFixed(2)
: (
((s.currentMonthCount - s.lastMonthCount) /
s.lastMonthCount) *
@@ -304,7 +304,7 @@
yAxisIndex: 1,
data: res.map((s: any) =>
s.lastYearCount === 0
- ? 'NULL'
+ ? (s.currentMonthCount > 0 ? 100 : 0).toFixed(2)
: (
((s.currentMonthCount - s.lastYearCount) /
s.lastYearCount) *
--
Gitblit v1.9.3