diff --git a/web-api/src/main/java/com/jeesite/modules/app/utils/vDate.java b/web-api/src/main/java/com/jeesite/modules/app/utils/vDate.java
index 7d574788..1e4dfc34 100644
--- a/web-api/src/main/java/com/jeesite/modules/app/utils/vDate.java
+++ b/web-api/src/main/java/com/jeesite/modules/app/utils/vDate.java
@@ -134,13 +134,13 @@ public class vDate {
return switch (cycleType) {
case "D" ->
// 日:最近30天,格式 yyyy-MM-dd
- baseDate.minusDays(7).format(DAY_FORMATTER);
+ baseDate.minusDays(14).format(DAY_FORMATTER);
case "M" ->
// 月:最近6个月,格式 yyyy-MM
- baseDate.minusMonths(6).format(MONTH_FORMATTER);
+ baseDate.minusMonths(12).format(MONTH_FORMATTER);
case "Q" ->
// 季度:最近3年,格式 yyyy-Qx
- getQuarterCycleCode(baseDate.minusYears(2));
+ getQuarterCycleCode(baseDate.minusYears(3));
case "Y" ->
// 年:最近6年,格式 yyyy
String.valueOf(baseDate.minusYears(6).getYear());
diff --git a/web-vue/packages/assets/images/bigview.png b/web-vue/packages/assets/images/bigview.png
new file mode 100644
index 00000000..4137c3c0
Binary files /dev/null and b/web-vue/packages/assets/images/bigview.png differ
diff --git a/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartPie.vue b/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartPie.vue
index 2ddbb498..cdf267be 100644
--- a/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartPie.vue
+++ b/web-vue/packages/biz/views/biz/dataReport/erp/components/ChartPie.vue
@@ -5,34 +5,64 @@
总金额:{{ totalAmountText }} 元
-
+
+
+
+
本月收入
+
+
+ {{ thisIncome }} 元
+
+
+
+
本月支出
+
+
+ {{ thisExpense }} 元
+
+
+
+
消费占比
+
+
+ {{ thisShare }} %
+
+
+
+
+
-
+
+
+/* 额外优化:防止图片溢出 */
+:deep(.header-img) {
+ max-width: 100%;
+ height: auto;
+}
+
\ No newline at end of file
diff --git a/web-vue/web/public/resource/img/icons/erp-add.png b/web-vue/web/public/resource/img/icons/erp-add.png
new file mode 100644
index 00000000..38c58470
Binary files /dev/null and b/web-vue/web/public/resource/img/icons/erp-add.png differ
diff --git a/web-vue/web/public/resource/img/icons/erp-bigview.png b/web-vue/web/public/resource/img/icons/erp-bigview.png
new file mode 100644
index 00000000..4137c3c0
Binary files /dev/null and b/web-vue/web/public/resource/img/icons/erp-bigview.png differ
diff --git a/web-vue/web/public/resource/img/icons/erp-bigview2.png b/web-vue/web/public/resource/img/icons/erp-bigview2.png
new file mode 100644
index 00000000..2e8464fe
Binary files /dev/null and b/web-vue/web/public/resource/img/icons/erp-bigview2.png differ
diff --git a/web-vue/web/public/resource/img/icons/erp-expense.png b/web-vue/web/public/resource/img/icons/erp-expense.png
new file mode 100644
index 00000000..cf0fed8f
Binary files /dev/null and b/web-vue/web/public/resource/img/icons/erp-expense.png differ
diff --git a/web-vue/web/public/resource/img/icons/erp-income.png b/web-vue/web/public/resource/img/icons/erp-income.png
new file mode 100644
index 00000000..9b12cf45
Binary files /dev/null and b/web-vue/web/public/resource/img/icons/erp-income.png differ
diff --git a/web-vue/web/public/resource/img/icons/erp-share.png b/web-vue/web/public/resource/img/icons/erp-share.png
new file mode 100644
index 00000000..cb3dafb6
Binary files /dev/null and b/web-vue/web/public/resource/img/icons/erp-share.png differ
diff --git a/web-vue/web/public/resource/img/icons/erp-view.png b/web-vue/web/public/resource/img/icons/erp-view.png
new file mode 100644
index 00000000..853127d9
Binary files /dev/null and b/web-vue/web/public/resource/img/icons/erp-view.png differ