报表统计修改

src/views/statistics/appWatchlogReport.vue

@@ -102,6 +102,7 @@
         </template>
       </el-table-column>
       <el-table-column label="红包金额" align="center" prop="redPacketAmount" />
+      <el-table-column label="红包领取数" align="center" prop="redPacketCount" />
       <el-table-column label="历史疗法订单数" align="center" prop="historyOrderCount" />
     </el-table>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"

src/views/statistics/appWatchlogReportStatistics.vue

@@ -87,15 +87,16 @@
       <el-table-column label="新注册APP会员数" align="center" prop="newAppUserCount" />
       <el-table-column label="所属销售部门" align="center" prop="salesDept"/>
       <el-table-column label="所属销售公司" align="center" prop="salesCompany"/>
-      <el-table-column label="训练营" align="center" prop="trainingCampName"/>
-      <el-table-column label="营期" align="center" prop="periodName"/>
-      <el-table-column label="课程小节" align="center" prop="videoTitle" />
+<!--      <el-table-column label="训练营" align="center" prop="trainingCampName"/>-->
+<!--      <el-table-column label="营期" align="center" prop="periodName"/>-->
+<!--      <el-table-column label="课程小节" align="center" prop="videoTitle" />-->
       <el-table-column label="完课数" align="center" prop="finishedCount" />
       <el-table-column label="未完课数" align="center" prop="unfinishedCount" />
       <el-table-column label="完课率" align="center" prop="completionRate" />
       <el-table-column label="未看数" align="center" prop="notWatchedCount" />
       <el-table-column label="未答题数" align="center" prop="notAnsweredCount" />
       <el-table-column label="红包金额" align="center" prop="redPacketAmount" />
+      <el-table-column label="红包领取数" align="center" prop="redPacketCount" />
       <el-table-column label="历史疗法订单数" align="center" prop="historyOrderCount" />
     </el-table>
 
@@ -106,15 +107,16 @@
       <el-table-column label="APP会员数" align="center" prop="appUserCount" />
       <el-table-column label="新注册APP会员数" align="center" prop="newAppUserCount" />
       <el-table-column label="所属销售公司" align="center" prop="salesCompany"/>
-      <el-table-column label="训练营" align="center" prop="trainingCampName"/>
-      <el-table-column label="营期" align="center" prop="periodName"/>
-      <el-table-column label="课程小节" align="center" prop="videoTitle" />
+<!--      <el-table-column label="训练营" align="center" prop="trainingCampName"/>-->
+<!--      <el-table-column label="营期" align="center" prop="periodName"/>-->
+<!--      <el-table-column label="课程小节" align="center" prop="videoTitle" />-->
       <el-table-column label="完课数" align="center" prop="finishedCount" />
       <el-table-column label="未完课数" align="center" prop="unfinishedCount" />
       <el-table-column label="完课率" align="center" prop="completionRate" />
       <el-table-column label="未看数" align="center" prop="notWatchedCount" />
       <el-table-column label="未答题数" align="center" prop="notAnsweredCount" />
       <el-table-column label="红包金额" align="center" prop="redPacketAmount" />
+      <el-table-column label="红包领取数" align="center" prop="redPacketCount" />
       <el-table-column label="历史疗法订单数" align="center" prop="historyOrderCount" />
     </el-table>
 
@@ -126,6 +128,7 @@
       <span class="total-item">未看数: {{ calculatedTotalData.notWatchedCount }}</span>
       <span class="total-item">未答题数: {{ calculatedTotalData.notAnsweredCount }}</span>
       <span class="total-item">红包金额: {{ calculatedTotalData.redPacketAmount }}</span>
+      <span class="total-item">红包领取数: {{ calculatedTotalData.redPacketCount }}</span>
       <span class="total-item">历史疗法订单数: {{ calculatedTotalData.historyOrderCount }}</span>
     </div>
 
@@ -179,6 +182,7 @@ export default {
         notWatchedCount: 0,
         notAnsweredCount: 0,
         redPacketAmount: 0,
+        redPacketCount: 0,
         historyOrderCount: 0
       },
       // 查询参数
@@ -326,6 +330,7 @@ export default {
         notWatchedCount: 0,
         notAnsweredCount: 0,
         redPacketAmount: 0,
+        redPacketCount: 0,
         historyOrderCount: 0
       };
       // 遍历当前页数据计算总和
@@ -335,6 +340,7 @@ export default {
         this.calculatedTotalData.notWatchedCount += item.notWatchedCount || 0;
         this.calculatedTotalData.notAnsweredCount += item.notAnsweredCount || 0;
         this.calculatedTotalData.redPacketAmount += item.redPacketAmount || 0;
+        this.calculatedTotalData.redPacketCount += item.redPacketCount || 0;
         this.calculatedTotalData.historyOrderCount += item.historyOrderCount || 0;
       });
       // 计算完课率

src/views/statistics/watchlogReport.vue

@@ -104,6 +104,7 @@
       <el-table-column label="完课时间" align="center" prop="finishTime" />
       <el-table-column label="答题状态" align="center" prop="answerStatus" />
       <el-table-column label="红包金额" align="center" prop="redPacketAmount" />
+      <el-table-column label="红包领取数" align="center" prop="redPacketCount" />
       <el-table-column label="历史疗法订单数" align="center" prop="historyOrderCount" />
     </el-table>
 <!--    <div class="total-summary">-->
@@ -250,6 +251,7 @@ export default {
           { prop: 'finishTime', label: '完课时间', width: 100 },
           { prop: 'answerStatus', label: '答题状态', width: 100 },
           { prop: 'redPacketAmount', label: '红包金额', width: 120 },
+          { prop: 'redPacketCount', label: '红包领取数', width: 120 },
           { prop: 'historyOrderCount', label: '历史疗法订单数', width: 120 }
         ],
         sales: [
@@ -268,6 +270,7 @@ export default {
           { prop: 'notWatchedCount', label: '未看数', width: 100, sortable: true },
           { prop: 'notAnsweredCount', label: '未答题人数', width: 100, sortable: true },
           { prop: 'redPacketAmount', label: '红包金额', width: 120 },
+          { prop: 'redPacketCount', label: '红包领取数', width: 120 },
           { prop: 'historyOrderCount', label: '历史疗法订单数', width: 120 }
         ],
         company: [
@@ -286,6 +289,7 @@ export default {
           { prop: 'notWatchedCount', label: '未看数', width: 100, sortable: true },
           { prop: 'notAnsweredCount', label: '未答题人数', width: 100, sortable: true },
           { prop: 'redPacketAmount', label: '红包金额', width: 120 },
+          { prop: 'redPacketCount', label: '红包领取数', width: 120 },
           { prop: 'historyOrderCount', label: '历史疗法订单数', width: 120 }
         ]
       },
@@ -312,6 +316,7 @@ export default {
         notWatchedCount: 0,
         notAnsweredCount: 0,
         redPacketAmount: 0,
+        redPacketCount: 0,
         historyOrderCount: 0
       },
       describeJson: { usageMethod: "", forPeople: "", tabootPeople: "", use: "" },
@@ -456,6 +461,7 @@ export default {
         notWatchedCount: 0,
         notAnsweredCount: 0,
         redPacketAmount: 0,
+        redPacketCount: 0,
         historyOrderCount: 0
       };
       // 遍历当前页数据计算总和
@@ -466,6 +472,7 @@ export default {
         this.calculatedTotalData.notWatchedCount += Number(item.notWatchedCount) || 0;
         this.calculatedTotalData.notAnsweredCount += Number(item.notAnsweredCount) || 0;
         this.calculatedTotalData.redPacketAmount += Number(item.redPacketAmount) || 0;
+        this.calculatedTotalData.redPacketCount += Number(item.redPacketCount) || 0;
         this.calculatedTotalData.historyOrderCount += Number(item.historyOrderCount) || 0;
       });
     },

src/views/statistics/watchlogReportCompany.vue

@@ -96,15 +96,16 @@
       <el-table-column label="当前会员上线数" align="center" prop="onlineUserCount" />
       <el-table-column label="所属销售部门" align="center" prop="salesDept"/>
       <el-table-column label="所属销售公司" align="center" prop="salesCompany"/>
-      <el-table-column label="训练营" align="center" prop="trainingCampName"/>
-      <el-table-column label="营期" align="center" prop="periodName"/>
-      <el-table-column label="课程小节" align="center" prop="videoTitle" />
+<!--      <el-table-column label="训练营" align="center" prop="trainingCampName"/>-->
+<!--      <el-table-column label="营期" align="center" prop="periodName"/>-->
+<!--      <el-table-column label="课程小节" align="center" prop="videoTitle" />-->
       <el-table-column label="完课数" align="center" prop="finishedCount" />
       <el-table-column label="未完课" align="center" prop="unfinishedCount" />
       <el-table-column label="完课率" align="center" prop="completionRate" />
       <el-table-column label="未看数" align="center" prop="notWatchedCount" />
       <el-table-column label="未答题人数" align="center" prop="notAnsweredCount" />
       <el-table-column label="红包金额" align="center" prop="redPacketAmount" />
+      <el-table-column label="红包领取数" align="center" prop="redPacketCount" />
       <el-table-column label="历史疗法订单数" align="center" prop="historyOrderCount" />
     </el-table>
     <div class="total-summary">
@@ -115,6 +116,7 @@
       <span class="total-item">未看数: {{ calculatedTotalData.notWatchedCount }}</span>
       <span class="total-item">未答题人数: {{ calculatedTotalData.notAnsweredCount }}</span>
       <span class="total-item">红包金额: {{ calculatedTotalData.redPacketAmount }}</span>
+      <span class="total-item">红包领取数: {{ calculatedTotalData.redPacketCount }}</span>
       <span class="total-item">历史疗法订单数: {{ calculatedTotalData.historyOrderCount }}</span>
     </div>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -251,6 +253,7 @@ export default {
           { prop: 'finishTime', label: '完课时间', width: 100 },
           { prop: 'answerStatus', label: '答题状态', width: 100 },
           { prop: 'redPacketAmount', label: '红包金额', width: 120 },
+          { prop: 'redPacketCount', label: '红包领取数', width: 120 },
           { prop: 'historyOrderCount', label: '历史疗法订单数', width: 120 }
         ],
         sales: [
@@ -269,6 +272,7 @@ export default {
           { prop: 'notWatchedCount', label: '未看数', width: 100, sortable: true },
           { prop: 'notAnsweredCount', label: '未答题人数', width: 100, sortable: true },
           { prop: 'redPacketAmount', label: '红包金额', width: 120 },
+          { prop: 'redPacketCount', label: '红包领取数', width: 120 },
           { prop: 'historyOrderCount', label: '历史疗法订单数', width: 120 }
         ],
         company: [
@@ -287,6 +291,7 @@ export default {
           { prop: 'notWatchedCount', label: '未看数', width: 100, sortable: true },
           { prop: 'notAnsweredCount', label: '未答题人数', width: 100, sortable: true },
           { prop: 'redPacketAmount', label: '红包金额', width: 120 },
+          { prop: 'redPacketCount', label: '红包领取数', width: 120 },
           { prop: 'historyOrderCount', label: '历史疗法订单数', width: 120 }
         ]
       },
@@ -313,6 +318,7 @@ export default {
         notWatchedCount: 0,
         notAnsweredCount: 0,
         redPacketAmount: 0,
+        redPacketCount: 0,
         historyOrderCount: 0
       },
       describeJson: { usageMethod: "", forPeople: "", tabootPeople: "", use: "" },
@@ -457,6 +463,7 @@ export default {
         notWatchedCount: 0,
         notAnsweredCount: 0,
         redPacketAmount: 0,
+        redPacketCount: 0,
         historyOrderCount: 0
       };
       // 遍历当前页数据计算总和
@@ -466,6 +473,7 @@ export default {
         this.calculatedTotalData.notWatchedCount += Number(item.notWatchedCount) || 0;
         this.calculatedTotalData.notAnsweredCount += Number(item.notAnsweredCount) || 0;
         this.calculatedTotalData.redPacketAmount += Number(item.redPacketAmount) || 0;
+        this.calculatedTotalData.redPacketCount += Number(item.redPacketCount) || 0;
         this.calculatedTotalData.historyOrderCount += Number(item.historyOrderCount) || 0;
       });
       const totalCount = this.calculatedTotalData.finishedCount + this.calculatedTotalData.unfinishedCount;

src/views/statistics/watchlogReportdept.vue

@@ -96,15 +96,16 @@
       <el-table-column label="会员数" align="center" prop="userCount" />
       <el-table-column label="当前会员上线数" align="center" prop="onlineUserCount" />
       <el-table-column label="所属销售公司" align="center" prop="salesCompany"/>
