ソースを参照

Merge remote-tracking branch 'origin/develop' into feature/review-bay

WuXinyu 7 年 前
コミット
db5c94da68

+ 16 - 6
mock/modules/question/index.js

@@ -6,18 +6,28 @@ const QuestionTypeSerializer = require("../../serializers/question/QuestionTypeS
 //获取全部题目分类
 router.route("/teacher/questionType").get((req, res) => {
   res.send({
-    data: [
-      QuestionTypeSerializer(),
-      QuestionTypeSerializer(),
-      QuestionTypeSerializer()
-    ]
+    data: [QuestionTypeSerializer(), QuestionTypeSerializer()]
   });
 });
 
 //按题目分类获得题目(分页) || 根据作业分类获得题目
 router.route("/teacher/questions").get((req, res) => {
   res.send({
-    data: [QuestionSerializer(), QuestionSerializer(), QuestionSerializer()],
+    data: [
+      QuestionSerializer(),
+      QuestionSerializer(),
+      QuestionSerializer(),
+      QuestionSerializer(),
+      QuestionSerializer(),
+      QuestionSerializer(),
+      QuestionSerializer(),
+      QuestionSerializer(),
+      QuestionSerializer(),
+      QuestionSerializer(),
+      QuestionSerializer(),
+      QuestionSerializer(),
+      QuestionSerializer()
+    ],
     pageNum: 1
   });
 });

+ 6 - 5
mock/serializers/question/QuestionSerializer.js

@@ -22,19 +22,20 @@ const fileSerializer = require("../FileSerializer");
 module.exports = () => {
   return {
     id: makeId(),
-    name: "物流系统需求规格说明书",
-    description: "某公司为xxx快递公司,请为该公司设计一个物流管理系统",
+    name: "独立的小易",
+    description:
+      "小易为了向他的父母表现他已经长大独立了,他决定搬出去自己居住一段时间。一个人生活增加了许多花费: 小易每天必须吃一个水果并且需要每天支付x元的房屋租金。当前小易手中已经有f个水果和d元钱,小易也能去商店购买一些水果,商店每个水果售卖p元。小易为了表现他独立生活的能力,希望能独立生活的时间越长越好,小易希望你来帮他计算一下他最多能独立生活多少天。",
     assignmentType: {
       name: "DOCUMENT",
       value: "文档作业"
     },
     type: {
-      name: "DOCUMENT",
-      value: "文档作业"
+      name: "JAVA",
+      value: "JAVA"
     },
     creator: makeId(),
     expectTime: 20,
     difficulty: 1,
-    file: fileSerializer()
+    file: [fileSerializer(), fileSerializer()]
   };
 };

+ 2 - 0
package.json

@@ -12,9 +12,11 @@
   },
   "dependencies": {
     "buefy": "^0.7.1",
+    "chart.js": "^2.7.3",
     "dayjs": "^1.7.8",
     "register-service-worker": "^1.5.2",
     "vue": "^2.5.17",
+    "vue-chartjs": "^3.4.0",
     "vue-markdown": "^2.2.4",
     "vue-router": "^3.0.1",
     "vuelidate": "^0.7.4",

+ 1 - 1
src/assets/scss/_variables.scss

@@ -130,7 +130,7 @@ $pre-background: $background !default;
 
 // Link colors
 
-$link: #6172ec !default;
+$link: $blue !default;
 $link-invert: $blue-invert !default;
 $link-visited: $purple !default;
 

+ 10 - 3
src/assets/scss/app.scss

@@ -48,7 +48,7 @@ $default-margin-between:1.5rem;
   }
   .menu-list {
     font-weight: bold;
-    font-size: 1.1rem;
+    font-size: 1rem;
     li {
       margin-bottom: 10px;
       a {
@@ -65,13 +65,20 @@ $default-margin-between:1.5rem;
     }
   }
   .is-active {
-    background-color: rgba(0, 0, 0, 0.18) !important;
+    background-color: rgba(255, 255, 255, 0.18) !important;
   }
 }
 
 .tabs a,
 .tabs ul{
-  border-bottom-color: white;
+  border-bottom-color: #dbdbdb;
+  //border-bottom-color: white;
+}
+.data-table {
+  width: 100%;
+  padding: 30px;
+  /*min-height: 80vh;*/
+  background-color: #ffffff;
 }
 
 .content blockquote {

+ 1 - 0
src/layouts/HomeLayout/HomeHeader/index.vue

@@ -25,6 +25,7 @@ export default {
     DefaultHeader,
     UserDropdown
   },
+
   computed: {
     ...mapState({
       profile: state => state.user.profile

+ 0 - 8
src/layouts/TeacherMainLayout.vue

@@ -1,8 +0,0 @@
-<template>
-  <div>
-    <div></div>
-    <router-view></router-view>
-  </div>
-</template>
-
-<style lang="scss"></style>

+ 3 - 2
src/layouts/courseLayouts/LayoutStructure.vue

@@ -87,7 +87,7 @@ $top-section-height: 4.25rem;
 .menu-section {
   //min-width: $menu-width;
   //width: $left-width-calc;
-  width: 300px;
+  max-width: 300px;
   /*background: white;*/
   /*border-right: 3px solid rgb(159, 148, 254);*/
   padding-left: $left-padding-calc;
@@ -97,7 +97,8 @@ $top-section-height: 4.25rem;
   /*background-image: url("../../assets/sideBar.png");*/
   /*background-image: linear-gradient(to top, #493a9e 0%, #4f54e9 100%);*/
   /*background: linear-gradient(to top, #7c71bd 0%, #4f62e9 100%);*/
-  background: linear-gradient(to top, #7c71bdc7 0%, #6172ec 100%);
+  /*background: linear-gradient(to top, #7c71bdc7 0%, #6172ec 100%);*/
+  background: linear-gradient(to top, #20328ec7 0%, #0d0f23 100%);
   background-size: cover;
   position: sticky;
   overflow-y: auto;

+ 38 - 1
src/router/routes.js

@@ -68,9 +68,42 @@ export default [
         path: "question",
         component: () => import("@/views/teacher/Question")
       },
+      {
+        path: "question/:id",
+        component: () => import("@/views/teacher/Question/questionDetail.vue")
+      },
       {
         path: "result",
         component: () => import("@/views/teacher/Result")
+      },
+      {
+        path: "code",
+        component: () => import("@/views/teacher/Code/index")
+      },
+      {
+        path: "code/detail",
+        component: () => import("@/views/teacher/Code/detail")
+      },
+      {
+        path: "code/detail/test",
+        component: () => import("@/views/teacher/Code/test")
+      },
+
+      {
+        path: "document",
+        component: () => import("@/views/teacher/Document/index")
+      },
+      {
+        path: "document/detail",
+        component: () => import("@/views/teacher/Document/detail")
+      },
+      {
+        path: "review",
+        component: () => import("@/views/teacher/Review/assignmentList")
+      },
+      {
+        path: "review/:id",
+        component: () => import("@/views/teacher/Review/assignment")
       }
     ]
   },
@@ -86,7 +119,11 @@ export default [
       },
       {
         path: "code",
-        component: () => import("@/views/student/Code")
+        component: () => import("@/views/student/Code/index")
+      },
+      {
+        path: "code/detail",
+        component: () => import("@/views/student/Code/detail")
       },
       {
         path: "document",

+ 51 - 0
src/views/student/Code/detail.vue

@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <page-header
+      :routes="[
+        { name: '代码作业', path: 'code' },
+        { name: '购物车web项目', path: 'code/detail' }
+      ]"
+    >
+      <template slot="title">
+        Here might be a page title
+      </template>
+      <template slot="content">
+        Here might be a page title
+      </template>
+    </page-header>
+    <page-body> </page-body>
+  </div>
+</template>
+
+<script>
+import PageHeader from "@/components/PageHeader";
+import PageBody from "@/components/PageBody/index";
+const codeAssignmentDetail = {
+  id: 1,
+  name: "软件需求规格说明书",
+  description: "这里是描述这里是描述这里是描述这里是描述这里是描述",
+  state: "未开始",
+  startAt: "2019-1-1",
+  endAt: "2019-6-1"
+};
+const codeAssignmentProjects = {
+  codeId: 1,
+  url: "https://www.github.com/adsf/adsfa",
+  name: "电影票web项目",
+  buildList: []
+};
+export default {
+  components: {
+    PageBody,
+    PageHeader
+  },
+  data() {
+    return {
+      codeAssignmentDetail,
+      codeAssignmentProjects
+    };
+  }
+};
+</script>
+
+<style scoped></style>

+ 124 - 1
src/views/student/Code/index.vue

@@ -1,3 +1,126 @@
 <template>
-  <div></div>
+  <div>
+    <page-header :routes="[{ name: '代码作业', path: 'code' }]">
+      <template slot="title">
+        代码作业列表
+      </template>
+      <template slot="content">
+        Here might be a page title
+      </template>
+    </page-header>
+    <page-body>
+      <div>
+        <b-table
+          :data="codeData"
+          paginated
+          per-page="5"
+          detailed
+          detail-key="id"
+        >
+          <template slot-scope="props">
+            <b-table-column field="id" label="题目ID" numeric sortable centered>
+              {{ props.row.id }}
+            </b-table-column>
+
+            <b-table-column label="题目名称" centered>
+              <router-link :to="`/course-student/:courseId/code/detail`">
+                {{ props.row.name }}</router-link
+              >
+            </b-table-column>
+            <b-table-column label="状态" centered>
+              {{ props.row.state }}
+            </b-table-column>
+
+            <b-table-column label="开始时间" centered>
+              {{ props.row.startAt }}
+            </b-table-column>
+
+            <b-table-column label="结束时间" centered>
+              {{ props.row.endAt }}
+            </b-table-column>
+          </template>
+
+          <template slot="detail">
+            <article class="media">
+              <div class="media-content">
+                <div class="content">
+                  <p>
+                    <strong>成绩详情</strong>
+                    <small>这里可以放具体的作业成绩,前面可以放总评啥的</small>
+                    <br />
+                  </p>
+                </div>
+              </div>
+            </article>
+          </template>
+        </b-table>
+      </div>
+    </page-body>
+  </div>
 </template>
+
+<script>
+import PageHeader from "@/components/PageHeader";
+import PageBody from "@/components/PageBody/index";
+const codeData = [
+  {
+    id: 1,
+    name: "购物车web项目",
+    state: "未开始",
+    startAt: "2019-1-1",
+    endAt: "2019-6-1"
+  },
+  {
+    id: 2,
+    name: "购物车web项目",
+    state: "已结束",
+    startAt: "2019-1-1",
+    endAt: "2019-6-1"
+  },
+  {
+    id: 3,
+    name: "购物车web项目",
+    state: "正在进行",
+    startAt: "2019-1-1",
+    endAt: "2019-6-1"
+  }
+];
+export default {
+  components: {
+    PageBody,
+    PageHeader
+  },
+  data() {
+    return {
+      codeData,
+      docAssignment: {
+        name: "",
+        description: "",
+        startAt: new Date(),
+        endAt: new Date()
+      },
+      isCardModalActive: false
+    };
+  },
+  methods: {}
+};
+</script>
+
+<style lang="scss" scoped>
+.card {
+  padding: 30px;
+  .title {
+    font-size: 1.25rem;
+    small {
+      color: gray;
+      font-size: 1rem;
+    }
+  }
+  .content {
+    a {
+      margin-top: 30px;
+      width: 100%;
+    }
+  }
+}
+</style>

+ 253 - 0
src/views/teacher/Code/detail.vue

@@ -0,0 +1,253 @@
+<template>
+  <div>
+    <page-header
+      :routes="[
+        { name: '代码作业', path: 'code' },
+        { name: `${assignmentInfo.name}`, path: 'code/detail' }
+      ]"
+    >
+      <template slot="title">
+        {{ assignmentInfo.name }}
+      </template>
+      <template slot="content">
+        作业描述信息作业描述信息作业描述信息作业描述信息作业描述信息作业描述信息作业描述信息
+      </template>
+    </page-header>
+
+    <page-body>
+      <div class="data-table">
+        <!--下拉框&搜索框-->
+        <div class="form-group">
+          <!--搜索框-->
+          <b-field>
+            <b-input
+              placeholder="输入关键字查找小组"
+              type="search"
+              icon="magnify"
+            >
+            </b-input>
+          </b-field>
+        </div>
+        <!---->
+        <b-tabs type="is-boxed">
+          <b-tab-item>
+            <template slot="header">
+              <span> {{ submitInfo.yes }} </span>
+            </template>
+            <div class="submitted-list">
+              <b-table :data="showResult" paginated per-page="5">
+                <template slot-scope="props">
+                  <b-table-column
+                    field="id"
+                    label="小组ID"
+                    width="120"
+                    numeric
+                    sortable
+                    centered
+                  >
+                    {{ props.row.id }}
+                  </b-table-column>
+                  <b-table-column label="构建" centered>
+                    <span :class="props.row.buildTag">{{
+                      props.row.buildStatus
+                    }}</span>
+                  </b-table-column>
+
+                  <b-table-column label="部署" centered>
+                    <span :class="props.row.deployTag">{{
+                      props.row.deployStatus
+                    }}</span>
+                  </b-table-column>
+                  <b-table-column label="测试">
+                    <span :class="props.row.testTag">{{
+                      props.row.testStatus
+                    }}</span>
+                  </b-table-column>
+                  <b-table-column label="详情">
+                    <router-link
+                      :to="{
+                        path: `/course-teacher/:courseId/code/detail/test`,
+                        query: { assignmentInfo: props.row }
+                      }"
+                      >查看详情</router-link
+                    >
+                  </b-table-column>
+                </template>
+              </b-table>
+            </div>
+          </b-tab-item>
+          <b-tab-item>
+            <template slot="header">
+              <span> {{ submitInfo.no }} </span>
+            </template>
+            <b-table
+              :data="unsubmited.data"
+              :columns="unsubmited.columns"
+            ></b-table>
+          </b-tab-item>
+        </b-tabs>
+      </div>
+    </page-body>
+  </div>
+</template>
+
+<script>
+import PageHeader from "@/components/PageHeader";
+import PageBody from "@/components/PageBody/index";
+
+const unsubmited = {
+  data: [
+    {
+      id: 1,
+      PM: "Jesse",
+      members: "Simmons\tClarence\tTina\tJohn"
+    },
+    {
+      id: 2,
+      PM: "Jesse",
+      members: "Simmons Clarence Tina John"
+    },
+    {
+      id: 3,
+      PM: "Jesse",
+      members: "Simmons Clarence Tina John"
+    }
+  ],
+  columns: [
+    {
+      field: "id",
+      label: "小组ID",
+      numeric: true,
+      centered: true
+    },
+    {
+      field: "PM",
+      label: "组长"
+    },
+    {
+      field: "members",
+      label: "组员"
+    }
+  ]
+};
+const info = [
+  {
+    id: 1,
+    stage: "测试",
+    PM: "Jesse",
+    members: "Simmons\tClarence\tTina\tJohn",
+    build: 0,
+    deploy: 0,
+    test: -1,
+    pass: 0,
+    testNum: 10
+  },
+  {
+    id: 2,
+    stage: "测试",
+    build: 1,
+    deploy: 1,
+    test: 0,
+    pass: 0,
+    testNum: 10
+  },
+  {
+    id: 3,
+    stage: "测试",
+    build: 1,
+    deploy: 1,
+    test: 1,
+    pass: 10,
+    testNum: 10
+  }
+];
+const showResult = [];
+const assignmentInfo = {
+  id: 0,
+  name: "",
+  description: "",
+  startAt: 0,
+  endAt: 0
+};
+
+const tag = {
+  success: "tag is-success",
+  failed: "tag is-danger",
+  blank: "tag is-dark"
+};
+
+const status = {
+  success: "SUCCESS",
+  failed: "FAILED",
+  blank: "BLANK"
+};
+
+const submitCount = {
+  yes: 19,
+  no: 8
+};
+const submitInfo = {
+  yes: "已提交:" + submitCount.yes,
+  no: "未提交:" + submitCount.no
+};
+
+export default {
+  components: {
+    PageBody,
+    PageHeader
+  },
+  mounted() {
+    this.assignmentInfo = this.$route.query.assignmentInfo;
+    for (var item of info) {
+      showResult.push({
+        id: item.id,
+        buildStatus: item.build === 1 ? status.success : status.failed,
+        buildTag: item.build === 1 ? tag.success : tag.failed,
+        deployStatus: item.deploy === 1 ? status.success : status.failed,
+        deployTag: item.deploy === 1 ? tag.success : tag.failed,
+        testStatus: item.test === 1 ? status.success : status.failed,
+        testTag: item.test === 1 ? tag.success : tag.failed
+      });
+    }
+  },
+  data() {
+    return {
+      info,
+      unsubmited,
+      assignmentInfo,
+      tag,
+      status,
+      showResult,
+      submitInfo
+    };
+  }
+};
+</script>
+
+<style scoped>
+.breadcrumb a {
+  /*color: #7957d5;*/
+  font-weight: bold;
+}
+.data-table {
+  width: 100%;
+  padding: 30px;
+  min-height: 80vh;
+  background-color: #ffffff;
+}
+.submitted-list {
+  /*margin-top: 30px;*/
+}
+.form-group {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 1.5rem;
+}
+
+.submit-state {
+  display: flex;
+  margin-top: 20px;
+  align-items: center;
+  margin-bottom: 20px;
+}
+</style>

+ 250 - 0
src/views/teacher/Code/index.vue

@@ -0,0 +1,250 @@
+<template>
+  <div>
+    <page-header :routes="[{ name: '代码作业', path: 'code' }]">
+      <template slot="title">
+        代码作业列表
+      </template>
+      <template slot="content">
+        Here might be a page title
+      </template>
+      <template slot="action">
+        <b-field>
+          <a class="button is-link" @click="updateInfo(-1)">新建代码作业</a>
+        </b-field>
+      </template>
+    </page-header>
+    <page-body>
+      <div class="data-table">
+        <b-table
+          :data="codeData"
+          paginated
+          per-page="5"
+          detailed
+          detail-key="id"
+        >
+          <template slot-scope="props">
+            <b-table-column field="id" label="题目ID" numeric sortable centered>
+              {{ props.row.id }}
+            </b-table-column>
+
+            <b-table-column label="题目名称" centered>
+              <router-link
+                :to="{
+                  path: `/course-teacher/:courseId/code/detail`,
+                  query: { assignmentInfo: props.row }
+                }"
+              >
+                {{ props.row.name }}
+              </router-link>
+            </b-table-column>
+
+            <b-table-column label="开始时间" centered>
+              {{ new Date(props.row.startAt).getFullYear() }}-{{
+                new Date(props.row.startAt).getMonth() + 1
+              }}-{{ new Date(props.row.startAt).getDate() }}
+            </b-table-column>
+
+            <b-table-column label="结束时间" centered>
+              {{ new Date(props.row.endAt).getFullYear() }}-{{
+                new Date(props.row.endAt).getMonth() + 1
+              }}-{{ new Date(props.row.endAt).getDate() }}
+            </b-table-column>
+
+            <b-table-column label="修改" centered>
+              <a @click="updateInfo(props.row.id)">修改</a>
+            </b-table-column>
+            <b-table-column label="删除" centered>
+              <a style="color:#b34141" @click="confirmDelete(props.row.id)"
+                >删除</a
+              >
+            </b-table-column>
+          </template>
+
+          <template slot="detail" slot-scope="props">
+            <article class="media">
+              <div class="media-content">
+                <div class="content">
+                  <p>
+                    <strong>作业描述:</strong>
+                    <small>{{ props.row.description }}</small> <br />
+                  </p>
+                </div>
+              </div>
+            </article>
+          </template>
+        </b-table>
+      </div>
+    </page-body>
+
+    <!--新建文档作业模态框-->
+    <b-modal :active.sync="isCardModalActive" :width="640" scroll="keep">
+      <div class="card">
+        <div class="title">{{ modal.title }}</div>
+        <div class="content">
+          <b-field label="作业名称">
+            <b-input v-model="codeAssignment.name"></b-input>
+          </b-field>
+          <b-field label="作业描述">
+            <b-input v-model="codeAssignment.description"></b-input>
+          </b-field>
+          <b-field label="开始时间">
+            <b-datepicker
+              v-model="codeAssignment.startAt"
+              placeholder="Click to select..."
+              icon="calendar-today"
+            >
+            </b-datepicker>
+          </b-field>
+          <b-field label="结束时间">
+            <b-datepicker
+              v-model="codeAssignment.endAt"
+              placeholder="Click to select..."
+              icon="calendar-today"
+            >
+            </b-datepicker>
+          </b-field>
+          <a class="button is-link" @click="createCodeAssignment">{{
+            modal.submit
+          }}</a>
+        </div>
+      </div>
+    </b-modal>
+  </div>
+</template>
+
+<script>
+import PageHeader from "@/components/PageHeader";
+import PageBody from "@/components/PageBody/index";
+const codeData = [
+  {
+    id: 1,
+    name: "购物车web项目",
+    description: "1111111111111这里是文档描述",
+    startAt: 1547107174000,
+    endAt: 1547971174000
+  },
+  {
+    id: 2,
+    name: "电影票web项目",
+    description: "222222222222这里是文档描述",
+    startAt: 1547107174000,
+    endAt: 1547971174000
+  },
+  {
+    id: 3,
+    name: "SEECweb项目",
+    description: "3333333333333333这里是文档描述",
+    startAt: 1547107174000,
+    endAt: 1547971174000
+  }
+];
+export default {
+  components: {
+    PageBody,
+    PageHeader
+  },
+  data() {
+    return {
+      codeData,
+      codeAssignment: {
+        id: -1,
+        name: "",
+        description: "",
+        startAt: new Date(),
+        endAt: new Date()
+      },
+      isCardModalActive: false,
+      modal: {
+        title: "新建文档作业",
+        submit: "确认创建"
+      }
+    };
+  },
+  methods: {
+    confirmDelete(id) {
+      this.$dialog.confirm({
+        message: "确认删除?",
+        confirmText: "删除",
+        type: "is-danger",
+        onConfirm: () => {
+          for (var item of this.codeData) {
+            if (item.id === id) {
+              this.codeData.pop(item);
+            }
+          }
+          this.$toast.open("删除成功");
+        }
+      });
+    },
+    updateInfo(id) {
+      this.isCardModalActive = true;
+      if (id !== -1) {
+        this.modal.submit = "确认修改";
+        this.modal.title = "修改文档作业";
+        console.log(this.modal.submit);
+        console.log(this.modal.submit);
+        for (let item of this.codeData) {
+          if (item.id === id) {
+            this.codeAssignment.id = id;
+            this.codeAssignment.name = item.name;
+            this.codeAssignment.description = item.description;
+            this.codeAssignment.startAt = new Date(item.startAt);
+            this.codeAssignment.endAt = new Date(item.endAt);
+            break;
+          }
+        }
+      } else {
+        this.modal.title = "新建文档作业";
+        this.modal.submit = "确认创建";
+        this.codeAssignment.id = -1;
+        this.codeAssignment.name = "";
+        this.codeAssignment.description = "";
+        this.codeAssignment.startAt = new Date();
+        this.codeAssignment.endAt = new Date();
+      }
+    },
+    createCodeAssignment() {
+      this.isCardModalActive = false;
+      if (this.codeAssignment.id === -1) {
+        var itemsCount = this.codeData.length;
+        this.codeData.push({
+          id: itemsCount + 1,
+          name: this.codeAssignment.name,
+          description: this.codeAssignment.description,
+          startAt: this.codeAssignment.startAt.getTime(),
+          endAt: this.codeAssignment.endAt.getTime()
+        });
+      } else {
+        for (var item of this.codeData) {
+          if (item.id === this.codeAssignment.id) {
+            item.name = this.codeAssignment.name;
+            item.description = this.codeAssignment.description;
+            item.startAt = this.codeAssignment.startAt.getTime();
+            item.endAt = this.codeAssignment.endAt.getTime();
+            break;
+          }
+        }
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.card {
+  padding: 30px;
+  .title {
+    font-size: 1.25rem;
+    small {
+      color: gray;
+      font-size: 1rem;
+    }
+  }
+  .content {
+    a {
+      margin-top: 30px;
+      width: 100%;
+    }
+  }
+}
+</style>

+ 116 - 0
src/views/teacher/Code/test.vue

@@ -0,0 +1,116 @@
+<template>
+  <div>
+    <page-header
+      :routes="[
+        { name: '代码作业', path: 'code' },
+        { name: '购物车web项目', path: 'code/detail' },
+        { name: '测试信息', path: 'code/detail/test' }
+      ]"
+    >
+      <template slot="title">
+        测试信息
+      </template>
+      <template slot="content">
+        可查看最近五条测试数据
+      </template>
+    </page-header>
+
+    <page-body>
+      <div class="data-table">
+        <b-collapse
+          :open="false"
+          class="collapseeeeeee"
+          v-for="item in testResult"
+          :key="item.id"
+        >
+          <button class="button is-primary " slot="trigger">
+            测试时间:2019-1-18 23:02{{ item.id }}
+          </button>
+          <div class="notification card">
+            <div class="content">
+              <h3>Build Info</h3>
+              <p>{{ item.buildResult }}</p>
+              <h3>Deploy Info</h3>
+              <p>{{ item.deployResult }}</p>
+              <h3>Unit Test Info</h3>
+              <p>{{ item.unitTestResult }}</p>
+              <h3>Functional Test Info</h3>
+              <p>{{ item.functionTestResult }}</p>
+            </div>
+          </div>
+        </b-collapse>
+      </div>
+    </page-body>
+  </div>
+</template>
+
+<script>
+import PageHeader from "@/components/PageHeader";
+import PageBody from "@/components/PageBody/index";
+
+const testResult = [
+  {
+    id: "1547130528000",
+    buildResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    deployResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    unitTestResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    functionTestResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS"
+  },
+  {
+    id: "1547130722000",
+    buildResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    deployResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    unitTestResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    functionTestResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS"
+  },
+  {
+    id: "1547123230722000",
+    buildResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    deployResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    unitTestResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    functionTestResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS"
+  },
+  {
+    id: "154712320722000",
+    buildResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    deployResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    unitTestResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    functionTestResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS"
+  },
+  {
+    id: "1547130434722000",
+    buildResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    deployResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    unitTestResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS",
+    functionTestResult: "SUCCESSSUCCESSSUCCESSSUCCESSSUCCESSSUCCESS"
+  }
+];
+const showResult = [];
+
+export default {
+  components: {
+    PageBody,
+    PageHeader
+  },
+  mounted() {
+    this.assignmentInfo = this.$route.query.assignmentInfo;
+  },
+  data() {
+    return {
+      assignmentInfo: {},
+      showResult,
+      testResult
+    };
+  }
+};
+</script>
+
+<style scoped>
+.breadcrumb a {
+  /*color: #7957d5;*/
+  font-weight: bold;
+}
+.collapseeeeeee {
+  margin-bottom: 10px;
+}
+</style>

+ 249 - 0
src/views/teacher/Document/detail.vue

@@ -0,0 +1,249 @@
+<template>
+  <div>
+    <page-header
+      :routes="[
+        { name: '文档作业', path: 'document' },
+        { name: `${assignmentInfo.name}`, path: 'document/detail' }
+      ]"
+    >
+      <template slot="title">
+        {{ assignmentInfo.name }}
+      </template>
+      <template slot="content">
+        Here might be a page title
+      </template>
+    </page-header>
+
+    <page-body>
+      <div class="data-table">
+        <!--下拉框&搜索框-->
+        <div class="form-group">
+          <!--搜索框-->
+          <b-field>
+            <b-input
+              placeholder="输入关键字查找小组"
+              type="search"
+              icon="magnify"
+            >
+            </b-input>
+          </b-field>
+        </div>
+
+        <b-tabs>
+          <b-tab-item :label="submitInfo.yes">
+            <div class="submitted-list">
+              <b-table
+                :data="data"
+                paginated
+                per-page="5"
+                detailed
+                detail-key="id"
+              >
+                <template slot-scope="props">
+                  <b-table-column
+                    field="id"
+                    label="小组ID"
+                    width="120"
+                    numeric
+                    sortable
+                    centered
+                  >
+                    {{ props.row.id }}
+                  </b-table-column>
+
+                  <b-table-column label="阶段" centered>
+                    {{ props.row.stage }}
+                  </b-table-column>
+
+                  <b-table-column label="互评负责组" centered>
+                    {{ props.row.charge }}
+                  </b-table-column>
+
+                  <b-table-column label="分数" centered>
+                    {{ props.row.score }}
+                  </b-table-column>
+                  <b-table-column field="difficulty" label="详情" centered>
+                    {{ props.row.detail }}
+                  </b-table-column>
+                </template>
+
+                <template slot="detail">
+                  <article class="media">
+                    <div class="media-content">
+                      <div class="content">
+                        <p>
+                          <strong>小组成员</strong><br />
+                          <small>组长:小明&emsp;组员:小黄 小兰</small> <br />
+                        </p>
+                      </div>
+                    </div>
+                  </article>
+                </template>
+              </b-table>
+            </div>
+          </b-tab-item>
+
+          <b-tab-item :label="submitInfo.no">
+            <b-table
+              :data="unsubmited.data"
+              :columns="unsubmited.columns"
+            ></b-table>
+          </b-tab-item>
+        </b-tabs>
+      </div>
+    </page-body>
+  </div>
+</template>
+
+<script>
+import PageHeader from "@/components/PageHeader";
+import PageBody from "@/components/PageBody/index";
+
+const unsubmited = {
+  data: [
+    {
+      id: 1,
+      PM: "Jesse",
+      members: "Simmons\tClarence\tTina\tJohn"
+    },
+    {
+      id: 2,
+      PM: "Jesse",
+      members: "Simmons Clarence Tina John"
+    },
+    {
+      id: 3,
+      PM: "Jesse",
+      members: "Simmons Clarence Tina John"
+    }
+  ],
+  columns: [
+    {
+      field: "id",
+      label: "小组ID",
+      // width: "80",
+      numeric: true,
+      centered: true
+    },
+    {
+      field: "PM",
+      label: "组长"
+    },
+    {
+      field: "members",
+      label: "组员"
+    }
+  ]
+};
+const submitCount = {
+  yes: 19,
+  no: 8
+};
+const submitInfo = {
+  yes: "已提交:" + submitCount.yes,
+  no: "未提交:" + submitCount.no
+};
+const data = [
+  {
+    id: 1,
+    stage: "互评完成",
+    charge: 2,
+    score: 80,
+    detail: "查看详情"
+  },
+  {
+    id: 2,
+    stage: "正在互评",
+    charge: 2,
+    score: 80,
+    detail: "查看详情"
+  },
+  {
+    id: 3,
+    stage: "互评完成",
+    charge: 2,
+    score: 80,
+    detail: "查看详情"
+  },
+  {
+    id: 4,
+    stage: "互评完成",
+    charge: 2,
+    score: 80,
+    detail: "查看详情"
+  }
+];
+
+const assignmentInfo = {
+  id: 0,
+  name: "",
+  description: "",
+  startAt: 0,
+  endAt: 0
+};
+
+export default {
+  components: {
+    PageBody,
+    PageHeader
+  },
+  mounted() {
+    this.assignmentInfo = this.$route.query.assignmentInfo;
+    console.log(this.assignmentInfo.name);
+    console.log(this.assignmentInfo.description);
+  },
+  data() {
+    return {
+      courses: [],
+      review: [],
+      questionType: [
+        { id: 1, title: "文档作业题目" },
+        { id: 2, title: "代码作业题目" }
+      ],
+      data,
+      unsubmited,
+      assignmentInfo,
+      submitInfo
+    };
+  }
+};
+</script>
+
+<style scoped>
+.breadcrumb a {
+  /*color: #7957d5;*/
+  font-weight: bold;
+}
+.data-table {
+  width: 100%;
+  padding: 30px;
+  min-height: 80vh;
+  background-color: #ffffff;
+}
+.submitted-list {
+  /*margin-top: 30px;*/
+}
+.form-group {
+  display: flex;
+  justify-content: space-between;
+}
+.description {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  word-wrap: break-word;
+  word-break: break-all;
+  display: -webkit-box;
+}
+.process-bar {
+  width: 50%;
+  margin-right: 10px;
+}
+.submit-state {
+  display: flex;
+  margin-top: 20px;
+  align-items: center;
+  margin-bottom: 20px;
+}
+</style>

+ 242 - 0
src/views/teacher/Document/index.vue

@@ -0,0 +1,242 @@
+<template>
+  <div>
+    <page-header :routes="[{ name: '文档作业', path: 'document' }]">
+      <template slot="title">
+        文档作业列表
+      </template>
+      <template slot="content">
+        Here might be a page title
+      </template>
+      <template slot="action">
+        <b-field>
+          <a class="button is-link" @click="updateInfo(-1)">新建文档作业</a>
+        </b-field>
+      </template>
+    </page-header>
+
+    <page-body>
+      <div class="data-table">
+        <b-table :data="data" paginated per-page="5" detailed detail-key="id">
+          <template slot-scope="props">
+            <b-table-column field="id" label="题目ID" numeric sortable centered>
+              {{ props.row.id }}
+            </b-table-column>
+
+            <b-table-column label="题目名称" centered>
+              <router-link
+                :to="{
+                  path: `/course-teacher/:courseId/document/detail`,
+                  query: { assignmentInfo: props.row }
+                }"
+              >
+                {{ props.row.name }}
+              </router-link>
+            </b-table-column>
+
+            <b-table-column label="开始时间" centered>
+              {{ new Date(props.row.startAt).getFullYear() }}-{{
+                new Date(props.row.startAt).getMonth() + 1
+              }}-{{ new Date(props.row.startAt).getDate() }}
+            </b-table-column>
+
+            <b-table-column label="结束时间" centered>
+              {{ new Date(props.row.endAt).getFullYear() }}-{{
+                new Date(props.row.endAt).getMonth() + 1
+              }}-{{ new Date(props.row.endAt).getDate() }}
+            </b-table-column>
+            <b-table-column label="修改" centered>
+              <a @click="updateInfo(props.row.id)">修改</a>
+            </b-table-column>
+            <b-table-column label="删除" centered>
+              <a style="color:#b34141" @click="confirmDelete(props.row.id)"
+                >删除</a
+              >
+            </b-table-column>
+          </template>
+
+          <template slot="detail" slot-scope="props">
+            <article class="media">
+              <div class="media-content">
+                <div class="content">
+                  <p>
+                    <strong>作业描述:</strong><br />
+                    <small>{{ props.row.description }}</small> <br />
+                  </p>
+                </div>
+              </div>
+            </article>
+          </template>
+        </b-table>
+      </div>
+    </page-body>
+
+    <!--新建文档作业模态框-->
+    <b-modal :active.sync="isCardModalActive" :width="640" scroll="keep">
+      <div class="card">
+        <div class="title">{{ modal.title }}</div>
+        <div class="content">
+          <b-field label="作业名称">
+            <b-input v-model="docAssignment.name"></b-input>
+          </b-field>
+          <b-field label="作业描述">
+            <b-input v-model="docAssignment.description"></b-input>
+          </b-field>
+          <b-field label="开始时间">
+            <b-datepicker
+              v-model="docAssignment.startAt"
+              placeholder="Click to select..."
+              icon="calendar-today"
+            >
+            </b-datepicker>
+          </b-field>
+          <b-field label="结束时间">
+            <b-datepicker
+              v-model="docAssignment.endAt"
+              placeholder="Click to select..."
+              icon="calendar-today"
+            >
+            </b-datepicker>
+          </b-field>
+          <a class="button is-link" @click="createDocAssignment()">{{
+            modal.submit
+          }}</a>
+        </div>
+      </div>
+    </b-modal>
+  </div>
+</template>
+
+<script>
+import PageHeader from "@/components/PageHeader";
+import PageBody from "@/components/PageBody/index";
+const docData = [
+  {
+    id: 1,
+    name: "软件需求规格说明书",
+    description: "1111111111111这里是文档描述",
+    startAt: 1547107174000,
+    endAt: 1547971174000
+  },
+  {
+    id: 2,
+    name: "用户需求列表",
+    description: "222222222222222222这里是文档描述",
+    startAt: 1547107174000,
+    endAt: 1547971174000
+  },
+  {
+    id: 3,
+    name: "面谈报告",
+    description: "333333333333333这里是文档描述",
+    startAt: 1547107174000,
+    endAt: 1547971174000
+  }
+];
+export default {
+  components: {
+    PageBody,
+    PageHeader
+  },
+  data() {
+    return {
+      data: docData,
+      docAssignment: {
+        id: -1,
+        name: "",
+        description: "",
+        startAt: new Date(),
+        endAt: new Date()
+      },
+      isCardModalActive: false,
+      modal: {
+        title: "新建文档作业",
+        submit: "确认创建"
+      }
+    };
+  },
+  methods: {
+    confirmDelete(id) {
+      this.$dialog.confirm({
+        message: "确认删除?",
+        confirmText: "删除",
+        type: "is-danger",
+        onConfirm: () => {
+          for (var item of this.data) {
+            if (item.id === id) {
+              this.data.pop(item);
+            }
+          }
+          this.$toast.open("删除成功");
+        }
+      });
+    },
+    updateInfo(id) {
+      this.isCardModalActive = true;
+      if (id !== -1) {
+        this.modal.title = "修改文档作业";
+        this.modal.submit = "确认修改";
+        for (let item of this.data) {
+          if (item.id === id) {
+            this.docAssignment.id = id;
+            this.docAssignment.name = item.name;
+            this.docAssignment.description = item.description;
+            this.docAssignment.startAt = new Date(item.startAt);
+            this.docAssignment.endAt = new Date(item.endAt);
+            break;
+          }
+        }
+      } else {
+        this.modal.title = "新建文档作业";
+        this.modal.submit = "确认创建";
+        this.docAssignment.id = -1;
+        this.docAssignment.name = "";
+        this.docAssignment.description = "";
+        this.docAssignment.startAt = new Date();
+        this.docAssignment.endAt = new Date();
+      }
+    },
+    createDocAssignment() {
+      this.isCardModalActive = false;
+      if (this.docAssignment.id === -1) {
+        var itemsCount = this.data.length;
+        this.data.push({
+          id: itemsCount + 1,
+          name: this.docAssignment.name,
+          description: this.docAssignment.description,
+          startAt: this.docAssignment.startAt.getTime(),
+          endAt: this.docAssignment.endAt.getTime()
+        });
+      } else {
+        for (var item of this.data) {
+          if (item.id === this.docAssignment.id) {
+            item.name = this.docAssignment.name;
+            item.description = this.docAssignment.description;
+            item.startAt = this.docAssignment.startAt.getTime();
+            item.endAt = this.docAssignment.endAt.getTime();
+            break;
+          }
+        }
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.card {
+  padding: 30px;
+  .title {
+    font-size: 1.25rem;
+    small {
+      color: gray;
+      font-size: 1rem;
+    }
+  }
+  .content {
+    a {
+      margin-top: 30px;
+      width: 100%;
+    }
+  }
+}
+</style>

+ 35 - 2
src/views/teacher/Home/index.vue

@@ -5,7 +5,11 @@
         <div class="container hint">
           <h1 class="title">我开设的课程</h1>
           <h2 class="subtitle">请点击下方按钮新建课程</h2>
-          <img class="newSubject" src="../../../assets/white.png" />
+          <img
+            class="newSubject"
+            src="../../../assets/white.png"
+            @click="isCardModalActive = true"
+          />
         </div>
       </div>
     </section>
@@ -18,19 +22,32 @@
         </div>
       </div>
     </div>
+    <!-- 成绩比例调控模态框 -->
+    <b-modal :active.sync="isCardModalActive" :width="320" scroll="keep">
+      <div class="card">
+        <div class="title">新建课程</div>
+        <div class="content">
+          <b-field label="课程名"> <b-input></b-input> </b-field>
+          <b-field label="选课码"> <b-input></b-input> </b-field>
+          <a class="button is-link" @click="isCardModalActive = false">新建</a>
+        </div>
+      </div>
+    </b-modal>
   </div>
 </template>
 
 <script>
 import Card from "@/components/Card";
 import { getTeacherCourses } from "@/api/course";
+
 export default {
   components: {
     Card
   },
   data() {
     return {
-      courses: []
+      courses: [],
+      isCardModalActive: false
     };
   },
   mounted() {
@@ -59,6 +76,22 @@ export default {
     color: #ffffff;
   }
 }
+.card {
+  padding: 30px;
+  .title {
+    font-size: 1.25rem;
+    small {
+      color: gray;
+      font-size: 1rem;
+    }
+  }
+  .content {
+    a {
+      margin-top: 30px;
+      width: 100%;
+    }
+  }
+}
 .newSubject {
   height: 80px;
   width: 80px;

+ 165 - 137
src/views/teacher/Question/index.vue

@@ -1,152 +1,145 @@
 <template>
   <div>
-    <nav class="breadcrumb" aria-label="breadcrumbs">
-      <ul>
-        <li><router-link :to="{ name: 'HOME' }">所有课程</router-link></li>
-        <li>
-          <router-link :to="`/course-teacher/${course.id}/dashboard`">{{
-            course.name
-          }}</router-link>
-        </li>
-        <li class="is-active">
-          <router-link :to="`/student-course/${course.id}/question`"
-            >查看题目</router-link
+    <page-header :routes="[{ name: `查看题目`, path: 'question' }]">
+      <template slot="title">
+        查看题目
+      </template>
+    </page-header>
+    <page-body>
+      <!-- container面板-->
+      <div class="data-table">
+        <!--下拉框&搜索框-->
+        <div class="form-group">
+          <!--下拉框-->
+          <b-field>
+            <b-select placeholder="选择题目类型">
+              <option
+                v-for="option in questionType"
+                :value="option.title"
+                :key="option.id"
+              >
+                {{ option.title }}
+              </option>
+            </b-select>
+          </b-field>
+          <!--搜索框-->
+          <div class="field has-addons">
+            <div class="control">
+              <input
+                class="input"
+                type="text"
+                placeholder="输入关键字查找题目"
+              />
+            </div>
+            <div class="control"><a class="button is-link"> 查找 </a></div>
+          </div>
+          <!--<b-field>-->
+          <!--<b-input-->
+          <!--placeholder="输入关键字查找题目"-->
+          <!--type="search"-->
+          <!--icon="magnify"-->
+          <!--&gt;-->
+          <!--</b-input>-->
+          <!--</b-field>-->
+        </div>
+        <!--题目table-->
+        <div class="question-list">
+          <b-table
+            :data="data"
+            paginated
+            per-page="10"
+            detailed
+            detail-key="id"
           >
-        </li>
-      </ul>
-    </nav>
-    <!-- container面板-->
-    <div class="data-table">
-      <!--下拉框&搜索框-->
-      <div class="form-group">
-        <!--下拉框-->
-        <b-field>
-          <b-select placeholder="选择题目类型">
-            <option
-              v-for="option in questionType"
-              :value="option.title"
-              :key="option.id"
-            >
-              {{ option.title }}
-            </option>
-          </b-select>
-        </b-field>
-        <!--搜索框-->
-        <b-field>
-          <b-input
-            placeholder="输入关键字查找题目"
-            type="search"
-            icon="magnify"
-          >
-          </b-input>
-        </b-field>
-      </div>
-      <!--题目table-->
-      <div class="question-list">
-        <b-table
-          :data="data"
-          paginated
-          per-page="5"
-          detailed
-          detail-key="id"
-          @details-open="
-            (row, index) => $toast.open(`Expanded ${row.user.first_name}`)
-          "
-        >
-          <template slot-scope="props">
-            <b-table-column field="id" label="ID" width="40" numeric sortable>
-              <!--{{ props.row.id }}-->1
-            </b-table-column>
+            <template slot-scope="props">
+              <b-table-column field="id" label="ID" width="40" numeric sortable>
+                {{ props.row.id }}
+              </b-table-column>
 
-            <b-table-column field="user.first_name" label="题目名称">
-              {{ props.row.name }}
-            </b-table-column>
+              <b-table-column label="题目名称">
+                <router-link
+                  :to="{
+                    path: `${props.row.id}`,
+                    query: { questionName: props.row.name }
+                  }"
+                  >{{ props.row.name }}</router-link
+                >
+              </b-table-column>
 
-            <b-table-column field="user.last_name" label="题目描述">
-              <div class="description">{{ props.row.description }}</div>
-            </b-table-column>
+              <b-table-column label="题目描述" width="400">
+                <div class="description">{{ props.row.description }}</div>
+              </b-table-column>
 
-            <b-table-column
-              field="difficulty"
-              label="题目难度"
-              sortable
-              centered
-            >
-              <span class="tag is-success">
-                {{ props.row.difficulty == 1 ? "简单" : "困难" }}
-              </span>
-            </b-table-column>
+              <b-table-column
+                field="difficulty"
+                label="题目难度"
+                sortable
+                centered
+              >
+                <span
+                  :class="['tag', `${difficultyClass(props.row.difficulty)}`]"
+                >
+                  {{ difficultyType(props.row.difficulty) }}
+                </span>
+              </b-table-column>
 
-            <b-table-column
-              label="平均时长"
-              field="expectTime"
-              sortable
-              centered
-            >
-              {{ props.row.expectTime }}分钟
-            </b-table-column>
-            <b-table-column label="题目标签">
-              {{ props.row.assignmentType.value }}
-            </b-table-column>
-          </template>
+              <b-table-column
+                label="平均时长"
+                field="expectTime"
+                sortable
+                centered
+              >
+                {{ props.row.expectTime }}分钟
+              </b-table-column>
+            </template>
 
-          <template slot="detail" slot-scope="props">
-            <article class="media">
-              <!--<figure class="media-left">-->
-              <!--<p class="image is-64x64">-->
-              <!--<img src="/static/img/placeholder-128x128.png">-->
-              <!--</p>-->
-              <!--</figure>-->
-              <div class="media-content">
-                <div class="content">
-                  <p>
-                    <strong>{{ props.row.name }}</strong>
-                    <small>@{{ props.row.expectTime }}分钟</small> <br />
-                    {{ props.row.description }}
-                  </p>
+            <template slot="detail" slot-scope="props">
+              <article class="media">
+                <div class="media-content">
+                  <div class="content">
+                    <p class="detail-content">
+                      <strong>{{ props.row.name }}</strong>
+                      <small
+                        ><b-tag type="is-info"
+                          >{{ props.row.expectTime }}分钟</b-tag
+                        ></small
+                      >
+                      <small
+                        ><b-tag
+                          :type="`${difficultyClass(props.row.difficulty)}`"
+                          >{{ difficultyType(props.row.difficulty) }}</b-tag
+                        ></small
+                      >
+                      <small
+                        ><b-tag type="is-link">{{
+                          props.row.assignmentType.value
+                        }}</b-tag></small
+                      >
+                      <br /><br />
+                      {{ props.row.description }}
+                    </p>
+                  </div>
                 </div>
-              </div>
-            </article>
-          </template>
-        </b-table>
+              </article>
+            </template>
+          </b-table>
+        </div>
       </div>
-    </div>
+    </page-body>
   </div>
 </template>
 <script>
 import { mapState } from "vuex";
 import { getStudentCourseReviewList } from "@/api/review";
 import { getTeacherQuestions } from "@/api/question";
-
-// const data = [
-//   {
-//     id: 1,
-//     name: "第一题",
-//     description: "这题xxxxxxxx",
-//     difficulty: "easy",
-//     expectTime: 20,
-//     assignmentType: "文档作业"
-//   },
-//   {
-//     id: 2,
-//     name: "第一题",
-//     description: "这题xxxxxxxx",
-//     difficulty: "easy",
-//     expectTime: 25,
-//     assignmentType: "文档作业"
-//   },
-//   {
-//     id: 3,
-//     name: "第一题",
-//     description: "这题xxxxxxxx",
-//     difficulty: "easy",
-//     expectTime: 35,
-//     assignmentType: "文档作业"
-//   }
-// ];
+import PageHeader from "@/components/PageHeader";
+import PageBody from "@/components/PageBody/index";
 
 export default {
-  components: {},
+  components: {
+    PageHeader,
+    PageBody
+  },
   computed: {
     ...mapState({
       course: state => state.course.currentCourse
@@ -168,6 +161,32 @@ export default {
       value => (this.review = value.data)
     );
     getTeacherQuestions().then(value => (this.data = value.data));
+  },
+  methods: {
+    difficultyType: level => {
+      switch (level) {
+        case 1:
+          return "简单";
+        case 2:
+          return "中等";
+        case 3:
+          return "困难";
+        default:
+          return "--";
+      }
+    },
+    difficultyClass: level => {
+      switch (level) {
+        case 1:
+          return "is-success";
+        case 2:
+          return "is-warning";
+        case 3:
+          return "is-danger";
+        default:
+          return "is-link";
+      }
+    }
   }
 };
 </script>
@@ -176,12 +195,12 @@ export default {
   /*color: #7957d5;*/
   font-weight: bold;
 }
-.data-table {
-  width: 100%;
-  padding: 30px;
-  min-height: 80vh;
-  background-color: #ffffff;
-}
+/*.data-table {*/
+/*width: 100%;*/
+/*padding: 30px;*/
+/*!*min-height: 80vh;*!*/
+/*background-color: #ffffff;*/
+/*}*/
 .question-list {
   margin-top: 30px;
 }
@@ -198,4 +217,13 @@ export default {
   word-break: break-all;
   display: -webkit-box;
 }
+.detail-content {
+  strong {
+    font-size: 1.2rem;
+    margin-right: 10px;
+  }
+  small {
+    margin-right: 10px;
+  }
+}
 </style>

+ 123 - 0
src/views/teacher/Question/questionDetail.vue

@@ -0,0 +1,123 @@
+<template>
+  <div>
+    <page-header
+      :routes="[
+        { name: '查看题目', path: 'question' },
+        { name: `${questionName}`, path: `question/123` }
+      ]"
+    >
+      <template slot="title">
+        {{ questionName }}
+      </template>
+      <template slot="content">
+        <b-tag class="tag" type="is-link" rounded>{{
+          questionInfo.assignmentType ? questionInfo.assignmentType.value : ""
+        }}</b-tag>
+        <b-tag class="tag" type="is-link" rounded>{{
+          questionInfo.type ? questionInfo.type.value : ""
+        }}</b-tag>
+      </template>
+    </page-header>
+    <page-body>
+      <div class="data-table">
+        <div class="question-description">
+          <div class="subtitle">题目描述</div>
+          <div class="question-content">{{ questionInfo.description }}</div>
+        </div>
+        <div class="question-description">
+          <div class="subtitle">预计完成时间</div>
+          <div class="question-content">{{ questionInfo.expectTime }}分钟</div>
+        </div>
+        <div class="question-description">
+          <div class="subtitle">题目难度</div>
+          <div class="question-content">
+            {{ difficultyType(questionInfo.difficulty) }}
+          </div>
+        </div>
+        <div class="question-description">
+          <div class="subtitle">文件信息</div>
+          <div class="question-content">
+            <div
+              class="file-info"
+              v-for="(item, index) in questionInfo.file"
+              :key="index"
+            >
+              <a>{{ item.filename }}</a>
+            </div>
+          </div>
+        </div>
+      </div>
+    </page-body>
+  </div>
+</template>
+<script>
+import PageHeader from "@/components/PageHeader";
+import PageBody from "@/components/PageBody/index";
+import { getQuestionDetail } from "@/api/question";
+
+export default {
+  components: {
+    PageBody,
+    PageHeader
+  },
+  mounted() {
+    this.questionName = this.$route.query.questionName;
+    getQuestionDetail(234).then(res => {
+      console.log(res.data);
+      this.questionInfo = res.data;
+    });
+  },
+  data() {
+    return {
+      questionName: "",
+      questionInfo: {}
+    };
+  },
+  methods: {
+    difficultyType: level => {
+      switch (level) {
+        case 1:
+          return "简单";
+        case 2:
+          return "中等";
+        case 3:
+          return "困难";
+        default:
+          return "--";
+      }
+    },
+    difficultyClass: level => {
+      switch (level) {
+        case 1:
+          return "is-success";
+        case 2:
+          return "is-warning";
+        case 3:
+          return "is-danger";
+        default:
+          return "is-link";
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.tag {
+  margin-right: 10px;
+}
+.question-description {
+  margin-bottom: 1.5rem;
+  .subtitle {
+    width: 100%;
+    font-weight: bold;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #dbdbdb;
+  }
+  .file-info {
+    margin-bottom: 0.75rem;
+    span {
+      margin-left: 0.75rem;
+    }
+  }
+}
+</style>

+ 239 - 127
src/views/teacher/Result/index.vue

@@ -1,122 +1,144 @@
 <template>
   <div>
-    <nav class="breadcrumb" aria-label="breadcrumbs">
-      <ul>
-        <li><router-link :to="{ name: 'HOME' }">所有课程</router-link></li>
-        <li>
-          <router-link :to="`/course-teacher/${course.id}/dashboard`">{{
-            course.name
-          }}</router-link>
-        </li>
-        <li class="is-active">
-          <router-link :to="`/student-course/${course.id}/result`"
-            >查看成绩</router-link
-          >
-        </li>
-      </ul>
-    </nav>
-    <!-- container面板-->
-    <div class="data-table">
-      <!--下拉框&搜索框-->
-      <div class="form-group">
-        <!--下拉框-->
-        <b-field> <a class="button is-link">导出作业成绩</a> </b-field>
-        <b-field>
-          <a class="button is-link" @click="isCardModalActive = true"
-            >成绩比例调控</a
-          >
-        </b-field>
-      </div>
-      <!--题目table-->
-      <div class="question-list">
-        <b-table :data="data" paginated per-page="5" detailed detail-key="id">
-          <template slot-scope="props">
-            <b-table-column field="id" label="ID" width="40" numeric sortable>
-              {{ props.row.id }}
-            </b-table-column>
-
-            <b-table-column label="文档作业" centered>
-              <div
-                class="result"
-                v-for="item in props.row.documentHomeworkResult"
-                :key="item.id"
-              >
-                {{ item.name }} : {{ item.result }}
-              </div>
-            </b-table-column>
+    <page-header :routes="[{ name: '成绩管理', path: 'result' }]">
+      <template slot="title">
+        全部作业成绩
+      </template>
+    </page-header>
+    <page-body>
+      <!-- container面板-->
+      <div class="data-table">
+        <!--下拉框&搜索框-->
+        <div class="form-group">
+          <!--下拉框-->
+          <b-field> <a class="button is-link">导出作业成绩</a> </b-field>
+          <b-field>
+            <a class="button is-link" @click="isCardModalActive = true"
+              >成绩比例调控</a
+            >
+          </b-field>
+        </div>
+        <!--成绩图表-->
+        <div class="chart">
+          <canvas id="result-chart" style="width: 100% !important;"></canvas>
+        </div>
+        <!--题目table-->
+        <div class="question-list">
+          <b-table :data="data" paginated per-page="5" detailed detail-key="id">
+            <template slot-scope="props">
+              <b-table-column field="id" label="ID" width="40" numeric sortable>
+                {{ props.row.id }}
+              </b-table-column>
+              <b-table-column label="学生姓名" width="120" centered>
+                {{ props.row.student }}
+              </b-table-column>
+              <b-table-column label="文档作业" centered> 80 </b-table-column>
 
-            <b-table-column label="代码作业" centered>
-              <div
-                class="result"
-                v-for="item in props.row.codeHomeworkResult"
-                :key="item.id"
-              >
-                {{ item.name }} : {{ item.result }}
-              </div>
-            </b-table-column>
+              <b-table-column label="代码作业" centered> 90 </b-table-column>
 
-            <b-table-column label="互评作业" centered>
-              <div
-                class="result"
-                v-for="item in props.row.reviewHomeworkResult"
-                :key="item.id"
-              >
-                {{ item.name }} : {{ item.result }}
-              </div>
-            </b-table-column>
-            <b-table-column field="difficulty" label="总评" sortable centered>
-              <span
-                :class="[
-                  'tag',
-                  props.row.finalResult > 60 ? 'is-success' : 'is-danger'
-                ]"
+              <b-table-column label="互评作业" centered> 100 </b-table-column>
+              <b-table-column
+                field="finalResult"
+                label="总评"
+                sortable
+                centered
               >
-                {{ props.row.finalResult }}
-              </span>
-            </b-table-column>
-          </template>
+                <span :class="['tag', type(props.row.finalResult)]">
+                  {{ props.row.finalResult }}
+                </span>
+              </b-table-column>
+            </template>
 
-          <template slot="detail">
-            <article class="media">
-              <!--<figure class="media-left">-->
-              <!--<p class="image is-64x64">-->
-              <!--<img src="/static/img/placeholder-128x128.png">-->
-              <!--</p>-->
-              <!--</figure>-->
-              <div class="media-content">
-                <div class="content">
-                  <p>
-                    <strong>成绩详情</strong>
-                    <small>这里可以放具体的作业成绩,前面可以放总评啥的</small>
-                    <br />
-                  </p>
+            <template slot="detail" slot-scope="props">
+              <article class="media">
+                <div class="media-content">
+                  <div class="content">
+                    <!--<strong>成绩详情</strong>-->
+                    <!--<br />-->
+                    <div class="homework-layout">
+                      <div class="document-homework">
+                        <div class="homework-class">文档作业</div>
+                        <div
+                          class="result"
+                          v-for="item in props.row.documentHomeworkResult"
+                          :key="item.id"
+                        >
+                          {{ item.name }} : {{ item.result }}
+                        </div>
+                      </div>
+                      <div class="document-homework">
+                        <div class="homework-class">代码作业</div>
+                        <div
+                          class="result"
+                          v-for="item in props.row.codeHomeworkResult"
+                          :key="item.id"
+                        >
+                          {{ item.name }} : {{ item.result }}
+                        </div>
+                      </div>
+                      <div class="document-homework">
+                        <div class="homework-class">互评作业</div>
+                        <div
+                          class="result"
+                          v-for="item in props.row.reviewHomeworkResult"
+                          :key="item.id"
+                        >
+                          {{ item.name }} : {{ item.result }}
+                        </div>
+                      </div>
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </article>
-          </template>
-        </b-table>
+              </article>
+            </template>
+          </b-table>
+        </div>
       </div>
-    </div>
+    </page-body>
     <!-- 成绩比例调控模态框 -->
-    <b-modal :active.sync="isCardModalActive" :width="320" scroll="keep">
+    <b-modal :active.sync="isCardModalActive" width="420px" scroll="keep">
       <div class="card">
         <div class="title">
           成绩比例调控<small>&nbsp;&nbsp;请按百分比填写</small>
         </div>
         <div class="content">
-          <b-field label="文档作业比例">
-            <b-input v-model="name"></b-input>
-          </b-field>
-          <b-field label="互评作业比例">
-            <b-input v-model="name"></b-input>
-          </b-field>
-          <b-field label="代码作业比例">
-            <b-input v-model="name"></b-input>
-          </b-field>
-          <a class="button is-link" @click="isCardModalActive = false"
-            >确认调整</a
-          >
+          <div class="homework-item">
+            <label>文档作业</label>
+            <div class="homework-percent">
+              <span>第一次作业</span>
+              <b-input></b-input>
+            </div>
+            <div class="homework-percent">
+              <span>第一次作业</span>
+              <b-input></b-input>
+            </div>
+            <div class="homework-percent">
+              <span>第一次作业</span>
+              <b-input></b-input>
+            </div>
+          </div>
+          <div class="homework-item">
+            <label>互评作业</label>
+            <div class="homework-percent">
+              <span>第一次作业</span>
+              <b-input></b-input>
+            </div>
+            <div class="homework-percent">
+              <span>第一次作业</span>
+              <b-input></b-input>
+            </div>
+          </div>
+          <div class="homework-item">
+            <label>代码作业</label>
+            <div class="homework-percent">
+              <span>第一次作业</span>
+              <b-input></b-input>
+            </div>
+          </div>
         </div>
+        <a class="button is-link" @click="isCardModalActive = false"
+          >确认调整</a
+        >
       </div>
     </b-modal>
   </div>
@@ -124,9 +146,15 @@
 <script>
 import { mapState } from "vuex";
 import { getStudentCourseReviewList } from "@/api/review";
+import PageHeader from "@/components/PageHeader";
+import PageBody from "@/components/PageBody/index";
+import Chart from "chart.js";
+import BInput from "buefy/src/components/input/Input";
+
 const data = [
   {
     id: 1,
+    student: "小白",
     documentHomeworkResult: [
       {
         id: 1,
@@ -144,14 +172,14 @@ const data = [
         result: 99
       }
     ],
-    reviewHomeworkResult: [
+    charge: [
       {
         id: 1,
         name: "第一次作业",
         result: 80
       }
     ],
-    codeHomeworkResult: [
+    score: [
       {
         id: 1,
         name: "第一次作业",
@@ -167,6 +195,7 @@ const data = [
   },
   {
     id: 2,
+    student: "yasen",
     documentHomeworkResult: [
       {
         id: 1,
@@ -184,14 +213,14 @@ const data = [
         result: 99
       }
     ],
-    reviewHomeworkResult: [
+    charge: [
       {
         id: 1,
         name: "第一次作业",
         result: 80
       }
     ],
-    codeHomeworkResult: [
+    score: [
       {
         id: 1,
         name: "第一次作业",
@@ -203,10 +232,12 @@ const data = [
         result: 85
       }
     ],
-    finalResult: 99
+
+    finalResult: 79
   },
   {
     id: 3,
+    student: "soleil",
     documentHomeworkResult: [
       {
         id: 1,
@@ -224,14 +255,14 @@ const data = [
         result: 99
       }
     ],
-    reviewHomeworkResult: [
+    charge: [
       {
         id: 1,
         name: "第一次作业",
         result: 80
       }
     ],
-    codeHomeworkResult: [
+    score: [
       {
         id: 1,
         name: "第一次作业",
@@ -243,10 +274,11 @@ const data = [
         result: 85
       }
     ],
-    finalResult: 99
+    finalResult: 59
   },
   {
     id: 4,
+    student: "xiaohan",
     documentHomeworkResult: [
       {
         id: 1,
@@ -264,14 +296,14 @@ const data = [
         result: 99
       }
     ],
-    reviewHomeworkResult: [
+    charge: [
       {
         id: 1,
         name: "第一次作业",
         result: 80
       }
     ],
-    codeHomeworkResult: [
+    score: [
       {
         id: 1,
         name: "第一次作业",
@@ -288,7 +320,11 @@ const data = [
 ];
 
 export default {
-  components: {},
+  components: {
+    BInput,
+    PageHeader,
+    PageBody
+  },
   computed: {
     ...mapState({
       course: state => state.course.currentCourse
@@ -296,6 +332,7 @@ export default {
   },
   data() {
     return {
+      name: "",
       courses: [],
       review: [],
       questionType: [
@@ -303,13 +340,57 @@ export default {
         { id: 2, title: "代码作业题目" }
       ],
       data,
-      isCardModalActive: false
+      isCardModalActive: false,
+      myChart2: {}
     };
   },
+  methods: {
+    type(value) {
+      const number = parseFloat(value);
+      if (number < 60) {
+        return "is-danger";
+      } else if (number >= 60 && number < 80) {
+        return "is-warning";
+      } else if (number >= 80) {
+        return "is-success";
+      }
+    }
+  },
   mounted() {
     getStudentCourseReviewList(this.courses.id).then(
       value => (this.review = value.data)
     );
+    //绘制图表
+    var resultChart = document.getElementById("result-chart");
+    var myChart2 = new Chart(resultChart, {
+      type: "bar",
+      data: {
+        labels: [
+          "0-30分段",
+          "30-60分段",
+          "60-70分段",
+          "70-80分段",
+          "80-90分段",
+          "90-100分段"
+        ],
+        datasets: [
+          {
+            label: "人数",
+            backgroundColor: "rgba(54,162,235,0.3)",
+            borderColor: "rgba(54,162,235,1)",
+            borderWidth: 1,
+            pointStrokeColor: "#fff",
+            pointStyle: "crossRot",
+            data: [6, 10, 34, 50, 80, 30],
+            cubicInterpolationMode: "monotone",
+            spanGaps: "false",
+            fill: "false"
+          }
+        ]
+      },
+      options: {}
+    });
+    this.myChart2 = myChart2;
   }
 };
 </script>
@@ -318,14 +399,17 @@ export default {
   /*color: #7957d5;*/
   font-weight: bold;
 }
-.data-table {
-  width: 100%;
-  padding: 30px;
-  min-height: 80vh;
-  background-color: #ffffff;
+/*.data-table {*/
+/*width: 100%;*/
+/*padding: 30px;*/
+/*!*min-height: 80vh;*!*/
+/*background-color: #ffffff;*/
+/*}*/
+.chart {
+  margin-top: 1.5rem;
 }
 .question-list {
-  margin-top: 30px;
+  margin-top: 3rem;
 }
 .form-group {
   display: flex;
@@ -337,20 +421,48 @@ export default {
 .card {
   padding: 30px;
   .title {
+    padding-bottom: 5px;
     font-size: 1.25rem;
+    border-bottom: 1px solid #dbdbdb;
     small {
       color: gray;
       font-size: 1rem;
     }
   }
   .content {
-    a {
-      margin-top: 30px;
-      width: 100%;
+    .homework-item {
+      margin-bottom: 30px;
+      flex: 1;
+      label {
+        width: 100%;
+        font-weight: bold;
+        border-bottom: 2px solid #dbdbdb;
+      }
+      .homework-percent {
+        margin-top: 20px;
+        display: flex;
+        align-items: center;
+        span {
+          margin-right: 0.5rem;
+        }
+      }
     }
   }
+  a {
+    margin-top: 30px;
+    width: 100%;
+  }
 }
-.button {
-  background-color: #6172ec;
+.homework-layout {
+  display: flex;
+  justify-content: space-between;
+  .document-homework {
+    margin-right: 3rem;
+    .homework-class {
+      font-weight: bold;
+      border-bottom: 1px solid #dbdbdb;
+      margin-bottom: 10px;
+    }
+  }
 }
 </style>

+ 142 - 0
src/views/teacher/Review/assignment.vue

@@ -0,0 +1,142 @@
+<template>
+  <div>
+    <page-header
+      :routes="[
+        { name: '互评作业', path: 'review' },
+        { name: '物流系统需求规格说明文档', path: `review/123` }
+      ]"
+    >
+      <template slot="title">
+        物流系统需求规格说明文档
+      </template>
+      <template slot="content">
+        <span>checklist:</span>
+        <b-tag class="checklist" type="is-link" rounded>需求明确</b-tag>
+        <b-tag class="checklist" type="is-link" rounded
+          >用例图、架构图、流程图完整</b-tag
+        >
+        <b-tag class="checklist" type="is-link" rounded>描述清晰</b-tag>
+      </template>
+    </page-header>
+    <page-body>
+      <!-- container面板-->
+      <div class="data-table">
+        <section>
+          <b-tabs type="is-boxed">
+            <b-tab-item label="未评价"> <!--题目table--> </b-tab-item>
+            <b-tab-item label="互评中"></b-tab-item>
+            <b-tab-item label="提出异议"> </b-tab-item>
+            <b-tab-item label="互评完成">
+              <!--题目table-->
+              <div class="question-list">
+                <b-table
+                  :data="data"
+                  paginated
+                  per-page="5"
+                  detailed
+                  detail-key="id"
+                >
+                  <template slot-scope="props">
+                    <b-table-column
+                      field="id"
+                      label="被评价小组"
+                      numeric
+                      sortable
+                      centered
+                    >
+                      {{ props.row.id }}
+                    </b-table-column>
+                    <b-table-column label="评价小组" numeric centered>
+                      {{ props.row.reviewId }}
+                    </b-table-column>
+                    <b-table-column label="作业等级" centered>
+                      {{ props.row.level }}
+                    </b-table-column>
+                    <b-table-column
+                      field="score"
+                      label="作业评分"
+                      sortable
+                      centered
+                    >
+                      <span :class="['tag', type(props.row.score)]">
+                        {{ props.row.score }}
+                      </span>
+                    </b-table-column>
+                  </template>
+
+                  <template slot="detail" slot-scope="props">
+                    <article class="media">
+                      <div class="media-content">
+                        <div class="content">
+                          <strong>成绩详情{{ props.row.score }}}</strong>
+                        </div>
+                      </div>
+                    </article>
+                  </template>
+                </b-table>
+              </div>
+            </b-tab-item>
+          </b-tabs>
+        </section>
+      </div>
+    </page-body>
+  </div>
+</template>
+<script>
+import { mapState } from "vuex";
+import PageHeader from "@/components/PageHeader";
+import PageBody from "@/components/PageBody/index";
+
+const data = [
+  {
+    id: 1,
+    reviewId: 2,
+    level: "S",
+    score: 88
+  }
+];
+
+export default {
+  components: {
+    PageBody,
+    PageHeader
+  },
+  computed: {
+    ...mapState({
+      course: state => state.course.currentCourse
+    })
+  },
+  data() {
+    return {
+      data
+    };
+  },
+  mounted() {},
+  methods: {
+    type(value) {
+      const number = parseFloat(value);
+      if (number < 60) {
+        return "is-danger";
+      } else if (number >= 60 && number < 80) {
+        return "is-warning";
+      } else if (number >= 80) {
+        return "is-success";
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.checklist {
+  margin-left: 0.75rem;
+}
+span {
+  font-weight: bold;
+}
+.data-table {
+  width: 100%;
+  padding: 30px;
+  /*min-height: 80vh;*/
+  background-color: #ffffff;
+}
+</style>

+ 142 - 0
src/views/teacher/Review/assignmentList.vue

@@ -0,0 +1,142 @@
+<template>
+  <div>
+    <page-header :routes="[{ name: '互评作业', path: 'review' }]">
+      <template slot="title">
+        全部互评作业
+      </template>
+      <template slot="content">
+        当前有3份互评作业进行中
+      </template>
+    </page-header>
+    <page-body>
+      <div class="page-section">
+        <!--<div class="submit-state">-->
+        <!--<span>提交情况</span>-->
+        <!--<progress class="progress is-link" value="30" max="100">40%</progress>-->
+        <!--50/200-->
+        <!--</div>-->
+        <div class="homework-list">
+          <section>
+            <b-tabs type="is-boxed">
+              <b-tab-item label="进行中的作业">
+                <router-link
+                  :to="`/course-teacher/${this.course.id}/review/123`"
+                  ><b-table
+                    :data="homeworkList"
+                    :columns="columns"
+                    :hoverable="true"
+                  ></b-table
+                ></router-link>
+              </b-tab-item>
+              <b-tab-item label="已结束作业">
+                <div class="info">暂无已结束作业</div>
+              </b-tab-item>
+            </b-tabs>
+          </section>
+        </div>
+      </div>
+    </page-body>
+  </div>
+</template>
+<script>
+import { mapState } from "vuex";
+import PageHeader from "@/components/PageHeader";
+import PageBody from "@/components/PageBody/index";
+const homeworkList = [
+  {
+    id: 1,
+    name: "物流系统需求规格说明文档",
+    beginAt: "2018-12-29",
+    endAt: "2019-01-06",
+    group: 2
+  },
+  {
+    id: 2,
+    name: "物流系统用例图",
+    beginAt: "2018-12-29",
+    endAt: "2019-01-06",
+    group: 3
+  },
+  {
+    id: 3,
+    name: "物流系统体系架构文档",
+    beginAt: "2018-12-29",
+    endAt: "2019-01-06",
+    group: 4
+  }
+];
+
+const columns = [
+  {
+    field: "id",
+    label: "ID",
+    numeric: true
+  },
+  {
+    field: "name",
+    label: "作业名",
+    centered: true
+  },
+  {
+    field: "beginAt",
+    label: "开始时间",
+    centered: true
+  },
+  {
+    field: "endAt",
+    label: "结束时间",
+    centered: true
+  }
+];
+
+export default {
+  components: {
+    PageBody,
+    PageHeader
+  },
+  computed: {
+    ...mapState({
+      course: state => state.course.currentCourse
+    })
+  },
+  data() {
+    return {
+      homeworkList,
+      columns
+    };
+  },
+  mounted() {}
+};
+</script>
+<style lang="scss" scoped>
+.breadcrumb a {
+  font-weight: bold;
+}
+.data-table {
+  width: 100%;
+  padding: 30px;
+  /*min-height: 80vh;*/
+  background-color: #ffffff;
+  .submit-state {
+    display: flex;
+    align-items: center;
+    font-size: 1rem;
+    font-weight: bold;
+    span {
+      margin-right: 1.5rem;
+    }
+    progress {
+      width: 50%;
+      margin-right: 1.5rem;
+    }
+  }
+  .homework-list {
+    .info {
+      display: flex;
+      justify-content: center;
+      margin: 0.75rem;
+      font-weight: bold;
+    }
+  }
+}
+</style>

ファイルの差分が大きいため隠しています
+ 0 - 142
yarn.lock


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません