Merge branch '07/06musicArchives' into test

src/views/main/cloudDate/activeUserNum.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <headers title="活跃用户统计" @changeOrgan="changeOrgan" />
+      <headers title="活跃用户统计" @changeOrgan="changeOrgan"  :special="true"/>
       <div class="chioseBox">
         <el-radio-group v-model="timers" size="mini" @change="changeQuick">
           <el-radio-button label="month">本月</el-radio-button>

src/views/main/cloudDate/organDateDetail.vue

@@ -25,7 +25,7 @@
             @change="search"
           >
             <el-option
-              v-for="(item, index) in selects.branchs"
+              v-for="(item, index) in specialList"
               :key="index"
               :label="item.name"
               :value="item.id"
@@ -43,7 +43,9 @@
           >
         </el-form-item>
       </save-form>
-       <a class="msg" v-if="noTeacherStudentNum>0">当前分部有{{noTeacherStudentNum}}名学员没有关联指导老师</a>
+      <a class="msg" v-if="noTeacherStudentNum > 0" @click="gotoStudentList"
+        >当前分部有{{ noTeacherStudentNum }}名学员没有关联指导老师</a
+      >
       <div class="tableWrap">
         <el-table
           style="width: 100%"
@@ -64,19 +66,15 @@
             align="center"
             prop="cloudStudyUseStudentNum"
             label="使用人数"
-
           ></el-table-column>
           <el-table-column
             align="center"
             prop="cloudStudyUseStudentDuty"
             label="使用人数比"
-
           >
-          <template slot-scope="scope">
-            <div>
-              {{scope.row.cloudStudyUseStudentDuty}}%
-            </div>
-          </template>
+            <template slot-scope="scope">
+              <div>{{ scope.row.cloudStudyUseStudentDuty }}%</div>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
@@ -161,7 +159,8 @@ export default {
         page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
       studentVisible: false,
-      noTeacherStudentNum:0,
+      noTeacherStudentNum: 0,
+      specialList:[]
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -170,6 +169,10 @@ 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]
+    this.specialList = this.selects.branchs.filter((item) => {
+      return arr.indexOf(item.id) == -1;
+    });
     if (this.$route.params?.organId) {
       this.searchForm.organId = this.$route.params.organId;
     }
@@ -189,8 +192,8 @@ export default {
         });
         this.tableList = res.data.rows;
         this.rules.total = res.data.total;
-        this.noTeacherStudentNum = res.data.statInfo.noTeacherStudentNum
-         this.$refs.saveForm.save();
+        this.noTeacherStudentNum = res.data.statInfo.noTeacherStudentNum;
+        this.$refs.saveForm.save();
       } catch (e) {
         console.log(e);
       }
@@ -198,16 +201,21 @@ export default {
     search() {
       this.rules.page = 1;
       this.getList();
-
     },
     onReSet() {},
     gotoDetail(row) {
       this.$router.push({
         name: "studentList",
-        params: { teacherId: row.teacherId },
+        params: { teacherId: row.teacherId, organId: this.searchForm.organId },
       });
       // this.studentVisible = true;
     },
+    gotoStudentList() {
+      this.$router.push({
+        name: "studentList",
+        params: { hasTeacher:'0', organId: this.searchForm.organId },
+      });
+    },
     goback() {
       this.$store.dispatch("delVisitedViews", this.$route);
       this.$router.push({ path: "/main/main?tabrouter=cloudDate" });

src/views/studentManager/studentList.vue

@@ -89,6 +89,18 @@
             <el-option label="否" value="false"></el-option>
           </el-select>
         </el-form-item>
+
+        <el-form-item prop="hasTeacher">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.hasTeacher"
+            clearable
+            placeholder="是否关联老师"
+          >
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item prop="operatingTag">
           <el-select
             class="multiple"
@@ -368,7 +380,7 @@
                     </p>
                   </div>
                 </div>
-<!--
+                <!--
                 <div></div>
                 <p v-if="scope.row.hasNoStartCloudTeacher">
                   {{ scope.row.membershipEndTime | dayjsFormat }}
@@ -878,6 +890,7 @@ export default {
         carePackage: null,
         comeOnPackage: null,
         isNewUser: null,
+        hasTeacher:null
       },
       searchList: [],
       tableList: [],
@@ -948,6 +961,12 @@ export default {
     if (this.$route.params.teacherId) {
       this.searchForm.teacherId = this.$route.params.teacherId;
     }
+    if (this.$route.params.hasTeacher) {
+      this.searchForm.hasTeacher = this.$route.params.hasTeacher;
+    }
+    if (this.$route.params.organId) {
+      this.searchForm.organId = this.$route.params.organId;
+    }
     this.$store.dispatch("setBranchs");
     this.$store.dispatch("setTeachers");
     this.getList();