Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/seec' into seec

mjh 4 gadi atpakaļ
vecāks
revīzija
eaaa459762

BIN
src/assets/messagePage.png


BIN
src/assets/miniClock.png


+ 1 - 1
src/components/GlobalHeader.vue

@@ -13,7 +13,7 @@
       <el-menu-item index="4">个人中心</el-menu-item>
       <el-menu-item index="4">个人中心</el-menu-item>
       <el-menu-item v-if="isTeacher" index="5">教师[临]</el-menu-item>
       <el-menu-item v-if="isTeacher" index="5">教师[临]</el-menu-item>
       <!--      todo @DQJ 导航栏可能还有变动-->
       <!--      todo @DQJ 导航栏可能还有变动-->
-      <el-menu-item index="6">问题[?]</el-menu-item>
+      <el-menu-item index="6">问题[临]</el-menu-item>
     </el-menu>
     </el-menu>
     <div id="global-header-icon">
     <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="this.$router.push('/message')" style="position: relative">

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

@@ -10,7 +10,7 @@ import AuthCard from "@/views/AuthPage/components/AuthCard";
 
 
 export default {
 export default {
   name: "AuthPage",
   name: "AuthPage",
-  components: { AuthCard, }
+  components: { AuthCard }
 };
 };
 </script>
 </script>
 
 

+ 12 - 19
src/views/AuthPage/components/AuthCard.vue

@@ -4,7 +4,7 @@
     <el-form id="auth-card-form" ref="cardFormRef" :model="cardForm" :rules="cardRuleForm" @keyup.enter="onSubmit">
     <el-form id="auth-card-form" ref="cardFormRef" :model="cardForm" :rules="cardRuleForm" @keyup.enter="onSubmit">
 
 
       <el-form-item v-if="cardType==='login'" class="auth-card-form-item" prop="phone">
       <el-form-item v-if="cardType==='login'" class="auth-card-form-item" prop="phone">
-        <el-input v-model="cardForm.phone" autofocus clearable oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入手机号">
+        <el-input v-model="cardForm.phone" autofocus clearable oninput="value=value.replace(/\D/g,'')" placeholder="请输入手机号">
           <template #prefix>
           <template #prefix>
             <el-icon class="el-input__icon">
             <el-icon class="el-input__icon">
               <phone/>
               <phone/>
@@ -64,7 +64,7 @@
       </el-form-item>
       </el-form-item>
 
 
       <el-form-item v-if="cardType==='reset'||cardType==='register'" class="auth-card-form-item" prop="phone">
       <el-form-item v-if="cardType==='reset'||cardType==='register'" class="auth-card-form-item" prop="phone">
-        <el-input v-model="cardForm.phone" autofocus clearable oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入手机号">
+        <el-input v-model="cardForm.phone" autofocus clearable oninput="value=value.replace(/\D/g,'')" placeholder="请输入手机号">
           <template #prefix>
           <template #prefix>
             <el-icon class="el-input__icon">
             <el-icon class="el-input__icon">
               <phone/>
               <phone/>
@@ -75,7 +75,7 @@
 
 
       <div v-if="cardType==='reset'||cardType==='register'" id="auth-card-code-verifier">
       <div v-if="cardType==='reset'||cardType==='register'" id="auth-card-code-verifier">
         <el-form-item prop="identifyCode">
         <el-form-item prop="identifyCode">
-          <el-input id="auth-card-code-verifier-code" v-model="cardForm.identifyCode" onchange="this.cardVerified=value.length===6" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入验证码">
+          <el-input id="auth-card-code-verifier-code" v-model="cardForm.identifyCode" onchange="this.cardVerified=value.length===6" oninput="value=value.replace(/\D/g,'')" placeholder="请输入验证码">
             <template #prefix>
             <template #prefix>
               <el-icon class="el-input__icon">
               <el-icon class="el-input__icon">
                 <key/>
                 <key/>
