|
|
@@ -108,30 +108,39 @@
|
|
|
<el-timeline-item
|
|
|
v-for="task in courseTaskList"
|
|
|
:key="task.id"
|
|
|
- :timestamp="task.examId ? task.startTime.substring(0, 16) : timestampToTime(task.startAt)"
|
|
|
+ :timestamp="task.examId ? task.startTime.substring(0, 16) + ' — ' + task.endTime.substring(0, 16) : timestampToTime(task.startAt * 1000) + ' — ' + timestampToTime(task.endAt * 1000)"
|
|
|
:color="courseTaskStatusColor(task)"
|
|
|
- placement="top"
|
|
|
>
|
|
|
<div>
|
|
|
- <el-row v-if="task.examId" class="task-title">
|
|
|
- {{ task.examName }}
|
|
|
- </el-row>
|
|
|
- <el-row v-else class="task-title">
|
|
|
- {{ task.name }}
|
|
|
- </el-row>
|
|
|
- <el-row v-if="task.examId" class="task-info">
|
|
|
- 截止时间: {{ task.endTime.substring(0, 16) }}
|
|
|
- </el-row>
|
|
|
- <el-row v-else class="task-info">
|
|
|
- 截止时间: {{ timestampToTime(task.endAt) }}
|
|
|
- </el-row>
|
|
|
- <el-row v-if="task.examId" class="task-info">
|
|
|
- <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>
|
|
|
- <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-col :span="1">
|
|
|
+ <el-tag v-if="task.examId" size="small" color="#8dc9e2" effect="dark" style="border: none">E</el-tag>
|
|
|
+ <el-tag v-else size="small" color="#f5b86e" effect="dark" style="border: none">C</el-tag>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-row v-if="task.examId" class="task-title">
|
|
|
+ {{ task.examName }}
|
|
|
+ </el-row>
|
|
|
+ <el-row v-else class="task-title">
|
|
|
+ {{ task.name }}
|
|
|
+ </el-row>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-row v-if="task.examId">
|
|
|
+ <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>
|
|
|
+ <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>
|
|
|
+ <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">已参加</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)==='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-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</el-timeline-item>
|
|
|
@@ -143,17 +152,17 @@
|
|
|
@delete="deleteAnnouncement(item, index)"/>
|
|
|
</div>
|
|
|
<div v-else-if="tabName==='courseware'">
|
|
|
- <!-- <div class="entry-header">-->
|
|
|
- <!-- <span class="name">文件名</span>-->
|
|
|
- <!-- <span class="size">文件大小</span>-->
|
|
|
- <!-- <span class="uploadTime">上传时间</span>-->
|
|
|
- <!-- <span class="operation">操作</span>-->
|
|
|
- <!-- </div>-->
|
|
|
- <!-- <FileEntry v-for="(entry,index) in fileEntryList"-->
|
|
|
- <!-- :key="index"-->
|
|
|
- <!-- :file-entry-info="entry"-->
|
|
|
- <!-- @downloadFileIconClick="handleDownloadFileIconClick"-->
|
|
|
- <!-- ></FileEntry>-->
|
|
|
+ <div class="entry-header">
|
|
|
+ <span class="name">文件名</span>
|
|
|
+ <span class="size">文件大小</span>
|
|
|
+ <span class="uploadTime">上传时间</span>
|
|
|
+ <span class="operation">操作</span>
|
|
|
+ </div>
|
|
|
+ <FileEntry v-for="(entry,index) in fileEntryList"
|
|
|
+ :key="index"
|
|
|
+ :file-entry-info="entry"
|
|
|
+ @downloadFileIconClick="handleDownloadFileIconClick"
|
|
|
+ ></FileEntry>
|
|
|
</div>
|
|
|
<div v-else-if="tabName==='comment'">
|
|
|
<el-input v-model="commentContent" placeholder="发表一条友善的评论">
|
|
|
@@ -161,7 +170,24 @@
|
|
|
<el-button type="primary" @click="createComment">发表评论</el-button>
|
|
|
</template>
|
|
|
</el-input>
|
|
|
- commentTree: {{ commentTree }}
|
|
|
+ <el-divider/>
|
|
|
+ <div class="comment">
|
|
|
+ <div v-for="message in commentTree" :key="message.id" class="comment-body">
|
|
|
+ <div class="comment-main">
|
|
|
+ <el-row style="font-weight: bold; margin-bottom: 10px">
|
|
|
+ <el-col>{{ message.mainMessage.sender.name }}</el-col>
|
|
|
+ <el-col>{{ message.mainMessage.createdAt.substring(0, 16) }}</el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row>{{ message.mainMessage.content }}</el-row>
|
|
|
+ </div>
|
|
|
+ <div v-for="child in message.children" :key="child.id" class="comment-child">
|
|
|
+ <el-row style="font-weight: bold; margin-bottom: 10px">{{ child.sender.name }}</el-row>
|
|
|
+ <el-row>@{{ child.target.sender.username }}:{{ child.content }}</el-row>
|
|
|
+ </div>
|
|
|
+ <el-divider/>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <!-- commentTree: {{ commentTree }}-->
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-card>
|
|
|
@@ -195,7 +221,7 @@
|
|
|
<script>
|
|
|
import NoticeItem from "./components/NoticeItem";
|
|
|
import FileEntry from "./components/FileEntry";
|
|
|
-import {ElMessageBox, ElMessage} from "element-plus";
|
|
|
+import { ElMessageBox, ElMessage } from "element-plus";
|
|
|
import variables from "@/utils/variables";
|
|
|
|
|
|
export default {
|
|
|
@@ -251,11 +277,11 @@ export default {
|
|
|
color: "",
|
|
|
},
|
|
|
noticeTypeMap: {
|
|
|
- announce: {type: "公告", title: "发布公告", color: themeColor.orange},
|
|
|
- homework: {type: "作业", title: "发布作业", color: themeColor.blue},
|
|
|
- exam: {type: "考试", title: "发布考试", color: themeColor.red},
|
|
|
+ announce: { type: "公告", title: "发布公告", color: themeColor.orange },
|
|
|
+ homework: { type: "作业", title: "发布作业", color: themeColor.blue },
|
|
|
+ exam: { type: "考试", title: "发布考试", color: themeColor.red },
|
|
|
},
|
|
|
- newNoticeInfo: {noticeDescription: "", priority: "1", fileList: []},
|
|
|
+ newNoticeInfo: { noticeDescription: "", priority: "1", fileList: [] },
|
|
|
postNoticeInfo: {},
|
|
|
fileEntryList: [{
|
|
|
id: 1,
|
|
|
@@ -338,8 +364,10 @@ export default {
|
|
|
const date = new Date(timestamp);
|
|
|
const Y = date.getFullYear() + "-";
|
|
|
const M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1) + "-";
|
|
|
- const D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate());
|
|
|
- return Y + M + D;
|
|
|
+ const D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
|
|
|
+ const h = (date.getHours() < 10 ? "0" + date.getHours() : date.getHours()) + ":";
|
|
|
+ const m = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
|
|
|
+ return Y + M + D + h + m;
|
|
|
},
|
|
|
// 任务
|
|
|
courseTaskStatusColor(VO) {
|
|
|
@@ -417,7 +445,7 @@ export default {
|
|
|
|
|
|
function createAnnouncement() {
|
|
|
let announcementVO = {
|
|
|
- sender: {id: _this.$store.state.user.id,},
|
|
|
+ sender: { id: _this.$store.state.user.id, },
|
|
|
courseId: _this.courseInfo.id,
|
|
|
title: _this.announcementForm.title,
|
|
|
content: _this.announcementForm.content,
|
|
|
@@ -495,7 +523,7 @@ export default {
|
|
|
confirmButtonText: "立即选课",
|
|
|
cancelButtonText: "我再想想",
|
|
|
})
|
|
|
- .then(({value}) => {
|
|
|
+ .then(({ value }) => {
|
|
|
if (value !== this.courseInfo.invitationCode) {
|
|
|
ElMessage.error("选课码错误");
|
|
|
} else {
|
|
|
@@ -588,6 +616,7 @@ export default {
|
|
|
case "comment":
|
|
|
this.$apis.getCommentsByCourseId(this.$route.params.id)
|
|
|
.then(res => {
|
|
|
+ console.log(res);
|
|
|
this.commentTree = res.data.data;
|
|
|
})
|
|
|
.catch();
|
|
|
@@ -613,7 +642,7 @@ export default {
|
|
|
createdAt: new Date(),
|
|
|
})
|
|
|
.then(res => {
|
|
|
- this.commentTree.push({mainMessage: res.data.data, children: []});
|
|
|
+ this.commentTree.push({ mainMessage: res.data.data, children: [] });
|
|
|
this.commentContent = "";
|
|
|
})
|
|
|
.catch();
|