md

src/modules/base/components/assignment/AssignConfig.vue

@@ -43,18 +43,38 @@
         prop="detail"
       >
         <el-radio-group v-model="modalForm.all">
-          <el-radio :label="true">统一设置</el-radio>
-          <el-radio :label="false">按考查学院设置</el-radio>
+          <el-radio-button :label="true">统一设置</el-radio-button>
+          <el-radio-button :label="false">按考查学院设置</el-radio-button>
         </el-radio-group>
-        <br />
-        <el-input-number
-          v-if="modalForm.all"
-          v-model.number="modalForm.value"
-          :min="0"
-          :controls="false"
-          placeholder="请填写赋分系数"
-          @change="allRateChange"
-        ></el-input-number>
+        <el-checkbox
+          v-model="modalForm.openRebuild"
+          class="ml-4"
+          @change="openRebuildChange"
+          >重修单独设置赋分系数</el-checkbox
+        >
+        <el-checkbox v-model="modalForm.openRound"
+          >赋分后59分自动加1</el-checkbox
+        >
+      </el-form-item>
+      <el-form-item>
+        <div v-if="modalForm.all">
+          <el-input-number
+            v-model.number="modalForm.value"
+            :min="0"
+            :controls="false"
+            placeholder="写赋分系数"
+            @change="allRateChange"
+          ></el-input-number>
+          <el-input-number
+            v-if="modalForm.openRebuild"
+            v-model.number="modalForm.rebuildValue"
+            class="ml-2"
+            :min="0"
+            :controls="false"
+            placeholder="重考赋分系数"
+            @change="allRateReChange"
+          ></el-input-number>
+        </div>
         <div v-else class="rate-details">
           <div
             class="rate-detail"
@@ -67,7 +87,15 @@
                 v-model.number="item.value"
                 :min="0"
                 :controls="false"
-                placeholder="请填写赋分系数"
+                placeholder="赋分系数"
+              ></el-input-number>
+              <el-input-number
+                v-if="modalForm.openRebuild"
+                v-model.number="item.rebuildValue"
+                class="ml-2"
+                :min="0"
+                :controls="false"
+                placeholder="重考赋分系数"
               ></el-input-number>
             </div>
           </div>
@@ -149,7 +177,10 @@ export default {
         id: null,
         formula: "",
         all: true,
+        openRebuild: false,
         value: undefined,
+        rebuildValue: undefined,
+        openRound: false,
         detail: [],
       },
       formulas: {
@@ -187,10 +218,13 @@ export default {
   mounted() {
     this.modalForm.id = this.detailInfo.id;
     this.modalForm.formula = this.detailInfo.formula;
+    this.modalForm.openRound = this.detailInfo.openRound;
     if (this.detailInfo.coefficient) {
       const coefficient = JSON.parse(this.detailInfo.coefficient);
       this.modalForm.all = coefficient.all;
+      this.modalForm.openRebuild = coefficient.openRebuild;
       this.modalForm.value = coefficient.value;
+      this.modalForm.rebuildValue = coefficient.rebuildValue;
       this.modalForm.detail = coefficient.detail || [];
     }
     this.detailData = { ...this.detailInfo };
@@ -199,6 +233,7 @@ export default {
         return {
           college: item,
           value: undefined,
+          rebuildValue: undefined,
         };
       });
     }
@@ -240,6 +275,21 @@ export default {
         item.value = val;
       });
     },
+    allRateReChange(val) {
+      this.modalForm.detail.forEach((item) => {
+        item.rebuildValue = val;
+      });
+    },
+    openRebuildChange(val) {
+      if (!val) this.modalForm.rebuildValue = undefined;
+
+      this.modalForm.detail.forEach((item) => {
+        item.rebuildValue =
+          val && this.modalForm.rebuildValue
+            ? this.modalForm.rebuildValue
+            : undefined;
+      });
+    },
     async toPublish() {
       if (!this.modalForm.id || this.detailData.status !== "FINISH") {
         return;
@@ -268,6 +318,7 @@ export default {
         ...this.assignInfo,
         id: this.modalForm.id,
         formula: this.modalForm.formula,
+        openRound: this.modalForm.openRound,
         coefficient: this.modalForm,
       };
       this.detailData.errorMsg = "";

src/modules/base/views/EcsDataManage.vue

@@ -132,7 +132,7 @@ export default {
       }
 
       const result = await this.$confirm(
-        `请确认下载的考务数据文件中的课程代码与导入云阅卷课程代码是否相同。相同，则点击【是】继续同步操作无不相同，则点击【否】进入课程关联管理进行对应关系导入操作。?`,
+        `请确认下载的考务数据文件中的课程代码与导入云阅卷课程代码是否相同。相同，则点击【是】继续同步操作。不相同，则点击【否】进入课程关联管理进行对应关系导入操作。`,
         "提示",
         {
           type: "warning",