@@ -123,14 +123,14 @@ export default {
       }
       }
     };
     };
     const phoneValidator = (rule, value, callback) => {
     const phoneValidator = (rule, value, callback) => {
-      if (/^(13[0-9]|14[0-9]|15[0-9]|16[6]|18[0-9]|19[6,9]|17[0-9])\d{8}$/i.test(value) === false) {
+      if (/^(13\d|14\d|15\d|166|18\d|19[6,9]|17\d)\d{8}$/i.test(value) === false) {
         callback(new Error("请输入正确格式的手机号"));
         callback(new Error("请输入正确格式的手机号"));
       } else {
       } else {
         callback();
         callback();
       }
       }
     };
     };
     const emailValidator = (rule, value, callback) => {
     const emailValidator = (rule, value, callback) => {
-      if (/^([a-zA-Z0-9]+[_|.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/.test(value) === false) {
+      if (/^([a-zA-Z\d]+[_|.]?)*[a-zA-Z\d]+@([a-zA-Z\d]+[_|.]?)*[a-zA-Z\d]+\.[a-zA-Z]{2,3}$/.test(value) === false) {
         callback(new Error("请输入正确格式的邮箱"));
         callback(new Error("请输入正确格式的邮箱"));
       } else {
       } else {
         callback();
         callback();
@@ -139,7 +139,7 @@ export default {
     const identifyCodeValidator = (rule, value, callback) => {
     const identifyCodeValidator = (rule, value, callback) => {
       if (value.length !== 6) {
       if (value.length !== 6) {
         this.shakeElem("auth-card-code-verifier");
         this.shakeElem("auth-card-code-verifier");
-        callback(new Error("请输入短信验证码"));
+        callback(new Error("请正确输入短信验证码"));
       } else {
       } else {
         this.cardVerified = true;
         this.cardVerified = true;
         callback();
         callback();
@@ -224,36 +224,29 @@ export default {
   },
   },
 
 
   computed: {
   computed: {
-    cardTitle: function () {
+    cardTitle() {
       if (this.cardType === "login") {
       if (this.cardType === "login") {
         return "登录";
         return "登录";
       } else if (this.cardType === "register") {
       } else if (this.cardType === "register") {
         return "注册";
         return "注册";
-      } else if (this.cardType === "reset") {
-        return "重置密码";
       } else {
       } else {
-        return "errString";
+        return "重置密码";
       }
       }
     },
     },
-    cardLink: function () {
+    cardLink() {
       if (this.cardType === "login") {
       if (this.cardType === "login") {
         return "立即注册";
         return "立即注册";
       } else if (this.cardType === "register") {
       } else if (this.cardType === "register") {
         return "已有账号? 前往登录";
         return "已有账号? 前往登录";
-      } else if (this.cardType === "reset") {
-        return "记得密码? 前往登录";
       } else {
       } else {
-        return "errString";
+        return "记得密码? 前往登录";
       }
       }
     },
     },
-
-    passwordPlaceHolder: function () {
+    passwordPlaceHolder() {
       if (this.cardType === "login") {
       if (this.cardType === "login") {
         return "请输入密码";
         return "请输入密码";
-      } else if (this.cardType === "register" || this.cardType === "reset") {
-        return "请输入密码,需要包含英文和数字,长度为8-20个字符";
       } else {
       } else {
-        return "errString";
+        return "请输入密码,需要包含英文和数字,长度为8-20个字符";
       }
       }
     }
     }
   },
   },

+ 3 - 5
src/views/AuthPage/components/SlideVerifier.vue

@@ -122,13 +122,11 @@ export default {
         background.style.transition = null;
         background.style.transition = null;
         //说明:clientX 事件属性会返回当事件被触发时,鼠标指针向对于浏览器页面(或客户区)的水平坐标。
         //说明:clientX 事件属性会返回当事件被触发时,鼠标指针向对于浏览器页面(或客户区)的水平坐标。
         //2.当滑块位于初始位置时,得到鼠标按下时的水平位置
         //2.当滑块位于初始位置时,得到鼠标按下时的水平位置
-        const ev = event || window.event;
-        const downX = ev.clientX;
+        const downX = event.clientX;
         //三、给文档注册鼠标移动事件
         //三、给文档注册鼠标移动事件
         document.onmousemove = (e) => {
         document.onmousemove = (e) => {
-          const evt = e || window.event;//是为了更好的兼容IE浏览器和非ie浏览器。在ie浏览器中,window.event是全局变量,在非ie中,就需要自己传入一个参数来获取event啦,所以就有了var e = e||window.event
-          //1.获取鼠标移动后的水平位置
-          const moveX = evt.clientX;
+         //1.获取鼠标移动后的水平位置
+          const moveX = e.clientX;
           //2.得到鼠标水平位置的偏移量(鼠标移动时的位置 - 鼠标按下时的位置)
           //2.得到鼠标水平位置的偏移量(鼠标移动时的位置 - 鼠标按下时的位置)
           let offsetX = moveX - downX;
           let offsetX = moveX - downX;
           //3.在这里判断一下:鼠标水平移动的距离 与 滑动成功的距离 之间的关系
           //3.在这里判断一下:鼠标水平移动的距离 与 滑动成功的距离 之间的关系

+ 198 - 132
src/views/CoursePage/CourseDetail.vue

@@ -1,140 +1,163 @@
 <template>
 <template>
-  <el-card class="course-detail-page">
+  <div class="course-detail-page">
     <div v-if="courseInfo!==null" class="course-detail-container">
     <div v-if="courseInfo!==null" class="course-detail-container">
-      <div class="header">
-        <div class="course-img">
-          <img :src="imgUrl" alt="">
-        </div>
-        <div class="course-info">
-          <el-row style="font-size: xx-large; font-weight: bold">
-            {{ courseInfo.name === undefined ? "空白课程" : courseInfo.name }}
-          </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-card>
+        <div class="header">
+          <div class="course-img">
+            <img :src="imgUrl" alt="">
+          </div>
+          <div class="course-info">
+            <el-row style="font-size: xx-large; font-weight: bold">
+              {{ courseInfo.name === undefined ? "空白课程" : courseInfo.name }}
+            </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>
+            </div>
+            <el-row class="mooc-link">
+              MOOC链接:
+              <el-link v-if="courseInfo.moocUrl!==null" :href="courseInfo.moocUrl" target="_blank">点击此处<i
+                class="el-icon-link el-icon--right"></i></el-link>
+              <span v-else>无</span>
+            </el-row>
+            <el-row v-if="isStudent">
+              <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-row>
           </div>
           </div>
-          <el-row class="mooc-link">
-            MOOC链接:
-            <el-link v-if="courseInfo.moocUrl!==null" :href="courseInfo.moocUrl" target="_blank">点击此处<i
-              class="el-icon-link el-icon--right"></i></el-link>
-            <span v-else>无</span>
-          </el-row>
-          <el-row v-if="isStudent">
-            <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-row>
         </div>
         </div>
-      </div>
 
 
-      <el-divider></el-divider>
+        <el-divider></el-divider>
 
 
-      <div class="introduce">
-        <div class="title">简介</div>
-        <div class="introduce-content">
-          {{ courseInfo.description === "" ? "无" : courseInfo.description }}
+        <div class="introduce">
+          <div class="title">简介</div>
+          <div class="introduce-content">
+            {{ courseInfo.description === "" ? "无" : courseInfo.description }}
+          </div>
         </div>
         </div>
-      </div>
+      </el-card>
 
 
       <el-divider v-if="isCreator || isCourseSelected"/>
       <el-divider v-if="isCreator || isCourseSelected"/>
 
 
-      <div v-if="isCreator || isCourseSelected" class="course-tabs">
-        <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="comment" @click="switchTab('comment')">评论</el-radio-button>
-        </el-radio-group>
-        <div>
-          <el-popover v-if="isCreator && tabName==='notice'"
-                      v-model:visible="noticePopover"
-                      :width="160"
-                      placement="bottom">
-            <el-row class="sel-notice-type">
-              <div :style="{color:themeColor.green}" class="notice-type-icon">
-                公告
-              </div>
-              <div class="notice-type-txt">
-                <el-link href="javascript:void(0);" type="success" @click="selAndInitAnnouncement('announcement')">发布公告
-                </el-link>
-              </div>
-            </el-row>
-            <el-row class="sel-notice-type">
-              <div :style="{color:themeColor.orange}" class="notice-type-icon">
-                作业
-              </div>
-              <div class="notice-type-txt">
-                <el-link href="javascript:void(0);" type="warning" @click="selAndInitAnnouncement('homework')">发布作业
-                </el-link>
-              </div>
-            </el-row>
-            <el-row class="sel-notice-type">
-              <div :style="{color:themeColor.red}" class="notice-type-icon">
-                考试
-              </div>
-              <div class="notice-type-txt">
-                <el-link href="javascript:void(0);" type="danger" @click="selAndInitAnnouncement('exam')">发布考试</el-link>
-              </div>
-            </el-row>
-            <template #reference>
-              <el-button plain type="primary" @click="noticePopover = true">添加发布
-              </el-button>
-            </template>
-          </el-popover>
-          <el-upload v-if="isCreator && tabName==='courseware'" :http-request="handleFileUploading"
-                     :on-success="handleFileUploadSuccess"
-                     :show-file-list="false" action="">
-            <el-button plain type="primary">上传课件</el-button>
-          </el-upload>
-        </div>
-      </div>
+      <el-card>
 
 
-      <div v-if="isCreator || isCourseSelected" class="course-tab-content">
-        <div v-if="tabName==='task'">
-          <!--          <el-timeline>-->
-          <!--            <el-timeline-item-->
-          <!--              v-for="(task, index) in tasks"-->
-          <!--              :key="index"-->
-          <!--              :timestamp="task.timestamp"-->
-          <!--            >-->
-          <!--              {{ task.content }}-->
-          <!--            </el-timeline-item>-->
-          <!--          </el-timeline>-->
-          evalExamList: {{ this.evalExamList }}
-          <br/>
-          coderExamList: {{ this.coderExamList }}
-        </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)"/>
-        </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 v-if="isCreator || isCourseSelected" class="course-tabs">
+          <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="comment" @click="switchTab('comment')">评论</el-radio-button>
+          </el-radio-group>
+          <div>
+            <el-popover v-if="isCreator && tabName==='notice'"
+                        v-model:visible="noticePopover"
+                        :width="160"
+                        placement="bottom">
+              <el-row class="sel-notice-type">
+                <div :style="{color:themeColor.green}" class="notice-type-icon">
+                  公告
+                </div>
+                <div class="notice-type-txt">
+                  <el-link href="javascript:void(0);" type="success" @click="selAndInitAnnouncement('announcement')">发布公告
+                  </el-link>
+                </div>
+              </el-row>
+              <el-row class="sel-notice-type">
+                <div :style="{color:themeColor.orange}" class="notice-type-icon">
+                  作业
+                </div>
+                <div class="notice-type-txt">
+                  <el-link href="javascript:void(0);" type="warning" @click="selAndInitAnnouncement('homework')">发布作业
+                  </el-link>
+                </div>
+              </el-row>
+              <el-row class="sel-notice-type">
+                <div :style="{color:themeColor.red}" class="notice-type-icon">
+                  考试
+                </div>
+                <div class="notice-type-txt">
+                  <el-link href="javascript:void(0);" type="danger" @click="selAndInitAnnouncement('exam')">发布考试</el-link>
+                </div>
+              </el-row>
+              <template #reference>
+                <el-button plain type="primary" @click="noticePopover = true">添加发布
+                </el-button>
+              </template>
+            </el-popover>
+            <el-upload v-if="isCreator && tabName==='courseware'" :http-request="handleFileUploading"
+                       :on-success="handleFileUploadSuccess"
+                       :show-file-list="false" action="">
+              <el-button plain type="primary">上传课件</el-button>
+            </el-upload>
+          </div>
         </div>
         </div>
-        <div v-else-if="tabName==='comment'">
-          <el-input v-model="commentContent" placeholder="发表一条友善的评论">
-            <template #append>
-              <el-button type="primary" @click="createComment">发表评论</el-button>
-            </template>
-          </el-input>
-          commentTree: {{ commentTree }}
+
+        <div v-if="isCreator || isCourseSelected" class="course-tab-content">
+          <div v-if="tabName==='task'">
+            <el-timeline>
+              <el-timeline-item
+                v-for="task in courseTaskList"
+                :key="task.id" :timestamp="task.examId ? task.startTime.substring(0, 16) : timestampToTime(task.startAt)"
+                :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>
+                </div>
+              </el-timeline-item>
+            </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)"/>
+          </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>
+          <div v-else-if="tabName==='comment'">
+            <el-input v-model="commentContent" placeholder="发表一条友善的评论">
+              <template #append>
+                <el-button type="primary" @click="createComment">发表评论</el-button>
+              </template>
+            </el-input>
+            commentTree: {{ commentTree }}
+          </div>
         </div>
         </div>
-      </div>
+      </el-card>
     </div>
     </div>
 
 
     <el-dialog v-model="announcementFormDialog" :before-close="beforeFormClose" :title="announcementForm.dialogTitle">
     <el-dialog v-model="announcementFormDialog" :before-close="beforeFormClose" :title="announcementForm.dialogTitle">
@@ -159,13 +182,13 @@
         <el-button plain type="danger" @click="beforeFormClose">我再想想</el-button>
         <el-button plain type="danger" @click="beforeFormClose">我再想想</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
-  </el-card>
+  </div>
 </template>
 </template>
 
 
 <script>
 <script>
 import NoticeItem from "./components/NoticeItem";
 import NoticeItem from "./components/NoticeItem";
 import FileEntry from "./components/FileEntry";
 import FileEntry from "./components/FileEntry";
-import {ElMessageBox, ElMessage} from "element-plus";
+import { ElMessageBox, ElMessage } from "element-plus";
 import variables from "@/utils/variables";
 import variables from "@/utils/variables";
 
 
 export default {
 export default {
@@ -221,11 +244,11 @@ export default {
         color: "",
         color: "",
       },
       },
       noticeTypeMap: {
       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: {},
       postNoticeInfo: {},
       fileEntryList: [{
       fileEntryList: [{
         id: 1,
         id: 1,
@@ -276,6 +299,18 @@ export default {
       return this.courseInfo.imageUrl === null ? this.noImgUrl : this.courseInfo.imageUrl;
       return this.courseInfo.imageUrl === null ? this.noImgUrl : this.courseInfo.imageUrl;
       // + "?t=" + Date.now().valueOf();
       // + "?t=" + Date.now().valueOf();
     },
     },
+    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;
+          });
+      }
+    },
   },
   },
   mounted() {
   mounted() {
     this.$apis.getCourseById(this.$route.params.id)
     this.$apis.getCourseById(this.$route.params.id)
@@ -299,6 +334,37 @@ export default {
       const D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate());
       const D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate());
       return Y + M + D;
       return Y + M + D;
     },
     },
+    // 任务
+    courseTaskStatusColor(VO) {
+      if (this.state(VO) === "FINISHED" || this.state(VO) === "NOT_STARTED" || this.state(VO) === "CLOSED") {
+        return "grey";
+      } else if (VO.isJoined) {
+        return this.themeColor.blue;
+      } else {
+        return this.themeColor.green;
+      }
+    },
+    state(VO) {
+      if (VO.examId) {
+        if (new Date(VO.endTime) < new Date()) {
+          return "FINISHED";
+        } else if (new Date(VO.startTime) > new Date()) {
+          return "NOT_STARTED";
+        } else {
+          return "RUNNING";
+        }
+      } else {
+        if (VO.status === "CLOSED") {
+          return "CLOSED";
+        } else if (VO.startAt * 1000 > new Date()) {
+          return "NOT_STARTED";
+        } else if (VO.endAt * 1000 < new Date()) {
+          return "FINISHED";
+        } else {
+          return "RUNNING";
+        }
+      }
+    },
     // 公告相关
     // 公告相关
     selAndInitAnnouncement(type) {
     selAndInitAnnouncement(type) {
       this.announcementForm.type = type;
       this.announcementForm.type = type;
@@ -344,7 +410,7 @@ export default {
 
 
       function createAnnouncement() {
       function createAnnouncement() {
         let announcementVO = {
         let announcementVO = {
-          sender: {id: _this.$store.state.user.id,},
+          sender: { id: _this.$store.state.user.id, },
           courseId: _this.courseInfo.id,
           courseId: _this.courseInfo.id,
           title: _this.announcementForm.title,
           title: _this.announcementForm.title,
           content: _this.announcementForm.content,
           content: _this.announcementForm.content,
@@ -422,7 +488,7 @@ export default {
         confirmButtonText: "立即选课",
         confirmButtonText: "立即选课",
         cancelButtonText: "我再想想",
         cancelButtonText: "我再想想",
       })
       })
-        .then(({value}) => {
+        .then(({ value }) => {
           if (value !== this.courseInfo.invitationCode) {
           if (value !== this.courseInfo.invitationCode) {
             ElMessage.error("选课码错误");
             ElMessage.error("选课码错误");
           } else {
           } else {

+ 9 - 1
src/views/CoursePage/style/CourseDetail.css

@@ -31,7 +31,7 @@
 .header {
 .header {
     display: flex;
     display: flex;
     justify-content: flex-start;
     justify-content: flex-start;
-    /*align-items: center;*/
+    margin: 40px 10vw 80px 10vw;
 }
 }
 
 
 .course-img {
 .course-img {
@@ -211,3 +211,11 @@
     width: fit-content;
     width: fit-content;
     text-align: right;
     text-align: right;
 }
 }
+
+.task-title {
+    font-weight: bold;
+}
+
+.task-info {
+    padding: 5px 0 0 5px;
+}

+ 9 - 6
src/views/MessagePage/MessagePage.vue

@@ -33,8 +33,8 @@
         <div v-if="this.activeIndex==='1'" class="message-page-main">
         <div v-if="this.activeIndex==='1'" class="message-page-main">
           <MessageCard v-for="i in myUnReadAnnouncement" :key="i.id" :messageVO="i"/>
           <MessageCard v-for="i in myUnReadAnnouncement" :key="i.id" :messageVO="i"/>
         </div>
         </div>
-        <div v-else>
-
+        <div v-else class="message-page-main">
+          <MessageCard v-for="i in myUnReadAnnouncement" :key="i.id" :messageVO="i"/>
         </div>
         </div>
       </el-card>
       </el-card>
     </el-col>
     </el-col>
@@ -52,6 +52,7 @@ export default {
     return {
     return {
       activeIndex: "1",
       activeIndex: "1",
       myUnReadAnnouncement: [],
       myUnReadAnnouncement: [],
+      myUnReadMessage: [],
     };
     };
   },
   },
   computed: {
   computed: {
@@ -60,10 +61,12 @@ export default {
     },
     },
   },
   },
   created() {
   created() {
-    this.$apis.getUnreadAnnouncements()
-      .then(res => {
-        this.myUnReadAnnouncement = res.data.data;
-      });
+    this.$apis.getUnreadAnnouncements().then(res => {
+      this.myUnReadAnnouncement = res.data.data;
+    });
+    // this.$apis.getUnreadMessages().then(res => {
+    //   this.myUnReadMessage = res.data.data;
+    // });
   },
   },
   methods: {
   methods: {
     handleSelect(index) {
     handleSelect(index) {

+ 1 - 0
src/views/PortalPage/PortalPage.vue

@@ -233,6 +233,7 @@ export default {
   //其他函数
   //其他函数
   methods: {
   methods: {
     handleResize() {
     handleResize() {
+      if (this.$route.path!=="/portal") return;
       // todo @DQJ 可能还得优化
       // todo @DQJ 可能还得优化
       let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
       let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
       if (scrollTop > 100) {
       if (scrollTop > 100) {