Prechádzať zdrojové kódy

feat: 对接了管理页面下的测试题数据

mjh 4 rokov pred
rodič
commit
0474948600

+ 10 - 5
src/api/coder.js

@@ -5,10 +5,14 @@ import {axios} from "@/requests/axios.config";
 function getStudentCoderExams({page, limit}) {
   return axios.get(`${prefix}/exam/student`, {
     // page和limit非必需
-    params: {
-      page,
-      limit,
-    }
+    params: {page, limit,}
+  });
+}
+
+function getTeacherCoderExams({page, limit}) {
+  return axios.get(`${prefix}/exam/teacher`, {
+    // page和limit非必需
+    params: {page, limit,}
   });
 }
 
@@ -26,12 +30,13 @@ function getTeacherCoderExamsByCourseId(courseId) {
   return axios.get(`${prefix}/exam/teacher/course`, {params: {courseId,}});
 }
 
-function getStudentCoderExamsByCourseId(courseId){
+function getStudentCoderExamsByCourseId(courseId) {
   return axios.get(`${prefix}/exam/student/course`, {params: {courseId,}});
 }
 
 const coderAPIs = {
   getStudentCoderExams,
+  getTeacherCoderExams,
   getExampleCoderExams,
   getTeacherCoderExamsByCourseId,
   getStudentCoderExamsByCourseId,

+ 8 - 6
src/api/eval.js

@@ -6,15 +6,16 @@ function getAllEvalExams(data) {
   return axios.get(`${prefix}/exam/all`, data);
 }
 
+function getTeacherEvalExams({pageSize, pageNum, state}){
+  return axios.get(`${prefix}/exam/teacher`, {
+    // pageSize、pageNum非必需,state必需,"0 所有, 1 未开始,2 进行中,3 已结束"
+    params:{pageSize, pageNum, state}});
+}
+
 function getStudentEvalExams({pageSize, pageNum, state}) {
   return axios.get(`${prefix}/exam/student`, {
     // pageSize、pageNum非必需,state必需,"0 所有, 1 未开始,2 进行中,3 已结束"
-    params: {
-      pageSize,
-      pageNum,
-      state,
-    }
-  });
+    params: {pageSize, pageNum, state,}});
 }
 
 function getExampleEvalExams() {
@@ -39,6 +40,7 @@ function getStudentEvalExamsByCourseId(courseId){
 
 const evalAPIs = {
   getAllEvalExams,
+  getTeacherEvalExams,
   getStudentEvalExams,
   getExampleEvalExams,
   getTeacherEvalExamsByCourseId,

+ 4 - 2
src/components/GlobalHeader.vue

@@ -4,7 +4,7 @@
     <img id="global-header-logo" alt="err" src="@/assets/seec-logo--full.png" @click="this.$router.push('/portal')">
     <el-menu :default-active="activeMenu" mode="horizontal" @select="handleMenuSelect">
       <el-menu-item index="1">首页</el-menu-item>
-      <el-menu-item index="2">任务</el-menu-item>
+      <el-menu-item v-if="isStudent" index="2">任务</el-menu-item>
       <el-submenu index="3">
         <template #title>{{ quickAccessTitle }}</template>
         <el-menu-item index="3-1">全部课程</el-menu-item>
@@ -81,6 +81,9 @@ export default {
     isTeacher() {
       return this.$store.getters.isTeacher;
     },
+    isStudent(){
+      return this.$store.getters.isStudent;
+    },
     activeMenu() {
       let out = "1";
       this.menuIndex.forEach(i => {
@@ -119,7 +122,6 @@ export default {
         });
       this.$apis.getUnreadMessages()
         .then(res=>{
-          console.log(res);
           this.myUnReadMessages = res.data.data;
         })
         .catch();

+ 8 - 1
src/router/index.js

@@ -90,13 +90,20 @@ router.beforeEach((to, from, next) => {
     });
     next({name: "Auth", params: {login_to: to.path}});
   } else {
-    if (to.name === "Manage" && !(["SEEC", "TEACHER", "ADMIN"].indexOf(store.state.user.role) !== -1)) {
+    if (to.name === "Manage" && !store.getters.isTeacher) {
       ElMessage({
         showClose: true,
         message: "当前用户无权访问教师页面",
         type: "error",
         duration: 1000,
       });
+    } else if (to.name === "Task" && !store.getters.isStudent) {
+      ElMessage({
+        showClose: true,
+        message: "当前用户无需访问任务页面",
+        type: "warning",
+        duration: 1000,
+      });
     } else {
       next();
     }

+ 8 - 4
src/views/ManagePage/ManagePage.vue

@@ -40,7 +40,8 @@
                   :value="item.value"
                 />
               </el-select>
-              <el-button class="ml-16" plain type="primary" @click="dialogTitle='新增课程';dialogVisible=true;switchDisabled=false;">
+              <el-button class="ml-16" plain type="primary"
+                         @click="dialogTitle='新增课程';dialogVisible=true;switchDisabled=false;">
                 新建课程
               </el-button>
             </div>
@@ -77,8 +78,6 @@
             </div>
           </div>
         </template>
-        暂无数据,接口还没对
-        <!-- todo 暂无数据,接口还没对-->
         <el-tabs v-model="activeTestPaneName">
           <el-tab-pane class="test-page-main" label="评测题" name="eval">
             <EvalCard v-for="item in evalExamList" :key="item.id" :examVO="item"/>
@@ -287,7 +286,12 @@ export default {
     this.$apis.getTeacherCourses().then(res => {
       this.myCourseList = res.data.data;
     });
-
+    this.$apis.getTeacherEvalExams({state: 0}).then(res => {
+      this.evalExamList = res.data.data.examVOList;
+    });
+    this.$apis.getTeacherCoderExams({}).then(res => {
+      this.coderExamList = res.data.data.res;
+    });
   },
   methods: {
     handleSelect(index) {

+ 6 - 6
src/views/MessagePage/MessagePage.vue

@@ -34,7 +34,7 @@
           <MessageCard v-for="i in myUnReadAnnouncement" :key="i.id" :messageVO="i"/>
         </div>
         <div v-else class="message-page-main">
-          <MessageCard v-for="i in myUnReadAnnouncement" :key="i.id" :messageVO="i"/>
+          {{ myUnReadMessage }}
         </div>
       </el-card>
     </el-col>
@@ -42,12 +42,12 @@
 </template>
 
 <script>
-import { Back, Bell, ChatDotRound } from "@element-plus/icons-vue";
+import {Back, Bell, ChatDotRound} from "@element-plus/icons-vue";
 import MessageCard from "@/views/MessagePage/components/MessageCard";
 
 export default {
   name: "MessagePage",
-  components: { MessageCard, ChatDotRound, Bell, Back },
+  components: {MessageCard, ChatDotRound, Bell, Back},
   data() {
     return {
       activeIndex: "1",
@@ -64,9 +64,9 @@ export default {
     this.$apis.getUnreadAnnouncements().then(res => {
       this.myUnReadAnnouncement = res.data.data;
     });
-    // this.$apis.getUnreadMessages().then(res => {
-    //   this.myUnReadMessage = res.data.data;
-    // });
+    this.$apis.getUnreadMessages().then(res => {
+      this.myUnReadMessage = res.data.data;
+    });
   },
   methods: {
     handleSelect(index) {

+ 3 - 3
src/views/TestPage/TestPage.vue

@@ -107,9 +107,9 @@ export default {
     this.$apis.getAllEvalExams().then(res => {
       this.evalExamList = res.data.data["examVOList"];
     });
-    this.$apis.getAllCoderExams().then(res => {
-      this.coderExamList = res.data.data.res;
-    });
+    // this.$apis.getAllCoderExams().then(res => {
+    //   this.coderExamList = res.data.data.res;
+    // });
     if (this.isStudent) {
       this.$apis.getStudentEvalExams({ state: 0 })
         .then(res => {