-      <el-table-column label="训练营" align="center" prop="trainingCampName"/>
-      <el-table-column label="营期" align="center" prop="periodName"/>
-      <el-table-column label="课程小节" align="center" prop="videoTitle" />
+<!--      <el-table-column label="训练营" align="center" prop="trainingCampName"/>-->
+<!--      <el-table-column label="营期" align="center" prop="periodName"/>-->
+<!--      <el-table-column label="课程小节" align="center" prop="videoTitle" />-->
       <el-table-column label="完课数" align="center" prop="finishedCount" />
       <el-table-column label="未完课" align="center" prop="unfinishedCount" />
       <el-table-column label="完课率" align="center" prop="completionRate" />
       <el-table-column label="未看数" align="center" prop="notWatchedCount" />
       <el-table-column label="未答题人数" align="center" prop="notAnsweredCount" />
       <el-table-column label="红包金额" align="center" prop="redPacketAmount" />
+      <el-table-column label="红包领取数" align="center" prop="redPacketCount" />
       <el-table-column label="历史疗法订单数" align="center" prop="historyOrderCount" />
     </el-table>
     <div class="total-summary">
@@ -115,6 +116,7 @@
       <span class="total-item">未看数: {{ calculatedTotalData.notWatchedCount }}</span>
       <span class="total-item">未答题人数: {{ calculatedTotalData.notAnsweredCount }}</span>
       <span class="total-item">红包金额: {{ calculatedTotalData.redPacketAmount }}</span>
+      <span class="total-item">红包领取数: {{ calculatedTotalData.redPacketCount }}</span>
       <span class="total-item">历史疗法订单数: {{ calculatedTotalData.historyOrderCount }}</span>
     </div>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -251,6 +253,7 @@ export default {
           { prop: 'finishTime', label: '完课时间', width: 100 },
           { prop: 'answerStatus', label: '答题状态', width: 100 },
           { prop: 'redPacketAmount', label: '红包金额', width: 120 },
+          { prop: 'redPacketCount', label: '红包领取数', width: 120 },
           { prop: 'historyOrderCount', label: '历史疗法订单数', width: 120 }
         ],
         sales: [
@@ -269,6 +272,7 @@ export default {
           { prop: 'notWatchedCount', label: '未看数', width: 100, sortable: true },
           { prop: 'notAnsweredCount', label: '未答题人数', width: 100, sortable: true },
           { prop: 'redPacketAmount', label: '红包金额', width: 120 },
+          { prop: 'redPacketCount', label: '红包领取数', width: 120 },
           { prop: 'historyOrderCount', label: '历史疗法订单数', width: 120 }
         ],
         company: [
@@ -287,6 +291,7 @@ export default {
           { prop: 'notWatchedCount', label: '未看数', width: 100, sortable: true },
           { prop: 'notAnsweredCount', label: '未答题人数', width: 100, sortable: true },
           { prop: 'redPacketAmount', label: '红包金额', width: 120 },
+          { prop: 'redPacketCount', label: '红包领取数', width: 120 },
           { prop: 'historyOrderCount', label: '历史疗法订单数', width: 120 }
         ]
       },
@@ -313,6 +318,7 @@ export default {
         notWatchedCount: 0,
         notAnsweredCount: 0,
         redPacketAmount: 0,
+        redPacketCount: 0,
         historyOrderCount: 0
       },
       describeJson: { usageMethod: "", forPeople: "", tabootPeople: "", use: "" },
@@ -456,6 +462,7 @@ export default {
         notWatchedCount: 0,
         notAnsweredCount: 0,
         redPacketAmount: 0,
+        redPacketCount: 0,
         historyOrderCount: 0
       };
       // 遍历当前页数据计算总和
@@ -465,6 +472,7 @@ export default {
         this.calculatedTotalData.notWatchedCount += Number(item.notWatchedCount) || 0;
         this.calculatedTotalData.notAnsweredCount += Number(item.notAnsweredCount) || 0;
         this.calculatedTotalData.redPacketAmount += Number(item.redPacketAmount) || 0;
+        this.calculatedTotalData.redPacketCount += Number(item.redPacketCount) || 0;
         this.calculatedTotalData.historyOrderCount += Number(item.historyOrderCount) || 0;
       });
       const totalCount = this.calculatedTotalData.finishedCount + this.calculatedTotalData.unfinishedCount;