mjh 4 лет назад
Родитель
Сommit
2c3921fac7

+ 7 - 2
src/api/eval.js

@@ -3,11 +3,11 @@ const prefix = "/eval";
 import {axios} from "@/requests/axios.config";
 
 function getAllEvalExams(data) {
-  return axios.get(`${prefix}/exams`, data);
+  return axios.get(`${prefix}/exam/all`, data);
 }
 
 function getStudentEvalExams({pageSize, pageNum, state}){
-  return axios.get(`${prefix}/exams/student`, {
+  return axios.get(`${prefix}/exam/student`, {
     // pageSize、pageNum非必需,state必需,"0 所有, 1 未开始,2 进行中,3 已结束"
     params:{
       pageSize,
@@ -17,9 +17,14 @@ function getStudentEvalExams({pageSize, pageNum, state}){
   });
 }
 
+function getExampleEvalExams(){
+  return axios.get(`${prefix}/exam/recommend`);
+}
+
 const evalAPIs = {
   getAllEvalExams,
   getStudentEvalExams,
+  getExampleEvalExams,
 };
 
 export default evalAPIs;

+ 4 - 7
src/views/CoursePage/CourseDetail.vue

@@ -237,10 +237,10 @@ export default {
   },
   computed: {
     isStudent() {
-      return ["STUDENT", "ADMIN", "SEEC"].indexOf(this.$store.state.user.role) !== -1;
+      return this.$store.getters.isStudent;
     },
     isTeacher() {
-      return ["TEACHER", "ADMIN", "SEEC"].indexOf(this.$store.state.user.role) !== -1;
+      return this.$store.getters.isTeacher;
     },
     isCreator() {
       return this.courseInfo.teacher.id === this.$store.state.user.id;
@@ -260,7 +260,6 @@ export default {
             this.$apis.getAnnouncementsByCourseId(this.$route.params.id)
             .then(res => {
               this.announcementList = res.data.data;
-              console.log(this.announcementList);
             });
           });
       });
@@ -304,9 +303,8 @@ export default {
         createdAt: new Date(),
       };
       this.$apis.createAnnouncement(announcementVO)
-        .then(res => {
+        .then(() => {
           ElMessage.success("新建公告完成");
-
         })
         .catch(err => console.log(err));
     },
@@ -335,8 +333,7 @@ export default {
                 userId: this.$store.state.user.id,
               }
             )
-              .then(res => {
-                console.log(res);
+              .then(() => {
                 ElMessage.success("选课成功");
                 setTimeout(function () {
                   location.reload();

+ 5 - 2
src/views/ManagePage/ManagePage.vue

@@ -314,6 +314,7 @@ export default {
           this.dialogVisible = false;
           this.$refs.formRef.resetFields();
           this.form.courseTime = [null, null];
+          this.form.fileList = [];
         })
         .catch((err) => {
           console.log(err);
@@ -340,8 +341,9 @@ export default {
             this.myCourseList.push(res.data.data);
             this.dialogVisible = false;
             this.$refs.formRef.resetFields();
-            ElMessage.success("新建课程成功");
             this.form.courseTime = [null, null];
+            this.form.fileList = [];
+            ElMessage.success("新建课程成功");
           })
           .catch(err => {
             ElMessage.error(err);
@@ -371,8 +373,9 @@ export default {
             this.$refs["courseCard" + this.form.id][0].setCourseInfo(res.data.data);
             this.dialogVisible = false;
             this.$refs.formRef.resetFields();
-            ElMessage.success("更新课程成功");
             this.form.courseTime = [null, null];
+            this.form.fileList = [];
+            ElMessage.success("更新课程成功");
           })
           .catch(err => {
             console.log(err);

+ 21 - 20
src/views/PortalPage/PortalPage.vue

@@ -21,7 +21,8 @@
             <div style="font-size: small; font-weight: bold; color: #666666">登录以查看</div>
           </div>
 
-          <div v-if="isLogin && isStudent && myCourseList!==null && myCourseList.length!==0" :style="{height: (courseRowHeight - 63) + 'px'}"
+          <div v-if="isLogin && isStudent && myCourseList!==null && myCourseList.length!==0"
+               :style="{height: (courseRowHeight - 63) + 'px'}"
                class="portal-card-main">
             <div class="portal-my-card-main">
               <MyCourseCard v-for="course in myCourseList" :key="course.id" :courseVO="course"/>
@@ -83,7 +84,8 @@
           <div style="font-size: small; font-weight: bold; color: #666666">登录以查看</div>
         </div>
 
-        <div v-if="isLogin && isStudent && myTestList!==null && myTestList.length!==0" :style="{height: (testRowHeight - 63) + 'px'}"
+        <div v-if="isLogin && isStudent && myTestList!==null && myTestList.length!==0"
+             :style="{height: (testRowHeight - 63) + 'px'}"
              class="portal-card-main">
           <div class="portal-my-card-main">
             <MyTestCard v-for="test in myTestList" :key="test.id" :testVO="test"/>
@@ -153,7 +155,7 @@ import EvalCard from "@/components/EvalCard";
 import CoderCard from "@/components/CoderCard";
 import MyCourseCard from "@/views/PortalPage/components/MyCourseCard";
 import MyTestCard from "@/views/PortalPage/components/MyTestCard";
-import { Lock, SetUp, ShoppingCart } from "@element-plus/icons-vue";
+import {Lock, SetUp, ShoppingCart} from "@element-plus/icons-vue";
 
 export default {
   //数据
@@ -213,31 +215,30 @@ export default {
 
     this.$apis.getExampleCourses().then(res => {
       this.courseList = res.data.data;
-      while (this.courseList.length < 6) {
-        this.courseList.push({});
-      }
-    });
-    this.$apis.getAllEvalExams().then(res => {
-      // todo ERROR: 缺少 token 就无法请求
-      this.evalExamList = res.data.data.examVOList;
-      while (this.evalExamList.length < 6) {
-        this.evalExamList.push({});
-      }
+      // while (this.courseList.length < 6) {
+      //   this.courseList.push({});
+      // }
     });
-    this.$apis.getAllCoderExams().then(res => {
-      // todo ERROR: 缺少 token 就无法请求
-      this.coderExamList = res.data.data.res;
-      while (this.coderExamList.length < 6) {
-        this.coderExamList.push({});
-      }
+    this.$apis.getExampleEvalExams().then(res => {
+      this.evalExamList = res.data.data;
+      // while (this.evalExamList.length < 6) {
+      //   this.evalExamList.push({});
+      // }
     });
+    // this.$apis.getAllCoderExams().then(res => {
+    // todo ERROR: 缺少 token 就无法请求
+    //   this.coderExamList = res.data.data.res;
+    //   while (this.coderExamList.length < 6) {
+    //     this.coderExamList.push({});
+    //   }
+    // });
 
     if (this.isLogin && this.isStudent) {
       this.$apis.getStudentCourses(this.$store.state.user.id).then(res => {
         this.myCourseList = res.data.data;
         that.handleResize();
       });
-      this.$apis.getStudentEvalExams({ state: 0 }).then(res => {
+      this.$apis.getStudentEvalExams({state: 0}).then(res => {
         this.myEvalExamList = res.data.data.examVOList;
         that.handleResize();
       });