合并

src/views/student/display_board/detail.vue

@@ -802,26 +802,43 @@ export default {
       let keys = Object.keys(datas);
       let list = [];
       let labers = [
+        { label: '正确部位', key: 'answer_position' },
+        { label: '错误部位', key: 'wrong_position' },
         { label: '题目', key: 'position' },
         { label: '正确答案', key: 'answer' },
         { label: '错题数量', key: 'wrong_num' },
         { label: '错误答案内容', key: 'distribute' },
       ];
+      // keys.forEach((element, index) => {
+      //   list.push({
+      //     position: element,
+      //     answer: datas[element].answer,
+      //     wrong_num: datas[element].wrong_num,
+      //     // distribute: datas[element].distribute,
+      //     distribute: countOccurrences(datas[element].distribute),
+      //     distribute_student: datas[element].distribute_student,
+      //   });
+      // });
       keys.forEach((element, index) => {
-        list.push({
-          position: element,
-          answer: datas[element].answer,
-          wrong_num: datas[element].wrong_num,
-          // distribute: datas[element].distribute,
-          distribute: countOccurrences(datas[element].distribute),
-          distribute_student: datas[element].distribute_student,
-        });
+        for (let s in datas[element]) {
+          for (let i in datas[element][s]) {
+            list.push({
+              answer_position: element,
+              wrong_position: s,
+              position: datas[element][s][i].title,
+              answer: datas[element][s][i].answer,
+              wrong_num: datas[element][s][i].wrong_num,
+              distribute: countOccurrences(datas[element][s][i].distribute),
+              distribute_student: datas[element][s][i].distribute_student,
+            });
+          }
+        }
       });
       return {
         type: 'table',
         chart_id: 'wrong_position',
         print_id: 'wrong_position',
-
+        merge_fields: ['answer_position', 'wrong_position'],
         color: '#E6A23C',
         title: '错误部位',
         labers,
@@ -834,25 +851,38 @@ export default {
       let keys = Object.keys(datas);
       let list = [];
       let labers = [
-        { label: '题目', key: 'level' },
+        { label: '错误等级', key: 'level' },
+        { label: '题目', key: 'title' },
         { label: '正确答案', key: 'answer' },
         { label: '错题数量', key: 'wrong_num' },
         { label: '错误答案内容', key: 'distribute' },
       ];
+      // keys.forEach((element, index) => {
+      //   list.push({
+      //     level: element,
+      //     answer: datas[element].answer,
+      //     wrong_num: datas[element].wrong_num,
+      //     distribute: countOccurrences(datas[element].distribute),
+      //     distribute_student: datas[element].distribute_student,
+      //   });
+      // });
       keys.forEach((element, index) => {
-        list.push({
-          level: element,
-          answer: datas[element].answer,
-          wrong_num: datas[element].wrong_num,
-          distribute: countOccurrences(datas[element].distribute),
-          distribute_student: datas[element].distribute_student,
-        });
+        for (let s in datas[element]) {
+          list.push({
+            level: element,
+            title: datas[element][s].title,
+            answer: datas[element][s].answer,
+            wrong_num: datas[element][s].wrong_num,
+            distribute: countOccurrences(datas[element][s].distribute),
+            distribute_student: datas[element][s].distribute_student,
+          });
+        }
       });
       return {
         type: 'table',
         chart_id: 'wrong_level',
         print_id: 'wrong_level',
-
+        merge_fields: ['level'],
         color: '#505F79',
         title: '错误上下一级',
         labers,
@@ -865,28 +895,41 @@ export default {
       let keys = Object.keys(datas);
       let list = [];
       let labers = [
-        { label: '题目', key: 'color' },
+        { label: '错误颜色', key: 'color' },
+        { label: '题目', key: 'title' },
         { label: '正确答案', key: 'answer' },
         { label: '错题数量', key: 'wrong_num' },
         { label: '错误答案内容', key: 'distribute' },
       ];
-      keys.forEach((element, index) => {
-        list.push({
-          color: element,
-          answer: datas[element].answer,
-          wrong_num: datas[element].wrong_num,
-          // distribute: datas[element].distribute,
-          distribute: countOccurrences(datas[element].distribute),
-          distribute_student: datas[element].distribute_student,
+      // keys.forEach((element, index) => {
+      //   list.push({
+      //     color: element,
+      //     answer: datas[element].answer,
+      //     wrong_num: datas[element].wrong_num,
+      //     // distribute: datas[element].distribute,
+      //     distribute: countOccurrences(datas[element].distribute),
+      //     distribute_student: datas[element].distribute_student,
 
-          //distribute: countOccurrences(datas[element].distribute),
-        });
+      //     //distribute: countOccurrences(datas[element].distribute),
+      //   });
+      // });
+      keys.forEach((element, index) => {
+        for (let s in datas[element]) {
+          list.push({
+            color: element,
+            title: datas[element][s].title,
+            answer: datas[element][s].answer,
+            wrong_num: datas[element][s].wrong_num,
+            distribute: countOccurrences(datas[element][s].distribute),
+            distribute_student: datas[element][s].distribute_student,
+          });
+        }
       });
       return {
         type: 'table',
         chart_id: 'wrong_color',
         print_id: 'wrong_color',
-
+        merge_fields: ['color'],
         color: '#99A9BF',
         title: '错误颜色',
         labers,
@@ -899,27 +942,40 @@ export default {
       let keys = Object.keys(datas);
       let list = [];
       let labers = [
-        { label: '题目', key: 'group' },
+        { label: '组别', key: 'group' },
+        { label: '题目', key: 'title' },
         { label: '正确答案', key: 'answer' },
         { label: '错题数量', key: 'wrong_num' },
         { label: '错误答案内容', key: 'distribute' },
       ];
+      // keys.forEach((element, index) => {
+      //   list.push({
+      //     group: element,
+      //     answer: datas[element].answer,
+      //     wrong_num: datas[element].wrong_num,
+      //     // distribute: datas[element].distribute,
+      //     distribute: countOccurrences(datas[element].distribute),
+      //     distribute_student: datas[element].distribute_student,
+      //     //countOccurrences
+      //   });
+      // });
       keys.forEach((element, index) => {
-        list.push({
-          group: element,
-          answer: datas[element].answer,
-          wrong_num: datas[element].wrong_num,
-          // distribute: datas[element].distribute,
-          distribute: countOccurrences(datas[element].distribute),
-          distribute_student: datas[element].distribute_student,
-          //countOccurrences
-        });
+        for (let s in datas[element]) {
+          list.push({
+            group: element,
+            title: datas[element][s].title,
+            answer: datas[element][s].answer,
+            wrong_num: datas[element][s].wrong_num,
+            distribute: countOccurrences(datas[element][s].distribute),
+            distribute_student: datas[element][s].distribute_student,
+          });
+        }
       });
       return {
         type: 'table',
         chart_id: 'wrong_group',
         print_id: 'wrong_group',
-
+        merge_fields: ['group'],
         color: '#529B2E',
         title: '错误组别',
         labers,

src/views/student/examination_questions/comment/index.vue

@@ -1159,7 +1159,6 @@ export default {
         //   distribute_student: datas[element].distribute_student,
         // });
       });
-      console.log(list);
 
       return {
         type: 'table',