多班对比问题

梁保满
1 parent 948b6a2c
Showing 4 changed files with 17 additions and 7 deletions
src/views/basic/test/components/test.vue
src/views/basic/test/index.vue
src/views/basic/test/list.vue
src/views/examinationPaper/addQs.vue
@@ -432,8 +432,8 @@
       </div>
       <div
         v-if="
-          (!status &&
-            examReport.subjectiveScore != examReport.examPaperScore) ||
+          !status &&
+          examReport.subjectiveScore != examReport.examPaperScore &&
           examReport.examPaperId != 0
         "
       >
@@ -284,9 +284,15 @@ export default {
       });
       if (status === 0) {
         this.subjectList = data.subjectNames || [];
-        this.subjectList.length
-          ? this.query.subjectNames.push(this.subjectList[0])
-          : "";
+        if (this.role == "ROLE_BANZHUREN") {
+          this.subjectList.length
+            ? this.query.subjectNames.push(this.subjectList[0])
+            : "";
+        } else {
+          this.subjectList.length
+            ? (this.query.subjectNames = this.subjectList[0])
+            : "";
+        }
       } else {
         this.$message.error(info);
       }
@@ -493,6 +493,10 @@ export default {
           }
         }
       }
+      let pageSize = this.size;
+      if (this.query.classId?.length > 1) {
+        pageSize = 9999;
+      }
       const examReportList =
         this.role == "ROLE_PERSONAL"
           ? this.$request.pExamReportList
@@ -500,7 +504,7 @@ export default {
       const { data, status, info } = await examReportList({
         ...query,
         page: this.page,
-        size: this.size,
+        size: pageSize,
       });
       this.loading = false;
       if (status === 0) {
@@ -945,7 +945,7 @@ export default {
     //整理问题
     formateQuestion() {
       this.formatQuestionList();
-      if (questionList[0]?.subQuestions) {
+      if (this.form.questionList[0]?.subQuestions) {
         this.form.questionList?.map((item) => {
           let types = [{}];
           let addndex = 0;