Commit 572de36793fe2078bb4fd6c58323bebc233336e6
1 parent
948b6a2c
多班对比问题
Showing
4 changed files
with
17 additions
and
7 deletions
src/views/basic/test/components/test.vue
| @@ -432,8 +432,8 @@ | @@ -432,8 +432,8 @@ | ||
| 432 | </div> | 432 | </div> |
| 433 | <div | 433 | <div |
| 434 | v-if=" | 434 | v-if=" |
| 435 | - (!status && | ||
| 436 | - examReport.subjectiveScore != examReport.examPaperScore) || | 435 | + !status && |
| 436 | + examReport.subjectiveScore != examReport.examPaperScore && | ||
| 437 | examReport.examPaperId != 0 | 437 | examReport.examPaperId != 0 |
| 438 | " | 438 | " |
| 439 | > | 439 | > |
src/views/basic/test/index.vue
| @@ -284,9 +284,15 @@ export default { | @@ -284,9 +284,15 @@ export default { | ||
| 284 | }); | 284 | }); |
| 285 | if (status === 0) { | 285 | if (status === 0) { |
| 286 | this.subjectList = data.subjectNames || []; | 286 | this.subjectList = data.subjectNames || []; |
| 287 | - this.subjectList.length | ||
| 288 | - ? this.query.subjectNames.push(this.subjectList[0]) | ||
| 289 | - : ""; | 287 | + if (this.role == "ROLE_BANZHUREN") { |
| 288 | + this.subjectList.length | ||
| 289 | + ? this.query.subjectNames.push(this.subjectList[0]) | ||
| 290 | + : ""; | ||
| 291 | + } else { | ||
| 292 | + this.subjectList.length | ||
| 293 | + ? (this.query.subjectNames = this.subjectList[0]) | ||
| 294 | + : ""; | ||
| 295 | + } | ||
| 290 | } else { | 296 | } else { |
| 291 | this.$message.error(info); | 297 | this.$message.error(info); |
| 292 | } | 298 | } |
src/views/basic/test/list.vue
| @@ -493,6 +493,10 @@ export default { | @@ -493,6 +493,10 @@ export default { | ||
| 493 | } | 493 | } |
| 494 | } | 494 | } |
| 495 | } | 495 | } |
| 496 | + let pageSize = this.size; | ||
| 497 | + if (this.query.classId?.length > 1) { | ||
| 498 | + pageSize = 9999; | ||
| 499 | + } | ||
| 496 | const examReportList = | 500 | const examReportList = |
| 497 | this.role == "ROLE_PERSONAL" | 501 | this.role == "ROLE_PERSONAL" |
| 498 | ? this.$request.pExamReportList | 502 | ? this.$request.pExamReportList |
| @@ -500,7 +504,7 @@ export default { | @@ -500,7 +504,7 @@ export default { | ||
| 500 | const { data, status, info } = await examReportList({ | 504 | const { data, status, info } = await examReportList({ |
| 501 | ...query, | 505 | ...query, |
| 502 | page: this.page, | 506 | page: this.page, |
| 503 | - size: this.size, | 507 | + size: pageSize, |
| 504 | }); | 508 | }); |
| 505 | this.loading = false; | 509 | this.loading = false; |
| 506 | if (status === 0) { | 510 | if (status === 0) { |
src/views/examinationPaper/addQs.vue
| @@ -945,7 +945,7 @@ export default { | @@ -945,7 +945,7 @@ export default { | ||
| 945 | //整理问题 | 945 | //整理问题 |
| 946 | formateQuestion() { | 946 | formateQuestion() { |
| 947 | this.formatQuestionList(); | 947 | this.formatQuestionList(); |
| 948 | - if (questionList[0]?.subQuestions) { | 948 | + if (this.form.questionList[0]?.subQuestions) { |
| 949 | this.form.questionList?.map((item) => { | 949 | this.form.questionList?.map((item) => { |
| 950 | let types = [{}]; | 950 | let types = [{}]; |
| 951 | let addndex = 0; | 951 | let addndex = 0; |