Merge branch 'iteration_0802' into test

src/views/main/cloudDate/organDate.vue

@@ -43,15 +43,15 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            prop="newStudentNum"
-            label="新用户人数"
+            prop="totalStudentNum"
+            label="学员总数"
           >
-            <template slot="header">
+            <template slot="header" slot-scope="slot">
               <div class="titleCell">
-                <span>新用户人数</span>
+                <span>学员总数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">
-                    乐团在读学员已上课程≤4节
+                    乐团在读学员+有剩余VIP课或网管课学员去重之和
                   </div>
                   <i
                     class="el-icon-question micon el-tooltip"
@@ -68,25 +68,14 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="newStudentDuty"
-            label="新用户占比"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.newStudentDuty }}%
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="totalStudentNum"
-            label="学员总数"
+            prop="cloudStudyLivelyStudentNum"
+            label="活跃人数"
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
-                <span>学员总数</span>
+                <span>活跃人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">
-                    乐团在读学员+有剩余VIP课或网管课学员去重之和
-                  </div>
+                  <div slot="content">近15天内使用达到5天及以上的用户数</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -102,14 +91,14 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="cloudStudyLivelyStudentNum"
-            label="活跃人数"
+            prop="cloudStudyUseStudentNum"
+            label="使用人数"
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
-                <span>活跃人数</span>
+                <span>使用人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">近15天内使用达到5天及以上的用户数</div>
+                  <div slot="content">截止目前使用云教练的总人数</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -125,14 +114,16 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="cloudStudyUseStudentNum"
-            label="使用人数"
+            prop="newStudentNum"
+            label="新用户人数"
           >
-            <template slot="header" slot-scope="slot">
+            <template slot="header">
               <div class="titleCell">
-                <span>使用人数</span>
+                <span>新用户人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">截止目前使用云教练的总人数</div>
+                  <div slot="content">
+                    乐团在读学员已上课程≤4节
+                  </div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -147,6 +138,16 @@
             </template>
           </el-table-column>
           <el-table-column
+            sortable="custom"
+            align="center"
+            prop="newStudentDuty"
+            label="新用户占比"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.newStudentDuty }}%
+            </template>
+          </el-table-column>
+          <el-table-column
             align="center"
             prop="newCloudStudyStudentNum"
             label="新增使用人数"

src/views/main/cloudDate/organRankDetail.vue

@@ -55,15 +55,15 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            prop="newStudentNum"
-            label="新用户人数"
+            prop="totalStudentNum"
+            label="学员总数"
           >
-            <template slot="header">
+            <template slot="header" slot-scope="slot">
               <div class="titleCell">
-                <span>新用户人数</span>
+                <span>学员总数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">
-                    乐团在读学员已上课程≤4节
+                    乐团在读学员+有剩余VIP课或网管课学员去重之和
                   </div>
                   <i
                     class="el-icon-question micon el-tooltip"
@@ -80,25 +80,14 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="newStudentDuty"
-            label="新用户占比"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.newStudentDuty }}%
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="totalStudentNum"
-            label="学员总数"
+            prop="cloudStudyLivelyStudentNum"
+            label="活跃人数"
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
-                <span>学员总数</span>
+                <span>活跃人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">
-                    乐团在读学员+有剩余VIP课或网管课学员去重之和
-                  </div>
+                  <div slot="content">近15天内使用达到5天及以上的用户数</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -114,14 +103,14 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="cloudStudyLivelyStudentNum"
-            label="活跃人数"
+            prop="cloudStudyUseStudentNum"
+            label="使用人数"
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
-                <span>活跃人数</span>
+                <span>使用人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">近15天内使用达到5天及以上的用户数</div>
+                  <div slot="content">截止目前使用云教练的总人数</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -137,14 +126,16 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="cloudStudyUseStudentNum"
-            label="使用人数"
+            prop="newStudentNum"
+            label="新用户人数"
           >
-            <template slot="header" slot-scope="slot">
+            <template slot="header">
               <div class="titleCell">
-                <span>使用人数</span>
+                <span>新用户人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">截止目前使用云教练的总人数</div>
+                  <div slot="content">
+                    乐团在读学员已上课程≤4节
+                  </div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -159,6 +150,16 @@
             </template>
           </el-table-column>
           <el-table-column
+            sortable="custom"
+            align="center"
+            prop="newStudentDuty"
+            label="新用户占比"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.newStudentDuty }}%
+            </template>
+          </el-table-column>
+          <el-table-column
             align="center"
             prop="newCloudStudyStudentNum"
             label="新增使用人数"