Merge branch 'ol_12_30' into online

src/views/teamBuild/teamSeting/components/setClassV2.vue

@@ -1434,17 +1434,19 @@ export default {
           });
         }
       });
-      if (this.activeType == "HIGH" || this.activeType == "HIGH_ONLINE") {
-        this.getNoClassStudent(row.type, row.memo);
-        let arr = row.memo.split(",");
-
-        this.activeSoundList = this.soundList.filter((sound) => {
-          return arr.indexOf(sound.id + "") != -1;
-        });
-      } else {
-        this.activeSoundList = this.soundList;
+         this.activeSoundList = this.soundList;
         this.getNoClassStudent(row.type);
-      }
+      // if (this.activeType == "HIGH" || this.activeType == "HIGH_ONLINE") {
+      //   this.getNoClassStudent(row.type, row.memo);
+      //   let arr = row.memo.split(",");
+
+      //   this.activeSoundList = this.soundList.filter((sound) => {
+      //     return arr.indexOf(sound.id + "") != -1;
+      //   });
+      // } else {
+      //   this.activeSoundList = this.soundList;
+      //   this.getNoClassStudent(row.type);
+      // }
     },
     // 排课开始
     arrangeStart() {

src/views/teamDetail/components/modals/classroom-setting.vue

@@ -54,7 +54,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="排课类型" label-width="88px">
+      <el-form-item v-if="!isEmpty" label="排课类型" label-width="88px">
         <el-tag
           class="tag"
           :effect="form.classs[key] ? 'dark' : 'plain'"

src/views/teamDetail/components/resetClass.vue

@@ -945,18 +945,20 @@ export default {
           });
         }
       });
-      if (this.activeType == "HIGH" || this.activeType == "HIGH_ONLINE") {
-        this.getNoClassStudent(row.type, row.memo);
-        let arr = row.memo.split(",");
-        console.log(arr);
-        this.activeSoundList = this.soundList.filter((sound) => {
-          return arr.indexOf(sound.id + "") != -1;
-        });
-      } else {
-        this.activeSoundList = this.soundList;
-        this.getNoClassStudent(row.type);
-        console.log(this.activeSoundList);
-      }
+      this.activeSoundList = this.soundList;
+      this.getNoClassStudent(row.type);// 基础技能班能获取所有
+      // if (this.activeType == "HIGH" || this.activeType == "HIGH_ONLINE") {
+      //   this.getNoClassStudent(row.type, row.memo);
+      //   let arr = row.memo.split(",");
+      //   console.log(arr);
+      //   this.activeSoundList = this.soundList.filter((sound) => {
+      //     return arr.indexOf(sound.id + "") != -1;
+      //   });
+      // } else {
+      //   this.activeSoundList = this.soundList;
+      //   this.getNoClassStudent(row.type);
+      //   console.log(this.activeSoundList);
+      // }
     },
     // 班级调整
     classAdjustment(row) {