统计页面修改

src/views/his/statistics/comprehensiveStatistics.vue

@@ -71,7 +71,7 @@
             <el-option
               v-for="user in userList"
               :key="user.userId"
-              :label="user.userName"
+              :label="user.nickName"
               :value="user.userId">
             </el-option>
           </el-select>
@@ -86,15 +86,22 @@
 
     <!-- 数据表格 -->
     <div class="table-section">
-      <el-table :data="paginatedTableData" border style="width: 100%" height="400">
+      <el-table :data="paginatedTableData" border style="width: 100%" height="600">
+        <!-- 添加时间列 -->
+        <el-table-column prop="statisticsTime" label="统计时间" width="180">
+          <template slot-scope="scope">
+            {{ formatDateTime(scope.row.statisticsTime) }}
+          </template>
+        </el-table-column>
         <el-table-column prop="companyName" label="公司名称" />
         <el-table-column prop="deptName" label="部门名称" />
-        <el-table-column prop="userName" label="人员姓名" />
-        <el-table-column prop="lineNum" label="进线数" />
-        <el-table-column prop="activeNum" label="激活数" />
-        <el-table-column prop="completeNum" label="完课数" />
+        <!-- 根据维度决定是否显示人员姓名 -->
+        <el-table-column prop="companyUserName" label="人员姓名" v-if="showUserNameColumn" />
+        <!-- 更新以下列为新的字段名 -->
+        <el-table-column prop="sendCount" label="发送数" />
         <el-table-column prop="answerNum" label="答题数" />
         <el-table-column prop="redPacketNum" label="红包领取数" />
+        <el-table-column prop="redPacketAmount" label="红包金额(元)" />
       </el-table>
 
       <el-pagination
@@ -104,10 +111,10 @@
         :page-sizes="[10, 20, 50, 100]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
-        :total="tableData.length"
-        style="margin-top: 20px; text-align: right;">
+        :total="tableData.length"        style="margin-top: 20px; text-align: right;">
       </el-pagination>
     </div>
+
   </div>
 </template>
 
@@ -178,6 +185,12 @@ export default {
       return this.queryParams.dimension === 1 &&
         this.queryParams.companyId &&
         this.queryParams.deptId;
+    },
+
+    // 添加计算属性控制人员姓名列显示
+    showUserNameColumn() {
+      // 当维度为个人时显示人员姓名列，公司维度时不显示
+      return this.queryParams.dimension === 1 || this.queryParams.dimension === 3;
     }
   },
 
@@ -225,6 +238,26 @@ export default {
       });
     },
 
+    // 添加时间格式化方法
+    formatDateTime(dateString) {
+      if (!dateString) return '';
+      // 移除时区信息并格式化日期时间
+      const date = new Date(dateString.replace(/\.\d{3}\+\d{4}$/, ''));
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
+
+    formatDate(date) {
+      if (!date) return '';
+      const d = new Date(date);
+      const year = d.getFullYear();
+      const month = String(d.getMonth() + 1).padStart(2, '0');
+      const day = String(d.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
+
     fetchStatisticsData() {
       // 构造请求参数对象
       const params = {
@@ -253,15 +286,6 @@ export default {
       });
     },
 
-    formatDate(date) {
-      if (!date) return '';
-      const d = new Date(date);
-      const year = d.getFullYear();
-      const month = String(d.getMonth() + 1).padStart(2, '0');
-      const day = String(d.getDate()).padStart(2, '0');
-      return `${year}-${month}-${day}`;
-    },
-
     handleCompanyChange(companyId) {
       this.queryParams.deptId = null;
       this.queryParams.userId = null;