lex 1 year ago
parent
commit
a287ab145c

+ 0 - 1
src/school/train-report/modal/teacher-attendance.tsx

@@ -112,7 +112,6 @@ export default defineComponent({
           // valueList2.push(dataNot[i])
         }
       }
-      console.log(valueList, valueList2)
       if (forms.type.includes('YES')) {
         seriesList.push({
           name: '出勤课时数',

+ 13 - 6
src/school/train-report/modal/train-progress.tsx

@@ -33,11 +33,18 @@ export default defineComponent({
     const formatCourse = () => {
       const knowledge = props.reportData
       for (const i in knowledge) {
-        i != 'TOTAL' &&
-          forms.knowledgeList.push({
-            courseName: reportCourseType[i],
-            ...knowledge[i]
-          })
+        if (i !== 'TOTAL') {
+          // forms.total = data[i]
+          const value = knowledge[i]
+          if (Array.isArray(value)) {
+            value.forEach((v: any) => {
+              forms.knowledgeList.push({
+                courseName: v.name,
+                ...v
+              })
+            })
+          }
+        }
       }
     }
 
@@ -81,7 +88,7 @@ export default defineComponent({
                   style={{
                     borderRadius: '10px'
                   }}
-                  percentage={item.learned / item.total * 100}
+                  percentage={(item.learned / item.total) * 100}
                   strokeWidth={8}
                 />
               </div>