Merge remote-tracking branch 'origin/seec' into seec

src/views/CoursePage/tabs/TaskTab.vue

@@ -62,18 +62,18 @@
           </el-tag>
           <el-row v-if="task['examId']" class="timeline-content">
             <el-tag v-if="this.state(task)==='NOT_STARTED'" size="small" >未开始</el-tag>
-            <el-tag v-else-if="this.state(task)==='RUNNING' && task['isJoined']" size="small" type="success">
+            <el-tag v-else-if="this.state(task)==='RUNNING' && task['joined']" size="small" type="success">
               已参加
             </el-tag>
-            <el-tag v-else-if="this.state(task)==='RUNNING' && !task['isJoined']" size="small">未参加</el-tag>
+            <el-tag v-else-if="this.state(task)==='RUNNING' && !task['joined']" size="small">未参加</el-tag>
             <el-tag v-else-if="this.state(task)==='FINISHED'" size="small" type="info">已结束</el-tag>
             <el-tag v-else-if="this.state(task)==='CLOSED'" size="small" type="info">已关闭</el-tag>
           </el-row>
           <el-row v-else class="timeline-content">
             <el-tag v-if="this.state(task)==='NOT_STARTED'" size="small">未开始</el-tag>
-            <el-tag v-else-if="this.state(task)==='RUNNING' && task['isJoined']" size="small" type="success">已参加
+            <el-tag v-else-if="this.state(task)==='RUNNING' && task['joined']" size="small" type="success">已参加
             </el-tag>
-            <el-tag v-else-if="this.state(task)==='RUNNING' && !task['isJoined']" size="small">未参加</el-tag>
+            <el-tag v-else-if="this.state(task)==='RUNNING' && !task['joined']" size="small">未参加</el-tag>
             <el-tag v-else-if="this.state(task)==='CLOSED'" size="small" type="info">已关闭</el-tag>
             <el-tag v-else-if="this.state(task)==='FINISHED'" size="small" type="danger">已结束</el-tag>
           </el-row>
@@ -96,7 +96,7 @@
         <el-input disabled :placeholder="courseName"/>
       </el-form-item>
       <el-form-item label="测试名称" prop="name">
-        <el-input class="course-form-item" v-model="coderExamForm.name" placeholder="请输入课程名称"></el-input>
+        <el-input class="course-form-item" v-model="coderExamForm.name" placeholder="请输入测试名称"></el-input>
       </el-form-item>
       <el-form-item label="测试时间" prop="range">
         <el-date-picker v-model="coderExamForm.range" range-separator="至"
@@ -323,9 +323,11 @@ export default {
       } else if (this.isStudent) {
         if (_this.evalId !== null) {
           _this.evalExamList = (await _this.$apis.getStudentEvalExamsByCourseId(_this.evalId)).data.data || [];
+          console.log(_this.evalExamList);
         }
         if (_this.coderId !== null) {
           _this.coderExamList = (await _this.$apis.getStudentCoderExamsByCourseId(_this.coderId)).data.data || [];
+          console.log(_this.coderExamList);
         }
       }
     },