From 301b3a258291e6065c0cee6596df162a518e03d1 Mon Sep 17 00:00:00 2001
From: chenghuan <chenghuanv587@qq.com>
Date: Mon, 23 Mar 2026 16:02:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=BB=9F=E8=AE=A1=E4=B8=9A=E5=8A=A1):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=A8=E9=83=A8=E7=94=A8=E6=88=B7=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=A1=B5=E9=9D=A2=E5=8F=8A=E7=9B=B8=E5=85=B3=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增用户统计页面，支持按日、月、年统计用户数据
- 引入用户统计基础组件，包含数据展示和导出功能
- 更新主统计页面以集成新的统计选项
---
 .../userStatistics/allUser.vue                | 14 +++++++++++
 .../{homeUser.vue => dayUser.vue}             |  0
 .../userStatistics/index.vue                  | 11 +++++---
 .../userStatistics/userStatisticsBase.vue     | 25 +++++++++++--------
 4 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 src/views/modules/statisticsBusiness/userStatistics/allUser.vue
 rename src/views/modules/statisticsBusiness/userStatistics/{homeUser.vue => dayUser.vue} (100%)

diff --git a/src/views/modules/statisticsBusiness/userStatistics/allUser.vue b/src/views/modules/statisticsBusiness/userStatistics/allUser.vue
new file mode 100644
index 0000000..735d222
--- /dev/null
+++ b/src/views/modules/statisticsBusiness/userStatistics/allUser.vue
@@ -0,0 +1,14 @@
+<template>
+  <userStatisticsBase mode="null" />
+</template>
+
+<script>
+import userStatisticsBase from './userStatisticsBase'
+
+export default {
+  components: {
+    userStatisticsBase
+  }
+}
+</script>
+
diff --git a/src/views/modules/statisticsBusiness/userStatistics/homeUser.vue b/src/views/modules/statisticsBusiness/userStatistics/dayUser.vue
similarity index 100%
rename from src/views/modules/statisticsBusiness/userStatistics/homeUser.vue
rename to src/views/modules/statisticsBusiness/userStatistics/dayUser.vue
diff --git a/src/views/modules/statisticsBusiness/userStatistics/index.vue b/src/views/modules/statisticsBusiness/userStatistics/index.vue
index 9b39c83..7e46246 100644
--- a/src/views/modules/statisticsBusiness/userStatistics/index.vue
+++ b/src/views/modules/statisticsBusiness/userStatistics/index.vue
@@ -1,9 +1,10 @@
 <template>
   <div class="mod-config">
     <el-tabs v-model="activeTab" type="card">
-      <el-tab-pane label="首页" name="homeUser" />
+      <el-tab-pane label="当日" name="dayUser" />
       <el-tab-pane label="月度" name="monthUser" />
       <el-tab-pane label="年度" name="yearUser" />
+      <el-tab-pane label="全部" name="allUser" />
       <el-tab-pane label="留存率" name="retainUser" />
     </el-tabs>
     <keep-alive>
@@ -13,21 +14,23 @@
 </template>
 
 <script>
-import homeUser from './homeUser'
+import allUser from './allUser'
+import dayUser from './dayUser'
 import monthUser from './monthUser'
 import yearUser from './yearUser'
 import retainUser from './retainUser'
 
 export default {
   components: {
-    homeUser,
+    dayUser,
     monthUser,
     yearUser,
+    allUser,
     retainUser
   },
   data() {
     return {
-      activeTab: 'homeUser'
+      activeTab: 'dayUser'
     }
   }
 }
diff --git a/src/views/modules/statisticsBusiness/userStatistics/userStatisticsBase.vue b/src/views/modules/statisticsBusiness/userStatistics/userStatisticsBase.vue
index efb8f00..75a2457 100644
--- a/src/views/modules/statisticsBusiness/userStatistics/userStatisticsBase.vue
+++ b/src/views/modules/statisticsBusiness/userStatistics/userStatisticsBase.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="user-statistics-page" v-loading="loading">
-    <div v-if="mode !== 'day'" class="query-section">
+    <div v-if="mode !== 'null'" class="query-section">
       <el-form :inline="true" @keyup.enter.native="getDataList">
         <el-form-item :label="queryLabel">
           <el-date-picker
@@ -50,7 +50,7 @@
       <el-table
         :data="tableData"
         border
-        :height="mode !== 'day' ? 470 : 520"
+        :height="mode !== 'null' ? 470 : 520"
         :header-cell-style="{ textAlign: 'center', padding: '6px 0' }"
         :cell-style="{ textAlign: 'center', padding: '6px 0' }"
       >
@@ -158,20 +158,23 @@ export default {
     pickerType() {
       if (this.mode === 'day') return 'date'
       if (this.mode === 'month') return 'month'
-      return 'year'
+      if (this.mode === 'year') return 'year'
+      return ''
     },
     displayFormat() {
       if (this.mode === 'day') return 'yyyy-MM-dd'
       if (this.mode === 'month') return 'yyyy-MM'
-      return 'yyyy'
+      if (this.mode === 'year') return 'yyyy'
+      return ''
     },
     valueFormat() {
       return this.displayFormat
     },
     timePrefix() {
-      if (this.mode === 'day') return '当日'
-      if (this.mode === 'month') return '当月'
-      return '当年'
+      // if (this.mode === 'day') return '当日'
+      // if (this.mode === 'month') return '当月'
+      // if (this.mode === 'year') return '当年'
+      return '当日'
     },
     pickerOptions() {
       return {
@@ -213,7 +216,8 @@ export default {
       const now = new Date()
       if (this.mode === 'day') return formatDate(now)
       if (this.mode === 'month') return formatMonth(now)
-      return formatYear(now)
+      if (this.mode === 'year') return formatYear(now)
+      return null
     },
     normalizeRows(userList = []) {
       return userList.map((item) => ({
@@ -281,12 +285,13 @@ export default {
         data: http.adornData({
           date: this.currentDate
         }),
-        responseType: 'blob'
+        responseType: 'blob',
+        timeout: 0
       }).then((response) => {
         const blob = new Blob([response.data])
         const link = document.createElement('a')
         link.href = URL.createObjectURL(blob)
-        link.download = `用户统计报表-${this.currentDate}.xlsx`
+        link.download = `用户统计报表-${this.currentDate || '全部'}.xlsx`
         link.click()
         URL.revokeObjectURL(link.href)
       }).catch(() => {