Преглед на файлове

fix: 修复教师无法点入eval测试的bug

yhd12345 преди 3 години
родител
ревизия
1571221386
променени са 1 файла, в които са добавени 36 реда и са изтрити 60 реда
  1. 36 60
      src/views/EvalPage/teacherExamDetails.vue

+ 36 - 60
src/views/EvalPage/teacherExamDetails.vue

@@ -90,9 +90,9 @@
       <el-card class="box-card">
         <span style="font-size: 20px">评测名单</span>
         <el-table :data="joinedUsers" style="width: 100%">
-          <el-table-column type="index" width="50"/>
-          <el-table-column prop="name" label="用户名" width="180"/>
-          <el-table-column prop="email" label="邮箱" width="180"/>
+          <el-table-column type="index" width="100"/>
+          <el-table-column prop="name" label="用户名" width="360"/>
+          <el-table-column prop="email" label="邮箱" width="360"/>
           <el-table-column prop="score" label="成绩"/>
         </el-table>
       </el-card>
@@ -114,6 +114,7 @@ import examQuestionsInfo from "@/views/EvalPage/ExamQuestionsInfo.vue";
 import questionList from "@/views/EvalPage/QuestionList.vue";
 import Vue from "vue-pdf-embed";
 import vue from "vue";
+import dayjs from "dayjs";
 
 export default {
   name: "teacherExamDetails",
@@ -140,6 +141,27 @@ export default {
 
   },
 
+
+  created() {
+    this.examId = this.$route.params.examId;
+    // const examId = 47;
+    console.log(this.examId);
+    this.$apis.getExamById(this.examId).then(_res => {
+      this.examInfo = _res.data.data.result;
+      console.log(this.examInfo);
+      this.examInfo.skills = this.examInfo.skills.toString();
+      this.state=this.computeExamStateText(this.examInfo.startTime,this.examInfo.endTime);
+      console.log(this.state);
+
+
+    });
+  },
+  mounted() {
+    this.getExamQuestions();
+    this.getExamJoiners();
+  },
+
+
   methods: {
     onClickHideButton() {
       this.showQuestionInfo = false;
@@ -208,69 +230,23 @@ export default {
       });
     },
 
-    strFormatToDate(formatStr, dateStr) {
-      let year = 0;
-      let start = -1;
-      const len = dateStr.length;
-      if ((start = formatStr.indexOf("yyyy")) > -1 && start < len) {
-        year = dateStr.substr(start, 4);
-      }
-      let month = 0;
-      if ((start = formatStr.indexOf("MM")) > -1 && start < len) {
-        month = parseInt(dateStr.substr(start, 2)) - 1;
-      }
-      let day = 0;
-      if ((start = formatStr.indexOf("dd")) > -1 && start < len) {
-        day = parseInt(dateStr.substr(start, 2));
-      }
-      let hour = 0;
-      if (((start = formatStr.indexOf("HH")) > -1 || (start = formatStr.indexOf("hh")) > 1) && start < len) {
-        hour = parseInt(dateStr.substr(start, 2));
-      }
-      let minute = 0;
-      if ((start = formatStr.indexOf("mm")) > -1 && start < len) {
-        minute = dateStr.substr(start, 2);
-      }
-      let second = 0;
-      if ((start = formatStr.indexOf("ss")) > -1 && start < len) {
-        second = dateStr.substr(start, 2);
-      }
-      return new Date(year, month, day, hour, minute, second);
-    },
 
-    getState(startTime,endTime){
-      // console.log(this.strFormatToDate("yyyy-MM-dd HH:mm:ss",startTime));
-      if (this.strFormatToDate("yyyy-MM-dd HH:mm:ss",endTime) < new Date()) {
+    computeExamStateText(startTime, endTime) {
+      const TIME_FORMAT = "YYYY-MM-DD HH:mm:ss";
+      const now = dayjs();
+      const formattedStartTime = dayjs(startTime, TIME_FORMAT);
+      const formattedEndTime = dayjs(endTime, TIME_FORMAT);
+
+      if (formattedEndTime < now) {
         return "FINISHED";
-      } else if (this.strFormatToDate("yyyy-MM-dd HH:mm:ss",startTime) > new Date()) {
+      }
+      if (formattedStartTime > now) {
         return "NOT_STARTED";
-      } else {
-        return "RUNNING";
-
       }
-    }
-  },
-
-  created() {
-    this.examId = this.$route.params.examId;
-    // const examId = 47;
-    console.log(this.examId);
-    this.$apis.getExamById(this.examId).then(_res => {
-      this.examInfo = _res.data.data.result;
-      console.log(this.examInfo);
-      this.examInfo.skills = this.examInfo.skills.toString();
-      this.state=this.getState(this.examInfo.startTime,this.examInfo.endTime);
-      console.log(this.state);
-
+      return "RUNNING";
+    },
 
-    });
   },
-  mounted() {
-    this.getExamQuestions();
-    this.getExamJoiners();
-  },
-
-
 
 };
 </script>