Ver Fonte

添加在线作业

Michael Wang há 5 anos atrás
pai
commit
47b910572b

+ 5 - 0
src/components/MainLayout/MainLayout.vue

@@ -81,6 +81,11 @@
             在线考试
           </router-link>
         </li>
+        <li v-if="!isEpcc">
+          <router-link class="link" to="/online-homework">
+            在线作业
+          </router-link>
+        </li>
         <li v-if="!isEpcc">
           <router-link class="link" to="/online-practice">
             在线练习

+ 11 - 1
src/features/OnlineExam/Examing/ExamingEnd.vue

@@ -58,7 +58,7 @@
 
       <router-link
         class="qm-primary-button"
-        to="/online-exam"
+        :to="backTo"
         style="display: inline-block; width: 100%;"
       >
         返回主页
@@ -89,6 +89,16 @@ export default {
   computed: {
     ...globalMapState(["user"]),
     // ...mapState(["exam"])
+    backTo() {
+      const examType = this.exam && this.exam.examType;
+      if (examType === "PRACTICE") {
+        return "/online-practice";
+      } else if (examType === "ONLINE_HOMEWORK") {
+        return "/online-homework";
+      }
+
+      return "/online-exam";
+    },
   },
   created() {
     this.$Message.destroy(); // 避免极端情况下,心跳过期的错误消息

+ 22 - 4
src/features/OnlineExam/OnlineExamHome.vue

@@ -5,7 +5,7 @@
                        background-color: #fafafa;"
     >
       当前所在位置:
-      <BreadcrumbItem>在线考试</BreadcrumbItem>
+      <BreadcrumbItem>{{ locationTitle }}</BreadcrumbItem>
     </Breadcrumb>
 
     <div class="home">
@@ -27,6 +27,12 @@ export default {
     "ecs-online-list": EcsOnlineList,
     PhoneVerifyForDD,
   },
+  props: {
+    examType: {
+      type: String,
+      default: "ONLINE",
+    },
+  },
   data() {
     return {
       previousUrl: "",
@@ -37,6 +43,14 @@ export default {
   computed: {
     ...mapState(["user", "siteMessagesTimeStamp"]),
     ...mapGetters(["isEpcc"]),
+    locationTitle() {
+      if (this.examType === "ONLINE") {
+        return "在线考试";
+      } else if (this.examType === "ONLINE_HOMEWORK") {
+        return "在线作业";
+      }
+      return "";
+    },
   },
   beforeRouteEnter(to, from, next) {
     next(vm => {
@@ -102,9 +116,13 @@ export default {
 
     let examListRes;
     for (let i = 0; i < 4; i++) {
-      examListRes = await this.$http.get(
-        "/api/ecs_oe_admin/examControl/queryExamList"
-      );
+      let url;
+      if (this.examType === "ONLINE") {
+        url = "/api/ecs_oe_admin/examControl/queryExamList";
+      } else if (this.examType === "ONLINE_HOMEWORK") {
+        url = "/api/ecs_oe_admin/examControl/queryHomeworkList";
+      }
+      examListRes = await this.$http.get(url);
       if (examListRes.status === 503) {
         await new Promise(resolve => setTimeout(() => resolve(), 2000));
         continue;

+ 14 - 0
src/router.js

@@ -26,6 +26,9 @@ let router = new Router({
       path: "/",
       name: "Home",
       component: OnlineExamHome,
+      props: {
+        examType: "ONLINE", // 在线考试
+      },
     },
     {
       path: "/login/:domain",
@@ -41,6 +44,17 @@ let router = new Router({
       path: "/online-exam",
       name: "OnlineExamHome",
       component: OnlineExamHome,
+      props: {
+        examType: "ONLINE", // 在线考试
+      },
+    },
+    {
+      path: "/online-homework",
+      name: "OnlineHomeworkHome",
+      component: OnlineExamHome,
+      props: {
+        examType: "ONLINE_HOMEWORK", // 在线考试
+      },
     },
     {
       path: "/online-exam/exam/:examId/overview",