Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_adminUI

src/views/statistics/member/index.vue

@@ -165,31 +165,37 @@
         <!-- 序号列 -->
         <el-table-column label="序号" type="index" width="60" align="center" />
         <!-- 统计日期列 -->
-        <el-table-column prop="date" label="统计日期" min-width="100" align="center" />
+        <el-table-column prop="statDate" label="统计日期" min-width="100" align="center" />
         <!-- 会员名称列 -->
-        <el-table-column prop="memberName" label="会员名称" min-width="100" align="center" />
-        <!-- 性别列 -->
-        <el-table-column prop="gender" label="性别" width="60" align="center" />
+        <el-table-column prop="nickName" label="会员名称" min-width="100" align="center" />
         <!-- 手机号列 -->
-        <el-table-column prop="mobile" label="手机号" min-width="100" align="center" />
+        <el-table-column prop="phone" label="手机号" min-width="100" align="center" />
         <!-- 会员标签列 -->
-        <el-table-column prop="memberTag" label="会员标签" min-width="100" align="center" />
+        <el-table-column prop="tag" label="会员标签" min-width="100" align="center" />
         <!-- 所属群管列 -->
-        <el-table-column prop="groupName" label="所属群管" min-width="100" align="center" />
+        <el-table-column prop="companyUserName" label="所属群管" min-width="100" align="center" />
         <!-- 所属经销商列 -->
-        <el-table-column prop="dealerName" label="所属经销商" min-width="100" align="center" />
+        <el-table-column prop="companyName" label="所属经销商" min-width="100" align="center" />
         <!-- 观看课程列 -->
-        <el-table-column prop="viewCount" label="观看课程" min-width="80" align="center" />
+        <el-table-column prop="count" label="观看课程" min-width="80" align="center" />
         <!-- 完课课程列 -->
-        <el-table-column prop="finishCount" label="完课课程" min-width="80" align="center" />
+        <el-table-column prop="overCount" label="完课课程" min-width="80" align="center" />
         <!-- 完课率列 -->
-        <el-table-column prop="finishRate" label="完课率" min-width="80" align="center" />
+        <el-table-column prop="finishRate" label="完课率" min-width="80" align="center">
+          <template slot-scope="scope">
+            {{ getPercentage(scope.row.overCount,  scope.row.count) }}
+          </template>
+        </el-table-column>
         <!-- 观看次数列 -->
-        <el-table-column prop="viewTimes" label="观看次数" min-width="80" align="center" />
+        <el-table-column prop="watchCount" label="观看次数" min-width="80" align="center" />
         <!-- 完课次数列 -->
-        <el-table-column prop="finishTimes" label="完课次数" min-width="80" align="center" />
+        <el-table-column prop="overCount" label="完课次数" min-width="80" align="center" />
         <!-- 视频率列 -->
-        <el-table-column prop="videoRate" label="视频率" min-width="80" align="center" />
+        <el-table-column prop="videoRate" label="视频率" min-width="80" align="center" >
+          <template slot-scope="scope">
+            {{ getPercentage(scope.row.overCount,  scope.row.watchCount) }}
+          </template>
+        </el-table-column>
 
         <!-- 操作列 -->
         <el-table-column label="操作" fixed="right" min-width="160" align="center">
@@ -315,6 +321,11 @@ export default {
 
   // ============= 组件方法 =============
   methods: {
+    getPercentage(part, total, precision = 2) {
+      if (total === 0) return '0%';
+      const percent = (part / total) * 100;
+      return percent.toFixed(precision) + '%';
+    },
     /**
      * 获取表格数据
      * 根据查询参数从服务器获取会员统计数据