Skip to content

Q
qualityTesting_adminHome
提交 294f8335 authored 作者: Yroc's avatar Yroc
浏览文件
操作

合并

上级 53f0153a
隐藏空白字符变更
内嵌 并排
正在显示 包含 97 行增加 和 42 行删除
src/views/student/display_board/detail.vue
浏览文件 @ 294f8335
...@@ -802,26 +802,43 @@ export default { ...@@ -802,26 +802,43 @@ export default {
let keys = Object.keys(datas); let keys = Object.keys(datas);
let list = []; let list = [];
let labers = [ let labers = [
{ label: '正确部位', key: 'answer_position' },
{ label: '错误部位', key: 'wrong_position' },
{ label: '题目', key: 'position' }, { label: '题目', key: 'position' },
{ label: '正确答案', key: 'answer' }, { label: '正确答案', key: 'answer' },
{ label: '错题数量', key: 'wrong_num' }, { label: '错题数量', key: 'wrong_num' },
{ label: '错误答案内容', key: 'distribute' }, { 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) => { keys.forEach((element, index) => {
list.push({ for (let s in datas[element]) {
position: element, for (let i in datas[element][s]) {
answer: datas[element].answer, list.push({
wrong_num: datas[element].wrong_num, answer_position: element,
// distribute: datas[element].distribute, wrong_position: s,
distribute: countOccurrences(datas[element].distribute), position: datas[element][s][i].title,
distribute_student: datas[element].distribute_student, 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 { return {
type: 'table', type: 'table',
chart_id: 'wrong_position', chart_id: 'wrong_position',
print_id: 'wrong_position', print_id: 'wrong_position',
merge_fields: ['answer_position', 'wrong_position'],
color: '#E6A23C', color: '#E6A23C',
title: '错误部位', title: '错误部位',
labers, labers,
...@@ -834,25 +851,38 @@ export default { ...@@ -834,25 +851,38 @@ export default {
let keys = Object.keys(datas); let keys = Object.keys(datas);
let list = []; let list = [];
let labers = [ let labers = [
{ label: '题目', key: 'level' }, { label: '错误等级', key: 'level' },
{ label: '题目', key: 'title' },
{ label: '正确答案', key: 'answer' }, { label: '正确答案', key: 'answer' },
{ label: '错题数量', key: 'wrong_num' }, { label: '错题数量', key: 'wrong_num' },
{ label: '错误答案内容', key: 'distribute' }, { 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) => { keys.forEach((element, index) => {
list.push({ for (let s in datas[element]) {
level: element, list.push({
answer: datas[element].answer, level: element,
wrong_num: datas[element].wrong_num, title: datas[element][s].title,
distribute: countOccurrences(datas[element].distribute), answer: datas[element][s].answer,
distribute_student: datas[element].distribute_student, wrong_num: datas[element][s].wrong_num,
}); distribute: countOccurrences(datas[element][s].distribute),
distribute_student: datas[element][s].distribute_student,
});
}
}); });
return { return {
type: 'table', type: 'table',
chart_id: 'wrong_level', chart_id: 'wrong_level',
print_id: 'wrong_level', print_id: 'wrong_level',
merge_fields: ['level'],
color: '#505F79', color: '#505F79',
title: '错误上下一级', title: '错误上下一级',
labers, labers,
...@@ -865,28 +895,41 @@ export default { ...@@ -865,28 +895,41 @@ export default {
let keys = Object.keys(datas); let keys = Object.keys(datas);
let list = []; let list = [];
let labers = [ let labers = [
{ label: '题目', key: 'color' }, { label: '错误颜色', key: 'color' },
{ label: '题目', key: 'title' },
{ label: '正确答案', key: 'answer' }, { label: '正确答案', key: 'answer' },
{ label: '错题数量', key: 'wrong_num' }, { label: '错题数量', key: 'wrong_num' },
{ label: '错误答案内容', key: 'distribute' }, { label: '错误答案内容', key: 'distribute' },
]; ];
keys.forEach((element, index) => { // keys.forEach((element, index) => {
list.push({ // list.push({
color: element, // color: element,
answer: datas[element].answer, // answer: datas[element].answer,
wrong_num: datas[element].wrong_num, // wrong_num: datas[element].wrong_num,
// distribute: datas[element].distribute, // // distribute: datas[element].distribute,
distribute: countOccurrences(datas[element].distribute), // distribute: countOccurrences(datas[element].distribute),
distribute_student: datas[element].distribute_student, // 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 { return {
type: 'table', type: 'table',
chart_id: 'wrong_color', chart_id: 'wrong_color',
print_id: 'wrong_color', print_id: 'wrong_color',
merge_fields: ['color'],
color: '#99A9BF', color: '#99A9BF',
title: '错误颜色', title: '错误颜色',
labers, labers,
...@@ -899,27 +942,40 @@ export default { ...@@ -899,27 +942,40 @@ export default {
let keys = Object.keys(datas); let keys = Object.keys(datas);
let list = []; let list = [];
let labers = [ let labers = [
{ label: '题目', key: 'group' }, { label: '组别', key: 'group' },
{ label: '题目', key: 'title' },
{ label: '正确答案', key: 'answer' }, { label: '正确答案', key: 'answer' },
{ label: '错题数量', key: 'wrong_num' }, { label: '错题数量', key: 'wrong_num' },
{ label: '错误答案内容', key: 'distribute' }, { 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) => { keys.forEach((element, index) => {
list.push({ for (let s in datas[element]) {
group: element, list.push({
answer: datas[element].answer, group: element,
wrong_num: datas[element].wrong_num, title: datas[element][s].title,
// distribute: datas[element].distribute, answer: datas[element][s].answer,
distribute: countOccurrences(datas[element].distribute), wrong_num: datas[element][s].wrong_num,
distribute_student: datas[element].distribute_student, distribute: countOccurrences(datas[element][s].distribute),
//countOccurrences distribute_student: datas[element][s].distribute_student,
}); });
}
}); });
return { return {
type: 'table', type: 'table',
chart_id: 'wrong_group', chart_id: 'wrong_group',
print_id: 'wrong_group', print_id: 'wrong_group',
merge_fields: ['group'],
color: '#529B2E', color: '#529B2E',
title: '错误组别', title: '错误组别',
labers, labers,
......
src/views/student/examination_questions/comment/index.vue
浏览文件 @ 294f8335
...@@ -1159,7 +1159,6 @@ export default { ...@@ -1159,7 +1159,6 @@ export default {
// distribute_student: datas[element].distribute_student, // distribute_student: datas[element].distribute_student,
// }); // });
}); });
console.log(list);
return { return {
type: 'table', type: 'table',
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论