Merge branch '03/03GRADE' into test

src/views/teachManager/index.vue

@@ -89,6 +89,15 @@
           ></el-table-column>
           <el-table-column
             align="center"
+            prop="musicScoreNum"
+            label="使用音源"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.soundResource | formatSoundReSource }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
             prop="updateTime"
             label="最后更新时间"
           ></el-table-column>
@@ -214,6 +223,16 @@ export default {
      this.$store.dispatch("setBranchs");
     this.init();
   },
+  filters: {
+    formatSoundReSource(val) {
+      let template = {
+        NOTEPERFORMER: 'NotePerformer音源',
+        TANG: '标准音源',
+        OFFICIAL: '官方音源'
+      }
+      return template[val]
+    }
+  },
   methods: {
     init() {
       this.getList();

src/views/teachManager/modals/addTeach.vue

@@ -61,7 +61,7 @@
       >
         <el-select filterable placeholder="请选择音源设置" clearable v-model="form.soundResource" style="width: 100% !important">
           <el-option label="NotePerformer音源" value="NOTEPERFORMER"></el-option>
-          <el-option label="唐老师音源" value="TANG"></el-option>
+          <el-option label="标准音源" value="TANG"></el-option>
           <el-option label="官方音源" value="OFFICIAL"></el-option>
         </el-select>
       </el-form-item>