From 03cd547e3b4a4852294d543159d5cae550182e92 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Tue, 6 Feb 2024 15:55:17 +0800
Subject: [PATCH] 单体型以及其他类型试卷修改答案逻辑

---
 src/api/urls/apis.js                     |   2 +-
 src/views/basic/test/analysis.vue        |  81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------
 src/views/basic/test/components/test.vue | 493 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------
 src/views/basic/test/list.vue            |   2 ++
 src/views/examinationPaper/add.vue       |  12 +++++++-----
 src/views/examinationPaper/addQs.vue     |  22 ++++++++++++++++------
 src/views/examinationPaper/edit.vue      |  39 +++++++++++++++++++++++++++++----------
 src/views/examinationPaper/index.vue     |   3 ++-
 8 files changed, 497 insertions(+), 157 deletions(-)

diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index 7eb773e..4d21036 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -414,7 +414,7 @@ export default {
 
   // 删除班级信息(新)
   deleteClass: "/api_html/school/manager/deleteClass",
-  // 清除老师下所有关联班级
+  // 清除老师所有关联班级
   clearTeacherClasses: "/api_html/school/manager/clearTeacherClasses",
 
   // 下载即时测导入分数模板
diff --git a/src/views/basic/test/analysis.vue b/src/views/basic/test/analysis.vue
index df9f273..f0749a4 100644
--- a/src/views/basic/test/analysis.vue
+++ b/src/views/basic/test/analysis.vue
@@ -2,29 +2,62 @@
   <div ref="main" class="page-container">
     <back-box>
       <template slot="title">
-        <span>{{ type == 1 ? '单卷测练报表' : type == 2 ? subjectName + "汇总报表" : type == 3 ? "多科汇总报表" :
-          `多班_${subjectName}_${title}_测练成绩对比分析` }}</span>
+        <span>{{
+          type == 1
+            ? "单卷测练报表"
+            : type == 2
+            ? subjectName + "汇总报表"
+            : type == 3
+            ? "多科汇总报表"
+            : `多班_${subjectName}_${title}_测练成绩对比分析`
+        }}</span>
       </template>
     </back-box>
-    <Test v-if="type == 1" :role="role" :id="id" :classId="classId" :subjectName="subjectName" :title="title"
-      :score="score" />
-    <MultipleTest v-else-if="type == 2" :role="role" :ids="ids" :classId="classId" :subjectName="subjectName" />
-    <MultipleSubTest v-else-if="type == 3" :role="role" :ids="ids" :classId="classId" :subjectName="subjectName" />
-    <Contrast v-else-if="type == 4" :role="role" :ids="ids" :subjectName="subjectName" :title="title" />
+    <Test
+      v-if="type == 1"
+      :role="role"
+      :id="id"
+      :classId="classId"
+      :subjectName="subjectName"
+      :title="title"
+      :score="score"
+      :examType="examType"
+    />
+    <MultipleTest
+      v-else-if="type == 2"
+      :role="role"
+      :ids="ids"
+      :classId="classId"
+      :subjectName="subjectName"
+    />
+    <MultipleSubTest
+      v-else-if="type == 3"
+      :role="role"
+      :ids="ids"
+      :classId="classId"
+      :subjectName="subjectName"
+    />
+    <Contrast
+      v-else-if="type == 4"
+      :role="role"
+      :ids="ids"
+      :subjectName="subjectName"
+      :title="title"
+    />
   </div>
 </template>
 
 <script>
-import Test from "./components/test.vue"
-import MultipleTest from "./components/multipleTest.vue"
-import MultipleSubTest from "./components/multipleSubTest.vue"
-import Contrast from "./components/contrast.vue"
+import Test from "./components/test.vue";
+import MultipleTest from "./components/multipleTest.vue";
+import MultipleSubTest from "./components/multipleSubTest.vue";
+import Contrast from "./components/contrast.vue";
 export default {
   components: {
     Test,
     MultipleTest,
     MultipleSubTest,
-    Contrast
+    Contrast,
   },
   data() {
     return {
@@ -33,9 +66,10 @@ export default {
       ids: [],
       type: 0,
       classId: "",
-      subjectName: '',
-      title: '',
-      score: 0
+      subjectName: "",
+      title: "",
+      score: 0,
+      examType: 2,
     };
   },
   created() {
@@ -43,16 +77,16 @@ export default {
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
     this.id = this.$route.query.id || "";
+    this.examType = this.$route.query.examType || 2;
     this.score = Number(this.$route.query.score) || 0;
-    this.ids = this.$route.query.ids && this.$route.query.ids.split(",") || [];
-    this.type = this.$route.query.type
+    this.ids =
+      (this.$route.query.ids && this.$route.query.ids.split(",")) || [];
+    this.type = this.$route.query.type;
     this.classId = this.$route.query.classId || "";
-    this.title = this.$route.query.title || ""
-    this.subjectName = this.$route.query.subjectName || ""
+    this.title = this.$route.query.title || "";
+    this.subjectName = this.$route.query.subjectName || "";
   },
-  methods: {
-
-  }
+  methods: {},
 };
 </script>
 <style lang="scss" scoped>
@@ -67,8 +101,6 @@ export default {
   &.active {
     overflow: hidden;
   }
-
-
 }
 
 .error {
@@ -79,7 +111,6 @@ export default {
   padding: 20px 20px 0;
 }
 
-
 .down {
   padding-top: 20px;
   width: 100%;
diff --git a/src/views/basic/test/components/test.vue b/src/views/basic/test/components/test.vue
index 380f182..91ed041 100644
--- a/src/views/basic/test/components/test.vue
+++ b/src/views/basic/test/components/test.vue
@@ -8,47 +8,128 @@
         }}修改了答案，是否重新记分？
       </p>
       <div class="btn-box">
-        <el-button type="danger" round @click="_ReScore" size="mini">重新计分</el-button>
-        <el-button type="danger" round plain size="mini" @click="paperModifyLog.modifiedTime = ''">暂时不计</el-button>
+        <el-button type="danger" round @click="_ReScore" size="mini"
+          >重新计分</el-button
+        >
+        <el-button
+          type="danger"
+          round
+          plain
+          size="mini"
+          @click="paperModifyLog.modifiedTime = ''"
+          >暂时不计</el-button
+        >
       </div>
     </div>
     <div class="content-header">
       <div class="tab-box">
-        <span v-for="(item, index) in tabList" :key="item" class="tab-item" :class="type == index ? 'active' : ''"
-          @click="setType(index)">{{ item }}</span>
+        <span
+          v-for="(item, index) in tabList"
+          :key="item"
+          class="tab-item"
+          :class="type == index ? 'active' : ''"
+          @click="setType(index)"
+          >{{ item }}</span
+        >
       </div>
-      <el-button v-if="!status" class="setMinScore" @click="diaMinScore = true" round size="small">设置低分值</el-button>
+      <el-button
+        v-if="!status"
+        class="setMinScore"
+        @click="diaMinScore = true"
+        round
+        size="small"
+        >设置低分值</el-button
+      >
     </div>
     <div id="print-content" v-loading="loading">
       <div class="table-box">
-        <el-table :max-height="tableMaxHeight" v-show="type == 0" :data="tableData" border style="width: 100%">
-          <el-table-column prop="questionIndex" label="题号" align="center" fixed width="60"></el-table-column>
-          <el-table-column prop="questionType" label="题型" align="center" fixed width="100"><template slot-scope="scope">{{
-            setSubPro(scope.row.questionType)
-          }}</template></el-table-column>
-          <el-table-column prop="score" width="100" label="满分值" sortable align="center"></el-table-column>
-          <el-table-column width="110" prop="highestScore" label="班最高分" sortable align="center"></el-table-column>
-          <el-table-column width="110" prop="lowestScore" label="班最低分" sortable align="center"></el-table-column>
-          <el-table-column width="110" prop="avgScore" label="班平均分" sortable align="center"></el-table-column>
-          <el-table-column prop="classScoringRate" width="120" sortable label="班级得分率" align="center"><template
-              slot-scope="scoped">{{ scoped.row.classScoringRate }}%</template></el-table-column>
-          <el-table-column prop="correctAnswer" label="答案" align="center"><template slot-scope="scoped">{{
-            scoped.row.correctAnswer == 1
-            ? "✓"
-            : scoped.row.correctAnswer == 2
-              ? "✗"
-              : scoped.row.correctAnswer
-          }}</template>
+        <el-table
+          :max-height="tableMaxHeight"
+          v-show="type == 0"
+          :data="tableData"
+          border
+          style="width: 100%"
+        >
+          <el-table-column
+            prop="questionIndex"
+            label="题号"
+            align="center"
+            fixed
+            width="60"
+          ></el-table-column>
+          <el-table-column
+            prop="questionType"
+            label="题型"
+            align="center"
+            fixed
+            width="100"
+            ><template slot-scope="scope">{{
+              setSubPro(scope.row.questionType)
+            }}</template></el-table-column
+          >
+          <el-table-column
+            prop="score"
+            width="100"
+            label="满分值"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            width="110"
+            prop="highestScore"
+            label="班最高分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            width="110"
+            prop="lowestScore"
+            label="班最低分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            width="110"
+            prop="avgScore"
+            label="班平均分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="classScoringRate"
+            width="120"
+            sortable
+            label="班级得分率"
+            align="center"
+            ><template slot-scope="scoped"
+              >{{ scoped.row.classScoringRate }}%</template
+            ></el-table-column
+          >
+          <el-table-column prop="correctAnswer" label="答案" align="center"
+            ><template slot-scope="scoped">{{
+              scoped.row.correctAnswer == 1
+                ? "✓"
+                : scoped.row.correctAnswer == 2
+                ? "✗"
+                : scoped.row.correctAnswer
+            }}</template>
           </el-table-column>
-          <el-table-column v-for="(item, index) in optionsList" :key="index" :label="item.title" :prop="'count' + index"
-            align="center" width="120"><template slot-scope="scope">
+          <el-table-column
+            v-for="(item, index) in optionsList"
+            :key="index"
+            :label="item.title"
+            :prop="'count' + index"
+            align="center"
+            width="120"
+            ><template slot-scope="scope">
               <p class="persent">
                 {{
                   scope.row.questionType == "5"
-                  ? ""
-                  : scope.row["option" + index]
-                    ? `${scope.row["option" + index]}(${scope.row["persent" + index]
-                    })`
+                    ? ""
+                    : scope.row["option" + index]
+                    ? `${scope.row["option" + index]}(${
+                        scope.row["persent" + index]
+                      })`
                     : ""
                 }}
               </p>
@@ -86,18 +167,22 @@
                 <td>
                   {{
                     tr.correctAnswer == 1
-                    ? "✓"
-                    : tr.correctAnswer == 2
+                      ? "✓"
+                      : tr.correctAnswer == 2
                       ? "✗"
                       : tr.correctAnswer
                   }}
                 </td>
-                <td v-for="(item, index) in optionsList" :key="index" width="120">
+                <td
+                  v-for="(item, index) in optionsList"
+                  :key="index"
+                  width="120"
+                >
                   <p class="persent">
                     {{
                       tr.questionType == "5"
-                      ? ""
-                      : tr["option" + index]
+                        ? ""
+                        : tr["option" + index]
                         ? `${tr["option" + index]}(${tr["persent" + index]})`
                         : ""
                     }}
@@ -121,7 +206,9 @@
                 <span class="hui-s s2">{{
                   examReport.subjectiveAvgScore
                 }}</span>
-                <span class="hui-s s3">{{ examReport.subjectiveClassScoringRate }}%</span>
+                <span class="hui-s s3"
+                  >{{ examReport.subjectiveClassScoringRate }}%</span
+                >
               </li>
               <li class="hui-li">
                 <span class="hui-s s1">客观题</span>
@@ -133,7 +220,9 @@
                   examReport.objectiveLowestScore
                 }}</span>
                 <span class="hui-s s2">{{ examReport.objectiveAvgScore }}</span>
-                <span class="hui-s s3">{{ examReport.objectiveClassScoringRate }}%</span>
+                <span class="hui-s s3"
+                  >{{ examReport.objectiveClassScoringRate }}%</span
+                >
               </li>
               <li class="hui-li">
                 <span class="hui-s s1">整卷</span>
@@ -146,51 +235,176 @@
             </ul>
           </div>
         </div>
-        <el-table v-show="type == 1" :max-height="tableMaxHeight" :data="tableData2" border style="width: 100%"
-          :default-sort="{ prop: 'dadui', order: 'descending' }">
-          <el-table-column prop="studentCode" label="学号" align="center" fixed></el-table-column>
-          <el-table-column prop="studentName" label="姓名" fixed align="center"></el-table-column>
-          <el-table-column prop="examScore" label="总分" sortable align="center"></el-table-column>
-          <el-table-column prop="scoringRate" label="得分率" sortable align="center"><template slot-scope="scope">{{
-            scope.row.scoringRate }}%</template></el-table-column>
-          <el-table-column prop="classRank" label="班名" sortable align="center"></el-table-column>
+        <el-table
+          v-show="type == 1"
+          :max-height="tableMaxHeight"
+          :data="tableData2"
+          border
+          style="width: 100%"
+          :default-sort="{ prop: 'dadui', order: 'descending' }"
+        >
+          <el-table-column
+            prop="studentCode"
+            label="学号"
+            align="center"
+            fixed
+          ></el-table-column>
+          <el-table-column
+            prop="studentName"
+            label="姓名"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="examScore"
+            label="总分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="scoringRate"
+            label="得分率"
+            sortable
+            align="center"
+            ><template slot-scope="scope"
+              >{{ scope.row.scoringRate }}%</template
+            ></el-table-column
+          >
+          <el-table-column
+            prop="classRank"
+            label="班名"
+            sortable
+            align="center"
+          ></el-table-column>
           <el-table-column label="客观题" align="center">
-            <el-table-column prop="objectiveExamScore" label="得分" align="center"></el-table-column>
-            <el-table-column prop="objectiveScoringRate" label="得分率" align="center"><template slot-scope="scope">{{
-              scope.row.objectiveScoringRate }}%</template></el-table-column>
+            <el-table-column
+              prop="objectiveExamScore"
+              label="得分"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="objectiveScoringRate"
+              label="得分率"
+              align="center"
+              ><template slot-scope="scope"
+                >{{ scope.row.objectiveScoringRate }}%</template
+              ></el-table-column
+            >
           </el-table-column>
           <el-table-column label="主观题" align="center">
-            <el-table-column prop="subjectiveExamScore" label="得分" align="center"></el-table-column>
-            <el-table-column prop="subjectiveScoringRate" label="得分率" align="center"><template slot-scope="scope">{{
-              scope.row.subjectiveScoringRate }}%</template></el-table-column>
+            <el-table-column
+              prop="subjectiveExamScore"
+              label="得分"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="subjectiveScoringRate"
+              label="得分率"
+              align="center"
+              ><template slot-scope="scope"
+                >{{ scope.row.subjectiveScoringRate }}%</template
+              ></el-table-column
+            >
           </el-table-column>
         </el-table>
-        <el-table v-show="type == 2" :max-height="tableMaxHeight" :data="tableData2" border style="width: 100%"
-          :default-sort="{ prop: '', order: 'descending' }">
-          <el-table-column prop="studentCode" label="学号" fixed align="center" width="120"></el-table-column>
-          <el-table-column prop="studentName" label="姓名" fixed align="center"></el-table-column>
-          <el-table-column prop="examScore" label="总分" sortable align="center"></el-table-column>
+        <el-table
+          v-show="type == 2"
+          :max-height="tableMaxHeight"
+          :data="tableData2"
+          border
+          style="width: 100%"
+          :default-sort="{ prop: '', order: 'descending' }"
+        >
+          <el-table-column
+            prop="studentCode"
+            label="学号"
+            fixed
+            align="center"
+            width="120"
+          ></el-table-column>
+          <el-table-column
+            prop="studentName"
+            label="姓名"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="examScore"
+            label="总分"
+            sortable
+            align="center"
+          ></el-table-column>
           <el-table-column label="分数组成" align="center">
-            <el-table-column prop="objectiveExamScore" label="客观题分" align="center"></el-table-column>
-            <el-table-column prop="subjectiveExamScore" label="主观题分" align="center"></el-table-column>
+            <el-table-column
+              prop="objectiveExamScore"
+              label="客观题分"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="subjectiveExamScore"
+              label="主观题分"
+              align="center"
+            ></el-table-column>
           </el-table-column>
-          <el-table-column align="center" v-for="(item, index) in questionList" :key="index" :label="'Q' + item.id"
-            :prop="'score' + item.id">
+          <el-table-column
+            align="center"
+            v-for="(item, index) in questionList"
+            :key="index"
+            :label="'Q' + item.id"
+            :prop="'score' + item.id"
+          >
           </el-table-column>
         </el-table>
-        <el-table :max-height="tableMaxHeight" v-show="type == 3" :data="tableData2" border style="width: 100%"
-          :default-sort="{ prop: '', order: 'descending' }">
-          <el-table-column prop="studentCode" label="学号" fixed align="center"></el-table-column>
-          <el-table-column prop="studentName" label="姓名" fixed align="center"></el-table-column>
-          <el-table-column prop="className" label="班级" align="center"></el-table-column>
-          <el-table-column prop="examScore" label="总分" sortable align="center"></el-table-column>
-          <el-table-column align="center" v-for="(item, index) in questionList" :key="index" :label="'Q' + item.id">
+        <el-table
+          :max-height="tableMaxHeight"
+          v-show="type == 3"
+          :data="tableData2"
+          border
+          style="width: 100%"
+          :default-sort="{ prop: '', order: 'descending' }"
+        >
+          <el-table-column
+            prop="studentCode"
+            label="学号"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="studentName"
+            label="姓名"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="className"
+            label="班级"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="examScore"
+            label="总分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            v-for="(item, index) in questionList"
+            :key="index"
+            :label="'Q' + item.id"
+          >
             <template slot-scope="scope">
               <span v-if="tableData[index]?.questionType == 5">*</span>
-              <span v-else-if="scope.row['answer' + item.id]" :class="scope.row['isRight' + item.id] ? '' : 'error'">
+              <span
+                v-else-if="scope.row['answer' + item.id]"
+                :class="scope.row['isRight' + item.id] ? '' : 'error'"
+              >
                 {{ scope.row["answer" + item.id] }}
               </span>
-              <span v-else :class="scope.row['questionType' + item.id] == 5 ? '' : 'error'">-</span>
+              <span
+                v-else
+                :class="scope.row['questionType' + item.id] == 5 ? '' : 'error'"
+                >-</span
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -198,22 +412,56 @@
     </div>
     <div class="down">
       <div>
-        <el-button @click="exportData" type="primary" plain round icon="fa fa-cloud-download">导出报表</el-button>
-        <el-button v-if="!this.$store.getters.code" @click="print" type="primary" plain round
-          icon="el-icon-printer">打印</el-button>
+        <el-button
+          @click="exportData"
+          type="primary"
+          plain
+          round
+          icon="fa fa-cloud-download"
+          >导出报表</el-button
+        >
+        <el-button
+          v-if="!this.$store.getters.code"
+          @click="print"
+          type="primary"
+          plain
+          round
+          icon="el-icon-printer"
+          >打印</el-button
+        >
       </div>
       <div v-if="!status">
-        <el-button type="primary" round @click="openScoreSet">答卷录分</el-button>
+        <el-button type="primary" round @click="openScoreSet"
+          >答卷录分</el-button
+        >
 
         <template v-if="role != 'ROLE_BANZHUREN'">
-          <el-button @click="edit" type="primary" v-if="examReport.subjectiveScore != examReport.examPaperScore"
-            round>查看题目</el-button></template>
+          <el-button
+            @click="edit"
+            type="primary"
+            v-if="examReport.subjectiveScore != examReport.examPaperScore"
+            round
+            >查看题目</el-button
+          ></template
+        >
       </div>
     </div>
-    <ScoreSet v-show="diaScoreSet" :role="role" :id="id" :title="title" :examScore="score" :diaScoreSet="diaScoreSet"
-      @closeScoreSet="closeScoreSet" />
-    <el-dialog :close-on-click-modal="false" title="低分区间设置" :visible.sync="diaMinScore" width="480px"
-      @closed="closeDiaMinScore">
+    <ScoreSet
+      v-show="diaScoreSet"
+      :role="role"
+      :id="id"
+      :title="title"
+      :examScore="score"
+      :diaScoreSet="diaScoreSet"
+      @closeScoreSet="closeScoreSet"
+    />
+    <el-dialog
+      :close-on-click-modal="false"
+      title="低分区间设置"
+      :visible.sync="diaMinScore"
+      width="480px"
+      @closed="closeDiaMinScore"
+    >
       <el-form>
         <el-form-item label="低分设置模式:">
           <el-select v-model="lowRange.type" @change="changeScore">
@@ -223,16 +471,35 @@
           </el-select>
         </el-form-item>
         <el-form-item label="低分区间:">
-          <el-input class="score-ipt" type="number" v-model="lowRange.range[0]" :min="0" :max="100"
+          <el-input
+            class="score-ipt"
+            type="number"
+            v-model="lowRange.range[0]"
+            :min="0"
+            :max="100"
             @input="lowRange.range[1] > 100 ? (lowRange.range[1] = 100) : ''"
-            @keydown.native="keydownRange($event)"></el-input>{{ lowRange.type != 0 ? "%" : "分" }}(含)
-          <el-input class="score-ipt" type="number" v-model="lowRange.range[1]" :min="0" :max="100"
+            @keydown.native="keydownRange($event)"
+          ></el-input
+          >{{ lowRange.type != 0 ? "%" : "分" }}(含)
+          <el-input
+            class="score-ipt"
+            type="number"
+            v-model="lowRange.range[1]"
+            :min="0"
+            :max="100"
             @input="lowRange.range[1] > 100 ? (lowRange.range[1] = 100) : ''"
-            @keydown.native="keydownRange($event)"></el-input>{{ lowRange.type != 0 ? "%" : "分" }}(含)
+            @keydown.native="keydownRange($event)"
+          ></el-input
+          >{{ lowRange.type != 0 ? "%" : "分" }}(含)
         </el-form-item>
       </el-form>
 
-      <div class="dialog-footer" slot="footer" align="center" v-loading="loadingTange">
+      <div
+        class="dialog-footer"
+        slot="footer"
+        align="center"
+        v-loading="loadingTange"
+      >
         <el-button type="danger" @click="_SavelowRange">保存</el-button>
         <el-button @click="diaMinScore = false">取 消</el-button>
       </div>
@@ -240,7 +507,7 @@
   </div>
 </template>
 <script>
-import ScoreSet from "./scoreSet.vue"
+import ScoreSet from "./scoreSet.vue";
 import { downloadFile, tablePrint } from "@/utils";
 export default {
   components: {
@@ -252,20 +519,22 @@ export default {
     title: String,
     classId: String,
     subjectName: String,
+    examType: String,
     score: {
       type: Number,
-      default: 0
+      default: 0,
     },
   },
   data() {
     return {
-      status: 0,// 1:已归档试卷
+      status: 0, // 1:已归档试卷
       tableMaxHeight: 600,
       loading: false,
       exportLoading: false,
       tabList: ["试题分析", "成绩排名", "小题分报表", "作答明细表"],
       type: 0,
-      paperModifyLog: { //修改信息
+      paperModifyLog: {
+        //修改信息
         realName: "",
         modifiedTime: "",
       },
@@ -309,7 +578,7 @@ export default {
 
       //导出相关
       diaShow: false,
-      exportStudent: []
+      exportStudent: [],
     };
   },
   created() {
@@ -330,7 +599,7 @@ export default {
     },
     //关闭设置分数
     closeScoreSet() {
-      this.diaScoreSet = false
+      this.diaScoreSet = false;
       this._QueryData();
     },
     setType(type) {
@@ -362,6 +631,7 @@ export default {
           paperId: this.id,
           title: this.title,
           type: 2,
+          examType: this.examType,
         },
       });
     },
@@ -386,9 +656,12 @@ export default {
     },
     // 保存低分设置
     async _SavelowRange() {
-      if (this.lowRange.range[0].trim() == "" || this.lowRange.range[1].trim() == "") {
+      if (
+        this.lowRange.range[0].trim() == "" ||
+        this.lowRange.range[1].trim() == ""
+      ) {
         this.$message.warning("请补全低分设置！");
-        return
+        return;
       }
       this.loadingTange = true;
       let { data, status, info } = await this.$request.setLowRange({
@@ -413,9 +686,10 @@ export default {
     async examDetail() {
       //详情
       this.loading = true;
-      const examDetail = this.role == "ROLE_PERSONAL" ?
-        this.$request.pExamDetail
-        : this.$request.examDetail;
+      const examDetail =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pExamDetail
+          : this.$request.examDetail;
 
       let { data, info, status } = await examDetail({
         examId: this.id,
@@ -444,7 +718,7 @@ export default {
       });
       this.loading = false;
       if (status === 0) {
-        this.$store.commit("setRefreshTestList", true)
+        this.$store.commit("setRefreshTestList", true);
         this.$message.success(info);
         this._QueryData();
         this.paperModifyLog.modifiedTime = "";
@@ -456,9 +730,10 @@ export default {
     async examStudentReport() {
       //成绩排名-小题分-作答明细
       this.loading = true;
-      const examStudentReport = this.role == "ROLE_PERSONAL" ?
-        this.$request.pExamStudentReport
-        : this.$request.examStudentReport;
+      const examStudentReport =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pExamStudentReport
+          : this.$request.examStudentReport;
       let { data, info, status } = await examStudentReport({
         examId: this.id,
       });
@@ -491,7 +766,7 @@ export default {
         this.questionList = optionsList.sort((a, b) => {
           return a.id - b.id;
         });
-        this.exportStudent = [...this.tableData2]
+        this.exportStudent = [...this.tableData2];
       } else {
         this.$message.error(info);
       }
@@ -499,9 +774,10 @@ export default {
     async examQuestionReport() {
       //试题分析
       this.loading = true;
-      const examQuestionReport = this.role == "ROLE_PERSONAL" ?
-        this.$request.pExamQuestionReport
-        : this.$request.examQuestionReport;
+      const examQuestionReport =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pExamQuestionReport
+          : this.$request.examQuestionReport;
 
       let { data, info, status } = await examQuestionReport({
         examId: this.id,
@@ -537,8 +813,8 @@ export default {
                   ? defaultArr[index]?.option == 1
                     ? "✓"
                     : defaultArr[index]?.option == 2
-                      ? "✗"
-                      : defaultArr[index]?.option
+                    ? "✗"
+                    : defaultArr[index]?.option
                   : "";
               items["title"] = "选项" + (index + 1);
             } else {
@@ -567,9 +843,10 @@ export default {
     async exportData() {
       if (this.exportLoading == true) return;
       this.exportLoading = true;
-      const exportExamReport = this.role == "ROLE_PERSONAL" ?
-        this.$request.pExportExamReport
-        : this.$request.exportExamReport;
+      const exportExamReport =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pExportExamReport
+          : this.$request.exportExamReport;
 
       const data = await exportExamReport({
         examId: this.id,
@@ -624,8 +901,6 @@ div::-webkit-scrollbar-thumb {
   color: #f30;
 }
 
-
-
 .tips {
   height: 48px;
   box-sizing: border-box;
diff --git a/src/views/basic/test/list.vue b/src/views/basic/test/list.vue
index f78194e..2197d82 100644
--- a/src/views/basic/test/list.vue
+++ b/src/views/basic/test/list.vue
@@ -299,6 +299,7 @@ export default {
           subjectName: obj.subjectName,
           classId: this.query.classId[0],
           params: this.$route.query.params,
+          examType: obj.examPaperId == 0 ? 1 : 2,
         },
       });
     },
@@ -404,6 +405,7 @@ export default {
           paperId: item.id,
           title: item.title,
           type: 2,
+          examType: item.examType || 1,
         },
       });
     },
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index ddb613e..393dfac 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -1260,13 +1260,13 @@ export default {
       this.stem.indexs = indexs;
       this.stem.type = type;
       if (type == 1) {
-        if (obj.screenshot == "") {
+        if (!obj.screenshot || obj.screenshot == "") {
           this.iframeLoading = false;
         }
         this.stem.screenshot = obj.screenshot || "";
         this.stem.answerScreenshot = "";
       } else {
-        if (obj.answerScreenshot == "") {
+        if (!obj.answerScreenshot || obj.answerScreenshot == "") {
           this.iframeLoading = false;
         }
         this.stem.answerScreenshot = obj.answerScreenshot || "";
@@ -2044,10 +2044,12 @@ export default {
         let subjectArr = [];
         this.subjectList =
           data.subjectNames?.map((item) => {
-            subjectArr.push(item.subjectName || item);
+            let subName =
+              this.role == "ROLE_PERSONAL" ? item.subjectName : item;
+            subjectArr.push(subName);
             return {
-              value: this.role == "ROLE_PERSONAL" ? item.subjectName : item,
-              label: this.role == "ROLE_PERSONAL" ? item.subjectName : item,
+              value: subName,
+              label: subName,
             };
           }) || [];
         if (this.subjectList.length) {
diff --git a/src/views/examinationPaper/addQs.vue b/src/views/examinationPaper/addQs.vue
index c9e154e..7e4721c 100644
--- a/src/views/examinationPaper/addQs.vue
+++ b/src/views/examinationPaper/addQs.vue
@@ -448,7 +448,7 @@
           </div>
         </el-dialog>
       </div>
-      <div v-show="step == 2">
+      <div v-if="step == 2">
         <div class="answer-title">
           <p class="name">{{ form.title }}</p>
         </div>
@@ -547,6 +547,7 @@ export default {
       listShare: 0,
       uploadUrl: "/file/uploadImgToHtml",
       iframeLoading: false,
+      subjectName: "",
     };
   },
   computed: {
@@ -588,6 +589,7 @@ export default {
     this.listShare = this.$route.query.listShare
       ? this.$route.query.listShare
       : 0;
+    this.subjectName = this.$route.query.subjectName || "";
     this.type = this.$route.query.type ? this.$route.query.type : 1;
     this.role =
       this.$store.getters.info.showRole ||
@@ -622,13 +624,13 @@ export default {
       this.stem.indexs = indexs;
       this.stem.type = type;
       if (type == 1) {
-        if (obj.screenshot == "") {
+        if (!obj.screenshot || obj.screenshot == "") {
           this.iframeLoading = false;
         }
         this.stem.screenshot = obj.screenshot || "";
         this.stem.answerScreenshot = "";
       } else {
-        if (obj.answerScreenshot == "") {
+        if (!obj.answerScreenshot || obj.answerScreenshot == "") {
           this.iframeLoading = false;
         }
         this.stem.answerScreenshot = obj.answerScreenshot || "";
@@ -1121,15 +1123,23 @@ export default {
       }
       const { data, status, info } = await fetchSubjectList({ ...query });
       if (status === 0) {
+        let subjectArr = [];
         this.subjectList =
           data.subjectNames?.map((item) => {
+            let subName =
+              this.role == "ROLE_PERSONAL" ? item.subjectName : item;
+            subjectArr.push(subName);
             return {
-              value: this.role == "ROLE_PERSONAL" ? item.subjectName : item,
-              label: this.role == "ROLE_PERSONAL" ? item.subjectName : item,
+              value: subName,
+              label: subName,
             };
           }) || [];
         if (this.subjectList.length) {
-          this.form.subjectName = this.subjectList[0].value;
+          if (subjectArr.includes(this.$route.query.subjectName)) {
+            this.form.subjectName = this.$route.query.subjectName;
+          } else {
+            this.form.subjectName = this.subjectList[0].value;
+          }
         }
       } else {
         this.$message.error(info);
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index bd3e2c3..3d28168 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -23,10 +23,7 @@
         <p class="totals">卷面总分：{{ allScore }}分</p>
       </div>
       <div class="question-box">
-        <ul
-          class="questions-ul questions-ul2"
-          v-if="!questionList[0]?.subQuestions"
-        >
+        <ul class="questions-ul questions-ul2" v-if="examType == 1">
           <li class="sub-questions">
             <div class="qs-num">题号</div>
             <div class="qs-type">题型</div>
@@ -155,9 +152,9 @@
             </div>
           </li>
         </ul>
-        <template v-if="questionList[0]?.subQuestions">
+        <template v-if="examType == 2">
           <template v-for="(question, index) in questionList">
-            <p class="question-title">
+            <p class="question-title" v-if="paperType == 2">
               <span>{{ setBigNum(index) }}、</span>
               <el-input
                 class="ipt"
@@ -167,7 +164,10 @@
               ></el-input>
               <span>共 {{ setScore(question) }} 分</span>
             </p>
-            <div class="questions-ul">
+            <div
+              class="questions-ul"
+              :class="paperType == 1 ? 'questions-ul2' : ''"
+            >
               <div class="sub-questions">
                 <div class="qs-num">题号</div>
                 <div class="qs-type">题型</div>
@@ -195,7 +195,7 @@
                   >
                 </p>
                 <div v-else class="sub-questions">
-                  <div class="qs-num">{{ subQuestions.questionIndex }}</div>
+                  <div class="qs-num">{{ setNum(index, indexs) }}</div>
                   <div class="qs-type">
                     {{ setSubPro(subQuestions.questionType) }}
                   </div>
@@ -531,6 +531,7 @@ export default {
       gradeClassList: [], //学段列表
       uploadUrl: "/file/uploadImgToHtml",
       iframeLoading: false,
+      examType: 2,
     };
   },
   computed: {
@@ -580,6 +581,7 @@ export default {
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
     this.type = this.$route.query.type || 1;
+    this.examType = this.$route.query.examType || 2;
     this.paperType = this.$route.query.paperType || 1;
     this.form.title = this.$route.query.title || "";
     this._QueryDetail();
@@ -594,13 +596,13 @@ export default {
       this.stem.index = index;
       this.stem.indexs = indexs;
       if (type == 1) {
-        if (obj.screenshot == "") {
+        if (!obj.screenshot || obj.screenshot == "") {
           this.iframeLoading = false;
         }
         this.stem.screenshot = obj.screenshot || "";
         this.stem.answerScreenshot = "";
       } else {
-        if (obj.answerScreenshot == "") {
+        if (!obj.answerScreenshot || obj.answerScreenshot == "") {
           this.iframeLoading = false;
         }
         this.stem.answerScreenshot = obj.answerScreenshot || "";
@@ -724,6 +726,23 @@ export default {
 
       return txt;
     },
+    //计算题号
+    setNum(index, indexs, sub) {
+      let lengths = 0; //所在大题之前的所有小题数量
+      let subIndex = 0; //所在大题的位置
+      for (let i = 0; i < index; i++) {
+        let subArr = this.questionList[i].subQuestions.filter((item) => {
+          return !!item.questionType;
+        });
+        lengths += subArr.length;
+      }
+      for (let i = 0; i < indexs; i++) {
+        if (!!this.questionList[index].subQuestions[i].questionType) {
+          subIndex += 1;
+        }
+      }
+      return lengths + subIndex + 1;
+    },
     setScore(question) {
       let score = question.subQuestions.reduce((a, b) => {
         return a + (b.score || 0);
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index 1c31043..9a3a2e3 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -414,6 +414,7 @@ export default {
           ...query,
           listType: this.query.type,
           listShare: this.query.share,
+          subjectName: this.query.subjectName,
         },
       };
       this.$router.push(routerItem);
@@ -887,7 +888,7 @@ export default {
 
   .img-box {
     position: relative;
-    color: #409EFF;
+    color: #409eff;
 
     .img {
       position: absolute;
--
libgit2 0.21.4