md

src/components/base/ClazzSelect.vue

@@ -35,8 +35,8 @@ export default {
           semesterId: "",
           examTypeId: "",
           courseCode: "",
-          kkCollegeName: "",
-          kcCollegeName: "",
+          openCollege: "",
+          kcCollege: "",
         };
       },
     },

src/components/base/KcCollegeSelect.vue

@@ -35,7 +35,7 @@ export default {
           semesterId: "",
           examTypeId: "",
           courseCode: "",
-          kkCollegeName: "",
+          openCollege: "",
         };
       },
     },

src/components/base/TeacherSelect.vue

@@ -35,8 +35,8 @@ export default {
           semesterId: "",
           examTypeId: "",
           courseCode: "",
-          kkCollegeName: "",
-          kcCollegeName: "",
+          openCollege: "",
+          kcCollege: "",
         };
       },
     },

src/modules/base/api.js

@@ -19,15 +19,15 @@ export const courseQuery = (datas) => {
   return $postParam("/api/common/course/list", datas);
 };
 export const kcCollegeQuery = (datas) => {
-  // semesterId,examTypeId,courseCode,kkCollegeName,
+  // semesterId,examTypeId,courseCode,openCollege,
   return $postParam("/api/common/examine/college/list", datas);
 };
 export const examClazzQuery = (datas) => {
-  // semesterId,examTypeId,courseCode,kkCollegeName,kcCollegeName
+  // semesterId,examTypeId,courseCode,openCollege,kcCollege
   return $postParam("/api/common/clazz/list", datas);
 };
 export const examTeacherQuery = (datas) => {
-  // semesterId,examTypeId,courseCode,kkCollegeName,kcCollegeName,clazzId
+  // semesterId,examTypeId,courseCode,openCollege,kcCollege,clazzId
   return $postParam("/api/common/teacher/list", datas);
 };
 // user --------------------------------->
@@ -170,11 +170,11 @@ export const assignmentCalculate = (datas) => {
   return $post("/api/assign/calc", datas);
 };
 export const assignmentCalcResult = (datas) => {
-  // required: semesterId,examTypeId,courseCode,kkCollegeName,
-  // kcCollegeName,clazzId,teacherCode
+  // required: semesterId,examTypeId,courseCode,openCollege,
+  // kcCollege,clazzId,teacherCode
   return $postParam("/api/assign/result", datas);
 };
 export const assignmentCompareResult = (datas) => {
-  // semesterId,examTypeId,courseCode,kkCollegeName,passScore
+  // semesterId,examTypeId,courseCode,openCollege,passScore
   return $postParam("/api/assign/contrast", datas);
 };

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

@@ -1,7 +1,7 @@
 <template>
   <div class="assign-compare">
     <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
-      <el-form-item label="卷面总分：">
+      <!-- <el-form-item label="卷面总分：">
         <el-input-number
           v-model.number="filter.scope"
           :min="0"
@@ -11,10 +11,10 @@
           :controls="false"
           style="width: 130px"
         ></el-input-number>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="及格分：">
         <el-input-number
-          v-model.number="filter.scope"
+          v-model.number="filter.passScore"
           :min="0"
           :max="99999"
           :step="0.1"
@@ -31,7 +31,7 @@
     <table class="table">
       <tr>
         <th rowspan="2">对比项</th>
-        <th colspan="3">总体有效人数：45人</th>
+        <th colspan="3">总体有效人数：{{ result.size }}人</th>
       </tr>
       <tr>
         <th>平均分</th>
@@ -40,15 +40,15 @@
       </tr>
       <tr>
         <td>赋分前</td>
-        <td></td>
-        <td></td>
-        <td></td>
+        <td>{{ result.assignBeforeAverageScore }}</td>
+        <td>{{ result.assignBeforeFailRate }}</td>
+        <td>{{ result.assignBeforeFailCount }}</td>
       </tr>
       <tr>
         <td>赋分后</td>
-        <td></td>
-        <td></td>
-        <td></td>
+        <td>{{ result.assignAfterAverageScore }}</td>
+        <td>{{ result.assignAfterFailRate }}</td>
+        <td>{{ result.assignAfterFailCount }}</td>
       </tr>
     </table>
   </div>
@@ -70,22 +70,20 @@ export default {
   data() {
     return {
       filter: {
-        semesterId: "",
-        examTypeId: "",
-        collegeId: "",
-        examId: "",
+        passScore: "",
       },
-      dataList: [],
+      result: {},
     };
   },
   methods: {
     async search() {
       const datas = {
+        ...this.assignInfo,
         ...this.filter,
       };
 
       const data = await assignmentCompareResult(datas);
-      this.dataList = data || [];
+      this.result = data || {};
     },
   },
 };

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

