Преглед изворни кода

Code Review(Not Finish yet)

Damon пре 4 година
родитељ
комит
9de64ae24c

+ 2 - 1
src/components/CourseCard.vue

@@ -71,7 +71,7 @@ export default {
       return this.timestampToTime(this.courseVO.endTime);
     },
     description() {
-      return this.courseVO.description || "无课程简介";
+      return this.courseVO.description.length > 28 ? this.courseVO.description.substring(0, 28) + "..." : this.courseVO.description;
     },
     isManagePage() {
       return this.$route.name === "Manage" && this.$store.getters.isTeacher;
@@ -113,6 +113,7 @@ export default {
   top: 0;
   left: 0;
   outline: solid 1px #eeeeee;
+  min-height: 60px;
 }
 
 .name {

+ 27 - 26
src/components/GlobalHeader.vue

@@ -19,24 +19,24 @@
         个人中心
       </el-menu-item>
       <el-menu-item v-if="isTeacher" index="6">
-        教师[临]
-      </el-menu-item>
-      <el-menu-item index="7">
-        问题[临]
+        管理
       </el-menu-item>
     </el-menu>
     <div id="global-header-icon">
-      <div class="global-header-icon-content" @click="toMessage" 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
-            d="M849.6 713.4c8.4-0.4 16.7 1.8 23.8 6.4-28.9-18.5-46.4-50.4-46.3-84.8V436c0-145.9-105.7-267.6-246.9-297.5v-7.2c0-37.1-30.1-67.1-67.2-67.1h-0.1c-37.1 0-67.3 30.1-67.3 67.2v7C304.3 168.4 198.7 290 198.7 436v199.1c0 35.7-18.6 66.9-46.4 84.8 7-4.6 15.4-6.9 23.8-6.4-24.7-0.9-45.5 18.4-46.4 43.1-0.9 24.7 18.4 45.5 43.1 46.4h676.6c24.7 0.1 44.8-20 44.9-44.7 0.1-24.8-19.9-44.9-44.7-44.9zM513 959.8c62 0 112.2-50.2 112.2-111.9H400.7c0 61.7 50.2 111.9 112.3 111.9z"
-            fill="#E8AA5B"></path>
-        </svg>
-      </div>
-      <div class="global-header-icon-content" @click="toHome">
+      <el-tooltip content="前往通知页" placement="bottom" effect="light" :show-after="1000">
+        <div class="global-header-icon-content" @click="toMessage" 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
+              d="M849.6 713.4c8.4-0.4 16.7 1.8 23.8 6.4-28.9-18.5-46.4-50.4-46.3-84.8V436c0-145.9-105.7-267.6-246.9-297.5v-7.2c0-37.1-30.1-67.1-67.2-67.1h-0.1c-37.1 0-67.3 30.1-67.3 67.2v7C304.3 168.4 198.7 290 198.7 436v199.1c0 35.7-18.6 66.9-46.4 84.8 7-4.6 15.4-6.9 23.8-6.4-24.7-0.9-45.5 18.4-46.4 43.1-0.9 24.7 18.4 45.5 43.1 46.4h676.6c24.7 0.1 44.8-20 44.9-44.7 0.1-24.8-19.9-44.9-44.7-44.9zM513 959.8c62 0 112.2-50.2 112.2-111.9H400.7c0 61.7 50.2 111.9 112.3 111.9z"
+              fill="#E8AA5B"></path>
+          </svg>
+        </div>
+      </el-tooltip>
+      <el-tooltip content="前往个人中心页" placement="right" effect="light" :show-after="1000">
+        <div class="global-header-icon-content" @click="toHome">
         <ElPopover trigger="hover">
           <template #reference>
             <div v-if="isLogin" id="info-circle">
@@ -59,6 +59,7 @@
           <InfoCard/>
         </ElPopover>
       </div>
+      </el-tooltip>
     </div>
   </div>
 </template>
@@ -71,8 +72,6 @@ export default {
   components: { InfoCard },
   data() {
     return {
-      myUnReadAnnouncements: [],
-      myUnReadMessages: [],
       menuIndex: [
         ["1", "Portal"],
         ["2", "Task"],
@@ -87,7 +86,7 @@ export default {
   },
   computed: {
     isLogin() {
-      return this.$store.state.user.token !== undefined;
+      return this.$store.getters.isLogin;
     },
     name() {
       return this.$store.state.user.name || "无名氏";
@@ -110,27 +109,33 @@ export default {
       });
       return out;
     },
+    unReadMessages() {
+      return this.$store.getters.unReadMessages;
+    },
+    unReadAnnouncements() {
+      return this.$store.getters.unReadAnnouncements;
+    },
     unreadNum() {
-      return this.myUnReadAnnouncements.length + this.myUnReadMessages.length > 99 ? "99+" : this.myUnReadAnnouncements.length + this.myUnReadMessages.length + "";
+      return this.unReadAnnouncements.length + this.unReadMessages.length > 99 ? "99+" : this.unReadAnnouncements.length + this.unReadMessages.length + "";
     },
   },
 
   watch: {
     isLogin(newData) {
       if (newData) {
-        this.fetchMessages();
+        this.$store.dispatch("fetchMessages", this);
       }
     },
     $route() {
       if (this.isLogin) {
-        this.fetchMessages();
+        this.$store.dispatch("fetchMessages", this);
       }
     }
   },
 
   created() {
     if (this.isLogin) {
-      this.fetchMessages();
+      this.$store.dispatch("fetchMessages", this);
     }
   },
 
@@ -144,10 +149,6 @@ export default {
     toMessage() {
       this.$router.push("/message");
     },
-    async fetchMessages() {
-      this.myUnReadAnnouncements = (await this.$apis.getUnreadAnnouncements()).data.data;
-      this.myUnReadMessages = (await this.$apis.getUnreadMessages()).data.data;
-    },
     handleMenuSelect(key) {
       let target = "/portal";
       this.menuIndex.forEach(i => {

+ 2 - 1
src/global/register-element.js

@@ -37,7 +37,7 @@ import {
   ElMenuItem,
   ElSubmenu, ElCollapse, ElCollapseItem,
   ElSwitch,
-  ElBadge, ElOptionGroup,
+  ElBadge, ElOptionGroup, ElTooltip,
 } from "element-plus";
 
 // NOTE 使用到的组件列表,请确保 import 和 component 的一致性
@@ -84,6 +84,7 @@ const components = [
   ElSwitch,
   ElBadge,
   ElOptionGroup,
+  ElTooltip,
 ];
 
 export default function (app) {

+ 5 - 1
src/store/index.js

@@ -1,10 +1,14 @@
 import { createStore } from "vuex";
 import user from "./modules/user";
 import problem from "./modules/problem";
+import utils from "@/store/modules/utils";
+import messages from "@/store/modules/message";
 
 export default createStore({
   modules: {
     user,
-    problem
+    problem,
+    utils,
+    messages,
   }
 });

+ 35 - 0
src/store/modules/message.js

@@ -0,0 +1,35 @@
+const messages = {
+  state() {
+    return {
+      messages: [],
+      announcements: [],
+    };
+  },
+
+  mutations: {
+    set_messages(state, data) {
+      state.messages = data;
+    },
+    set_announcements(state, data) {
+      state.announcements = data;
+    }
+  },
+
+  actions: {
+    async fetchMessages({commit, state}, that) {
+      commit("set_messages", (await that.$apis.getUnreadAnnouncements()).data.data);
+      commit("set_announcements", (await that.$apis.getUnreadMessages()).data.data);
+    }
+  },
+
+  getters: {
+    unReadMessages(state) {
+      return state.messages;
+    },
+    unReadAnnouncements(state) {
+      return state.announcements;
+    },
+  },
+};
+
+export default messages;

+ 5 - 2
src/store/modules/user.js

@@ -125,11 +125,14 @@ const user = {
   },
 
   getters: {
-    isTeacher(state){
+    isTeacher(state) {
       return ["TEACHER"].indexOf(state.role) !== -1;
     },
-    isStudent(state){
+    isStudent(state) {
       return ["STUDENT"].indexOf(state.role) !== -1;
+    },
+    isLogin(state) {
+      return state.token !== undefined;
     }
   }
 };

+ 19 - 0
src/store/modules/utils.js

@@ -0,0 +1,19 @@
+const utils = {
+  state() {
+    //
+  },
+
+  mutations: {
+
+  },
+
+  actions: {
+
+  },
+
+  getters: {
+
+  },
+};
+
+export default utils;

+ 4 - 0
src/utils/variables.js

@@ -1,7 +1,11 @@
 const noImgUrl = "https://mjh1.oss-cn-hangzhou.aliyuncs.com/hci/no-image.png";
 
+// AuthPage
+const backgroundLOGO = "seec-logo--horizontal.png";
+
 const variables = {
   noImgUrl,
+  backgroundLOGO,
 };
 
 export default variables;

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

@@ -1,5 +1,7 @@
 <template>
-  <img id="auth-img" alt="err" src="@/assets/seec-logo--horizontal.png" @click="toPortal">
+  <el-tooltip content="前往门户首页" placement="bottom" effect="light" :show-after="1000">
+    <img id="auth-img" alt="err" src="@/assets/seec-logo--horizontal.png" @click="toPortal">
+  </el-tooltip>
   <div id="auth-card">
     <AuthCard/>
   </div>
@@ -26,6 +28,7 @@ export default {
   left: 15vw;
   width: 352px;
   height: 300px;
+  cursor: pointer;
 }
 
 #auth-card {

+ 0 - 5
src/views/AuthPage/components/AuthCard.css

@@ -49,14 +49,9 @@
     justify-content: space-between;
 }
 
-#auth-card-code-verifier-code {
-
-}
-
 #auth-card-code-verifier-button {
     height: 100%;
     width: 150px;
-    /*margin-right: 10px;*/
 }
 
 #auth-card-submit-button {

+ 27 - 10
src/views/AuthPage/components/AuthCard.vue

@@ -1,10 +1,10 @@
 <template>
   <div id="auth-card-body">
     <h2 id="auth-card-title">{{ cardTitle }} </h2>
-    <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="cardFormRule" @keyup.enter="onSubmit">
 
       <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 placeholder="请输入手机号">
           <template #prefix>
             <el-icon class="el-input__icon">
               <phone/>
@@ -64,7 +64,7 @@
       </el-form-item>
 
       <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 placeholder="请输入手机号">
           <template #prefix>
             <el-icon class="el-input__icon">
               <phone/>
@@ -75,7 +75,7 @@
 
       <div v-if="cardType==='reset'||cardType==='register'" id="auth-card-code-verifier">
         <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 v-model="cardForm.identifyCode" placeholder="请输入验证码">
             <template #prefix>
               <el-icon class="el-input__icon">
                 <key/>
@@ -115,6 +115,13 @@ export default {
   name: "AuthCard",
   components: { Message, Cherry, Avatar, SlideVerifier, Lock, Phone, Key },
   data() {
+    const inputNumberValidator = (rule, value, callback) => {
+      if (!(/(^[1-9]\d*$)/.test(value))) {
+        callback(new Error("请勿输入非数字"));
+      } else {
+        callback();
+      }
+    };
     const passwordConfirmValidator = (rule, value, callback) => {
       if (value !== this.cardForm.password) {
         callback(new Error("请输入相同的密码"));
@@ -149,7 +156,7 @@ export default {
       cardType: "login",
       cardButtonDisabled: false,
       cardButtonText: "获取验证码",
-      cardVerified: true,
+      cardVerified: false,
       rememberMe: false,
       cardForm: {
         phone: "",
@@ -160,12 +167,16 @@ export default {
         passwordConfirm: "",
         identifyCode: "",
       },
-      cardRuleForm: {
+      cardFormRule: {
         phone: [
           { required: true, message: "请输入手机号", trigger: "blur" },
           {
             validator: phoneValidator,
             trigger: "blur"
+          },
+          {
+            validator: inputNumberValidator,
+            trigger: "change"
           }
         ],
         name: [
@@ -217,6 +228,10 @@ export default {
           {
             validator: identifyCodeValidator,
             trigger: "blur",
+          },
+          {
+            validator: inputNumberValidator,
+            trigger: "change",
           }
         ]
       },
@@ -251,7 +266,7 @@ export default {
     }
   },
 
-  mounted() {
+  created() {
     if (localStorage.rememberMe) {
       this.cardForm.phone = localStorage.phone;
       this.cardForm.password = localStorage.password;
@@ -360,7 +375,7 @@ export default {
       });
     },
     handleRegister() {
-      //傻子写法,有可能的话重构一下
+      //虽然很傻,但是似乎没有直接简化的写法
       const thatForm = this.$refs.cardFormRef;
       thatForm.validateField("name", v1 => {
         thatForm.validateField("username", v2 => {
@@ -465,11 +480,12 @@ export default {
         });
       });
     },
-
     handleSlideVerifier(verifyStatus) {
       this.cardVerified = verifyStatus;
       if (this.cardVerified && verifyStatus && this.rememberMe && localStorage.getItem("rememberMe")) {
-        this.handleLogin();
+        if (localStorage.phone === this.cardForm.phone && localStorage.password === this.cardForm.password) {
+          this.handleLogin();
+        }
       }
     },
     shakeElem(elemId) {
@@ -525,6 +541,7 @@ export default {
         }
       });
     },
+
   }
 };
 </script>

+ 67 - 62
src/views/CoursePage/CourseDetail.vue

@@ -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>

+ 32 - 33
src/views/CoursePage/CoursePage.vue

@@ -1,29 +1,31 @@
 <template>
   <el-row id="course-page-body">
     <el-col :span="3">
-      <el-menu background-color="#f8f9fb" default-active="1" style="position: fixed;"
-               @select="handleSelect">
-        <el-menu-item index="0">
-          <el-icon>
-            <Back/>
-          </el-icon>
-          <span style="padding-left: 20px">返回首页</span>
-        </el-menu-item>
-        <el-menu-item index="1">
-          <el-icon>
-            <Folder/>
-          </el-icon>
-          <span style="padding-left: 20px">全部课程</span>
-        </el-menu-item>
-        <el-menu-item index="2">
-          <el-icon>
-            <FolderChecked/>
-          </el-icon>
-          <span style="padding-left: 20px">我的课程</span>
-        </el-menu-item>
-      </el-menu>
+      <el-card style="position: fixed;">
+        <el-menu default-active="1" @select="handleSelect">
+          <el-menu-item index="0">
+            <el-icon>
+              <Back/>
+            </el-icon>
+            <span style="padding-left: 20px">返回首页</span>
+          </el-menu-item>
+          <el-menu-item index="1">
+            <el-icon>
+              <Folder/>
+            </el-icon>
+            <span style="padding-left: 20px">全部课程</span>
+          </el-menu-item>
+          <el-menu-item index="2">
+            <el-icon>
+              <FolderChecked/>
+            </el-icon>
+            <span style="padding-left: 20px">我的课程</span>
+          </el-menu-item>
+        </el-menu>
+      </el-card>
+
     </el-col>
-    <el-col :span="1"/>
+    <el-col :span="2"/>
     <el-col :span="18">
       <el-card>
         <template #header>
@@ -76,18 +78,15 @@ export default {
     isStudent() {
       return this.$store.getters.isStudent;
     },
+    isLogin() {
+      return this.$store.getters.isLogin;
+    },
   },
 
-  mounted() {
-    this.$apis.getAllCourses().then(res => {
-      this.courses_all = res.data.data;
-    });
-    if (this.isStudent) {
-      if (this.$store.state.user.token) {
-        this.courses_my = this.$apis.getStudentCourses().then(res => {
-          this.courses_my = res.data.data;
-        });
-      }
+  async created() {
+    this.courses_all = (await (this.$apis.getAllCourses())).data.data;
+    if (this.isStudent && this.isLogin) {
+      this.courses_my = (await (this.$apis.getStudentCourses())).data.data;
     }
   },
 
@@ -104,7 +103,7 @@ export default {
 
 <style scoped>
 #course-page-body {
-  margin: 40px 60px 80px 60px;
+  margin: 40px 60px 80px 0;
   min-height: calc(100vh - 340px);
   position: relative;
 }

+ 1 - 0
src/views/CoursePage/components/NoticeItem.vue

@@ -97,6 +97,7 @@ export default {
 
 <style scoped>
 .notice-item {
+  padding: 0 20px 0 20px;
   border-radius: 6px;
   width: 100%;
   display: flex;

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

@@ -78,6 +78,7 @@
 }
 
 .introduce-content {
+    white-space: pre-wrap;
     margin-top: 16px;
     font-size: 14px;
     line-height: 26px;
@@ -264,6 +265,7 @@
 .announcement-content {
     font-size: 16px;
     padding: 10px 0 0 20px;
+    white-space: pre-wrap;
 }
 
 .el-timeline-item {

+ 24 - 22
src/views/HomePage/HomePage.vue

@@ -1,28 +1,30 @@
 <template>
   <el-row id="home-page-body">
     <el-col :span="4">
-      <el-menu background-color="#f8f9fb" default-active="1" @select="handleSelect" style="position: fixed;">
-        <el-menu-item index="0">
-          <el-icon>
-            <Back/>
-          </el-icon>
-          <span style="padding-left: 20px">返回首页</span>
-        </el-menu-item>
-        <el-menu-item index="1">
-          <el-icon>
-            <User/>
-          </el-icon>
-          <span style="padding-left: 20px">基本信息</span>
-        </el-menu-item>
-        <el-menu-item index="2">
-          <el-icon>
-            <Medal/>
-          </el-icon>
-          <span style="padding-left: 20px">身份认证</span>
-        </el-menu-item>
-      </el-menu>
+      <el-card style="position: fixed;">
+        <el-menu default-active="1" @select="handleSelect">
+          <el-menu-item index="0">
+            <el-icon>
+              <Back/>
+            </el-icon>
+            <span style="padding-left: 20px">返回首页</span>
+          </el-menu-item>
+          <el-menu-item index="1">
+            <el-icon>
+              <User/>
+            </el-icon>
+            <span style="padding-left: 20px">基本信息</span>
+          </el-menu-item>
+          <el-menu-item index="2">
+            <el-icon>
+              <Medal/>
+            </el-icon>
+            <span style="padding-left: 20px">身份认证</span>
+          </el-menu-item>
+        </el-menu>
+      </el-card>
     </el-col>
-    <el-col :span="1"/>
+    <el-col :span="2"/>
     <el-col :span="18">
       <InformationCard v-if="activeIndex==='1'"/>
       <CertificationCard v-else/>
@@ -56,7 +58,7 @@ export default {
 
 <style scoped>
 #home-page-body {
-  margin: 40px 160px 80px 160px;
+  margin: 40px 160px 80px 0;
   min-height: calc(100vh - 160px);
 }
 </style>

+ 10 - 10
src/views/ManagePage/ManagePage.vue

@@ -60,16 +60,16 @@
           <span style="font-weight: bold; font-size: larger">
             全部测试
           </span>
-            <div class="course-type-selector">
-              <el-select v-model="examType" class="m-2" placeholder="测试类型">
-                <el-option
-                  v-for="item in examTypeOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </div>
+<!--            <div class="course-type-selector">-->
+<!--              <el-select v-model="examType" class="m-2" placeholder="测试类型">-->
+<!--                <el-option-->
+<!--                  v-for="item in examTypeOptions"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </div>-->
           </div>
         </template>
         <el-tabs v-model="activeTestPaneName">

+ 24 - 22
src/views/MessagePage/MessagePage.vue

@@ -1,28 +1,30 @@
 <template>
   <el-row id="message-page-body">
     <el-col :span="4">
-      <el-menu background-color="#f8f9fb" default-active="1" @select="handleSelect" style="position: fixed;">
-        <el-menu-item index="0">
-          <el-icon>
-            <Back/>
-          </el-icon>
-          <span style="padding-left: 20px">返回首页</span>
-        </el-menu-item>
-        <el-menu-item index="1">
-          <el-icon>
-            <Bell/>
-          </el-icon>
-          <span style="padding-left: 20px">通知列表</span>
-        </el-menu-item>
-        <el-menu-item index="2">
-          <el-icon>
-            <ChatDotRound/>
-          </el-icon>
-          <span style="padding-left: 20px">消息列表</span>
-        </el-menu-item>
-      </el-menu>
+      <el-card style="position: fixed;">
+        <el-menu default-active="1" @select="handleSelect">
+          <el-menu-item index="0">
+            <el-icon>
+              <Back/>
+            </el-icon>
+            <span style="padding-left: 20px">返回首页</span>
+          </el-menu-item>
+          <el-menu-item index="1">
+            <el-icon>
+              <Bell/>
+            </el-icon>
+            <span style="padding-left: 20px">通知列表</span>
+          </el-menu-item>
+          <el-menu-item index="2">
+            <el-icon>
+              <ChatDotRound/>
+            </el-icon>
+            <span style="padding-left: 20px">消息列表</span>
+          </el-menu-item>
+        </el-menu>
+      </el-card>
     </el-col>
-    <el-col :span="1"/>
+    <el-col :span="2"/>
     <el-col :span="18">
       <el-card>
         <template #header>
@@ -97,7 +99,7 @@ export default {
 
 <style scoped>
 #message-page-body {
-  margin: 40px 160px 80px 160px;
+  margin: 40px 160px 80px 0;
   min-height: calc(100vh - 160px);
 }
 

+ 3 - 3
src/views/MessagePage/components/MessageCard.vue

@@ -87,11 +87,11 @@ export default {
   methods: {
     async jump() {
       if (this.messageVO.courseId) {
-        this.$router.push({name: "CourseDetail", params: {jump_from_message: "1", id: this.messageVO.courseId}});
+        await this.$router.push({ name: "CourseDetail", params: { jump_from_message: "1", id: this.messageVO.courseId } });
       } else {
         const viewInfo = (await this.$apis.getViewByMessage(this.messageVO.id)).data.data;
         await this.$apis.readMessage(this.messageVO.id);
-        this.$router.push({name: "CourseDetail", params: {jump_from_message: "2", id: viewInfo["course"]}});
+        await this.$router.push({ name: "CourseDetail", params: { jump_from_message: "2", id: viewInfo["course"] } });
       }
     }
   }
@@ -107,7 +107,7 @@ export default {
 }
 
 .body:hover {
-  background: #e4e7ed;
+  background: #f9fcff;
   cursor: pointer;
 }
 

+ 9 - 7
src/views/PortalPage/PortalPage.vue

@@ -7,6 +7,7 @@
       <el-card :style="{height: this.courseRowHeight + 'px'}">
         <div class="portal-card-title">
           <div class="portal-card-title-main">我的课程</div>
+          <div style="font-size: 10px; color: #777777" v-if="myCourseList.length>6">可滚动查看课程列表</div>
         </div>
         <el-divider class="portal-card-divider"/>
         <div>
@@ -24,7 +25,7 @@
           <div v-if="isLogin && isStudent && myCourseList.length!==0"
                :style="{height: (this.courseRowHeight - 63) + 'px'}"
                class="portal-card-main">
-            <div class="portal-my-card-main">
+            <div class="portal-my-card-main" ref="a">
               <MyCourseCard v-for="course in myCourseList" :key="course.id" :courseVO="course"/>
             </div>
           </div>
@@ -81,6 +82,7 @@
       <el-card :style="{height: this.testRowHeight + 'px'}">
         <div class="portal-card-title">
           <div class="portal-card-title-main">我的测试</div>
+          <div style="font-size: 10px; color: #777777" v-if="myTestList.length>6">可滚动查看测试列表</div>
         </div>
         <el-divider class="portal-card-divider"/>
         <div>
@@ -201,7 +203,7 @@ export default {
   },
   computed: {
     isLogin() {
-      return this.$store.state.user.token !== undefined;
+      return this.$store.getters.isLogin;
     },
     isTeacher() {
       return this.$store.getters.isTeacher;
@@ -214,8 +216,8 @@ export default {
         .concat(this.myEvalExamList)
         .concat(this.myCoderExamList)
         .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();
+          let a_time = a["startAt"] * 1000 || new Date(a.startTime).getTime();
+          let b_time = b["startAt"] * 1000 || new Date(b.startTime).getTime();
           return a_time - b_time;
         });
     },
@@ -284,7 +286,7 @@ export default {
     },
     state(testVO) {
       const now = new Date();
-      if (testVO.examId) {
+      if (testVO["examId"]) {
         if (new Date(testVO.endTime) < now) {
           return "FINISHED";
         } else if (new Date(testVO.startTime) > now) {
@@ -295,9 +297,9 @@ export default {
       } else {
         if (testVO.status === "CLOSED") {
           return "CLOSED";
-        } else if (testVO.startAt * 1000 > now) {
+        } else if (testVO["startAt"] * 1000 > now) {
           return "NOT_STARTED";
-        } else if (testVO.endAt * 1000 < now) {
+        } else if (testVO["endAt"] * 1000 < now) {
           return "FINISHED";
         } else {
           return "RUNNING";

+ 2 - 2
src/views/TaskPage/TaskPage.vue

@@ -164,8 +164,8 @@ export default {
         .concat(this.myEvalExamList)
         .concat(this.myCoderExamList)
         .sort((a, b) => {
-          let a_time = a.endAt * 1000 || new Date(a.endTime).getTime();
-          let b_time = b.endAt * 1000 || new Date(b.endTime).getTime();
+          let a_time = a["endAt"] * 1000 || new Date(a.endTime).getTime();
+          let b_time = b["endAt"] * 1000 || new Date(b.endTime).getTime();
           return a_time - b_time;
         })
         .filter(i => (this.state(i) === "RUNNING_IN" || this.state(i) === "RUNNING_NOT"));

+ 28 - 27
src/views/TestPage/TestPage.vue

@@ -1,29 +1,30 @@
 <template>
   <el-row id="test-page-body">
     <el-col :span="3">
-      <el-menu background-color="#f8f9fb" default-active="1" style="position: fixed;"
-               @select="handleSelect">
-        <el-menu-item index="0">
-          <el-icon>
-            <Back/>
-          </el-icon>
-          <span style="padding-left: 20px">返回首页</span>
-        </el-menu-item>
-        <el-menu-item index="1">
-          <el-icon>
-            <Document/>
-          </el-icon>
-          <span style="padding-left: 20px">公开测试</span>
-        </el-menu-item>
-        <el-menu-item index="2">
-          <el-icon>
-            <DocumentChecked/>
-          </el-icon>
-          <span style="padding-left: 20px">我的测试</span>
-        </el-menu-item>
-      </el-menu>
+      <el-card style="position: fixed;">
+        <el-menu default-active="1" @select="handleSelect">
+          <el-menu-item index="0">
+            <el-icon>
+              <Back/>
+            </el-icon>
+            <span style="padding-left: 20px">返回首页</span>
+          </el-menu-item>
+          <el-menu-item index="1">
+            <el-icon>
+              <Document/>
+            </el-icon>
+            <span style="padding-left: 20px">公开测试</span>
+          </el-menu-item>
+          <el-menu-item index="2">
+            <el-icon>
+              <DocumentChecked/>
+            </el-icon>
+            <span style="padding-left: 20px">我的测试</span>
+          </el-menu-item>
+        </el-menu>
+      </el-card>
     </el-col>
-    <el-col :span="1"/>
+    <el-col :span="2"/>
     <el-col :span="18">
       <el-card>
         <template #header>
@@ -36,7 +37,7 @@
             <el-tab-pane label="评测题" name="eval">
               <div v-for="(item, key) in evalExamList" :key="key">
                 <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>
                 </div>
                 <div class="test-page-main">
                   <TestCard v-for="exam in item" :key="exam.id" :testVO="exam" :isPublicTest="true"/>
@@ -46,7 +47,7 @@
             <el-tab-pane label="代码题" name="coder">
               <div v-for="(item, key) in coderExamList" :key="key">
                 <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>
                 </div>
                 <div class="test-page-main">
                   <TestCard v-for="exam in item" :key="exam.id" :testVO="exam"/>
@@ -61,7 +62,7 @@
             <el-tab-pane label="评测题" name="eval">
               <div v-for="(item, key) in evalExamList_my" :key="key">
                 <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>
                 </div>
                 <div class="test-page-main">
                   <TestCard v-for="exam in item" :key="exam.id" :testVO="exam"/>
@@ -71,7 +72,7 @@
             <el-tab-pane label="代码题" name="coder">
               <div v-for="(item, key) in coderExamList_my" :key="key">
                 <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>
                 </div>
                 <div class="test-page-main">
                   <TestCard v-for="exam in item" :key="exam.id" :testVO="exam"/>
@@ -156,7 +157,7 @@ export default {
 
 <style scoped>
 #test-page-body {
-  margin: 40px 60px 80px 60px;
+  margin: 40px 60px 80px 0;
   min-height: calc(100vh - 340px);
   position: relative;
 }