mock/modules/assignment/index.js

@@ -42,6 +42,14 @@ router.route("/teacher/course/:courseId/code").get((req, res) => {
   });
 });
 
+//老师查看单个代码作业
+router.route("/teacher/:codeId").get((req, res) => {
+  res.send({
+    code: 0,
+    data: CodeSerializer()
+  });
+});
+
 //学生查看代码作业列表
 router.route("/student/course/:courseId/code").get((req, res) => {
   res.send({
@@ -132,6 +140,14 @@ router.route("/teacher/course/:courseId/document").get((req, res) => {
   });
 });
 
+//老师查看单个文档作业
+router.route("/teacher/document/:documentId").get((req, res) => {
+  res.send({
+    code: 0,
+    data: DocumentSerializer()
+  });
+});
+
 //学生查看文档作业列表
 router.route("/student/course/:courseId/document").get((req, res) => {
   res.send({
@@ -179,11 +195,13 @@ router.route("/student/document/:documentId/result").get((req, res) => {
   });
 });
 
-router.route("/teacher/document/:documentId/content").get((req, res) => {
-  res.send({
-    code: 0,
-    data: DocumentContentSerializer()
+router
+  .route("/teacher/document/result/:documentResultId/content")
+  .get((req, res) => {
+    res.send({
+      code: 0,
+      data: DocumentContentSerializer()
+    });
   });
-});
 
 module.exports = router;

mock/serializers/assignment/DocumentResultSerializer.js

@@ -1,5 +1,6 @@
 const makeId = require("../../util/makeId");
 const groupSerializer = require("../course/GroupSerializer");
+const documentSerializer = require("../assignment/DocumentSerializer");
 /**
  * @description 文档作业成绩
  * @typedef {Object} DocumentResultSerializerType
@@ -18,7 +19,7 @@ const groupSerializer = require("../course/GroupSerializer");
 module.exports = () => {
   return {
     id: makeId(),
-    document: makeId(),
+    document: documentSerializer(),
     group: groupSerializer(),
     state: "互评中",
     result: "A",

src/api/assignment.js

@@ -71,6 +71,15 @@ export const getCodeAssignmentListByTeacher = courseId => {
   return request(`${ASSIGNMENT_MODULE}/teacher/course/${courseId}/code`);
 };
 
+/**
+ * 老师查看单个代码作业
+ * @param codeId
+ * @returns {Promise<{data:CodeSerializerType}>}
+ */
+export const getCodeAssignmentByTeacher = codeId => {
+  return request(`${ASSIGNMENT_MODULE}/teacher/${codeId}`);
+};
+
 /**
  * 学生查看代码作业列表
  * @param courseId
@@ -210,6 +219,15 @@ export const getDocAssignmentListTeacherByCrs = courseId => {
   return request(`${ASSIGNMENT_MODULE}/teacher/course/${courseId}/document`);
 };
 
+/**
+ * 老师查看单个文档作业
+ * @param documentId
+ * @returns {Promise<{data:DocumentSerializerType}>}
+ */
+export const getDocAssignmentTeacherByCrs = documentId => {
+  return request(`${ASSIGNMENT_MODULE}/teacher/document/${documentId}`);
+};
+
 /**
  * 学生查看文档作业列表
  * @param courseId
@@ -264,6 +282,8 @@ export const getUnsubmittedDocGroupsByDocId = documentId => {
  * @param documentId
  * @return {Promise<data:DocumentContentSerializerType>}
  */
-export const getDocContentByDocId = documentId => {
-  return request(`${ASSIGNMENT_MODULE}/teacher/document/${documentId}/content`);
+export const getDocContentByDocId = documentResultId => {
+  return request(
+    `${ASSIGNMENT_MODULE}/teacher/document/result/${documentResultId}/content`
+  );
 };

src/components/AssignmentCRUD/CreateAssignment/index.vue

@@ -82,6 +82,7 @@
               placeholder="输入关键字模糊查找"
               type="search"
               v-model="$v.searchContent.$model"
+              @keyup.enter.native="search(searchContent)"
               expanded
             >
             </b-input>
@@ -221,6 +222,7 @@ export default {
       errorMassage: null,
       isServerError: false,
       submitting: false,
+      // 转圈圈
       loadingSearchQuestions: false,
       loadingCreateAssignment: false
     };
@@ -289,16 +291,16 @@ export default {
           );
         }
         this.myPromise.then(res => {
+          //创建成功
+          this.isCreateModalActive = false;
           if (res.code === 0) {
-            //创建成功
-            this.$emit("sendCreatedAssignment", res.data);
-            this.isCreateModalActive = false;
-            this.loadingCreateAssignment = false;
             if (this.assignType === 1) {
               this.$router.push({
                 path: `${this.prefix}/review?documentHwId=${res.data.id}`
               });
             }
+            this.$emit("sendCreatedAssignment", res.data);
+            this.loadingCreateAssignment = false;
           } else {
             //创建失败
             this.isCreateModalActive = false;

src/components/AssignmentCRUD/DeleteAssignment/index.vue

@@ -1,12 +1,5 @@
 <template>
-  <div>
-    <a
-      style="color:#b34141"
-      :class="{ 'is-loading': loadingDelAssignment }"
-      @click="confirmDelete()"
-      >删除</a
-    >
-  </div>
+  <div><a style="color:#b34141" @click="confirmDelete()">删除</a></div>
 </template>
 
 <script>
@@ -25,17 +18,15 @@ export default {
   data() {
     return {
       myPromise: null,
-      submitting: false,
-      loadingDelAssignment: false
+      submitting: false
     };
   },
   methods: {
     confirmDelete() {
       if (this.submitting) return;
-      this.loadingDelAssignment = true;
       this.submitting = true;
       this.$dialog.confirm({
-        message: "确认删除？",
+        message: `确认删除？`,
         confirmText: "删除",
         type: "is-danger",
         onConfirm: () => {
@@ -56,7 +47,6 @@ export default {
                 hasIcon: true
               });
             }
-            this.loadingDelAssignment = false;
           });
         }
       });

src/components/AssignmentCRUD/UpdateAssignment/index.vue

@@ -119,6 +119,8 @@ export default {
       this.isUpdateModalActive = true;
       this.params.name = this.updateItem.name;
       this.params.description = this.updateItem.description;
+      this.params.startAt = this.updateItem.startAt;
+      this.params.endAt = this.updateItem.endAt;
     },
     /**
      * 确认修改

src/router/routes.js

@@ -85,7 +85,7 @@ export default [
         component: () => import("@/views/teacher/Code/detail")
       },
       {
-        path: "code/:codeId/test",
+        path: "code/:codeId/test/:testId",
         component: () => import("@/views/teacher/Code/test")
       },
 
@@ -98,7 +98,7 @@ export default [
         component: () => import("@/views/teacher/Document/detail")
       },
       {
-        path: "document/:documentId/content",
+        path: "document/:documentId/content/:groupWorkId",
         component: () => import("@/views/teacher/Document/docContent")
       },
       {

src/views/student/Document/detail.vue

@@ -8,10 +8,10 @@
       ]"
     >
       <template slot="title">
-        {{ assignmentInfo.name }}
+        {{ detail.name }}
       </template>
       <template slot="content">
-        {{ assignmentInfo.description }}
+        {{ detail.description }}
       </template>
       <template slot="action" v-if="loadingDocResult">
         <a class="button is-primary">成绩：{{ docResult.result }}</a>
@@ -28,7 +28,9 @@
               <div class="subtitle is-6" v-if="isAvailable">
                 {{ detail.problem ? detail.problem.name : "" }}
               </div>
-              <div class="subtitle is-6" v-else>题目开始进行才可查看</div>
+              <div class="subtitle is-6" v-else>
+                <s>题目开始进行才可查看</s>
+              </div>
             </div>
             <div class="column">
               <h5 class="title is-5">状态:</h5>
@@ -82,14 +84,6 @@ import DocumentStateTag from "@/components/DocumentStateTag";
 import timeMixins from "@/mixins/time";
 import PageSectionLoading from "@/components/PageBody/PageSectionLoading/index";
 
-const assignmentInfo = {
-  id: 0,
-  name: "",
-  description: "",
-  startAt: 0,
-  endAt: 0
-};
-
 export default {
   components: {
     PageSectionLoading,
@@ -99,25 +93,25 @@ export default {
   },
   mixins: [timeMixins],
   mounted() {
+    const { documentId } = this.$route.params;
     this.loadingDocDetail = true;
-    this.assignmentInfo = this.$route.query.assignmentInfo;
-    getDocAssignmentDetailByDocuId(this.assignmentInfo.id).then(res => {
+    getDocAssignmentDetailByDocuId(documentId).then(res => {
       this.detail = res.data;
       this.loadingDocDetail = false;
       this.isAvailable =
         this.detail.status === "AVAILABLE" || this.detail.status === "FINISHED";
     });
-    getDocResultById(this.assignmentInfo.id).then(res => {
+    getDocResultById(documentId).then(res => {
       this.docResult = res.data;
       // 有成绩
-      if (parseInt(this.docResult.result) !== -1) {
-        this.loadingDocResult = true;
+      // 修改为String
+      if (this.docResult.result !== null) {
+        this.loadingDocResult = true; //不显示
       }
     });
   },
   data() {
     return {
-      assignmentInfo,
       detail: {},
       docResult: {},
       loadingDocResult: false,

src/views/student/Document/index.vue

@@ -22,12 +22,7 @@
           v-for="item in docList"
           class="column is-4-desktop"
         >
-          <router-link
-            :to="{
-              path: `${$route.path}/${item.id}`,
-              query: { assignmentInfo: item }
-            }"
-          >
+          <router-link :to="{ path: `${$route.path}/${item.id}` }">
             <card hoverable>
               {{ item.name }}
               <div>

src/views/teacher/Code/detail.vue

@@ -4,14 +4,14 @@
       :loading="loadingCommittedGroups"
       :routes="[
         { name: '代码作业', path: 'code' },
-        { name: '作业详情', path: 'code/${assignmentInfo.id}' }
+        { name: '作业详情', path: `${$route.path}` }
       ]"
     >
       <template slot="title">
-        {{ assignmentInfo.name }}
+        {{ problemInfo.name }}
       </template>
       <template slot="content">
-        作业描述信息作业描述信息作业描述信息作业描述信息作业描述信息作业描述信息作业描述信息
+        {{ problemInfo.description }}
       </template>
     </page-header>
 
@@ -38,43 +38,58 @@
                   {{ props.row.group.id }}
                 </b-table-column>
                 <b-table-column label="构建" centered>
-                  <span :class="geneTitleAndTag(props.row.buildStatus.key).tag">
-                    {{ geneTitleAndTag(props.row.buildStatus.key).title }}
+                  <span :class="geneTag(props.row.buildStatus.key)">
+                    {{
+                      props.row.buildStatus.key === 0
+                        ? "未构建"
+                        : props.row.buildStatus.key === -1
+                        ? "失败"
+                        : "成功"
+                    }}
                   </span>
                 </b-table-column>
 
                 <b-table-column label="部署" centered>
-                  <span
-                    :class="geneTitleAndTag(props.row.deployStatus.key).tag"
-                  >
-                    {{ geneTitleAndTag(props.row.deployStatus.key).title }}
+                  <span :class="geneTag(props.row.deployStatus.key)">
+                    {{
+                      props.row.deployStatus.key === 0
+                        ? "未部署"
+                        : props.row.deployStatus.key === -1
+                        ? "失败"
+                        : "成功"
+                    }}
                   </span>
                 </b-table-column>
-                <b-table-column label="单元测试">
-                  <span
-                    :class="geneTitleAndTag(props.row.unitTestStatus.key).tag"
-                  >
-                    {{ props.row.unitTestStatus.passCount }}/{{
-                      props.row.unitTestStatus.testCount
+                <b-table-column label="单元测试" centered>
+                  <span :class="geneTag(props.row.unitTestStatus.key)">
+                    {{
+                      props.row.unitTestStatus.key === 0
+                        ? "未测试"
+                        : props.row.unitTestStatus.key === -1
+                        ? "构建失败"
+                        : props.row.unitTestStatus.passCount +
+                          "/" +
+                          props.row.unitTestStatus.testCount
                     }}
                   </span>
                 </b-table-column>
-                <b-table-column label="功能测试">
-                  <span
-                    :class="
-                      geneTitleAndTag(props.row.functionTestStatus.key).tag
-                    "
-                  >
-                    {{ props.row.functionTestStatus.passCount }}/{{
-                      props.row.functionTestStatus.testCount
+                <b-table-column label="功能测试" centered>
+                  <span :class="geneTag(props.row.functionTestStatus.key)">
+                    {{
+                      props.row.functionTestStatus.key === 0
+                        ? "未测试"
+                        : props.row.functionTestStatus.key === -1
+                        ? "未知状态"
+                        : props.row.functionTestStatus.passCount +
+                          "/" +
+                          props.row.functionTestStatus.testCount
                     }}
                   </span>
                 </b-table-column>
-                <b-table-column label="详情">
+                <b-table-column label="详情" centered>
                   <router-link
                     :to="{
-                      path: `/course-teacher/:courseId/code/detail/test`,
-                      query: { assignmentInfo: props.row }
+                      path: `${$route.path}/test/${props.row.id}`
                     }"
                     >查看详情</router-link
                   >
@@ -117,7 +132,7 @@
                 <b-table-column label="小组名称" centered>
                   {{ props.row.name }}
                 </b-table-column>
-                <b-table-column label="小组成员" centered>
+                <b-table-column label="小组a成员" centered>
                   <span v-for="member in props.row.members" :key="member.id"
                     >{{ member.username }}&emsp;</span
                   >
@@ -136,15 +151,9 @@ import PageHeader from "@/components/PageHeader";
 import PageBody from "@/components/PageBody/index";
 import { getCodeProcedureListByCodeId } from "@/api/assignment";
 import { getUnsubmittedCodeGroupsList } from "@/api/assignment";
-import PageSectionLoading from "@/components/PageBody/PageSectionLoading/index";
+import { getCodeAssignmentByTeacher } from "@/api/assignment";
 
-const assignmentInfo = {
-  id: 0,
-  name: "",
-  description: "",
-  startAt: 0,
-  endAt: 0
-};
+import PageSectionLoading from "@/components/PageBody/PageSectionLoading/index";
 
 const tag = {
   success: "tag is-success",
@@ -165,15 +174,18 @@ export default {
     PageSectionLoading
   },
   mounted() {
+    this.codeId = this.$route.params;
     this.loadingUncommittedGroups = true;
     this.loadingCommittedGroups = true;
-    this.assignmentInfo = this.$route.query.assignmentInfo;
-    getCodeProcedureListByCodeId(123).then(res => {
+    getCodeAssignmentByTeacher(this.codeId).then(res => {
+      this.problemInfo = res.data.problem;
+    });
+    getCodeProcedureListByCodeId(this.codeId).then(res => {
       this.codeProcedureList = res.data;
       this.submitInfo.yes = "已提交：" + this.codeProcedureList.length;
       this.loadingCommittedGroups = false;
     });
-    getUnsubmittedCodeGroupsList(123).then(res => {
+    getUnsubmittedCodeGroupsList(this.codeId).then(res => {
       this.unsubmitedGroups = res.data;
       this.submitInfo.no = "未提交：" + this.unsubmitedGroups.length;
       this.loadingUncommittedGroups = false;
@@ -181,10 +193,14 @@ export default {
   },
   data() {
     return {
+      codeId: null,
       codeProcedureList: [],
       unsubmitedGroups: [],
-      showResult: [],
-      assignmentInfo,
+      problemInfo: {
+        id: null,
+        name: null,
+        description: null
+      },
       tag,
       status,
       submitInfo: {
@@ -196,6 +212,17 @@ export default {
     };
   },
   methods: {
+    geneTag(state) {
+      let showTag = "";
+      if (state === -1) {
+        showTag = tag.failed;
+      } else if (state === 0) {
+        showTag = tag.uncommitted;
+      } else {
+        showTag = tag.success;
+      }
+      return showTag;
+    },
     geneTitleAndTag(state) {
       let data = {
         title: "",

src/views/teacher/Code/index.vue

@@ -36,10 +36,7 @@
             <b-table-column label="作业名称" centered>
               <router-link
                 :to="{
-                  path: `code/${props.row.id}`,
-                  query: {
-                    assignmentInfo: props.row.problem
-                  }
+                  path: `code/${props.row.id}`
                 }"
               >
                 {{ props.row.name }}

src/views/teacher/Code/test.vue

@@ -3,7 +3,7 @@
     <page-header
       :routes="[
         { name: '代码作业', path: 'code' },
-        { name: '作业详情', path: `code/${assignmentInfo.id}` },
+        { name: '作业详情', path: `code/${$route.params.codeId}` },
         { name: '测试信息', path: `${$route.path}` }
       ]"
     >
@@ -31,12 +31,11 @@ export default {
     PageHeader
   },
   mounted() {
-    this.assignmentInfo = this.$route.query.assignmentInfo;
+    const { testId } = this.$route.params;
+    console.log(testId);
   },
   data() {
-    return {
-      assignmentInfo: {}
-    };
+    return {};
   }
 };
 </script>

src/views/teacher/Document/detail.vue

@@ -4,14 +4,14 @@
       :loading="loadingCommittedGroups"
       :routes="[
         { name: '文档作业', path: 'document' },
-        { name: `作业详情`, path: `document` }
+        { name: `作业详情`, path: `${$route.path}` }
       ]"
     >
       <template slot="title">
-        {{ question.name }}
+        {{ problem.name }}
       </template>
       <template slot="content">
-        题目描述：{{ question.description }}
+        题目描述：{{ problem.description }}
       </template>
       <template slot="extraContent">
         题目进行阶段：{{ status }}
@@ -56,8 +56,7 @@
                 <b-table-column field="difficulty" label="详情" centered
                   ><router-link
                     :to="{
-                      path: `${$route.path}/content`,
-                      query: { assignId: docId }
+                      path: `${$route.path}/content/${props.row.id}`
                     }"
                     >查看详情</router-link
                   >
@@ -123,6 +122,7 @@ import PageHeader from "@/components/PageHeader";
 import PageBody from "@/components/PageBody/index";
 import { getSubmittedDocResultListByDocId } from "@/api/assignment";
 import { getUnsubmittedDocGroupsByDocId } from "@/api/assignment";
+import { getDocAssignmentTeacherByCrs } from "@/api/assignment";
 import { mapState } from "vuex";
 import PageSectionLoading from "@/components/PageBody/PageSectionLoading/index";
 
@@ -137,20 +137,20 @@ export default {
     PageHeader,
     PageSectionLoading
   },
-  created() {
-    this.docId = this.$route.query.docId;
-    this.question = this.$route.query.question;
-  },
   mounted() {
+    const { documentId } = this.$route.query;
     this.loadingCommittedGroups = true;
     this.loadingUncommittedGroups = true;
-    getSubmittedDocResultListByDocId(this.docId).then(res => {
+    getDocAssignmentTeacherByCrs(documentId).then(res => {
+      this.problem = res.data.problem;
+    });
+    getSubmittedDocResultListByDocId(documentId).then(res => {
       this.status = res.data.status;
       this.submittedData = res.data.result;
       this.submitInfo.yes = "已提交：" + this.submittedData.length;
       this.loadingCommittedGroups = false;
     });
-    getUnsubmittedDocGroupsByDocId(this.docId).then(res => {
+    getUnsubmittedDocGroupsByDocId(documentId).then(res => {
       this.unsubmitedGroups = res.data;
       this.submitInfo.no = "未提交：" + this.unsubmitedGroups.length;
       this.loadingUncommittedGroups = false;
@@ -158,11 +158,14 @@ export default {
   },
   data() {
     return {
+      problem: {
+        id: null,
+        name: null,
+        description: null
+      },
       submittedData: [],
       unsubmitedGroups: [],
       status: "",
-      question: null,
-      docId: null,
       submitInfo: {
         yes: "已提交",
         no: "未提交"

src/views/teacher/Document/docContent.vue

@@ -6,7 +6,7 @@
         { name: '文档作业', path: 'document' },
         {
           name: `作业详情`,
-          path: `document/${docId}`
+          path: `document/${$route.params.documentId}`
         },
         { name: `文档内容`, path: `${$route.path}` }
       ]"
@@ -57,7 +57,6 @@ export default {
   },
   data() {
     return {
-      docId: null,
       contentResult: {
         content: "",
         group: "",
@@ -67,12 +66,11 @@ export default {
       loadingDocContent: false
     };
   },
-  created() {
-    this.docId = this.$route.query.assignId;
-  },
+
   mounted() {
     this.loadingDocContent = true;
-    getDocContentByDocId(this.docId).then(res => {
+    const { groupWorkId } = this.$route.params;
+    getDocContentByDocId(groupWorkId).then(res => {
       this.contentResult = res.data;
       this.loadingDocContent = false;
     });

src/views/teacher/Document/index.vue

@@ -32,8 +32,7 @@
               <b-table-column label="作业名称" centered>
                 <router-link
                   :to="{
-                    path: `${$route.path}/${props.row.id}`,
-                    query: { docId: props.row.id, question: props.row.problem }
+                    path: `${$route.path}/${props.row.id}`
                   }"
                 >
                   {{ props.row.name }}

vue.config.js

@@ -3,7 +3,7 @@ module.exports = {
     proxy: {
       "^/api": {
         target: "http://localhost:4000/",
-        // target: "http://10.1.1.198:8080/",
+        // target: "http://10.1.2.2:8080/",
         ws: true,
         changeOrigin: true
       }