Merge branch '07/06musicArchives' into test

src/views/main/cloudDate/organDate.vue

@@ -95,7 +95,7 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="cloudStudyLivelyStudentNum"
+            prop="newCloudStudyStudentNum"
             label="新增使用人数"
             width="130px"
           >

src/views/main/cloudDate/organRanking.vue

@@ -94,12 +94,12 @@
             sortable="custom"
             align="center"
             prop="cloudStudyLivelyStudentDuty"
-            label="活跃人数比"
-            width="140px"
+            label="活跃人数占比"
+            width="150px"
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
-                <span>活跃人数比</span>
+                <span>活跃人数占比</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">活跃人数 / 学员总数</div>
                   <i
@@ -143,7 +143,7 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="newMemberStudentNum"
+            prop="newCloudStudyStudentNum"
             label="新增使用人数"
             width="100px"
           >
@@ -167,14 +167,14 @@
           </el-table-column>
           <el-table-column
             sortable="custom"
-            width="140px"
+            width="150px"
             align="center"
             prop="cloudStudyUseStudentDuty"
             label="当日使用人数比"
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
-                <span>使用人数比</span>
+                <span>使用人数占比</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">云教练当日使用人数 / 学员总数</div>
                   <i
@@ -221,14 +221,14 @@
           </el-table-column>
           <el-table-column
             sortable="custom"
-            width="140px"
+            width="150px"
             align="center"
             prop="vipStudentDuty"
             label="付费会员比"
           >
             <template slot="header" slot-scope="slot">
               <div class="titleCell">
-                <span>付费会员比</span>
+                <span>付费会员占比</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">付费会员数 / 学员总数</div>
                   <i

src/views/studentManager/studentList.vue

@@ -158,7 +158,7 @@
             <el-option label="否" :value="0"></el-option>
           </el-select>
         </el-form-item>
-                <el-form-item prop="isRecord">
+        <el-form-item prop="isRecord">
           <el-select
             class="multiple"
             v-model.trim="searchForm.isRecord"
@@ -365,9 +365,9 @@
               scope.row.serviceTag ? "是" : "否"
             }}</template>
           </el-table-column>
-                <el-table-column align="center" label="是否使用云教练">
+          <el-table-column align="center" label="是否使用云教练">
             <template slot-scope="scope">{{
-              scope.row.recordUserId>0 ? "是" : "否"
+              scope.row.recordUserId > 0 ? "是" : "否"
             }}</template>
           </el-table-column>
           <el-table-column
@@ -906,8 +906,8 @@ export default {
         carePackage: null,
         comeOnPackage: null,
         isNewUser: null,
-        hasTeacher:null,
-        isRecord:null,
+        hasTeacher: null,
+        isRecord: null,
       },
       searchList: [],
       tableList: [],
@@ -1039,18 +1039,42 @@ export default {
     downLoadStudent() {
       let url = "/api-web/export/studentHasCourse";
       let searchForm = this.searchForm;
+
+
+      /**
+       *         organId: null,
+        search: null,
+        studentName: null,
+        isActive: null,
+        hasCourse: null,
+        // isMake: null,
+        hasPracticeCourse: null,
+        operatingTag: null,
+        serviceTag: null,
+        teacherId: null,
+        carePackage: null,
+        comeOnPackage: null,
+        isNewUser: null,
+        hasTeacher: null,
+        isRecord: null,
+       */
       let data = {
-        organId: searchForm.organId ? searchForm.organId : null,
-        search: searchForm.search ? searchForm.search : null,
-        isActive: searchForm.isActive ? searchForm.isActive : null,
+        organId: searchForm.organId+'' ? searchForm.organId : null,
+        search: searchForm.search+'' ? searchForm.search : null,
+        isActive: searchForm.isActive+'' ? searchForm.isActive : null,
         hasCourse: searchForm.hasCourse == "" ? null : searchForm.hasCourse,
         // isMake: searchForm.isMake ? searchForm.isMake : null,
-        hasPracticeCourse: searchForm.hasPracticeCourse
+        hasPracticeCourse: searchForm.hasPracticeCourse+''
           ? searchForm.hasPracticeCourse
           : null,
-        operatingTag: searchForm.operatingTag ? searchForm.operatingTag : null,
-        serviceTag: searchForm.serviceTag ? searchForm.serviceTag : null,
-        teacherId: searchForm.teacherId ? searchForm.teacherId : null,
+        operatingTag: searchForm.operatingTag+'' ? searchForm.operatingTag : null,
+        serviceTag: searchForm.serviceTag+'' ? searchForm.serviceTag : null,
+        teacherId: searchForm.teacherId+'' ? searchForm.teacherId : null,
+        carePackage: searchForm.carePackage+'' ? searchForm.carePackage : null,
+        comeOnPackage: searchForm.comeOnPackage+'' ? searchForm.comeOnPackage : null,
+        isNewUser: searchForm.isNewUser+'' ? searchForm.isNewUser : null,
+        hasTeacher: searchForm.hasTeacher+'' ? searchForm.hasTeacher : null,
+        isRecord: searchForm.isRecord+'' ? searchForm.isRecord : null,
       };
       const options = {
         method: "POST",

src/views/teamDetail/components/studentList.vue

@@ -472,7 +472,7 @@
           width="120px;"
         >
         <template slot-scope="scope">
-              <div v-if="scope.row.membershipEndTime" class="red">
+              <div v-if="scope.row.membershipEndTime">
                 <div v-if="scope.row.membershipDay >= 0">
                   {{ scope.row.membershipEndTime | dayjsFormat }}
                   <p class="red">剩余{{ scope.row.membershipDay }}天</p>