|
|
@@ -4,19 +4,16 @@
|
|
|
<el-card>
|
|
|
<div class="header">
|
|
|
<div class="course-img">
|
|
|
- <img :src="imgUrl" alt="">
|
|
|
+ <img :src="imgUrl" alt="err">
|
|
|
</div>
|
|
|
<div class="course-info">
|
|
|
<el-row style="font-size: xx-large; font-weight: bold">
|
|
|
- {{ courseInfo.name === undefined ? "空白课程" : courseInfo.name }}
|
|
|
+ {{ courseName }}
|
|
|
</el-row>
|
|
|
<div class="course-info-main">
|
|
|
- <el-row>教师:{{ courseInfo.teacher.name }}</el-row>
|
|
|
- <el-row>学期:{{ courseInfo.semester }}</el-row>
|
|
|
- <el-row>时间:{{ timestampToTime(courseInfo.startTime) }} 至 {{
|
|
|
- timestampToTime(courseInfo.endTime)
|
|
|
- }}
|
|
|
- </el-row>
|
|
|
+ <el-row>{{ teacherName }}</el-row>
|
|
|
+ <el-row>{{ semester }}</el-row>
|
|
|
+ <el-row>{{ coursePeriod }}</el-row>
|
|
|
</div>
|
|
|
<el-row class="mooc-link">
|
|
|
MOOC链接:
|
|
|
@@ -28,9 +25,9 @@
|
|
|
<el-button :disabled="isCourseSelected" size="mini" @click="handleSelectCourse">
|
|
|
{{ isCourseSelected ? "已选课" : "确认选课" }}
|
|
|
</el-button>
|
|
|
- <!-- <el-button v-if="isCourseSelected" size="mini" type="danger" @click="handleDropCourse">-->
|
|
|
- <!-- 退课-->
|
|
|
- <!-- </el-button>-->
|
|
|
+ <el-button v-if="isCourseSelected" size="mini" type="danger" @click="handleDropCourse">
|
|
|
+ 退课
|
|
|
+ </el-button>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -39,9 +36,7 @@
|
|
|
|
|
|
<div class="introduce">
|
|
|
<div class="title">简介</div>
|
|
|
- <div class="introduce-content">
|
|
|
- {{ courseInfo.description === "" ? "无" : courseInfo.description }}
|
|
|
- </div>
|
|
|
+ <div class="introduce-content">{{ description }}</div>
|
|
|
</div>
|
|
|
</el-card>
|
|
|
|
|
|
@@ -53,7 +48,7 @@
|
|
|
<el-radio-group v-model="tabName" size="large">
|
|
|
<el-radio-button label="task" @click="switchTab('task')">任务</el-radio-button>
|
|
|
<el-radio-button label="notice" @click="switchTab('notice')">通知</el-radio-button>
|
|
|
- <el-radio-button label="courseware" @click="switchTab('courseware')">课件</el-radio-button>
|
|
|
+<!-- <el-radio-button label="courseware" @click="switchTab('courseware')">课件</el-radio-button>-->
|
|
|
<el-radio-button label="comment" @click="switchTab('comment')">评论</el-radio-button>
|
|
|
</el-radio-group>
|
|
|
<div v-if="isCreator">
|
|
|
@@ -116,35 +111,35 @@
|
|
|
<el-timeline>
|
|
|
<el-timeline-item
|
|
|
v-for="task in courseTaskList"
|
|
|
- :key="task.id"
|
|
|
- :timestamp="task.examId ? task.startTime.substring(0, 16) + ' — ' + task.endTime.substring(0, 16) : timestampToTime(task.startAt * 1000) + ' — ' + timestampToTime(task.endAt * 1000)"
|
|
|
+ :key="task['id']"
|
|
|
+ :timestamp="task['examId'] ? task.startTime.substring(0, 16) + ' — ' + task.endTime.substring(0, 16) : timestampToTime(task['startAt'] * 1000) + ' — ' + timestampToTime(task['endAt'] * 1000)"
|
|
|
:color="courseTaskStatusColor(task)" @click="toTask(task)">
|
|
|
<el-row>
|
|
|
- <el-tag v-if="task.examId" class="timeline-content" size="small" color="#f5b86e" effect="dark"
|
|
|
+ <el-tag v-if="task['examId']" class="timeline-content" size="small" color="#f5b86e" effect="dark"
|
|
|
style="border: none">E
|
|
|
</el-tag>
|
|
|
<el-tag v-else class="timeline-content" size="small" color="#8dc9e2" effect="dark"
|
|
|
style="border: none">C
|
|
|
</el-tag>
|
|
|
- <el-row v-if="task.examId" class="timeline-content">
|
|
|
+ <el-row v-if="task['examId']" class="timeline-content">
|
|
|
<el-tag v-if="this.state(task)==='NOT_STARTED'" size="small" type="info">未开始</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['isJoined']" 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['isJoined']" 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" type="info">未开始</el-tag>
|
|
|
- <el-tag v-else-if="this.state(task)==='RUNNING' && task.joined" size="small" type="success">已参加
|
|
|
+ <el-tag v-else-if="this.state(task)==='RUNNING' && task['isJoined']" size="small" type="success">已参加
|
|
|
</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)==='RUNNING' && !task['isJoined']" 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>
|
|
|
- <el-row v-if="task.examId" class="task-title timeline-content">
|
|
|
- {{ task.examName }}
|
|
|
+ <el-row v-if="task['examId']" class="task-title timeline-content">
|
|
|
+ {{ task["examName"] }}
|
|
|
</el-row>
|
|
|
<el-row v-else class="task-title timeline-content">
|
|
|
{{ task.name }}
|
|
|
@@ -207,8 +202,9 @@
|
|
|
{{ comments.mainMessage.createdAt.substring(0, 16).replace("T", " ") }}
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
- {{ comments.mainMessage.content }}<span @click="handleReplyClick(comments.mainMessage, index)"
|
|
|
- class="reply-button">回复</span>
|
|
|
+ {{ comments.mainMessage.content }}
|
|
|
+ <span @click="handleReplyClick(comments.mainMessage, index)" class="reply-button">回复</span>
|
|
|
+ <span v-if="comments.mainMessage.sender.id === userId" @click="handleDeleteClick(comments.mainMessage, index)" class="reply-button">删除</span>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</el-row>
|
|
|
@@ -231,8 +227,10 @@
|
|
|
<el-row>
|
|
|
<span style="color: black;">{{
|
|
|
child.targetId === null ? "" : `@${comments.children[child.targetId].sender.name}: `
|
|
|
- }}</span>{{ child.content }}<span
|
|
|
- @click="handleReplyClick(child,index)" class="reply-button">回复</span>
|
|
|
+ }}</span>{{ child.content }}
|
|
|
+ <span
|
|
|
+ @click="handleReplyClick(child,index)" class="reply-button">回复</span>
|
|
|
+ <span v-if="child.sender.id === userId" @click="handleDeleteClick(child,index)" class="reply-button">删除</span>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</el-row>
|
|
|
@@ -354,21 +352,27 @@ export default {
|
|
|
uploadTime: "2021-12-12 08:22:23",
|
|
|
url: ""
|
|
|
}],
|
|
|
- tasks: [{
|
|
|
- content: "软工二大作业迭代一",
|
|
|
- timestamp: "2018-04-15",
|
|
|
- },
|
|
|
- {
|
|
|
- content: "代码题提交",
|
|
|
- timestamp: "2018-03-11",
|
|
|
- },
|
|
|
- {
|
|
|
- content: "Eval评测题目提交",
|
|
|
- timestamp: "2018-02-28",
|
|
|
- }],
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
+ userId() {
|
|
|
+ return Number(this.$store.state.user.id);
|
|
|
+ },
|
|
|
+ description() {
|
|
|
+ return this.courseInfo.description;
|
|
|
+ },
|
|
|
+ courseName() {
|
|
|
+ return this.courseInfo.name;
|
|
|
+ },
|
|
|
+ teacherName() {
|
|
|
+ return "教师:" + this.courseInfo.teacher.name;
|
|
|
+ },
|
|
|
+ semester() {
|
|
|
+ return "学期:" + this.courseInfo.semester;
|
|
|
+ },
|
|
|
+ coursePeriod() {
|
|
|
+ return "时间:" + this.timestampToTime(this.courseInfo.startTime) + "至" + this.timestampToTime(this.courseInfo.endTime);
|
|
|
+ },
|
|
|
isStudent() {
|
|
|
return this.$store.getters.isStudent;
|
|
|
},
|
|
|
@@ -376,22 +380,20 @@ export default {
|
|
|
return this.$store.getters.isTeacher;
|
|
|
},
|
|
|
isCreator() {
|
|
|
- return this.courseInfo.teacher.id === Number(this.$store.state.user.id);
|
|
|
+ return Number(this.courseInfo.teacher.id) === Number(this.$store.state.user.id);
|
|
|
},
|
|
|
imgUrl() {
|
|
|
return this.courseInfo.imageUrl === null ? this.noImgUrl : this.courseInfo.imageUrl;
|
|
|
},
|
|
|
courseTaskList() {
|
|
|
- if (!this.evalExamList || !this.coderExamList) {
|
|
|
- return [];
|
|
|
- } else {
|
|
|
- return [].concat(this.evalExamList).concat(this.coderExamList)
|
|
|
- .sort((a, b) => {
|
|
|
- let a_time = a.startAt * 1000 || new Date(a.startTime).getTime();
|
|
|
- let b_time = b.startAt * 1000 || new Date(b.startTime).getTime();
|
|
|
- return b_time - a_time;
|
|
|
- });
|
|
|
- }
|
|
|
+ return []
|
|
|
+ .concat(this.evalExamList)
|
|
|
+ .concat(this.coderExamList)
|
|
|
+ .sort((a, b) => {
|
|
|
+ let a_time = a["startAt"] * 1000 || new Date(a.startTime).getTime();
|
|
|
+ let b_time = b["startAt"] * 1000 || new Date(b.startTime).getTime();
|
|
|
+ return b_time - a_time;
|
|
|
+ });
|
|
|
},
|
|
|
},
|
|
|
mounted() {
|
|
|
@@ -430,14 +432,14 @@ export default {
|
|
|
courseTaskStatusColor(VO) {
|
|
|
if (this.state(VO) === "FINISHED" || this.state(VO) === "NOT_STARTED" || this.state(VO) === "CLOSED") {
|
|
|
return "grey";
|
|
|
- } else if (VO.isJoined || VO.joined) {
|
|
|
+ } else if (VO["isJoined"] || VO["joined"]) {
|
|
|
return this.themeColor.green;
|
|
|
} else {
|
|
|
return this.themeColor.blue;
|
|
|
}
|
|
|
},
|
|
|
state(VO) {
|
|
|
- if (VO.examId) {
|
|
|
+ if (VO["examId"]) {
|
|
|
if (new Date(VO.endTime) < new Date()) {
|
|
|
return "FINISHED";
|
|
|
} else if (new Date(VO.startTime) > new Date()) {
|
|
|
@@ -448,9 +450,9 @@ export default {
|
|
|
} else {
|
|
|
if (VO.status === "CLOSED") {
|
|
|
return "CLOSED";
|
|
|
- } else if (VO.startAt * 1000 > new Date()) {
|
|
|
+ } else if (VO["startAt"] * 1000 > new Date()) {
|
|
|
return "NOT_STARTED";
|
|
|
- } else if (VO.endAt * 1000 < new Date()) {
|
|
|
+ } else if (VO["endAt"] * 1000 < new Date()) {
|
|
|
return "FINISHED";
|
|
|
} else {
|
|
|
return "RUNNING";
|
|
|
@@ -474,7 +476,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
toTask(task) {
|
|
|
- const type = task.examId ? "eval" : "coder";
|
|
|
+ const type = task["examId"] ? "eval" : "coder";
|
|
|
let evalUrl;
|
|
|
let evalExamUrl;
|
|
|
let coderUrl;
|
|
|
@@ -494,8 +496,8 @@ export default {
|
|
|
url = type === "eval" ? evalUrl : coderUrl;
|
|
|
break;
|
|
|
case "RUNNING":
|
|
|
- if (task.isJoined || task.joined) {
|
|
|
- url = type === "eval" ? evalExamUrl + task.examId + "/before-exam" : coderUrl + task.id;
|
|
|
+ if (task["isJoined"] || task["joined"]) {
|
|
|
+ url = type === "eval" ? evalExamUrl + task["examId"] + "/before-exam" : coderUrl + task.id;
|
|
|
} else {
|
|
|
url = type === "eval" ? evalUrl : coderUrl;
|
|
|
}
|
|
|
@@ -504,7 +506,7 @@ export default {
|
|
|
} 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;
|
|
|
+ url = type === "eval" ? evalUrl + task["examId"] + "/details" : coderUrl + task.id;
|
|
|
}
|
|
|
window.open(url + "?id_token=" + this.$store.state.user.token);
|
|
|
},
|
|
|
@@ -690,14 +692,14 @@ export default {
|
|
|
case "task":
|
|
|
if (this.isTeacher) {
|
|
|
if (this.courseInfo.evalId !== null) {
|
|
|
- this.evalExamList = (await this.$apis.getTeacherEvalExamsByCourseId(this.courseInfo.evalId)).data.data;
|
|
|
+ this.evalExamList = (await this.$apis.getTeacherEvalExamsByCourseId(this.courseInfo.evalId)).data.data || [];
|
|
|
}
|
|
|
if (this.courseInfo.coderId !== null) {
|
|
|
this.coderExamList = (await this.$apis.getTeacherCoderExamsByCourseId(this.courseInfo.coderId)).data.data;
|
|
|
}
|
|
|
} else if (this.isStudent) {
|
|
|
if (this.courseInfo.evalId !== null) {
|
|
|
- this.evalExamList = (await this.$apis.getStudentEvalExamsByCourseId(this.courseInfo.evalId)).data.data;
|
|
|
+ this.evalExamList = (await this.$apis.getStudentEvalExamsByCourseId(this.courseInfo.evalId)).data.data || [];
|
|
|
}
|
|
|
if (this.courseInfo.coderId !== null) {
|
|
|
this.coderExamList = (await this.$apis.getStudentCoderExamsByCourseId(this.courseInfo.coderId)).data.data;
|
|
|
@@ -772,6 +774,9 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ handleDeleteClick(target, index) {
|
|
|
+ alert(1);
|
|
|
+ },
|
|
|
},
|
|
|
};
|
|
|
</script>
|