chenken 6 лет назад
Родитель
Сommit
6e58a98532

+ 2 - 2
src/modules/oe/component/audit.vue

@@ -26,12 +26,12 @@
   </div>
 </template>
 <script>
-import { disciplineTypeList } from "../constants/constants";
+import { DISCIPLINE_TYPE_LIST } from "../constants/constants";
 export default {
   props: ["auditForm"],
   data() {
     return {
-      disciplineTypeList: disciplineTypeList
+      disciplineTypeList: DISCIPLINE_TYPE_LIST
     };
   }
 };

+ 12 - 4
src/modules/oe/component/commonForm.vue

@@ -94,7 +94,7 @@
   </el-form>
 </template>
 <script>
-import { courseLevels } from "../constants/constants";
+import { COURSE_LEVELS } from "../constants/constants";
 import { mapState } from "vuex";
 export default {
   props: ["form", "getExamCondition"],
@@ -103,7 +103,7 @@ export default {
       examList: [],
       courseList: [],
       orgList: [],
-      courseLevels: courseLevels
+      courseLevels: COURSE_LEVELS
     };
   },
   computed: {
@@ -119,13 +119,21 @@ export default {
           params: this.getExamCondition.params
         })
         .then(response => {
-          this.examList = response.data;
+          var examList = response.data;
           if (this.getExamCondition.filterCondition == "IS_FACE_ENABLE") {
-            this.examList = this.examList.filter(function(e) {
+            examList = examList.filter(function(e) {
               //查询开启人脸识别的
               return e.properties["IS_FACE_ENABLE"] == "true";
             });
+          } else if (this.getExamCondition.filterCondition == "OVERDUE") {
+            //缺考登记
+            examList = examList.filter(function(e) {
+              var now = new Date().getTime();
+              var endTime = new Date(e.endTime).getTime();
+              return now > endTime; //查询考试结束时间已过期的
+            });
           }
+          this.examList = examList;
         });
     },
     getOrgs(orgName) {

+ 3 - 1
src/modules/oe/component/examSummaryLine.vue

@@ -25,9 +25,11 @@ export default {
       this.$http
         .get(
           "/api/ecs_oe_admin/exam/student/courseProgress/list?examId=" +
-            this.examId
+            this.examId +
+            "&isForChart=true"
         )
         .then(response => {
+          debugger;
           var resp = response.data;
           resp.sort(function(a, b) {
             if (b["completedProportion"] != a["completedProportion"]) {

+ 3 - 3
src/modules/oe/constants/constants.js

@@ -1,9 +1,9 @@
-export const courseLevels = [
+export const COURSE_LEVELS = [
   { code: "GQZ", name: "高起专" },
   { code: "GQB", name: "高起本" },
   { code: "ZSB", name: "专升本" }
 ];
-export const auditExplainList = [
+export const AUDIT_EXPLAIN_LIST = [
   { name: "CHEAT", desc: "作弊" },
   { name: "NOT_ONESELF", desc: "他人替考" },
   { name: "NOT_ONESELF_OF_PHOTO", desc: "相片替考" },
@@ -12,7 +12,7 @@ export const auditExplainList = [
   { name: "BATCH_NOTPASS", desc: "批量审核不通过" },
   { name: "OTHER", desc: "其他" }
 ];
-export const disciplineTypeList = [
+export const DISCIPLINE_TYPE_LIST = [
   { name: "CHEAT", desc: "作弊" },
   { name: "NOT_ONESELF", desc: "他人替考" },
   { name: "NOT_ONESELF_OF_PHOTO", desc: "相片替考" },

+ 2 - 2
src/modules/oe/views/absent.vue

@@ -79,13 +79,13 @@ export default {
         studentCode: null,
         studentName: null,
         pageNo: 1,
-        pageSize: "10",
+        pageSize: 10,
         rootOrgId: "",
         auditStatus: null
       },
       getExamCondition: {
         params: { name: "", examTypes: "ONLINE#OFFLINE" },
-        filterCondition: "IS_FACE_ENABLE"
+        filterCondition: "OVERDUE"
       },
       tableData: [],
       exportUrl: "/api/ecs_oe_admin/exam/student/unfinished/list/export",

+ 2 - 2
src/modules/oe/views/alreadyAudited.vue

@@ -119,12 +119,12 @@
 <script>
 import { mapState } from "vuex";
 import commonFormVue from "../component/commonForm.vue";
-import { auditExplainList } from "../constants/constants";
+import { AUDIT_EXPLAIN_LIST } from "../constants/constants";
 export default {
   components: { commonFormVue },
   data() {
     return {
-      auditExplainList: auditExplainList,
+      auditExplainList: AUDIT_EXPLAIN_LIST,
       total: 0,
       tableLoading: false,
       form: {

+ 2 - 2
src/modules/oe/views/examDetail.vue

@@ -149,12 +149,12 @@
 import { mapState } from "vuex";
 import commonFormVue from "../component/commonForm.vue";
 import commonExportVue from "../component/commonExport.vue";
-import { disciplineTypeList } from "../constants/constants";
+import { DISCIPLINE_TYPE_LIST } from "../constants/constants";
 export default {
   components: { commonFormVue, commonExportVue },
   data() {
     return {
-      disciplineTypeList: disciplineTypeList,
+      disciplineTypeList: DISCIPLINE_TYPE_LIST,
       total: 0,
       tableLoading: false,
       form: {

+ 2 - 3
src/modules/oe/views/examSummary.vue

@@ -28,13 +28,12 @@
           </el-form>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row :gutter="2">
         <el-col :span="10" class="chart-border">
           <div class="chart-header">考试进度情况</div>
           <examSummaryPie :examId="examId"></examSummaryPie>
         </el-col>
-        <el-col :span="1">&nbsp;</el-col>
-        <el-col :span="13" class="chart-border">
+        <el-col :span="14" class="chart-border">
           <div class="chart-header">课程完成进度TOP5</div>
           <examSummaryLine :examId="examId"></examSummaryLine>
         </el-col>

+ 2 - 2
src/modules/oe/views/illegalityNameList.vue

@@ -100,12 +100,12 @@
 import { mapState } from "vuex";
 import commonFormVue from "../component/commonForm.vue";
 import commonExportVue from "../component/commonExport.vue";
-import { disciplineTypeList } from "../constants/constants";
+import { DISCIPLINE_TYPE_LIST } from "../constants/constants";
 export default {
   components: { commonFormVue, commonExportVue },
   data() {
     return {
-      disciplineTypeList: disciplineTypeList,
+      disciplineTypeList: DISCIPLINE_TYPE_LIST,
       total: 0,
       tableLoading: false,
       exportLoading: false,

+ 2 - 2
src/modules/oe/views/scoreStatistics.vue

@@ -82,12 +82,12 @@
 import { mapState } from "vuex";
 import commonFormVue from "../component/commonForm.vue";
 import commonExportVue from "../component/commonExport.vue";
-import { disciplineTypeList } from "../constants/constants";
+import { DISCIPLINE_TYPE_LIST } from "../constants/constants";
 export default {
   components: { commonFormVue, commonExportVue },
   data() {
     return {
-      disciplineTypeList: disciplineTypeList,
+      disciplineTypeList: DISCIPLINE_TYPE_LIST,
       total: 0,
       tableLoading: false,
       form: {