Merge branch '07/06musicArchives' into test

src/views/main/cloudDate/organDate.vue

@@ -79,7 +79,7 @@
               <div class="titleCell">
                 <span>使用人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">当日使用的总人数</div>
+                  <div slot="content">截止目前使用云教练的总人数</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -128,7 +128,7 @@
               <div class="titleCell">
                 <span>使用比例</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">云教练使用人数 / 学员总数</div>
+                  <div slot="content">使用人数 / 学员总数</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="

src/views/main/cloudDate/organDateDetail.vue

@@ -61,17 +61,74 @@
             align="center"
             prop="totalStudentNum"
             label="学员总数"
-          ></el-table-column>
+          >
+            <template slot="header" slot-scope="slot">
+              <div class="titleCell">
+                <span>学员总数</span>
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">
+                    指导老师关联的乐团在读学员+有剩余VIP课或网管课学员去重之和
+                  </div>
+                  <i
+                    class="el-icon-question micon el-tooltip"
+                    style="
+                      font-size: 18px;
+                      color: #f56c6c;
+                      top: 2px;
+                      position: relative;
+                    "
+                  ></i>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="cloudStudyUseStudentNum"
             label="使用人数"
-          ></el-table-column>
+          >
+            <template slot="header" slot-scope="slot">
+              <div class="titleCell">
+                <span>使用人数</span>
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">
+                    指导老师关联的截止目前使用云教练的总人数
+                  </div>
+                  <i
+                    class="el-icon-question micon el-tooltip"
+                    style="
+                      font-size: 18px;
+                      color: #f56c6c;
+                      top: 2px;
+                      position: relative;
+                    "
+                  ></i>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="cloudStudyUseStudentDuty"
             label="使用人数比"
           >
+            <template slot="header" slot-scope="slot">
+              <div class="titleCell">
+                <span>使用比例</span>
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">使用人数 / 学员总数</div>
+                  <i
+                    class="el-icon-question micon el-tooltip"
+                    style="
+                      font-size: 18px;
+                      color: #f56c6c;
+                      top: 2px;
+                      position: relative;
+                    "
+                  ></i>
+                </el-tooltip>
+              </div>
+            </template>
             <template slot-scope="scope">
               <div>{{ scope.row.cloudStudyUseStudentDuty }}%</div>
             </template>
@@ -80,7 +137,25 @@
             align="center"
             prop="vipStudentNum"
             label="付费会员数"
-          ></el-table-column>
+          >
+            <template slot="header" slot-scope="slot">
+              <div class="titleCell">
+                <span>付费会员数</span>
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">指导老师关联的生效中、待生效付费会员总数</div>
+                  <i
+                    class="el-icon-question micon el-tooltip"
+                    style="
+                      font-size: 18px;
+                      color: #f56c6c;
+                      top: 2px;
+                      position: relative;
+                    "
+                  ></i>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
           <!-- <el-table-column
             align="center"
             prop="eVipStudentNum"
@@ -90,8 +165,25 @@
           <el-table-column
             align="center"
             prop="vipStudentDuty"
-            label="会员占比"
+            label="付费会员占比"
           >
+            <template slot="header" slot-scope="slot">
+              <div class="titleCell">
+                <span>付费会员占比</span>
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">付费会员数 / 学员总数</div>
+                  <i
+                    class="el-icon-question micon el-tooltip"
+                    style="
+                      font-size: 18px;
+                      color: #f56c6c;
+                      top: 2px;
+                      position: relative;
+                    "
+                  ></i>
+                </el-tooltip>
+              </div>
+            </template>
             <template slot-scope="scope">
               <div>{{ scope.row.vipStudentDuty }}%</div>
             </template>
@@ -160,7 +252,7 @@ export default {
       },
       studentVisible: false,
       noTeacherStudentNum: 0,
-      specialList:[]
+      specialList: [],
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -169,7 +261,9 @@ export default {
   async mounted() {
     // 获取分部
     await this.$store.dispatch("setBranchs");
-        const arr = [36,39,41,42,43,44,45,46,47,48,49,50,52,54,55,56]
+    const arr = [
+      36, 39, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 52, 54, 55, 56,
+    ];
     this.specialList = this.selects.branchs.filter((item) => {
       return arr.indexOf(item.id) == -1;
     });
@@ -206,14 +300,14 @@ export default {
     gotoDetail(row) {
       this.$router.push({
         name: "studentList",
-        params: { teacherId: row.teacherId},
+        params: { teacherId: row.teacherId },
       });
       // this.studentVisible = true;
     },
     gotoStudentList() {
       this.$router.push({
         name: "studentList",
-        params: { hasTeacher:'0', organId: this.searchForm.organId },
+        params: { hasTeacher: "0", organId: this.searchForm.organId },
       });
     },
     goback() {