Browse Source

Merge branch 'iteration-20241126' into dev

lex-xin 1 year ago
parent
commit
b966181cce

+ 0 - 2
src/teacher/statistics/practice-statistics-detail/index.module.less

@@ -91,7 +91,6 @@
     padding-bottom: 20px;
     .num {
       font-family: DIN;
-      font-weight: bold;
       font-size: 30px;
       color: #333333;
       line-height: 35px;
@@ -134,7 +133,6 @@
     .sBottom {
       .num {
         font-family: DIN;
-        font-weight: bold;
         font-size: 22px;
         color: #333333;
         line-height: 26px;

+ 3 - 9
src/teacher/statistics/practice-statistics-detail/index.tsx

@@ -239,17 +239,10 @@ export default defineComponent({
 
     const getSubjectList = async () => {
       const { data } = await request.get(
-        `api-teacher/subject/subjectSelect?type=MUSIC&clientId=TEACHER`
+        `api-teacher/subject/subSubjectSelect?type=MUSIC`
       )
       if (Array.isArray(data)) {
-        // 初始化乐器编号
-        data.forEach((item: any) => {
-          if (Array.isArray(item.subjects)) {
-            item.subjects.forEach((child: any) => {
-              forms.subjectList.push(child)
-            })
-          }
-        })
+        forms.subjectList = data
       }
     }
 
@@ -283,6 +276,7 @@ export default defineComponent({
       searchStatus.value = false
       forms.subjectId = searchObj.tempSubjectId
       getDetail()
+      getStudentDetail()
     }
 
     /** 排序 */