Explorar o código

总分标准分总分放在第一个

liurongli hai 8 meses
pai
achega
a82d942466

+ 0 - 2
src/views/analysisReport/studentPage/scrolReport/transcript_single.vue

@@ -589,7 +589,6 @@ export default {
             const customQuestionData = res?.data?.customQuestionData ?? [];
             if (customQuestionData && customQuestionData.length > 0) {
               customQuestionData.forEach((item, index) => {
-                console.log(item, 'itemitemitem')
                 this.groupData.groupName.push({
                   name: item.customName,
                   value: `customQuestionData${index}`
@@ -607,7 +606,6 @@ export default {
                   datay: [],//y轴数据
                   radarChartData: []
                 });
-                console.log(this.groupData.groupName, 'this.groupData.groupName')
                 const tableData = item?.questionData?.tableData || [];
                 const titleData = item?.questionData?.titleData || [];
                 const studentOpenness = res.data?.studentOpenness ?? '';

+ 21 - 9
src/views/analysisReport/studentPage/scrolReport/transcript_total.vue

@@ -199,15 +199,27 @@ export default {
             this.subjectData.tableData = res.data.tableData || [];
             this.subjectData.studentOpenness = res.data.studentOpenness ?? '';
             this.subjectData.titleData = res.data.titleData || [];
-            this.subjectData.datax = this.subjectData.tableData.map(item => item.subjectName);
-            this.subjectData.datay = this.subjectData.tableData.map(item => item.standardScore);
-            this.subjectData.tooltipData = this.subjectData.tableData.map(item => ({
-              list: [{
-                name: '标准分',
-                value: item.standardScore ?? '',
-              }],
-              name: item.subjectName,
-            }));
+            this.subjectData.datax = [];
+            this.subjectData.datay = [];
+            this.subjectData.tooltipData = [];
+            //总分
+            const totalScore = this.subjectData.tableData.filter(item => item.isTotal == 1);
+            //组合
+            const subjectGroup = this.subjectData.tableData.filter(item => item.isTotal == 0 && item.subjectGroupType == 1);
+            //单科
+            const singleSubject = this.subjectData.tableData.filter(item => item.isTotal == 0 && item.subjectGroupType == 0);
+            const chartData = [...totalScore,...subjectGroup,...singleSubject];
+            chartData.forEach(item=>{
+              this.subjectData.datax.push(item.subjectName)
+              this.subjectData.datay.push(item.standardScore)
+              this.subjectData.tooltipData.push({
+                list: [{
+                  name: '标准分',
+                  value: item.standardScore ?? '',
+                }],
+                name: item.subjectName,
+              })
+            })
             let maxSubject = [], minSubject = [];
             this.subjectData.datay.forEach((item, k) => {
               if (Number(item) > 0) {