成绩分析bug修改

src/views/analysisReport/studentPage/downloadPdf/studentReport.vue

@@ -927,13 +927,8 @@ export default {
                 subjectCode:subjectCode
             }).then(async res => {
                 if (res.code == 200 && res.data) {
-                    const { bigQuestion, knowledgePointQuestion, abilityQuestion } = res.data
-                    if (bigQuestion && bigQuestion?.tableData?.length > 0) {
-                        const tableData = bigQuestion.tableData || [];
-                        const titleData = bigQuestion.titleData || [];
-                        const studentOpenness = bigQuestion?.studentOpenness ?? '';
-                        this.TableChartData(tableData, titleData, studentOpenness, index,'bigQuestionData','大题',subjectCode);
-                    }
+                    const { bigQuestion, knowledgePointQuestion, abilityQuestion,majorQuestion } = res.data
+                    
                     if (knowledgePointQuestion && knowledgePointQuestion?.tableData?.length > 0) {
                         const tableData = knowledgePointQuestion.tableData || [];
                         const titleData = knowledgePointQuestion.titleData || [];
@@ -949,12 +944,24 @@ export default {
                             this.knowLedgeLayeringPageNum.push(this.SingleChartPage(domHeight));
                         }
                     }
+                    if (majorQuestion && majorQuestion?.tableData?.length > 0) {
+                        const tableData = majorQuestion.tableData || [];
+                        const titleData = majorQuestion.titleData || [];
+                        const studentOpenness = majorQuestion?.studentOpenness ?? '';
+                        this.TableChartData(tableData, titleData, studentOpenness, index,'majorQuestionData','大题',subjectCode);
+                    }
                     if (abilityQuestion && abilityQuestion?.tableData?.length > 0) {
                         const tableData = abilityQuestion.tableData || [];
                         const titleData = abilityQuestion.titleData || [];
                         const studentOpenness = abilityQuestion?.studentOpenness ?? '';
                         this.TableChartData(tableData, titleData, studentOpenness, index,'abilityQuestionData','能力要素',subjectCode);
                     }
+                    if (bigQuestion && bigQuestion?.tableData?.length > 0) {
+                        const tableData = bigQuestion.tableData || [];
+                        const titleData = bigQuestion.titleData || [];
+                        const studentOpenness = bigQuestion?.studentOpenness ?? '';
+                        this.TableChartData(tableData, titleData, studentOpenness, index,'bigQuestionData','核心素养',subjectCode);
+                    }
                 }
             })
         },

src/views/analysisReport/studentPage/scrolReport/transcript_single.vue

@@ -513,7 +513,20 @@ export default {
           datax: [], //x轴数据
           datay: [], //y轴数据
           radarChartData: []
-        }
+        },
+        majorQuestionData: {
+          studentOpenness: '',
+          loading: false,
+          chartType: 'vertical_bar', //默认显示折线图柱状图line_bar_chart
+          total: 0,
+          pageNum: 1,
+          pageSize: 10,
+          tableData: [],
+          titleData: [],
+          datax: [], //x轴数据
+          datay: [], //y轴数据
+          radarChartData: []
+        },
       },
       knowLedgeLayering:{
         fullScore:'',
@@ -791,19 +804,11 @@ export default {
       this.groupData.bigQuestionData.loading = true
       this.groupData.knowledgePointQuestionData.loading = true
       this.groupData.abilityQuestionData.loading = true
+      this.groupData.majorQuestionData.loading = true
       this.$api.reportStudent[getApiName()].queryOneSubjectGroupQuestionData(this.reportParam).then(res => {
           if (res.code == 200 && res.data) {
-            const { bigQuestion, knowledgePointQuestion, abilityQuestion } = res.data
-            if (bigQuestion && bigQuestion?.tableData?.length > 0) {
-              this.groupData.groupName.push({
-                name: '大题',
-                value: 'bigQuestionData'
-              })
-              const tableData = bigQuestion.tableData || []
-              const titleData = bigQuestion.titleData || []
-              const studentOpenness = bigQuestion?.studentOpenness ?? ''
-              this.TableChartData(tableData, titleData, studentOpenness, 'bigQuestionData')
-            }
+            const { bigQuestion, knowledgePointQuestion, majorQuestion,abilityQuestion } = res.data
+            
             if (knowledgePointQuestion && knowledgePointQuestion?.tableData?.length > 0) {
               this.groupData.groupName.push({
                 name: '知识点',
@@ -814,6 +819,16 @@ export default {
               const studentOpenness = knowledgePointQuestion?.studentOpenness ?? ''
               this.TableChartData(tableData, titleData, studentOpenness, 'knowledgePointQuestionData')
             }
+            if (majorQuestion && majorQuestion?.tableData?.length > 0) {
+              this.groupData.groupName.push({
+                name: '大题',
+                value: 'majorQuestionData'
+              })
+              const tableData = majorQuestion.tableData || []
+              const titleData = majorQuestion.titleData || []
+              const studentOpenness = majorQuestion?.studentOpenness ?? ''
+              this.TableChartData(tableData, titleData, studentOpenness, 'majorQuestionData')
+            }
             if (abilityQuestion && abilityQuestion?.tableData?.length > 0) {
               this.groupData.groupName.push({
                 name: '能力要素',
@@ -824,6 +839,16 @@ export default {
               const studentOpenness = abilityQuestion?.studentOpenness ?? ''
               this.TableChartData(tableData, titleData, studentOpenness, 'abilityQuestionData')
             }
+            if (bigQuestion && bigQuestion?.tableData?.length > 0) {
+              this.groupData.groupName.push({
+                name: '核心素养',
+                value: 'bigQuestionData'
+              })
+              const tableData = bigQuestion.tableData || []
+              const titleData = bigQuestion.titleData || []
+              const studentOpenness = bigQuestion?.studentOpenness ?? ''
+              this.TableChartData(tableData, titleData, studentOpenness, 'bigQuestionData')
+            }
           } else {
             this.groupData.bigQuestionData.tableData = []
             this.groupData.bigQuestionData.titleData = []
@@ -843,6 +868,12 @@ export default {
             this.groupData.abilityQuestionData.datax = []
             this.groupData.abilityQuestionData.datay = []
             this.groupData.abilityQuestionData.studentOpenness = ''
+            this.groupData.majorQuestionData.tableData = []
+            this.groupData.majorQuestionData.titleData = []
+            this.groupData.majorQuestionData.total = 0
+            this.groupData.majorQuestionData.datax = []
+            this.groupData.majorQuestionData.datay = []
+            this.groupData.majorQuestionData.studentOpenness = ''
           }
           this.QueryOneSubjectCustomGroupQuestion() //学生端查询单科-自定义分组
         })
@@ -850,6 +881,7 @@ export default {
           this.groupData.bigQuestionData.loading = false
           this.groupData.knowledgePointQuestionData.loading = false
           this.groupData.abilityQuestionData.loading = false
+          this.groupData.majorQuestionData.loading = false
         })
     },
     //学生端查询单科-自定义分组

src/views/targetImprove/practice/practiceAnswer.vue

@@ -342,7 +342,6 @@ export default {
     SubmitAnswer(){
       console.log(this.questionList)
       const studentAnswers = this.questionList.map(item=>item.studentAnswer);
-      console.log(studentAnswers)
       const hasInvalid = studentAnswers.some(item => {
         // 判断 null 或 undefined
         if (item == null) return true;