feat: 新需求

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eds-web",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "scripts": {
     "start": "npm run serve",
     "serve": "vue-cli-service serve",

src/components/base/CourseSelect.vue

@@ -31,6 +31,7 @@ export default {
     clearable: { type: Boolean, default: true },
     semesterId: { type: String, default: "" },
     examTypeId: { type: String, default: "" },
+    collegeId: { type: String, default: "" },
   },
   data() {
     return {
@@ -59,6 +60,13 @@ export default {
         this.$emit("change", {});
       }
     },
+    collegeId(val, oldval) {
+      if (val !== oldval) {
+        this.search();
+        this.$emit("input", "");
+        this.$emit("change", {});
+      }
+    },
   },
   async created() {
     this.search();
@@ -70,6 +78,7 @@ export default {
       let data = {
         semesterId: this.semesterId,
         examTypeId: this.examTypeId,
+        collegeId: this.collegeId,
       };
 
       const res = await courseQuery(data);

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

@@ -58,6 +58,12 @@
         <el-checkbox v-model="modalForm.openTotalScoreRound"
           >原始分四舍五入</el-checkbox
         >
+        <el-checkbox v-model="modalForm.open54To53"
+          >赋分后等于54分调整赋分分值为53</el-checkbox
+        >
+        <el-checkbox v-model="modalForm.open54d5"
+          >赋分后如果小于等于54.5的取原始分值</el-checkbox
+        >
       </el-form-item>
       <el-form-item v-if="modalForm.formula === 'FORMULA1'">
         <div v-if="modalForm.all">
@@ -104,6 +110,11 @@
           </div>
         </div>
       </el-form-item>
+      <el-form-item v-if="modalForm.formula === 'FORMULA2'" label="规则：">
+        <el-checkbox v-model="modalForm.openFetchOriginScore"
+          >赋分后小于原始分值取原始分值</el-checkbox
+        >
+      </el-form-item>
       <el-form-item
         v-if="modalForm.formula === 'FORMULA2'"
         label="参数："
@@ -186,6 +197,9 @@ export default {
         openRound: false,
         openTotalScoreRound: false,
         detail: [],
+        open54To53: false,
+        open54d5: false,
+        openFetchOriginScore: false,
       },
       formulas: {
         FORMULA1: "公式1",

src/modules/base/views/AssignmentCalculate.vue

@@ -26,6 +26,7 @@
             style="width: 300px"
             :semester-id="filter.semesterId"
             :exam-type-id="filter.examTypeId"
+            :college-id="filter.collegeId"
           ></course-select>
         </el-form-item>
         <el-form-item>

src/modules/base/views/AssignmentCalculateDetail.vue

@@ -3,6 +3,7 @@
     <div class="ass-part">
       <div class="box-justify mb-2">
         <h3>开课课程考试情况总览</h3>
+        <el-button type="primary" plain @click="toback">返回</el-button>
       </div>
       <div class="part-box part-box-pad ass-summary">
         <div class="ass-summary-tags">
@@ -117,6 +118,9 @@ export default {
       this.detailInfo = res || {};
       this.dataReady = true;
     },
+    toback() {
+      this.$router.back();
+    },
   },
 };
 </script>

src/modules/base/views/EcsDataManage.vue

@@ -23,6 +23,37 @@
             :college-id="filter.collegeId"
           ></ecs-exam-select>
         </el-form-item>
+        <el-form-item label="云阅卷课程代码">
+          <el-input
+            v-model="filter.cloudMarkingCourseCode"
+            placeholder="云阅卷课程代码"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="考务数据课程代码">
+          <el-input
+            v-model="filter.syncCourseCode"
+            placeholder="考务数据课程代码"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="学号">
+          <el-input
+            v-model="filter.studentCode"
+            placeholder="学号"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="是否关联">
+          <el-select v-model="filter.related" placeholder="是否关联" clearable>
+            <el-option
+              v-for="(val, key) in BOOLEAN_TYPE"
+              :key="key"
+              :value="key * 1"
+              :label="val"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="toPage(1)">查询</el-button>
         </el-form-item>
@@ -93,6 +124,7 @@
 <script>
 import { ecsDataList, syncEcsData } from "../api";
 import DataTaskDialog from "../components/DataTaskDialog.vue";
+import { BOOLEAN_TYPE } from "@/constants/enumerate";
 
 export default {
   name: "ecs-data-manage",
@@ -104,11 +136,16 @@ export default {
         examTypeId: "",
         collegeId: "",
         examId: "",
+        cloudMarkingCourseCode: "",
+        syncCourseCode: "",
+        studentCode: "",
+        related: null,
       },
       current: 1,
       size: this.GLOBAL.pageSize,
       total: 0,
       dataList: [],
+      BOOLEAN_TYPE,
     };
   },
   async mounted() {