From 572de36793fe2078bb4fd6c58323bebc233336e6 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Tue, 27 Feb 2024 10:59:53 +0800
Subject: [PATCH] 多班对比问题

---
 src/views/basic/test/components/test.vue |  4 ++--
 src/views/basic/test/index.vue           | 12 +++++++++---
 src/views/basic/test/list.vue            |  6 +++++-
 src/views/examinationPaper/addQs.vue     |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/views/basic/test/components/test.vue b/src/views/basic/test/components/test.vue
index de95710..a7f2e99 100644
--- a/src/views/basic/test/components/test.vue
+++ b/src/views/basic/test/components/test.vue
@@ -432,8 +432,8 @@
       </div>
       <div
         v-if="
-          (!status &&
-            examReport.subjectiveScore != examReport.examPaperScore) ||
+          !status &&
+          examReport.subjectiveScore != examReport.examPaperScore &&
           examReport.examPaperId != 0
         "
       >
diff --git a/src/views/basic/test/index.vue b/src/views/basic/test/index.vue
index c18612a..e782f5f 100644
--- a/src/views/basic/test/index.vue
+++ b/src/views/basic/test/index.vue
@@ -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);
       }
diff --git a/src/views/basic/test/list.vue b/src/views/basic/test/list.vue
index 496c8aa..8d4d57a 100644
--- a/src/views/basic/test/list.vue
+++ b/src/views/basic/test/list.vue
@@ -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) {
diff --git a/src/views/examinationPaper/addQs.vue b/src/views/examinationPaper/addQs.vue
index 778579c..10efdd7 100644
--- a/src/views/examinationPaper/addQs.vue
+++ b/src/views/examinationPaper/addQs.vue
@@ -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;
--
libgit2 0.21.4