md

src/modules/mark/components/ScoreCheckDetail.vue

@@ -43,22 +43,22 @@
         </el-form-item>
         <el-form-item label="检查条件">
           <el-select v-model="filter.filter" placeholder="检查条件">
-            <el-option :value="0">无</el-option>
-            <el-option :value="1">客观题0分</el-option>
-            <el-option :value="2">客观题0分，主观题有分</el-option>
-            <el-option :value="3">主观题有分，客观题0分</el-option>
+            <el-option :value="0" label="无"></el-option>
+            <el-option :value="1" label="客观题0分"></el-option>
+            <el-option :value="2" label="客观题0分，主观题有分"></el-option>
+            <el-option :value="3" label="主观题有分，客观题0分"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="是否缺考">
           <el-select v-model="filter.absent" placeholder="是否缺考" clearable>
-            <el-option :value="1">缺考</el-option>
-            <el-option :value="0">正常</el-option>
+            <el-option :value="1" label="缺考"></el-option>
+            <el-option :value="0" label="正常"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="是否违纪">
           <el-select v-model="filter.breach" placeholder="是否违纪" clearable>
-            <el-option :value="1">违纪</el-option>
-            <el-option :value="0">正常</el-option>
+            <el-option :value="1" label="违纪"></el-option>
+            <el-option :value="0" label="正常"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="试卷总分">

src/modules/mark/components/markParam/MarkParamStructure.vue

@@ -131,6 +131,7 @@
               step-strictly
               :controls="false"
               placeholder="小题分值"
+              @change="totalScoreChange(scope.row)"
             ></el-input-number>
           </template>
         </el-table-column>
@@ -157,7 +158,7 @@
               class="width-full"
               size="small"
               :min="0.5"
-              :max="500"
+              :max="scope.row.totalScore"
               :step="0.5"
               step-strictly
               :controls="false"
@@ -426,6 +427,7 @@ export default {
         .filter((item) => item.mainId === row.mainId)
         .forEach((item) => {
           item.totalScore = val;
+          item.intervalScore = Math.min(item.totalScore, item.intervalScore);
         });
     },
     intervalScorePerTopicChange(val, row) {
@@ -433,9 +435,12 @@ export default {
       this.tableData
         .filter((item) => item.mainId === row.mainId)
         .forEach((item) => {
-          item.intervalScore = val;
+          item.intervalScore = Math.min(item.totalScore, val);
         });
     },
+    totalScoreChange(row) {
+      row.intervalScore = Math.min(row.totalScore, row.intervalScore);
+    },
     checkData() {
       let errorMessages = [];
       this.tableData.forEach((item) => {

src/modules/mark/components/markParam/MarkParamSubjectiveAnswer.vue

@@ -114,6 +114,7 @@ export default {
       this.loading = false;
       if (!data) return;
 
+      this.answerFileUrl = data;
       this.$message.success("上传成功！");
       // this.$emit("confirm");
     },

src/modules/mark/components/markParam/ModifyMarkParams.vue

@@ -191,6 +191,9 @@ export default {
       if (this.isLastStep) {
         this.selectMenu(this.tabs[0].val);
       } else {
+        if (this.curTab === "structure") {
+          this.questionSubmit = true;
+        }
         if (this.curTab === "group" && !this.openMarkClass) {
           this.selectMenu(this.tabs[this.current + 2].val);
         } else {