格式优化

src/modules/marking/canvas/mark_sign.js

@@ -1,3 +1,5 @@
+import rasterizeHTML from "rasterizehtml";
+
 export function Drawing(canvas, option) {
   typeof canvas == "string" && (canvas = document.getElementById(canvas));
   if (!canvas || !canvas.getContext) {
@@ -83,7 +85,7 @@ Drawing.prototype = {
     );
   },
   removeEvent: function() {
-    this.canvas.removeEventListener("click", function(event) {}, false);
+    this.canvas.removeEventListener("click", function() {}, false);
   },
   ResetDrawAll: function() {
     this.clearDraw();

src/modules/marking/routes/routes.js

@@ -1,77 +1,72 @@
 import Home from "../../portal/views/Home.vue";
-import marking from "../views/marking.vue";
-import mark_setting_main from "../views/mark_setting_main.vue";
-import mark_work from "../views/mark_work.vue";
-import mark_paper_check from "../views/mark_paper_check.vue";
-import mark_setting_work from "../views/mark_setting_work.vue";
-import mark_setting_fast from "../views/mark_setting_fast.vue";
-import mark_grade_main from "../views/mark_grade_main.vue";
-import view_paper from "../views/view_paper.vue";
-import mark_work_overview from "../views/mark_work_overview.vue";
-import marker from "../views/marker.vue";
-import course_detail from "../views/course_detail.vue";
-import marker_detail from "../views/marker_detail.vue";
-import batchMark from "../views/batchMark.vue";
+import Marking from "../views/Marking.vue";
+import MarkSettingMain from "../views/MarkSettingMain.vue";
+import MarkWork from "../views/MarkWork.vue";
+import MarkPaperCheck from "../views/MarkPaperCheck.vue";
+import MarkSettingWork from "../views/MarkSettingWork.vue";
+import MarkSettingFast from "../views/MarkSettingFast.vue";
+import MarkGradeMain from "../views/MarkGradeMain.vue";
+import ViewPaper from "../views/ViewPaper.vue";
+import MarkWorkOverview from "../views/MarkWorkOverview.vue";
+import Marker from "../views/Marker.vue";
+import CourseDetail from "../views/CourseDetail.vue";
+import MarkerDetail from "../views/MarkerDetail.vue";
 
 export default [
   {
-    path: "/marking", //首页
+    path: "/Marking", //首页
     meta: { auth: false },
     component: Home,
     children: [
       {
-        path: "mark_work_overview/:workId/:examId/:name", //评卷总览
-        component: mark_work_overview
+        path: "MarkWorkOverview/:workId/:examId/:name", //评卷总览
+        component: MarkWorkOverview
       },
       {
-        path: "course_detail/:workId/:examId/:name/:courseCode/:courseName", //课程详情
-        component: course_detail
+        path: "CourseDetail/:workId/:examId/:name/:courseCode/:courseName", //课程详情
+        component: CourseDetail
       },
       {
-        path: "marker/:workId/:examId/:name", //评卷员一览
-        component: marker
+        path: "Marker/:workId/:examId/:name", //评卷员一览
+        component: Marker
       },
       {
-        path: "marker_detail/:workId/:examId/:name/:markerId/:userName", //评卷员详情
-        component: marker_detail
+        path: "MarkerDetail/:workId/:examId/:name/:markerId/:userName", //评卷员详情
+        component: MarkerDetail
       },
       {
-        path: "mark_setting_main/:workId/:examId/:name", //评卷设置主页面
-        component: mark_setting_main
+        path: "MarkSettingMain/:workId/:examId/:name", //评卷设置主页面
+        component: MarkSettingMain
       },
       {
-        path: "mark_setting_fast/:workId/:examId/:name/:courseCode/:courseName", //评卷快速设置主页面
-        component: mark_setting_fast
+        path: "MarkSettingFast/:workId/:examId/:name/:courseCode/:courseName", //评卷快速设置主页面
+        component: MarkSettingFast
       },
       {
-        path: "mark_work", //评卷工作
-        component: mark_work
+        path: "MarkWork", //评卷工作
+        component: MarkWork
       },
       {
-        path: "mark_paper_check/:workId/:examId/:examType", //试卷检查
-        component: mark_paper_check
+        path: "MarkPaperCheck/:workId/:examId/:examType", //试卷检查
+        component: MarkPaperCheck
       },
       {
-        path: "mark_setting_work/:type", //选择评卷工作
-        component: mark_setting_work
+        path: "MarkSettingWork/:type", //选择评卷工作
+        component: MarkSettingWork
       },
       {
-        path: "mark_grade_main/:examId", //成绩查询
-        component: mark_grade_main
+        path: "MarkGradeMain/:examId", //成绩查询
+        component: MarkGradeMain
       },
       {
-        path: "view_paper/:workId/:examId/:studentPaperId/:examType", //查看原卷
-        component: view_paper
+        path: "ViewPaper/:workId/:examId/:studentPaperId/:examType", //查看原卷
+        component: ViewPaper
       }
     ]
   },
   {
-    path: "/marking/:workId/:examType", //试卷正评
-    component: marking
-  },
-  {
-    path: "/batchMark/:workId", //批量离线评分
-    component: batchMark
+    path: "/Marking/:workId/:examType", //试卷正评
+    component: Marking
   },
   { path: "*", redirect: "/login" }
 ];

src/modules/marking/views/course_detail.vue → src/modules/marking/views/CourseDetail.vue

@@ -125,13 +125,7 @@ li {
 </template>
 
 <script>
-import {
-  CORE_API,
-  EXAM_WORK_API,
-  MARKING_API,
-  DATA_PROCESS_API,
-  OE_API
-} from "../constants/constants";
+import { DATA_PROCESS_API } from "../constants/constants";
 import { mapState } from "vuex";
 export default {
   data() {
@@ -227,7 +221,7 @@ export default {
     back() {
       this.$router.push({
         path:
-          "/index/mark_work_overview/" +
+          "/index/MarkWorkOverview/" +
           this.workId +
           "/" +
           this.examId +

src/modules/marking/views/mark_grade_main.vue → src/modules/marking/views/MarkGradeMain.vue

@@ -205,14 +205,7 @@ li {
 
 <script>
 import { mapState } from "vuex";
-import {
-  CORE_API,
-  EXAM_WORK_API,
-  MARKING_API,
-  DATA_PROCESS_API,
-  OE_API,
-  LEVEL_TYPE
-} from "../constants/constants";
+import { CORE_API, DATA_PROCESS_API, LEVEL_TYPE } from "../constants/constants";
 export default {
   data() {
     return {
@@ -297,7 +290,6 @@ export default {
         for (let item of rList) {
           if (item.id == studentpaperPk) {
             return item.value;
-            break;
           }
         }
       }
@@ -356,7 +348,7 @@ export default {
     },
     back() {
       this.$router.push({
-        path: "/index/mark_setting_work/grade"
+        path: "/index/MarkSettingWork/grade"
       });
     }
   },

src/modules/marking/views/mark_paper_check.vue → src/modules/marking/views/MarkPaperCheck.vue

@@ -205,11 +205,8 @@
 import { mapState } from "vuex";
 import {
   CORE_API,
-  EXAM_WORK_API,
   MARKING_API,
-  DATA_PROCESS_API,
-  OE_API,
-  TAGS
+  DATA_PROCESS_API
 } from "../constants/constants";
 export default {
   data() {
@@ -324,7 +321,6 @@ export default {
     },
     //查询方法
     searchMarkPaperCheck() {
-      var orgId = this.user.rootOrgId;
       this.formSearch.workId = this.workId;
       this.formSearch.examType = this.examType;
       this.loading = true;
@@ -358,7 +354,7 @@ export default {
         var studentPaperId = row.studentPaper.id;
         console.log("studentPaperId:", studentPaperId);
         var urls =
-          "/index/view_paper/" +
+          "/index/ViewPaper/" +
           this.workId +
           "/" +
           this.examId +

src/modules/marking/views/mark_setting_fast.vue → src/modules/marking/views/MarkSettingFast.vue

@@ -121,13 +121,7 @@ li {
 </template>
 
 <script>
-import {
-  CORE_API,
-  EXAM_WORK_API,
-  MARKING_API,
-  DATA_PROCESS_API,
-  OE_API
-} from "../constants/constants";
+import { MARKING_API, DATA_PROCESS_API } from "../constants/constants";
 import { mapState } from "vuex";
 export default {
   data() {
@@ -162,7 +156,7 @@ export default {
   methods: {
     selectChange(val) {
       var selectedMarker = this.selectedMarker;
-      val.forEach((element, index) => {
+      val.forEach(element => {
         selectedMarker.push(element);
         this.removeMarkerData(element.userId);
       });
@@ -181,7 +175,7 @@ export default {
         };
         this.loading = true;
         this.$http.post(DATA_PROCESS_API + "/markTasks", this.markTasks).then(
-          response => {
+          () => {
             this.$notify({
               message: "快速设置成功",
               type: "success"
@@ -190,7 +184,7 @@ export default {
             this.initMarker();
             this.searchSelectedMarker();
           },
-          response => {
+          () => {
             this.$notify({
               message: "快速设置失败",
               type: "error"
@@ -294,7 +288,7 @@ export default {
     back() {
       this.$router.push({
         path:
-          "/index/mark_setting_main/" +
+          "/index/MarkSettingMain/" +
           this.$route.params.workId +
           "/" +
           this.$route.params.examId +

src/modules/marking/views/mark_setting_main.vue → src/modules/marking/views/MarkSettingMain.vue

@@ -258,7 +258,7 @@ export default {
     fastSetting(index, row) {
       this.paperId = row.pk;
       var url =
-        "/index/mark_setting_fast/" +
+        "/index/MarkSettingFast/" +
         this.$route.params.workId +
         "/" +
         this.$route.params.examId +
@@ -353,7 +353,7 @@ export default {
     },
     back() {
       this.$router.push({
-        path: "/index/mark_setting_work/setting"
+        path: "/index/MarkSettingWork/setting"
       });
     },
     //导入

src/modules/marking/views/mark_setting_work.vue → src/modules/marking/views/MarkSettingWork.vue

@@ -130,14 +130,7 @@
 </template>
 
 <script>
-import {
-  CORE_API,
-  EXAM_WORK_API,
-  MARKING_API,
-  DATA_PROCESS_API,
-  EXAMTYPES
-} from "../constants/constants";
-import { mapActions } from "vuex";
+import { DATA_PROCESS_API } from "../constants/constants";
 import { mapState } from "vuex";
 export default {
   data() {
@@ -215,37 +208,27 @@ export default {
     },
     settingMarkWork(row) {
       var url =
-        "/index/mark_setting_main/" +
-        row.id +
-        "/" +
-        row.examId +
-        "/" +
-        row.name;
+        "/index/MarkSettingMain/" + row.id + "/" + row.examId + "/" + row.name;
       this.$router.push({
         path: url
       });
     },
     markWorkOverview(row) {
       var url =
-        "/index/mark_work_overview/" +
-        row.id +
-        "/" +
-        row.examId +
-        "/" +
-        row.name;
+        "/index/MarkWorkOverview/" + row.id + "/" + row.examId + "/" + row.name;
       this.$router.push({
         path: url
       });
     },
     marker(row) {
-      var url = "/index/marker/" + row.id + "/" + row.examId + "/" + row.name;
+      var url = "/index/Marker/" + row.id + "/" + row.examId + "/" + row.name;
       this.$router.push({
         path: url
       });
     },
     paperCheck(row) {
       var url =
-        "/index/mark_paper_check/" +
+        "/index/MarkPaperCheck/" +
         row.id +
         "/" +
         row.examId +
@@ -256,7 +239,7 @@ export default {
       });
     },
     viewGrade(row) {
-      var url = "/index/mark_grade_main/" + row.examId;
+      var url = "/index/MarkGradeMain/" + row.examId;
       this.$router.push({
         path: url
       });
@@ -264,7 +247,7 @@ export default {
     marking(row) {
       var userId = this.user.userId;
       var self = this;
-      var url = "/marking/" + row.id + "/" + row.examType;
+      var url = "/Marking/" + row.id + "/" + row.examType;
       self.$http
         .get(
           DATA_PROCESS_API + "/markTasks?workId=" + row.id + "&userId=" + userId
@@ -296,7 +279,6 @@ export default {
       return false;
     },
     isMarker() {
-      return true;
       if (sessionStorage.getItem("MarkButtonShow")) {
         return true;
       }

src/modules/marking/views/mark_work.vue → src/modules/marking/views/MarkWork.vue

@@ -270,16 +270,14 @@ export default {
     },
     recreate(row) {
       this.loading = true;
-      this.$http
-        .put(DATA_PROCESS_API + "/markWorks/" + row.id)
-        .then(response => {
-          this.$notify({
-            message: "评卷工作保存成功",
-            type: "success"
-          });
-          this.initMarkWorkData();
-          this.loading = false;
+      this.$http.put(DATA_PROCESS_API + "/markWorks/" + row.id).then(() => {
+        this.$notify({
+          message: "评卷工作保存成功",
+          type: "success"
         });
+        this.initMarkWorkData();
+        this.loading = false;
+      });
     },
     getExamSelect() {
       var orgId = this.user.rootOrgId;
@@ -380,14 +378,14 @@ export default {
         this.loading = true;
         this.$http
           .delete(MARKING_API + "/markWorks/" + row.id)
-          .then(response => {
+          .then(() => {
             this.$notify({
               message: "删除成功",
               type: "success"
             });
             this.initMarkWorkData();
           })
-          .catch(throws => {
+          .catch(() => {
             this.$notify({
               message: "删除失败",
               type: "success"
@@ -413,13 +411,13 @@ export default {
         this.$http
           .post(DATA_PROCESS_API + "/markWorks/" + row.examId + "/publish")
           .then(
-            response => {
+            () => {
               this.$notify({
                 message: "成绩发布成功",
                 type: "success"
               });
             },
-            response => {
+            () => {
               this.$notify({
                 message: "成绩发布失败",
                 type: "error"
@@ -460,7 +458,7 @@ export default {
                 this.formMarkWork
               )
               .then(
-                response => {
+                () => {
                   this.$notify({
                     message: "评卷工作保存成功",
                     type: "success"
@@ -482,7 +480,7 @@ export default {
             this.$http
               .post(DATA_PROCESS_API + "/markWorks", this.formMarkWork)
               .then(
-                response => {
+                () => {
                   this.$notify({
                     message: "评卷工作新增成功",
                     type: "success"

src/modules/marking/views/mark_work_overview.vue → src/modules/marking/views/MarkWorkOverview.vue

@@ -326,7 +326,7 @@ export default {
     },
     courseDetail(row) {
       var url =
-        "/index/course_detail/" +
+        "/index/CourseDetail/" +
         this.$route.params.workId +
         "/" +
         this.$route.params.examId +

src/modules/marking/views/marker.vue → src/modules/marking/views/Marker.vue

@@ -125,13 +125,7 @@ li {
 </template>
 
 <script>
-import {
-  CORE_API,
-  EXAM_WORK_API,
-  MARKING_API,
-  DATA_PROCESS_API,
-  OE_API
-} from "../constants/constants";
+import { DATA_PROCESS_API } from "../constants/constants";
 import { mapState } from "vuex";
 export default {
   data() {
@@ -210,7 +204,7 @@ export default {
     },
     markerDetail(row) {
       var url =
-        "/index/marker_detail/" +
+        "/index/MarkerDetail/" +
         this.$route.params.workId +
         "/" +
         this.$route.params.examId +

src/modules/marking/views/marker_detail.vue → src/modules/marking/views/MarkerDetail.vue

@@ -120,13 +120,7 @@ li {
 </template>
 
 <script>
-import {
-  CORE_API,
-  EXAM_WORK_API,
-  MARKING_API,
-  DATA_PROCESS_API,
-  OE_API
-} from "../constants/constants";
+import { MARKING_API } from "../constants/constants";
 import { mapState } from "vuex";
 export default {
   data() {
@@ -170,7 +164,7 @@ export default {
       this.$http
         .get(
           MARKING_API +
-            "/markCourses/all/marker/0/" +
+            "/markCourses/all/Marker/0/" +
             this.pageSize +
             "?workId=" +
             this.workId +
@@ -189,7 +183,7 @@ export default {
       this.$http
         .get(
           MARKING_API +
-            "/markCourses/all/marker/" +
+            "/markCourses/all/Marker/" +
             (this.currentPage - 1) +
             "/" +
             this.pageSize +
@@ -209,7 +203,7 @@ export default {
     back() {
       this.$router.push({
         path:
-          "/index/marker/" +
+          "/index/Marker/" +
           this.workId +
           "/" +
           this.examId +

src/modules/marking/views/marking.vue → src/modules/marking/views/Marking.vue

@@ -332,13 +332,13 @@ li {
 </template>
 <script>
 import { mapState } from "vuex";
-import tpMain from ".//tp_main.vue";
-import tpScoreboard from ".//tp_scoreboard.vue";
+import TpMain from "./TpMain.vue";
+import TpScoreBoard from "./TpScoreBoard.vue";
 import { MARKING_API, DATA_PROCESS_API } from "../constants/constants";
 export default {
   components: {
-    tpMain,
-    tpScoreboard
+    tpMain: TpMain,
+    tpScoreboard: TpScoreBoard
   },
   data() {
     return {
@@ -405,7 +405,7 @@ export default {
         }
       }
     },
-    clearScores(val) {
+    clearScores() {
       this.signScores.splice(0, this.signScores.length);
     },
     changePaperSign(val) {
@@ -439,7 +439,7 @@ export default {
       this.problemTaskVisible = true;
     },
     backIndex() {
-      this.$router.push({ path: "/index/mark_setting_work/marking" });
+      this.$router.push({ path: "/index/MarkSettingWork/Marking" });
     },
     taskCurrentChange(val) {
       this.taskCurrentPage = val;

src/modules/marking/views/tp_main.vue → src/modules/marking/views/TpMain.vue

@@ -97,10 +97,7 @@ img {
       <template v-if="this.examType == 'OFFLINE'">
         <el-tab-pane label="标答" name="second">
           <div id="answer-source" v-if="this.examType == 'OFFLINE'">
-            <div
-              style="float: right;margin-right: 20px;"
-              class="no-print"
-            >
+            <div style="float: right;margin-right: 20px;" class="no-print">
               <el-button size="small" type="success" @click="printAnswer();">
                 打印
               </el-button>

src/modules/marking/views/view_paper.vue → src/modules/marking/views/ViewPaper.vue

@@ -9,13 +9,7 @@
 </template>
 <script>
 import { mapState } from "vuex";
-import {
-  CORE_API,
-  EXAM_WORK_API,
-  MARKING_API,
-  DATA_PROCESS_API,
-  OE_API
-} from "../constants/constants";
+import { DATA_PROCESS_API } from "../constants/constants";
 export default {
   data() {
     return {
@@ -32,7 +26,7 @@ export default {
   methods: {
     back() {
       var url =
-        "/index/mark_paper_check/" +
+        "/index/MarkPaperCheck/" +
         this.workId +
         "/" +
         this.examId +

src/modules/marking/views/batchMark.vue

@@ -1,376 +0,0 @@
-<style lang="css"></style>
-
-<template lang="html">
-  <div>
-    <section class="content">
-      <div class="box box-info">
-        <div class="box-header with-border">
-          <h3 class="box-title">请选择评卷工作</h3>
-          <div class="box-tools pull-right">
-            <button
-              type="button"
-              class="btn btn-box-tool"
-              data-widget="collapse"
-            >
-              <i class="fa fa-minus"></i>
-            </button>
-          </div>
-        </div>
-        <div class="box-body">
-          <el-form
-            :inline="true"
-            :model="formSearch"
-            label-position="right"
-            label-width="110px"
-          >
-            <el-form-item label="课程代码" class="pull-left">
-              <el-input
-                placeholder="课程代码"
-                v-model="formSearch.courseCode"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="课程名称" class="pull-left">
-              <el-input
-                placeholder="课程名称"
-                v-model="formSearch.courseName"
-              ></el-input>
-            </el-form-item>
-            <el-form-item class="pull-right">
-              <el-button type="primary" icon="search" @click="searchMarkWork"
-                >查询</el-button
-              >
-              <el-button type="success" icon="caret-left" @click="backIndex"
-                >返回</el-button
-              >
-            </el-form-item>
-          </el-form>
-          <el-table
-            v-loading="loading"
-            element-loading-text="拼命加载中"
-            :data="tableData"
-            border
-            style="width: 100%"
-          >
-            <el-table-column label="课程名称" width="200">
-              <div>
-                <span style="margin-left: 10px">{{ row.courseName }}</span>
-              </div>
-            </el-table-column>
-            <el-table-column label="课程代码" width="250">
-              <div>
-                <span style="margin-left: 10px">{{ row.courseCode }}</span>
-              </div>
-            </el-table-column>
-            <el-table-column label="试卷数" width="200">
-              <div>
-                <span style="margin-left: 10px">{{ row.totalCount }}</span>
-              </div>
-            </el-table-column>
-            <el-table-column label="进度">
-              <div>
-                <span style="margin-left: 10px"
-                  >{{
-                    (
-                      ((row.totalCount - row.leftCount) * 100) /
-                      row.totalCount
-                    ).toFixed(2)
-                  }}%</span
-                >
-              </div>
-            </el-table-column>
-            <el-table-column label="未评数">
-              <div>
-                <span style="margin-left: 10px">{{ row.leftCount }}</span>
-              </div>
-            </el-table-column>
-            <el-table-column :context="_self" label="操作">
-              <div class="pull-left">
-                <el-button
-                  @click="batchUserPaperInfo(row);"
-                  type="success"
-                  size="mini"
-                  >批量下载</el-button
-                >
-                <el-button
-                  @click="uploadMarkScore(row);"
-                  type="info"
-                  size="mini"
-                  >上传评分</el-button
-                >
-              </div>
-            </el-table-column>
-          </el-table>
-
-          <!-- 导入弹窗 -->
-          <el-dialog
-            title="离线分数"
-            size="tiny"
-            v-model="batchScoreImportDialog"
-          >
-            <el-form>
-              <el-row>
-                <el-form-item style="margin-left:20px">
-                  <el-upload
-                    class="form_left"
-                    ref="upload"
-                    accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-                    :action="uploadAction"
-                    :headers="uploadHeaders"
-                    :data="uploadData"
-                    :before-upload="beforeUpload"
-                    :on-progress="uploadProgress"
-                    :on-success="uploadSuccess"
-                    :on-error="uploadError"
-                    :file-list="fileList"
-                    :auto-upload="false"
-                    :multiple="false"
-                  >
-                    <el-button size="small" slot="trigger" type="primary"
-                      >选择文件</el-button
-                    >
-                    <el-button size="small" type="success" @click="submitUpload"
-                      >确认上传</el-button
-                    >
-                    <el-button size="small" type="danger" @click="removeFile"
-                      >清空文件</el-button
-                    >
-                    <!--
-                      <el-button size="small" type="info" @click="exportFile">下载模板</el-button>
-                    -->
-                    <div slot="tip" class="el-upload__tip">
-                      只能上传xlsx文件
-                    </div>
-                  </el-upload>
-                </el-form-item>
-              </el-row>
-            </el-form>
-          </el-dialog>
-
-          <!-- 导入错误信息列表 -->
-          <el-dialog title="错误提示" v-model="errDialog">
-            <div
-              class="text-danger"
-              v-for="errMessage in errMessages"
-              :key="errMessage.row"
-            >
-              第{{ errMessage.row }}行：{{ errMessage.excelErrorType }}
-            </div>
-            <span slot="footer" class="dialog-footer">
-              <el-button @click="errDialog = false;">确定</el-button>
-            </span>
-          </el-dialog>
-
-          <div class="page pull-right">
-            <el-pagination
-              background
-              @current-change="paging"
-              :current-page="currentPage"
-              :page-size="pageSize"
-              layout="total, prev, pager, next, jumper"
-              :total="total"
-            >
-            </el-pagination>
-          </div>
-        </div>
-      </div>
-    </section>
-  </div>
-</template>
-
-<script>
-import { DATA_PROCESS_API } from "../constants/constants";
-import { mapState } from "vuex";
-export default {
-  data() {
-    return {
-      formSearch: {
-        courseCode: "",
-        courseName: ""
-      },
-      tableData: [],
-      currentPage: 1,
-      pageSize: 10,
-      total: 0,
-      loading: false,
-      batchScoreImportDialog: false,
-      uploadAction: DATA_PROCESS_API + "/markTasks/batchImportScore",
-      uploadHeaders: {},
-      uploadData: { workId: this.$route.params.workId, courseCode: "" },
-      errMessages: [],
-      errDialog: false,
-      fileLoading: false,
-      fileList: []
-    };
-  },
-  methods: {
-    searchMarkWork() {
-      var self = this;
-      this.loading = true;
-      this.workId = this.$route.params.workId;
-      var userId = this.user.userId;
-      $.ajax({
-        type: "GET",
-        url:
-          DATA_PROCESS_API +
-          "/markTasks?workId=" +
-          self.workId +
-          "&userId=" +
-          userId,
-        async: false,
-        beforeSend: function(XMLHttpRequest) {
-          XMLHttpRequest.setRequestHeader("key", self.user.key);
-          XMLHttpRequest.setRequestHeader("token", self.user.token);
-        },
-        success: function(response) {
-          self.tableData = response;
-          self.total = self.tableData.length;
-          self.filterMarkWork();
-          self.paging();
-          self.loading = false;
-        }
-      });
-    },
-    filterMarkWork() {
-      var tempData = this.tableData.filter(element => {
-        var flag = true;
-        if (this.formSearch.courseCode || this.formSearch.courseName) {
-          if (this.formSearch.courseCode) {
-            flag =
-              flag && element.courseCode.includes(this.formSearch.courseCode);
-          }
-          if (this.formSearch.courseName) {
-            flag =
-              flag && element.courseName.includes(this.formSearch.courseName);
-          }
-          return flag;
-        } else {
-          return flag;
-        }
-      });
-      this.tableData = tempData;
-      this.total = tempData.length;
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.searchMarkWork();
-    },
-    paging() {
-      var start = (this.currentPage - 1) * this.pageSize;
-      var end =
-        this.currentPage * this.pageSize < this.total
-          ? this.currentPage * this.pageSize
-          : this.total;
-      var tempData = [];
-      console.log(`当前页: ${this.currentPage},开始:${start},结束:${end}`);
-      for (let i = start; i < end; i++) {
-        tempData.push(this.tableData[i]);
-      }
-      console.log(tempData);
-      this.tableData = tempData;
-    },
-    batchUserPaperInfo(row) {
-      this.$notify({
-        message: "离线考试批量评阅",
-        type: "warning"
-      });
-    },
-    uploadMarkScore(row) {
-      this.uploadData.courseCode = row.courseCode;
-      this.batchScoreImportDialog = true;
-      this.initUpload();
-    },
-    backIndex() {
-      this.$router.push({ path: "/index/mark_setting_work/marking" });
-    },
-    //关于导入/导出
-    beforeUpload(file) {
-      console.log(file);
-    },
-    uploadProgress(event, file, fileList) {
-      console.log("uploadProgress");
-    },
-    uploadSuccess(response, file, fileList) {
-      console.log("uploadSuccess");
-      console.log(response);
-      if (!response || response.length == 0) {
-        this.$notify({
-          message: "上传成功",
-          type: "success"
-        });
-      } else {
-        this.errMessages = response;
-        this.errDialog = true;
-      }
-      this.fileLoading = false;
-      this.batchScoreImportDialog = false;
-      this.searchMarkWork();
-    },
-    uploadError(err, file, fileList) {
-      var result = err.message.match(/\{.+}/);
-      var errMessage = JSON.parse(result[0]).errorMsg;
-      this.$notify({
-        message: errMessage,
-        type: "error"
-      });
-      this.fileLoading = false;
-    },
-    initUpload() {
-      this.fileList = [];
-    },
-    checkUpload() {
-      var fileList = this.$refs.upload.uploadFiles;
-      if (fileList.length == 0) {
-        this.$notify({
-          message: "上传文件不能为空",
-          type: "error"
-        });
-        return false;
-      }
-      if (fileList.length > 1) {
-        this.$notify({
-          message: "每次只能上传一个文件",
-          type: "error"
-        });
-        return false;
-      }
-      for (let file of fileList) {
-        if (!file.name.endsWith(".xlsx")) {
-          this.$notify({
-            message: "上传文件必须为xlsx格式",
-            type: "error"
-          });
-          this.initUpload();
-          return false;
-        }
-      }
-      return true;
-    },
-    //确定上传
-    submitUpload() {
-      if (!this.checkUpload()) {
-        return false;
-      }
-      this.$refs.upload.submit();
-      this.fileLoading = true;
-    },
-    //清空文件
-    removeFile() {
-      this.$refs.upload.clearFiles();
-    },
-    //下载模板
-    exportFile() {
-      window.location.href = "/api/sms/teacher/download";
-    }
-  },
-  computed: {
-    ...mapState({ user: state => state.user })
-  },
-  created() {
-    this.uploadHeaders = {
-      key: this.user.key,
-      token: this.user.token
-    };
-    this.searchMarkWork();
-  }
-};
-</script>

src/modules/marking/views/index.vue

@@ -1,202 +0,0 @@
-<template>
-  <div>
-    <el-container>
-      <el-header>
-        <a href="javascript:void(0)" class="logo">
-          <span class="logo-mini"><b>阅</b></span>
-          <span class="logo-lg"><b>云阅卷</b></span>
-        </a>
-        <!-- Header Navbar: style can be found in header.less -->
-        <nav class="navbar navbar-static-top">
-          <!-- Sidebar toggle button -->
-          <a
-            href="javascript:void(0)"
-            class="sidebar-toggle"
-            data-toggle="offcanvas"
-            role="button"
-          >
-            <span class="sr-only">Toggle navigation</span>
-          </a>
-          <!-- Navbar Right Menu -->
-          <div class="navbar-custom-menu">
-            <ul class="nav navbar-nav">
-              <!-- User Account: style can be found in dropdown.less -->
-              <li class="dropdown user user-menu">
-                <a
-                  href="javascript:void(0)"
-                  class="dropdown-toggle"
-                  data-toggle="dropdown"
-                >
-                  <span class="hidden-xs">
-                    <i class="fa fa-user"></i> {{ user.displayName }}
-                  </span>
-                </a>
-              </li>
-
-              <li class="user user-menu">
-                <a href="javascript:void(0)" click="backIndex">
-                  <i class="fa fa-home"></i> <span>主页面</span>
-                </a>
-              </li>
-
-              <li class="user user-menu">
-                <a href="javascript:void(0)" click="logout">
-                  <i class="fa fa-sign-out"></i> <span>退出</span>
-                </a>
-              </li>
-            </ul>
-          </div>
-        </nav>
-      </el-header>
-      <el-container>
-        <el-aside width="200px">
-          <ul class="sidebar-menu">
-            <li class="header"></li>
-            <li class="treeview active">
-              <a href="javascript:void(0)">
-                <i class="fa fa-database"></i> <span>云阅卷</span>
-                <span class="pull-right-container">
-                  <i class="fa fa-angle-left pull-right"></i>
-                </span>
-              </a>
-
-              <ul class="treeview-menu">
-                <li
-                  v-for="menu1 in menuList"
-                  v-if="menu1.parentId == null && menu1.ext1 == 'menu'"
-                  :key="menu1"
-                >
-                  <a href="#" v-if="menu1.ext2 == null">
-                    <i v-bind:class="menu1.ext3"></i>{{ menu1.name }}
-                    <span class="pull-right-container">
-                      <i class="fa fa-angle-left pull-right"></i>
-                    </span>
-                  </a>
-                  <router-link v-else :to="{ path: menu1.ext2 }"
-                    ><i v-bind:class="menu1.ext3"></i>{{ menu1.name }}
-                  </router-link>
-                  <ul class="treeview-menu">
-                    <li
-                      v-for="menu2 in menuList"
-                      v-if="menu2.parentId == menu1.id && menu2.ext1 == 'menu'"
-                      :key="menu2"
-                    >
-                      <router-link :to="{ path: menu2.ext2 }">
-                        <i v-bind:class="menu2.ext3"></i>{{ menu2.name }}
-                      </router-link>
-                    </li>
-                  </ul>
-                </li>
-              </ul>
-            </li>
-          </ul>
-        </el-aside>
-        <el-container>
-          <el-main>
-            <div class="content-wrapper">
-              <!-- Content Header (Page header) -->
-              <section class="content">
-                <div class="row"><router-view></router-view></div>
-              </section>
-              <!-- Main content -->
-            </div>
-          </el-main>
-        </el-container>
-      </el-container>
-    </el-container>
-  </div>
-</template>
-<style>
-span.logo-lg {
-  font-family: "Micrsoft YaHei";
-  font-size: 30px;
-}
-</style>
-<script>
-import { mapActions } from "vuex";
-import { mapState } from "vuex";
-import { CORE_API } from "../constants/constants";
-import { USER_SIGNOUT } from "../../portal/store/user";
-
-export default {
-  data() {
-    return {
-      menuList: []
-    };
-  },
-  components: {},
-  computed: {
-    ...mapState({ user: state => state.user })
-  },
-  methods: {
-    ...mapActions([USER_SIGNOUT]),
-    logout() {
-      var loginUrl = sessionStorage.getItem("loginUrl");
-      this.$http
-        .post(CORE_API + "/auth/logout")
-        .then(response => {
-          this.USER_SIGNOUT();
-          sessionStorage.clear();
-          if (loginUrl) {
-            window.location.href = loginUrl;
-          } else {
-            window.location.href = "about:blank";
-          }
-        })
-        .catch(response => {
-          this.USER_SIGNOUT();
-          sessionStorage.clear();
-          if (loginUrl) {
-            window.location.href = loginUrl;
-          } else {
-            window.location.href = "about:blank";
-          }
-        });
-    },
-    backIndex() {
-      var indexUrl = sessionStorage.getItem("indexUrl");
-      if (indexUrl) {
-        window.location.href = indexUrl;
-      } else {
-        window.location.href = "about:blank";
-      }
-    },
-    getUserPrivileges() {
-      var self = this;
-      var url = CORE_API + "/rolePrivilege/getUserPrivileges";
-      let config = {
-        url: url,
-        method: "post",
-        params: {
-          groupCode: "MARK_WORK_MENUS",
-          full: false
-        },
-        headers: {
-          "Content-Type": "application/x-www-form-urlencoded"
-        }
-      };
-      this.$http
-        .post(config)
-        .then(response => {
-          self.menuList = response.data;
-          for (let menu in self.menuList) {
-            let menuItem = self.menuList[menu];
-            if (menuItem.ext1 == "button") {
-              sessionStorage.setItem(menuItem.code, true);
-            }
-          }
-        })
-        .catch(thrown => {
-          self.$notify({
-            showClose: true,
-            message: thrown.message,
-            type: "error"
-          });
-        });
-    }
-  },
-  created() {
-    this.getUserPrivileges();
-  }
-};
-</script>

src/modules/marking/views/logout.vue

@@ -1,18 +0,0 @@
-<style scoped></style>
-<template>
-  <div><a href="javascript:void(0)" @click="submit">退出</a></div>
-</template>
-<script>
-import { mapActions } from "vuex";
-import { USER_SIGNOUT } from "../../portal/store/user";
-export default {
-  methods: {
-    ...mapActions([USER_SIGNOUT]),
-    submit: function() {
-      this.USER_SIGNOUT();
-      this.$router.replace({ path: "/login" });
-      window.location.reload();
-    }
-  }
-};
-</script>

src/modules/portal/views/Home.vue

@@ -74,13 +74,11 @@
       </el-aside>
       <el-container>
         <el-main>
-            <div class="content-wrapper">
-                <section class="content">
-                    <div class="row">
-                        <router-view></router-view>
-                    </div>
-                </section>
-            </div>
+          <div class="content-wrapper">
+            <section class="content">
+              <div class="row"><router-view></router-view></div>
+            </section>
+          </div>
         </el-main>
         <el-footer>&copy; 启明泰和 2018</el-footer>
       </el-container>

src/router.js

@@ -7,7 +7,7 @@ Vue.use(Router);
 
 let router = new Router({
   mode: "history",
-  routes: [...PortalRoutes,...MarklRoutes]
+  routes: [...PortalRoutes, ...MarklRoutes]
 });
 
 // router.beforeEach((to, from, next) => {