mjh 4 years ago
parent
commit
3956e527c2

+ 13 - 6
src/api/course/course.js

@@ -86,14 +86,20 @@ function uploadCourseImage(name, image) {
   });
 }
 
-function uploadCarouselChart(input){
-  return axios.post(`${prefix}/uploadCarouseChart`,input);
+function uploadCarouselChart(input) {
+  return axios.post(`${prefix}/uploadCarouseChart`, input);
 }
 
-function queryCarouselChart(){
-  return axios.get(`${prefix}/queryCarouselChart`,{
-    params:{
+function queryCarouselChart() {
+  return axios.get(`${prefix}/queryCarouselChart`, {
+    params: {}
+  });
+}
 
+function findCourseByName(data) {
+  return axios.get(`${prefix}/findCourseByName`, {
+    params: {
+      name: data,
     }
   });
 }
@@ -115,7 +121,8 @@ const courseAPIs = {
   getCourseByEvalId,
   uploadCourseImage,
   uploadCarouselChart,
-  queryCarouselChart
+  queryCarouselChart,
+  findCourseByName,
 };
 
 export default courseAPIs;

+ 5 - 0
src/api/project.js

@@ -59,6 +59,10 @@ function forkProject(projectId, name = null) {
   });
 }
 
+function findAllPublicProjectsGroupByCourse() {
+  return axios.get(`${prefix}/findAllPublicGroupByCourse`);
+}
+
 const projectAPIs = {
   findAllProjects,
   findCourseProjects,
@@ -69,6 +73,7 @@ const projectAPIs = {
   createProject,
   updateCourseProjectState,
   forkProject,
+  findAllPublicProjectsGroupByCourse,
 };
 
 export default projectAPIs;

+ 3 - 3
src/components/GlobalHeader.vue

@@ -18,12 +18,12 @@
       <el-menu-item index="5">
         测试
       </el-menu-item>
-      <el-menu-item index="6">
-        个人中心
-      </el-menu-item>
       <el-menu-item v-if="isTeacher" index="7">
         管理
       </el-menu-item>
+      <el-menu-item index="6">
+        个人中心
+      </el-menu-item>
     </el-menu>
     <div id="global-header-icon">
       <el-tooltip content="前往通知页" placement="bottom" effect="light" :show-after="1000">

+ 6 - 1
src/components/ProjectCard.vue

@@ -34,6 +34,7 @@ export default {
   props: {
     projectVO: Object,
     type: String,
+    isPublic: undefined,
   },
   data() {
     return {
@@ -69,6 +70,9 @@ export default {
           duration: 1000,
         });
         await this.$router.push({name: "Auth", params: {login_to: "/portal"}});
+      } else if (this.isPublic) {
+        const courseId = (await this.$apis.findCourseByName(this.isPublic)).data.data.id;
+        await this.$router.push(`/course/${courseId}`);
       } else {
         if (this.projectVO.name) {
           window.open("https://devcloud.seec.seecoder.cn/project/" + this.projectVO.id + "/schedule?id_token=" + this.$store.state.user.token);
@@ -95,7 +99,7 @@ export default {
 
 .project:hover {
   cursor: pointer;
-  border: 1px solid #aaaaaa;
+  border: 1px solid #999999;
 }
 
 .projectId {
@@ -109,6 +113,7 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  font-weight: bold;
 }
 
 .project-description {

+ 12 - 9
src/components/TestCard.vue

@@ -70,11 +70,18 @@ export default {
       return store.state.user.token;
     },
     isCreator() {
-      if (this.testVO.examId) {
-        return Number(this.testVO.course.teacherId) === Number(this.$store.state.user.id);
-      } else {
-        return this.testVO.creator.username === this.$store.state.user.username;
+      let result = null;
+      switch (this.type) {
+        case "eval":
+          result = Number(this.testVO.course.teacherId) === Number(this.$store.state.user.id);
+          break;
+        case "coder":
+          result = this.testVO.creator.username === this.$store.state.user.username;
+          break;
+        default:
+          break;
       }
+      return result;
     },
     isTeacher() {
       return this.$store.getters.isTeacher;
@@ -187,15 +194,11 @@ export default {
         return;
       }
 
-      console.log(this.testVO);
-
       if (this.isCreator) {
         if (this.type === "eval") {
-          this.$router.push(`/exam/${this.testVO.examId}`);
-          // window.open("https://eval.seec.seecoder.cn/teacher/exam/" + this.testVO.examId + "/details?id_token" + this.$store.state.user.token);
+          this.$router.push(`/evalExam/${this.testVO.examId}/teacher/details`);
         } else {
           this.$router.push(`/exam/${this.testVO.id}`); //跳转到考试详情页
-          // window.open("https://coder.seec.seecoder.cn/exam/" + this.testVO.id + "?id_token=" + this.$store.state.user.token);
         }
       } else if (this.isTeacher) {
         this.$message.error("无权访问其他教师创建的课程");

+ 32 - 33
src/views/CoursePage/tabs/TaskTab.vue

@@ -499,42 +499,42 @@ export default {
     toTask(task) {
       const _this = this;
       const type = task["examId"] ? "eval" : "coder";
-      let evalUrl;
-      let evalExamUrl;
-      let coderUrl;
-      let url;
-      if (_this.isStudent) {
-        evalUrl = "https://eval.seec.seecoder.cn/student/home/";
-        evalExamUrl = "https://eval.seec.seecoder.cn/exam/";
-        coderUrl = "https://coder.seec.seecoder.cn/exam/";
-        switch (this.state(task)) {
-          case "NOT_STARTED":
-            url = type === "eval" ? evalUrl : coderUrl;
-            break;
-          case "CLOSED":
-            url = type === "eval" ? evalUrl : coderUrl;
-            break;
-          case "FINISHED":
-            url = type === "eval" ? evalUrl : coderUrl;
-            break;
-          case "RUNNING":
-            if (task["isJoined"] || task["joined"]) {
-              url = type === "eval" ? evalExamUrl + task["examId"] + "/before-exam" : coderUrl + task.id;
-            } else {
-              url = type === "eval" ? evalUrl : coderUrl;
-            }
-            break;
-        }
-      } else {
-        evalUrl = "https://eval.seec.seecoder.cn/teacher/exam/";
-        coderUrl = "https://coder.seec.seecoder.cn/exam/";
-        url = type === "eval" ? evalUrl + task["examId"] + "/details" : coderUrl + task.id;
-      }
+      // let evalUrl;
+      // let evalExamUrl;
+      // let coderUrl;
+      // let url;
+      // if (_this.isStudent) {
+      //   evalUrl = "https://eval.seec.seecoder.cn/student/home/";
+      //   evalExamUrl = "https://eval.seec.seecoder.cn/exam/";
+      //   coderUrl = "https://coder.seec.seecoder.cn/exam/";
+      //   switch (this.state(task)) {
+      //     case "NOT_STARTED":
+      //       url = type === "eval" ? evalUrl : coderUrl;
+      //       break;
+      //     case "CLOSED":
+      //       url = type === "eval" ? evalUrl : coderUrl;
+      //       break;
+      //     case "FINISHED":
+      //       url = type === "eval" ? evalUrl : coderUrl;
+      //       break;
+      //     case "RUNNING":
+      //       if (task["isJoined"] || task["joined"]) {
+      //         url = type === "eval" ? evalExamUrl + task["examId"] + "/before-exam" : coderUrl + task.id;
+      //       } else {
+      //         url = type === "eval" ? evalUrl : coderUrl;
+      //       }
+      //       break;
+      //   }
+      // } else {
+      //   evalUrl = "https://eval.seec.seecoder.cn/teacher/exam/";
+      //   coderUrl = "https://coder.seec.seecoder.cn/exam/";
+      //   url = type === "eval" ? evalUrl + task["examId"] + "/details" : coderUrl + task.id;
+      // }
       if (type === "coder") {
         _this.$router.push(`/exam/${task.id}`);
 
       } else { //只有eval直接跳转
-        if (_this.isTeacher()) {
+        if (_this.isTeacher) {
           _this.$router.push({
             name: "teacher-examDetails",
             params: {
@@ -549,7 +549,6 @@ export default {
             }
           });
         }
-        // window.open(url + "?id_token=" + this.$store.state.user.token);
       }
     },
     // 创建Coder考试的Dialog

+ 0 - 1
src/views/ExamPage/ExamDetail.vue

@@ -362,7 +362,6 @@ export default {
       this.$apis.getCoderExamByExamId(examId)
           .then(_res => {
             this.exam = _res.data.res;
-            console.log(this.exam);
             if (!this.isAdmin && this.exam.joined) {
               this.fetchResult();
             }

+ 1 - 1
src/views/HomePage/HomePage.vue

@@ -25,7 +25,7 @@
             <el-icon>
               <Files/>
             </el-icon>
-            <span style="padding-left: 20px">gitlab</span>
+            <span style="padding-left: 20px">Gitlab</span>
           </el-menu-item>
         </el-menu>
       </el-card>

+ 1 - 1
src/views/ManagePage/ManagePage.vue

@@ -30,7 +30,7 @@
         </el-menu>
       </el-card>
     </el-col>
-    <el-col :span="1"/>
+    <el-col :span="2"/>
     <el-col :span="18">
       <el-card id="all-test-card">
         <template #header>

+ 26 - 16
src/views/ProjectPage/ProjectPage.vue

@@ -1,6 +1,6 @@
 <template>
   <el-row id="project-page-body">
-    <el-col :span="3">
+    <el-col :span="4">
       <el-card style="position: fixed;">
         <el-menu default-active="1" @select="handleSelect">
           <el-menu-item index="0">
@@ -26,14 +26,14 @@
             <el-icon>
               <Document/>
             </el-icon>
-            <span style="padding-left: 20px">个人项目分析</span>
+            <span style="padding-left: 20px">个人分析</span>
           </el-menu-item>
 
           <el-menu-item index="4">
             <el-icon>
               <Document/>
             </el-icon>
-            <span style="padding-left: 20px">小组项目分析</span>
+            <span style="padding-left: 20px">小组分析</span>
           </el-menu-item>
 
         </el-menu>
@@ -49,12 +49,26 @@
           </span>
         </template>
         <div v-if="this.activeIndex === '1'">
+          <div v-for="(item, key) in courseProjectList" :key="key">
+            <div v-if="item.length !== 0">
+              <div>
+                <el-divider style="margin: 10px 0 20px 0" content-position="left">{{ key }}</el-divider>
+              </div>
+              <div class="project-page-main">
+                <ProjectCard v-for="project in item"
+                             :is-public="key"
+                             :key="project.id"
+                             :projectVO="project"
+                             type="courseProject"/>
+              </div>
+            </div>
+          </div>
         </div>
 
         <div v-if="this.activeIndex === '2' && isStudent">
           <el-tabs v-model="activeProjectPaneName" style="width: 100%">
             <el-tab-pane label="课程下项目" name="courseProject">
-              <div v-for="(item, key) in courseProjectList" :key="key">
+              <div v-for="(item, key) in myCourseProjects" :key="key">
                 <div v-if="item.length !== 0">
                   <div>
                     <el-divider style="margin: 10px 0 20px 0" content-position="left">{{ key }}</el-divider>
@@ -67,7 +81,7 @@
             </el-tab-pane>
             <el-tab-pane label="非课程项目" name="commonProject">
               <div class="project-page-main">
-                <ProjectCard v-for="(item,key) in commonProjectList" :key="key" :projectVO="item" type="commonProject"></ProjectCard>
+                <ProjectCard v-for="(item,key) in myNonCourseProjects" :key="key" :projectVO="item" type="commonProject"></ProjectCard>
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -111,9 +125,9 @@ export default {
   data() {
     return {
       activeIndex: "1",
-      courseProjectList: [],
-      commonProjectList: [],
-      ProjectList_my: [],
+      courseProjectList: null,
+      myNonCourseProjects: null,
+      myCourseProjects: null,
       activeProjectPaneName: "courseProject",
       activeProjectPaneName_my: "courseProject_my",
       userId:1575,//传递给分析系统
@@ -144,19 +158,15 @@ export default {
   },
   mounted() {
     this.$apis.findCourseProjects().then(res =>{
-        this.courseProjectList = res.data.data;
-        console.log(this.courseProjectList);
+        this.myCourseProjects = res.data.data;
         });
 
     this.$apis.findNonCourseProjects().then(res =>{
-      this.commonProjectList = res.data.data;
-      console.log(this.commonProjectList);
+      this.myNonCourseProjects = res.data.data;
     });
 
-    this.$apis.findProjectById(this.$store.state.user.id).then(res =>{
-      this.ProjectList_my = res.data.data;
-      this.userId = this.$store.state.user.id;
-      console.log(this.ProjectList_my);
+    this.$apis.findAllPublicProjectsGroupByCourse().then(res =>{
+      this.courseProjectList = res.data.data;
     });
 
   },

+ 5 - 0
yarn.lock

@@ -6520,6 +6520,11 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+marked@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.3.tgz#bd76a5eb510ff1d8421bc6c3b2f0b93488c15bea"
+  integrity sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw==
+
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"