Commit d44087bd32d32a0ec0fd6b46b39d0dc0a4157415

Authored by 梁保满
1 parent f1b55bc6

分数去零,班主任切换班级多次添加科目

src/views/examinationPaper/add.vue
@@ -955,7 +955,7 @@ export default { @@ -955,7 +955,7 @@ export default {
955 return a + Number(b.score ? b.score : 0); 955 return a + Number(b.score ? b.score : 0);
956 }, 0); 956 }, 0);
957 }, 0); 957 }, 0);
958 - return Number(score).toFixed(2); 958 + return Number(score);
959 }, 959 },
960 }, 960 },
961 watch: { 961 watch: {
@@ -1582,7 +1582,7 @@ export default { @@ -1582,7 +1582,7 @@ export default {
1582 let score = question.subQuestions.reduce((a, b) => { 1582 let score = question.subQuestions.reduce((a, b) => {
1583 return a + (b.score ? b.score : 0); 1583 return a + (b.score ? b.score : 0);
1584 }, 0); 1584 }, 0);
1585 - return Number(score).toFixed(2); 1585 + return Number(score);
1586 }, 1586 },
1587 changeAddSubQuestions(val, question) { 1587 changeAddSubQuestions(val, question) {
1588 if (val) { 1588 if (val) {
src/views/examinationPaper/edit.vue
@@ -530,7 +530,7 @@ export default { @@ -530,7 +530,7 @@ export default {
530 score += (item.score || 0); 530 score += (item.score || 0);
531 } 531 }
532 }, 0); 532 }, 0);
533 - return Number(score).toFixed(2); 533 + return Number(score);
534 }, 534 },
535 }, 535 },
536 created() { 536 created() {
@@ -666,7 +666,7 @@ export default { @@ -666,7 +666,7 @@ export default {
666 let score = question.subQuestions.reduce((a, b) => { 666 let score = question.subQuestions.reduce((a, b) => {
667 return a + (b.score || 0); 667 return a + (b.score || 0);
668 }, 0); 668 }, 0);
669 - return Number(score).toFixed(2); 669 + return Number(score);
670 }, 670 },
671 changAnswer(sub, option) { 671 changAnswer(sub, option) {
672 //设置多选答案 672 //设置多选答案
src/views/personal/test/analysis.vue
@@ -592,7 +592,7 @@ export default { @@ -592,7 +592,7 @@ export default {
592 detail.map((items, index) => { 592 detail.map((items, index) => {
593 params["que" + items.id] = items.id; 593 params["que" + items.id] = items.id;
594 params["score" + items.id] = String(items.score).includes(".") 594 params["score" + items.id] = String(items.score).includes(".")
595 - ? Number(items.score).toFixed(2) 595 + ? Number(items.score)
596 : items.score; 596 : items.score;
597 params["answer" + items.id] = 597 params["answer" + items.id] =
598 items.answer == 1 ? "✓" : items.answer == 2 ? "✗" : items.answer; 598 items.answer == 1 ? "✓" : items.answer == 2 ? "✗" : items.answer;
src/views/standard/examinationPaper/add.vue
@@ -860,7 +860,7 @@ export default { @@ -860,7 +860,7 @@ export default {
860 return a + Number(b.score ? b.score : 0); 860 return a + Number(b.score ? b.score : 0);
861 }, 0); 861 }, 0);
862 }, 0); 862 }, 0);
863 - return Number(score).toFixed(2); 863 + return Number(score);
864 }, 864 },
865 }, 865 },
866 watch: { 866 watch: {
@@ -1441,7 +1441,7 @@ export default { @@ -1441,7 +1441,7 @@ export default {
1441 let score = question.subQuestions.reduce((a, b) => { 1441 let score = question.subQuestions.reduce((a, b) => {
1442 return a + (b.score ? b.score : 0); 1442 return a + (b.score ? b.score : 0);
1443 }, 0); 1443 }, 0);
1444 - return Number(score).toFixed(2); 1444 + return Number(score);
1445 }, 1445 },
1446 equalScore(question) { 1446 equalScore(question) {
1447 let score = 0; 1447 let score = 0;
src/views/standard/examinationPaper/edit.vue
@@ -377,7 +377,7 @@ export default { @@ -377,7 +377,7 @@ export default {
377 score += item.score; 377 score += item.score;
378 } 378 }
379 }, 0); 379 }, 0);
380 - return Number(score).toFixed(2); 380 + return Number(score);
381 }, 381 },
382 }, 382 },
383 created() { 383 created() {
@@ -444,7 +444,7 @@ export default { @@ -444,7 +444,7 @@ export default {
444 let score = question.subQuestions.reduce((a, b) => { 444 let score = question.subQuestions.reduce((a, b) => {
445 return a + (b.score || 0); 445 return a + (b.score || 0);
446 }, 0); 446 }, 0);
447 - return Number(score).toFixed(2); 447 + return Number(score);
448 }, 448 },
449 changAnswer(sub, option) { 449 changAnswer(sub, option) {
450 //设置多选答案 450 //设置多选答案
src/views/standard/test/analysis.vue
@@ -745,7 +745,7 @@ export default { @@ -745,7 +745,7 @@ export default {
745 detail.map((items, index) => { 745 detail.map((items, index) => {
746 params["que" + items.id] = items.id; 746 params["que" + items.id] = items.id;
747 params["score" + items.id] = String(items.score).includes(".") 747 params["score" + items.id] = String(items.score).includes(".")
748 - ? Number(items.score).toFixed(2) 748 + ? Number(items.score)
749 : items.score; 749 : items.score;
750 params["answer" + items.id] = 750 params["answer" + items.id] =
751 items.answer == 1 ? "✓" : items.answer == 2 ? "✗" : items.answer; 751 items.answer == 1 ? "✓" : items.answer == 2 ? "✗" : items.answer;
src/views/standard/test/index.vue
@@ -364,6 +364,7 @@ @@ -364,6 +364,7 @@
364 ></el-button> 364 ></el-button>
365 </el-tooltip> 365 </el-tooltip>
366 <el-popconfirm 366 <el-popconfirm
  367 + v-if="role != 'ROLE_BANZHUREN'"
367 title="确定删除吗?" 368 title="确定删除吗?"
368 @confirm="removeReport(scoped.row, scoped.$index)" 369 @confirm="removeReport(scoped.row, scoped.$index)"
369 > 370 >
@@ -1042,7 +1043,7 @@ export default { @@ -1042,7 +1043,7 @@ export default {
1042 value: "全部", 1043 value: "全部",
1043 label: "全部", 1044 label: "全部",
1044 }); 1045 });
1045 - this.query.subjectNames.push(this.subjectList[0]?.value); 1046 + this.query.subjectNames = [this.subjectList[0]?.value];
1046 } else { 1047 } else {
1047 this.query.subjectNames = this.subjectList[0]?.value; 1048 this.query.subjectNames = this.subjectList[0]?.value;
1048 } 1049 }