zhangjie преди 8 месеца
родител
ревизия
7e96bedfac

+ 5 - 0
src/modules/mark/components/ScoreCheckDetail.vue

@@ -278,6 +278,11 @@
           label="状态"
           label="状态"
           width="80"
           width="80"
         ></el-table-column>
         ></el-table-column>
+        <el-table-column
+          prop="paperType"
+          label="卷型"
+          width="80"
+        ></el-table-column>
         <el-table-column
         <el-table-column
           prop="objectiveScore"
           prop="objectiveScore"
           label="客观分"
           label="客观分"

+ 5 - 0
src/modules/mark/components/ScoreClassDetail.vue

@@ -212,6 +212,11 @@
             label="状态"
             label="状态"
             width="80"
             width="80"
           ></el-table-column>
           ></el-table-column>
+          <el-table-column
+            prop="paperType"
+            label="卷型"
+            width="80"
+          ></el-table-column>
           <el-table-column
           <el-table-column
             prop="totalScore"
             prop="totalScore"
             label="成绩"
             label="成绩"

+ 31 - 8
src/modules/mark/components/markParam/MarkParamObjectiveAnswer.vue

@@ -16,6 +16,16 @@
         </p>
         </p>
 
 
         <div>
         <div>
+          <el-select
+            v-model="curPaperType"
+            placeholder="选择卷型"
+            :clearable="false"
+            style="width: 100px; margin-right: 10px"
+            @change="paperTypeChange"
+          >
+            <el-option value="A" label="A卷"></el-option>
+            <el-option value="B" label="B卷"></el-option>
+          </el-select>
           <el-button type="primary" @click="toImport">导入标答</el-button>
           <el-button type="primary" @click="toImport">导入标答</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -179,10 +189,7 @@
       title="导入客观题标答"
       title="导入客观题标答"
       :upload-url="uploadUrl"
       :upload-url="uploadUrl"
       :format="['xls', 'xlsx']"
       :format="['xls', 'xlsx']"
-      :upload-data="{
-        examId: basicInfo.examId,
-        paperNumber: basicInfo.paperNumber,
-      }"
+      :upload-data="uploadData"
       :download-handle="downloadHandle"
       :download-handle="downloadHandle"
       :download-filename="dfilename"
       :download-filename="dfilename"
       :auto-upload="false"
       :auto-upload="false"
@@ -217,6 +224,8 @@ export default {
         NONE: "全对给分",
         NONE: "全对给分",
         ALL: "任选给分",
         ALL: "任选给分",
       },
       },
+      curPaperType: "A",
+      prevPaperType: "A",
       // import
       // import
       uploadUrl: "/api/admin/mark/question/objective/import",
       uploadUrl: "/api/admin/mark/question/objective/import",
       dfilename: "客观题标答导入模板.xlsx",
       dfilename: "客观题标答导入模板.xlsx",
@@ -225,6 +234,13 @@ export default {
   },
   },
   computed: {
   computed: {
     ...mapState("markParam", ["basicInfo"]),
     ...mapState("markParam", ["basicInfo"]),
+    uploadData() {
+      return {
+        examId: this.basicInfo.examId,
+        paperNumber: this.basicInfo.paperNumber,
+        paperType: this.curPaperType,
+      };
+    },
   },
   },
   mounted() {
   mounted() {
     this.initData();
     this.initData();
@@ -260,6 +276,13 @@ export default {
         return nitem;
         return nitem;
       });
       });
     },
     },
+    paperTypeChange() {
+      if (!this.checkData()) {
+        this.curPaperType = this.prevPaperType;
+        return;
+      }
+      this.prevPaperType = this.curPaperType;
+    },
     getRowClassName({ row }) {
     getRowClassName({ row }) {
       let classNames = [];
       let classNames = [];
       if (row.mainFirstSub) {
       if (row.mainFirstSub) {
@@ -373,6 +396,7 @@ export default {
       const datas = {
       const datas = {
         examId: this.basicInfo.examId,
         examId: this.basicInfo.examId,
         paperNumber: this.basicInfo.paperNumber,
         paperNumber: this.basicInfo.paperNumber,
+        paperType: this.curPaperType,
         objectiveInfo: this.tableData.map((item) =>
         objectiveInfo: this.tableData.map((item) =>
           omit(item, ["mainFirstSub", "expandSub", "error", "errMsg", "mainId"])
           omit(item, ["mainFirstSub", "expandSub", "error", "errMsg", "mainId"])
         ),
         ),
@@ -384,6 +408,8 @@ export default {
       this.$message.success(
       this.$message.success(
         "保存成功,请到成绩检查菜单点击客观题统分按钮进行统分!"
         "保存成功,请到成绩检查菜单点击客观题统分按钮进行统分!"
       );
       );
+
+      // TODO:检查其他卷是否已提交
       // this.$emit("confirm");
       // this.$emit("confirm");
     },
     },
     cancel() {
     cancel() {
@@ -395,10 +421,7 @@ export default {
       this.downloading = true;
       this.downloading = true;
 
 
       const res = await downloadByApi(() => {
       const res = await downloadByApi(() => {
-        return markObjectiveQuestionExport({
-          examId: this.basicInfo.examId,
-          paperNumber: this.basicInfo.paperNumber,
-        });
+        return markObjectiveQuestionExport(this.uploadData);
       }).catch((e) => {
       }).catch((e) => {
         this.$message.error(e || "下载失败,请重新尝试!");
         this.$message.error(e || "下载失败,请重新尝试!");
       });
       });

+ 5 - 0
src/modules/mark/views/ScoreManage.vue

@@ -62,6 +62,11 @@
           label="试卷编号"
           label="试卷编号"
           width="200"
           width="200"
         ></el-table-column>
         ></el-table-column>
+        <el-table-column
+          prop="paperType"
+          label="卷型"
+          width="80"
+        ></el-table-column>
         <el-table-column
         <el-table-column
           prop="studentCount"
           prop="studentCount"
           label="总考生"
           label="总考生"