@@ -2,10 +2,27 @@
   <div class="assign-result">
     <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
       <el-form-item label="考查学院：">
-        <kc-college-select v-model="filter.kcCollegeName"></kc-college-select>
+        <kc-college-select
+          v-model="filter.kcCollege"
+          :filter-data="assignInfo"
+        ></kc-college-select>
+      </el-form-item>
+      <el-form-item label="班级：">
+        <clazz-select
+          v-model="filter.clazzId"
+          :filter-data="{ ...assignInfo, kcCollege: filter.kcCollege }"
+        ></clazz-select>
+      </el-form-item>
+      <el-form-item label="任课老师：">
+        <teacher-select
+          v-model="filter.teacherCode"
+          :filter-data="{
+            ...assignInfo,
+            kcCollege: filter.kcCollege,
+            clazzId: filter.clazzId,
+          }"
+        ></teacher-select>
       </el-form-item>
-      <el-form-item label="班级："> </el-form-item>
-      <el-form-item label="任课老师："> </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="toPage(1)">查询</el-button>
       </el-form-item>
@@ -14,30 +31,34 @@
     <el-table ref="TableList" :data="dataList">
       <el-table-column prop="courseCode" label="课程代码"></el-table-column>
       <el-table-column prop="courseName" label="课程名称"></el-table-column>
-      <el-table-column prop="stdno" label="学号"></el-table-column>
-      <el-table-column prop="stdName" label="姓名"></el-table-column>
+      <el-table-column prop="studentCode" label="学号"></el-table-column>
+      <el-table-column prop="studentName" label="姓名"></el-table-column>
       <el-table-column
-        prop="examId"
+        prop="objectiveScore"
         label="客观总分"
         width="90"
       ></el-table-column>
       <el-table-column
-        prop="examId"
+        prop="subjectiveScore"
         label="主观总分"
         width="90"
       ></el-table-column>
-      <el-table-column prop="examId" label="总分" width="80"></el-table-column>
-      <el-table-column prop="xnm" label="评分明细"></el-table-column>
-      <el-table-column prop="xqm" label="班级"></el-table-column>
-      <el-table-column prop="xqm" label="学院"></el-table-column>
-      <el-table-column prop="xqm" label="任课老师"></el-table-column>
       <el-table-column
-        prop="xqm"
+        prop="totalScore"
+        label="总分"
+        width="80"
+      ></el-table-column>
+      <el-table-column prop="scoreDetail" label="评分明细"></el-table-column>
+      <el-table-column prop="clazzName" label="班级"></el-table-column>
+      <el-table-column prop="collegeName" label="学院"></el-table-column>
+      <el-table-column prop="teacherName" label="任课老师"></el-table-column>
+      <el-table-column
+        prop="assignScore"
         label="赋分后总分"
         width="100"
       ></el-table-column>
     </el-table>
-    <div class="part-page">
+    <!-- <div class="part-page">
       <el-pagination
         background
         layout="total,prev, pager, next"
@@ -48,7 +69,7 @@
         @current-change="toPage"
       >
       </el-pagination>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -68,7 +89,7 @@ export default {
   data() {
     return {
       filter: {
-        kcCollegeName: "",
+        kcCollege: "",
         clazzId: "",
         teacherCode: "",
       },
@@ -81,13 +102,14 @@ export default {
   methods: {
     async getList() {
       const datas = {
-        ...this.filter,
         ...this.assignInfo,
+        ...this.filter,
       };
 
       const data = await assignmentCalcResult(datas);
-      this.dataList = data.records;
-      this.total = data.total;
+      this.dataList = data || [];
+      // this.dataList = data.records;
+      // this.total = data.total;
     },
     toPage(page) {
       this.current = page;

src/modules/base/views/AssignmentCalculateDetail.vue

@@ -54,7 +54,7 @@
       <assign-result
         ref="AssignResult"
         class="part-box part-box-pad"
-        :assign-info="curAssignInfo"
+        :assign-info="assignData"
       ></assign-result>
     </div>
     <div class="ass-part">
@@ -64,7 +64,7 @@
       <assign-compare
         ref="AssignCompare"
         class="part-box part-box-pad"
-        :assign-info="curAssignInfo"
+        :assign-info="assignData"
       ></assign-compare>
     </div>
   </div>
@@ -86,6 +86,7 @@ export default {
   data() {
     return {
       curAssignInfo: {},
+      assignData: {},
       detailInfo: {
         semesterId: "",
         examTypeId: "",
@@ -100,8 +101,11 @@ export default {
       dataReady: false,
     };
   },
-  mounted() {
+  created() {
     this.curAssignInfo = this.$ls.get("curAssignInfo");
+    this.assignData = { ...this.curAssignInfo };
+    delete this.assignData.courseCode;
+
     this.getData();
   },
   beforeDestroy() {