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