mjh 4 лет назад
Родитель
Сommit
176a273bc8

+ 5 - 0
src/api/announcement.js

@@ -30,6 +30,10 @@ function getUnreadAnnouncements() {
   return axios.get(`${prefix}/getUnreadByUserId`);
 }
 
+function readAnnouncement(data) {
+  return axios.put(`${prefix}/read`, data);
+}
+
 const announcementAPIs = {
   createAnnouncement,
   getAnnouncementById,
@@ -37,6 +41,7 @@ const announcementAPIs = {
   updateAnnouncement,
   deleteAnnouncement,
   getUnreadAnnouncements,
+  readAnnouncement,
 };
 
 export default announcementAPIs;

+ 16 - 4
src/components/GlobalHeader.vue

@@ -16,7 +16,7 @@
       <el-menu-item index="6">问题[临]</el-menu-item>
     </el-menu>
     <div id="global-header-icon">
-      <div class="global-header-icon-content" @click="this.$router.push('/message')" style="position: relative">
+      <div class="global-header-icon-content" @click="toMessageView" style="position: relative">
         <sup v-if="unreadNum !== '0'" class="reminder">{{ unreadNum }}</sup>
         <svg height="32" viewBox="0 0 1024 1024" width="32" xmlns="http://www.w3.org/2000/svg">
           <path
@@ -81,7 +81,7 @@ export default {
     isTeacher() {
       return this.$store.getters.isTeacher;
     },
-    isStudent(){
+    isStudent() {
       return this.$store.getters.isStudent;
     },
     activeMenu() {
@@ -106,7 +106,7 @@ export default {
             this.myUnReadAnnouncements = res.data.data;
           });
         this.$apis.getUnreadMessages()
-          .then(res=>{
+          .then(res => {
             this.myUnReadMessages = res.data.data;
           })
           .catch();
@@ -121,7 +121,7 @@ export default {
           this.myUnReadAnnouncements = res.data.data;
         });
       this.$apis.getUnreadMessages()
-        .then(res=>{
+        .then(res => {
           this.myUnReadMessages = res.data.data;
         })
         .catch();
@@ -145,6 +145,18 @@ export default {
         this.quickAccessTitle = "快速访问";
       }
     },
+    toMessageView() {
+      this.$apis.getUnreadAnnouncements()
+        .then(res => {
+          this.myUnReadAnnouncements = res.data.data;
+        });
+      this.$apis.getUnreadMessages()
+        .then(res => {
+          this.myUnReadMessages = res.data.data;
+        })
+        .catch();
+      this.$router.push("/message");
+    },
   },
 };
 </script>

+ 43 - 15
src/views/CoursePage/CourseDetail.vue

@@ -123,7 +123,8 @@
                 <div>
                   <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-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">
@@ -137,7 +138,9 @@
                     <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" 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>
@@ -156,9 +159,17 @@
             </el-timeline>
           </div>
           <div v-else-if="tabName==='notice'">
-            <NoticeItem v-for="(item,index) in announcementList" :key="index" :ref="'noticeItem'+item.id"
-                        :notice-v-o="item" @update="beforeUpdateAnnouncement(item)"
-                        @delete="deleteAnnouncement(item, index)"/>
+            <el-collapse>
+              <el-collapse-item v-for="(item,index) in announcementList" :key="index" :name="index"
+                                @click="readAnnouncement(item)">
+                <template #title>
+                  <NoticeItem :ref="'noticeItem'+item.id"
+                              :notice-v-o="item" @update="beforeUpdateAnnouncement(item)"
+                              @delete="deleteAnnouncement(item, index)"/>
+                </template>
+                <span class="announcement-content">{{ announcementContent(item) }}</span>
+              </el-collapse-item>
+            </el-collapse>
           </div>
           <div v-else-if="tabName==='courseware'">
             <div class="entry-header">
@@ -224,13 +235,14 @@
         <el-button plain type="danger" @click="beforeFormClose">我再想想</el-button>
       </div>
     </el-dialog>
+    <!--    <el-dialog v-model="announcementDialog"-->
   </div>
 </template>
 
 <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 {
@@ -286,11 +298,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,
@@ -412,13 +424,13 @@ export default {
     addTest(type) {
       switch (type) {
         case "eval":
-          if(this.courseInfo.evalId === null){
+          if (this.courseInfo.evalId === null) {
             ElMessage.error("本课程没有链接eval系统");
           }
           window.open("https://eval.seec.seecoder.cn/teacher/create/?id_token=" + this.$store.state.user.token);
           break;
         case "coder":
-          if(this.courseInfo.coderId === null){
+          if (this.courseInfo.coderId === null) {
             ElMessage.error("本课程没有链接coder系统");
           }
           window.open("https://coder.seec.seecoder.cn/exam/create/?id_token=" + this.$store.state.user.token);
@@ -472,7 +484,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,
@@ -537,6 +549,22 @@ export default {
           console.log(action);
         });
     },
+    announcementContent(item) {
+      if (item.content === "") {
+        return "当前公告暂无具体内容。";
+      } else {
+        return item.content;
+      }
+    },
+    readAnnouncement(item) {
+      if (!item.read) {
+        this.$apis.readAnnouncement({id: item.id})
+          .then(res => {
+            item.read = true;
+            this.$refs["noticeItem" + item.id][0].setNoticeInfo(item);
+          });
+      }
+    },
     //
     handleFileUploading() {
     },
@@ -550,7 +578,7 @@ export default {
         confirmButtonText: "立即选课",
         cancelButtonText: "我再想想",
       })
-        .then(({ value }) => {
+        .then(({value}) => {
           if (value !== this.courseInfo.invitationCode) {
             ElMessage.error("选课码错误");
           } else {
@@ -669,7 +697,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();

+ 3 - 3
src/views/CoursePage/components/NoticeItem.vue

@@ -106,9 +106,9 @@ export default {
   transition: all 0.2s ease-in-out;
 }
 
-.notice-item:hover {
-  background-color: #F0F0F0;
-}
+/*.notice-item:hover {*/
+/*  background-color: #F0F0F0;*/
+/*}*/
 
 .mode-text, .time-avatar {
   display: flex;

+ 4 - 0
src/views/CoursePage/style/CourseDetail.css

@@ -252,4 +252,8 @@
 
 .comment-child {
     padding: 20px 0 0 20px;
+}
+
+.announcement-content{
+    font-size: 16px;
 }

+ 1 - 6
src/views/TestPage/TestPage.vue

@@ -66,13 +66,11 @@
   </el-row>
 </template>
 
-
 <script>
 import EvalCard from "@/components/EvalCard";
 import CoderCard from "@/components/CoderCard";
 import { Back, Document, DocumentChecked } from "@element-plus/icons-vue";
 
-
 export default {
   name: "TestPage",
   components: { Back, Document, DocumentChecked, CoderCard, EvalCard, },
@@ -90,7 +88,7 @@ export default {
   computed: {
     activeName() {
       if (this.activeIndex === "1") {
-        return "全部测试";
+        return "公开测试";
       } else {
         return "我的测试";
       }
@@ -102,8 +100,6 @@ export default {
       return this.$store.getters.isStudent;
     },
   },
-
-
   mounted() {
     this.$apis.getAllEvalExams().then(res => {
       this.evalExamList = res.data.data["examVOList"];
@@ -122,7 +118,6 @@ export default {
         });
     }
   },
-
   methods: {
     handleSelect(index) {
       if (index === "0") {