Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-web-admin

src/modules/examwork/view/examInfo.vue

@@ -146,7 +146,13 @@
                   编辑
                 </el-button>
 
-                <el-dropdown style="margin-left: 10px;">
+                <el-dropdown
+                  style="margin-left: 10px;"
+                  v-if="
+                    rolePrivileges.change_exam_availability ||
+                      rolePrivileges.update_exam
+                  "
+                >
                   <el-button type="primary" plain size="mini">
                     更多<i class="el-icon-arrow-down el-icon--right"></i>
                   </el-button>

src/modules/examwork/view/examStudent.vue

@@ -5,7 +5,7 @@
       <div class="box-body">
         <!-- 搜索表单 -->
         <el-form :inline="true" :model="formSearch" label-width="70px">
-          <el-form-item label="考试" class="pull-left">
+          <el-form-item label="考试">
             <el-select
               class="input"
               :remote-method="queryExams4Search"
@@ -25,28 +25,28 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="姓名" class="pull-left">
+          <el-form-item label="姓名">
             <el-input
               class="input"
               placeholder="请输入姓名"
               v-model="formSearch.studentName"
             ></el-input>
           </el-form-item>
-          <el-form-item label="学号" class="pull-left">
+          <el-form-item label="学号">
             <el-input
               class="input"
               placeholder="请输入学号"
               v-model="formSearch.studentCode"
             ></el-input>
           </el-form-item>
-          <el-form-item label="专业" class="pull-left">
+          <el-form-item label="专业">
             <el-input
               class="input"
               placeholder="请输入专业"
               v-model="formSearch.specialtyName"
             ></el-input>
           </el-form-item>
-          <el-form-item label="课程" class="pull-left">
+          <el-form-item label="课程">
             <el-select
               class="input"
               :remote-method="getCourses4Search"
@@ -66,7 +66,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="学习中心" class="pull-left">
+          <el-form-item label="学习中心">
             <el-select
               class="input"
               :remote-method="getOrgList4Search"
@@ -87,21 +87,21 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="采集人" class="pull-left">
+          <el-form-item label="采集人">
             <el-input
               class="input"
               placeholder="请输入采集人"
               v-model="formSearch.infoCollector"
             ></el-input>
           </el-form-item>
-          <el-form-item label="身份证" class="pull-left">
+          <el-form-item label="身份证">
             <el-input
               class="input"
               placeholder="请输入身份证"
               v-model="formSearch.identityNumber"
             ></el-input>
           </el-form-item>
-          <el-form-item label="考点" class="pull-left">
+          <el-form-item label="考点">
             <el-input
               class="input"
               placeholder="请输入考点"

src/modules/examwork/view/offlineExam.vue

@@ -19,7 +19,11 @@
               <el-button type="primary" size="small" @click="saveExam"
                 >保 存</el-button
               >
-              <el-button type="primary" size="small" @click="back"
+              <el-button
+                type="primary"
+                size="small"
+                @click="back"
+                icon="el-icon-arrow-left"
                 >返 回</el-button
               >
             </div>

src/modules/examwork/view/onlineExam.vue

@@ -19,7 +19,11 @@
               <el-button type="primary" size="small" @click="saveExam"
                 >保 存</el-button
               >
-              <el-button type="primary" size="small" @click="back"
+              <el-button
+                type="primary"
+                size="small"
+                @click="back"
+                icon="el-icon-arrow-left"
                 >返 回</el-button
               >
             </div>
@@ -806,16 +810,16 @@ export default {
         started: false,
         name: "",
         examType: "ONLINE",
-        examTimes: 1,
+        examTimes: null,
         beginTime: null,
         endTime: null,
-        duration: 120,
+        duration: null,
         enable: "true",
         examLimit: "false",
         properties: {
           IS_OBJ_SCORE_VIEW: "true",
-          EXAM_RECONNECT_TIME: 30,
-          FREEZE_TIME: 0,
+          EXAM_RECONNECT_TIME: null,
+          FREEZE_TIME: null,
           BEFORE_EXAM_REMARK: "",
           AFTER_EXAM_REMARK: "",
           SHOW_CHEATING_REMARK: "true",
@@ -830,15 +834,15 @@ export default {
           BOOL_ANSWER_REMARK: "",
           IS_FACE_ENABLE: "false",
           IS_FACE_CHECK: "false",
-          SNAPSHOT_INTERVAL: 30,
-          WARN_THRESHOLD: 50,
+          SNAPSHOT_INTERVAL: null,
+          WARN_THRESHOLD: null,
           MARKING_TYPE: "ALL",
           IP_LIMIT: "false",
           IP_ADDRESSES: null,
-          LIVING_WARN_THRESHOLD: 50,
+          LIVING_WARN_THRESHOLD: null,
           IS_FACE_VERIFY: "false",
-          FACE_VERIFY_START_MINUTE: 5,
-          FACE_VERIFY_END_MINUTE: 10,
+          FACE_VERIFY_START_MINUTE: null,
+          FACE_VERIFY_END_MINUTE: null,
           PUSH_SCORE: "true"
         }
       },
@@ -931,6 +935,15 @@ export default {
               response.data
             );
 
+            this.form.properties.SINGLE_EDIT =
+              this.form.properties.SINGLE_EDIT === "true";
+            this.form.properties.MUTIPLE_EDIT =
+              this.form.properties.MUTIPLE_EDIT === "true";
+            this.form.properties.BOOL_EDIT =
+              this.form.properties.BOOL_EDIT === "true";
+            this.form.properties.FILL_BLANK_EDIT =
+              this.form.properties.FILL_BLANK_EDIT === "true";
+
             this.show_ckeditor = true;
           });
         });

src/modules/examwork/view/onlineExamOrgSettings.vue

@@ -363,21 +363,27 @@
                   :auto-upload="false"
                   :multiple="false"
                 >
-                  <el-button size="small" slot="trigger" type="primary"
+                  <el-button
+                    size="small"
+                    slot="trigger"
+                    type="primary"
+                    icon="el-icon-search"
                     >选择文件</el-button
                   >
                   <el-button
                     size="small"
                     style="margin-left:10px;"
-                    type="success"
+                    type="primary"
                     @click="submitUpload"
+                    icon="el-icon-check"
                     >确认上传
                   </el-button>
                   <el-button
                     size="small"
                     style="margin-left: 10px;"
-                    type="danger"
+                    type="primary"
                     @click="removeFile"
+                    icon="el-icon-refresh"
                     >清空文件
                   </el-button>
                   <div slot="tip" class="el-upload__tip">只能上传xlsx文件</div>

src/modules/examwork/view/practiceExam.vue

@@ -19,7 +19,11 @@
               <el-button type="primary" size="small" @click="saveExam"
                 >保 存</el-button
               >
-              <el-button type="primary" size="small" @click="back"
+              <el-button
+                type="primary"
+                size="small"
+                @click="back"
+                icon="el-icon-arrow-left"
                 >返 回</el-button
               >
             </div>

src/modules/examwork/view/printExam.vue

@@ -19,7 +19,11 @@
               <el-button type="primary" size="small" @click="saveExam"
                 >保 存</el-button
               >
-              <el-button type="primary" size="small" @click="back"
+              <el-button
+                type="primary"
+                size="small"
+                @click="back"
+                icon="el-icon-arrow-left"
                 >返 回</el-button
               >
             </div>

src/modules/examwork/view/traditionExam.vue

@@ -19,7 +19,11 @@
               <el-button type="primary" size="small" @click="saveExam"
                 >保 存</el-button
               >
-              <el-button type="primary" size="small" @click="back"
+              <el-button
+                type="primary"
+                size="small"
+                @click="back"
+                icon="el-icon-arrow-left"
                 >返 回</el-button
               >
             </div>

src/modules/marking/routes/routes.js

@@ -38,7 +38,7 @@ export default [
         component: Marker
       },
       {
-        path: "marker_detail/:workId/:examId/:name/:markerId/:userName", //评卷员详情
+        path: "marker_detail/:workId/:markerId/:userName", //评卷员详情
         component: MarkerDetail
       },
       {

src/modules/marking/views/MarkPaperCheck.vue

@@ -9,22 +9,21 @@
             ref="formSearch"
             label-width="70px"
           >
-            <el-form-item label="评卷名称" prop="markId">
+            <el-form-item label="评卷名称" prop="workId">
               <el-select
                 clearable
                 filterable
                 class="input"
-                v-model="formSearch.markId"
+                v-model="formSearch.workId"
                 placeholder="请选择"
                 style="width:150px;"
-                @change="getCourses"
+                @change="changeMarkWork"
               >
-                <el-option value>请选择</el-option>
                 <el-option
                   v-for="item in markWorkSelect"
                   :label="item.markName"
-                  :value="item.markId"
-                  :key="item.markId"
+                  :value="item.workId"
+                  :key="item.workId"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -41,7 +40,6 @@
                 style="width:150px;"
                 @focus="e => getOrgs(e.target.value)"
               >
-                <el-option label="请选择" value></el-option>
                 <el-option
                   v-for="item in orgList"
                   :label="item.name"
@@ -72,7 +70,6 @@
                 filterable
                 style="width:150px;"
               >
-                <el-option label="请选择" value></el-option>
                 <el-option
                   v-for="item in tags"
                   :label="item.name"
@@ -91,7 +88,6 @@
                 placeholder="请选择"
                 style="width:150px;"
               >
-                <el-option label="请选择" value></el-option>
                 <el-option
                   v-for="item in courseAllListSelect"
                   :label="item.courseInfo"
@@ -109,7 +105,6 @@
                 placeholder="请选择"
                 style="width:150px;"
               >
-                <el-option label="请选择" value></el-option>
                 <el-option
                   v-for="item in userList"
                   :label="item.name"
@@ -135,7 +130,7 @@
                 >查询</el-button
               >
               <el-button
-                @click="resetForm('formSearch')"
+                @click="resetForm()"
                 size="small"
                 icon="el-icon-refresh"
                 >重置</el-button
@@ -222,7 +217,7 @@
           </el-table>
           <div class="page pull-right">
             <el-pagination
-              background
+              v-if="paginationShow"
               @current-change="handleCurrentChange"
               @size-change="handleSizeChange"
               :current-page="currentPage"
@@ -253,8 +248,6 @@ export default {
         courseCode: "",
         userId: "",
         workId: "",
-        specialtyCode: "",
-        examType: "",
         markRemark: ""
       },
       orgList: [],
@@ -265,9 +258,8 @@ export default {
       currentPage: 1,
       pageSize: 10,
       total: 0,
-      workId: "",
+      paginationShow: false,
       examId: "",
-      paper: "",
       tags: [],
       loading: false,
       examType: "",
@@ -281,7 +273,7 @@ export default {
       let markWorkNames = [];
       for (let markWork of this.markWorkList) {
         markWorkNames.push({
-          markId: markWork.id,
+          workId: markWork.id,
           markName: markWork.name,
           examId: markWork.examId
         });
@@ -298,11 +290,38 @@ export default {
     }
   },
   methods: {
+    changeMarkWork() {
+      if (this.$route.query) {
+        this.$router.push({ path: "/marking/mark_paper_check" });
+      }
+      let obj = {};
+      for (let item of this.markWorkList) {
+        if (item.id === this.formSearch.workId) {
+          obj = item;
+          break;
+        }
+      }
+      this.examId = obj.examId;
+      this.examType = obj.examType;
+      this.getCourses();
+      this.formSearch = Object.assign(this.formSearch, {
+        orgCode: "",
+        studentName: "",
+        studentCode: "",
+        tag: "",
+        courseCode: "",
+        userId: "",
+        markRemark: ""
+      });
+    },
     getMarkWorks() {
       this.$http
         .get(DATA_PROCESS_API + "/markWorks?status=1")
         .then(response => {
           this.markWorkList = response.data;
+          if (this.$route.query && this.$route.query.workId) {
+            this.formSearch.workId = parseInt(this.$route.query.workId);
+          }
         });
     },
     //查询学习中心
@@ -314,30 +333,36 @@ export default {
       });
     },
     //查询课程
-    getCourses(markId) {
-      let workId = this.formSearch.markId;
-      if (markId) {
-        workId = markId;
-      }
+    getCourses() {
       this.$http
-        .get(MARKING_API + "/markResults/queryExamCourseList?workId=" + workId)
+        .get(
+          MARKING_API +
+            "/markResults/queryExamCourseList?workId=" +
+            this.formSearch.workId
+        )
         .then(response => {
           this.courseList = response.data;
+          if (this.$route.query && this.$route.query.courseCode) {
+            this.formSearch.courseCode = this.$route.query.courseCode;
+            this.getUserList();
+          }
         });
     },
     //查询评委
     getUserList() {
-      this.formSearch.userId = "";
       this.$http
         .get(
           DATA_PROCESS_API +
             "/markUsers/assign?workId=" +
-            this.workId +
+            this.formSearch.workId +
             "&courseCode=" +
             this.formSearch.courseCode
         )
         .then(response => {
           this.userList = response.data;
+          if (this.$route.query && this.$route.query.userId) {
+            this.formSearch.userId = parseInt(this.$route.query.userId);
+          }
         });
     },
     //查询标记卷
@@ -364,7 +389,11 @@ export default {
     },
     //查询方法
     searchMarkPaperCheck() {
-      if (!this.formSearch.markId) {
+      this.currentPage = 1;
+      this.initMarkPaperCheck();
+    },
+    initMarkPaperCheck() {
+      if (!this.formSearch.workId) {
         this.$notify({
           title: "警告",
           message: "请选择评卷名称",
@@ -372,17 +401,6 @@ export default {
         });
         return false;
       }
-      let obj = {};
-      for (let item of this.markWorkList) {
-        if (item.id === this.formSearch.markId) {
-          obj = item;
-          break;
-        }
-      }
-      this.examId = obj.examId;
-      this.formSearch.workId = this.formSearch.markId;
-      this.examType = obj.examType;
-      this.formSearch.examType = this.examType;
       this.loading = true;
       var url =
         DATA_PROCESS_API +
@@ -390,33 +408,56 @@ export default {
         (this.currentPage - 1) +
         "/" +
         this.pageSize;
-      this.$http
-        .get(url, { params: this.formSearch })
-        .then(response => {
-          console.log("查询的列表集合", response);
-          this.tableData = response.data.list;
-          this.total = response.data.total;
-          this.loading = false;
-          this.$router.push({
-            path:
-              "/marking/mark_paper_check?" +
-              new URLSearchParams(JSON.parse(JSON.stringify(this.formSearch)))
-          });
-        })
-        .catch(function(response) {
-          console.log(response);
+      this.$http.get(url, { params: this.formSearch }).then(response => {
+        console.log("查询的列表集合", response);
+        this.tableData = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+        this.$router.push({
+          path: "/marking/mark_paper_check",
+          query: {
+            workId: this.formSearch.workId,
+            orgCode: this.formSearch.orgCode,
+            studentName: this.formSearch.studentName,
+            studentCode: this.formSearch.studentCode,
+            tag: this.formSearch.tag,
+            courseCode: this.formSearch.courseCode,
+            userId: this.formSearch.userId,
+            markRemark: this.formSearch.markRemark,
+            examId: this.examId,
+            examType: this.examType,
+            currentPage: this.currentPage,
+            pageSize: this.pageSize
+          }
         });
+        this.$nextTick(function() {
+          this.paginationShow = true;
+        });
+      });
     },
-    resetForm(formName) {
-      this.$refs[formName].resetFields();
+    resetForm() {
+      this.formSearch = Object.assign(this.formSearch, {
+        orgCode: "",
+        studentName: "",
+        studentCode: "",
+        tag: "",
+        courseCode: "",
+        userId: "",
+        workId: "",
+        markRemark: ""
+      });
+      this.tableData = [];
+      this.total = 0;
+      this.$router.push({ path: "/marking/mark_paper_check" });
     },
     handleCurrentChange(val) {
       this.currentPage = val;
-      this.searchMarkPaperCheck();
+      this.initMarkPaperCheck();
     },
     handleSizeChange(val) {
       this.pageSize = val;
-      this.searchMarkPaperCheck();
+      this.currentPage = 1;
+      this.initMarkPaperCheck();
     },
     //查看原卷
     viewPaper(row) {
@@ -425,7 +466,7 @@ export default {
         console.log("studentPaperId:", studentPaperId);
         var urls =
           "/marking/view_paper/" +
-          this.formSearch.markId +
+          this.formSearch.workId +
           "/" +
           this.examId +
           "/" +
@@ -461,32 +502,31 @@ export default {
         }
       }
     },
-    backFill() {
-      var formData = this.$route.query;
-      if (formData && formData.markId) {
-        for (var attr in formData) {
-          var value = formData[attr];
-          if (value && value != "null") {
-            if (!isNaN(value)) {
-              if (~~value == value) {
-                value = parseInt(value);
-              } else {
-                value = parseFloat(value);
-              }
-            }
-            this.formSearch[attr] = value;
-          }
-        }
+    operaQuery() {
+      let formData = this.$route.query;
+      if (formData && formData.workId) {
+        this.formSearch.workId = formData.workId;
+        this.formSearch.orgCode = formData.orgCode;
+        this.formSearch.studentName = formData.studentName;
+        this.formSearch.studentCode = formData.studentCode;
+        this.formSearch.markRemark = formData.markRemark;
+        this.formSearch.courseCode = formData.courseCode;
+        this.formSearch.userId = formData.userId;
+        this.formSearch.tag = formData.tag;
+        this.examId = formData.examId;
+        this.examType = formData.examType;
+        this.currentPage = parseInt(formData.currentPage);
+        this.pageSize = parseInt(formData.pageSize);
         this.getCourses();
-        this.searchMarkPaperCheck();
+        this.initMarkPaperCheck();
       }
     }
   },
   created() {
-    this.getMarkWorks();
     //查询标记卷
     this.getTags();
-    this.backFill();
+    this.getMarkWorks();
+    this.operaQuery();
   }
 };
 </script>

src/modules/marking/views/MarkSettingMain.vue

@@ -449,13 +449,18 @@ export default {
     exportCourse() {
       var key = this.user.key;
       var token = this.user.token;
-      window.location.href =
+      let url =
         "/api/ecs_marking/markCourses/export?workId=" +
         this.workId +
         "&$key=" +
         key +
         "&$token=" +
         token;
+      let courseCode = this.formSearch.courseCode;
+      if (courseCode) {
+        url = url + "&courseCode=" + courseCode;
+      }
+      window.location.href = url;
     },
     handleCommand(buttonType) {
       if (buttonType == "in") this.imp();

src/modules/marking/views/MarkWork.vue

@@ -209,7 +209,12 @@
                 ></el-input>
               </el-form-item>
               <el-form-item style="margin-top:10px;margin-left: 100px">
-                <el-button type="primary" @click="saveMarkWork">保存</el-button>
+                <el-button
+                  :loading="saveLoading"
+                  type="primary"
+                  @click="saveMarkWork"
+                  >保存</el-button
+                >
                 <el-button @click="closeMarkWork">取消</el-button>
                 <el-button @click="resetForm">重置</el-button>
               </el-form-item>
@@ -259,6 +264,7 @@ export default {
       loading: false,
       closeClickModal: false,
       isAdmin: false,
+      saveLoading: false,
       oldWorkName: ""
     };
   },
@@ -280,7 +286,7 @@ export default {
         "/" +
         row.examId +
         "/" +
-        row.name;
+        encodeURIComponent(row.name);
       this.$router.push({
         path: url
       });
@@ -479,6 +485,7 @@ export default {
               return;
             }
           }
+          this.saveLoading = true;
           this.oldWorkName = "";
           this.loading = true;
           if (this.markWorkId) {
@@ -496,14 +503,15 @@ export default {
                   this.closeMarkWork();
                   this.initMarkWorkData();
                   this.loading = false;
+                  this.saveLoading = false;
                 },
-                response => {
-                  console.log(response);
+                error => {
                   this.$notify({
-                    message: response.response.data,
+                    message: error.response.data,
                     type: "error"
                   });
                   this.loading = false;
+                  this.saveLoading = false;
                 }
               );
           } else {
@@ -518,13 +526,15 @@ export default {
                   this.closeMarkWork();
                   this.initMarkWorkData();
                   this.loading = false;
+                  this.saveLoading = false;
                 },
-                response => {
+                error => {
                   this.$notify({
-                    message: response.response.data,
+                    message: error.response.data,
                     type: "error"
                   });
                   this.loading = false;
+                  this.saveLoading = false;
                 }
               );
           }

src/modules/marking/views/MarkWorkOverview.vue

@@ -70,7 +70,7 @@
                     size="small"
                     type="primary"
                     icon="el-icon-search"
-                    @click="searchSetting"
+                    @click="searchBtnFn"
                     >查询</el-button
                   >
                 </el-form-item>
@@ -135,6 +135,7 @@
           </el-table>
           <div class="page pull-right">
             <el-pagination
+              v-if="paginationShow"
               @current-change="handleSettingCurrentChange"
               @size-change="handleSizeChange"
               :current-page="currentPage"
@@ -161,6 +162,7 @@ export default {
   },
   data() {
     return {
+      paginationShow: false,
       formSearch: {
         courseCode: ""
       },
@@ -364,6 +366,9 @@ export default {
         .get(DATA_PROCESS_API + "/markWorks?status=1")
         .then(response => {
           this.markWorkList = response.data;
+          if (this.$route.query && this.$route.query.markId) {
+            this.markWorkSearchForm.markId = parseInt(this.$route.query.markId);
+          }
         });
     },
     getCourses() {
@@ -373,6 +378,9 @@ export default {
         )
         .then(response => {
           this.courseList = response.data;
+          if (this.$route.query && this.$route.query.courseCode) {
+            this.formSearch.courseCode = this.$route.query.courseCode;
+          }
         });
     },
     handleSettingCurrentChange(val) {
@@ -383,6 +391,10 @@ export default {
       this.pageSize = val;
       this.searchSetting();
     },
+    searchBtnFn() {
+      this.currentPage = 1;
+      this.searchSetting();
+    },
     searchSetting() {
       if (!this.markWorkSearchForm.markId) {
         this.$notify({
@@ -419,6 +431,9 @@ export default {
               "/marking/mark_work_overview?" +
               new URLSearchParams(JSON.parse(JSON.stringify(this.quertTemp)))
           });
+          this.$nextTick(function() {
+            this.paginationShow = true;
+          });
         });
     },
     courseDetail(row) {
@@ -428,7 +443,7 @@ export default {
         "/" +
         this.examId +
         "/" +
-        this.markWorkName +
+        encodeURIComponent(this.markWorkName) +
         "/" +
         row.code +
         "/" +
@@ -566,30 +581,15 @@ export default {
       var formData = this.$route.query;
       if (formData && formData.markId) {
         this.workId = formData.markId;
-        for (var attr in formData) {
-          var value = formData[attr];
-          if (value && value != "null") {
-            if (!isNaN(value)) {
-              if (~~value == value) {
-                value = parseInt(value);
-              } else {
-                value = parseFloat(value);
-              }
-            }
-            if (attr === "markId") {
-              this.markWorkSearchForm[attr] = value;
-            } else {
-              console.log("formSearch", this.formSearch);
-              this.formSearch[attr] = value;
-            }
-          }
-        }
+        this.markWorkSearchForm.markId = parseInt(formData.markId);
+        this.formSearch.courseCode = formData.courseCode;
         this.currentPage = parseInt(formData.currentPage);
         this.pageSize = parseInt(formData.pageSize);
         this.examId = parseInt(formData.examId);
         this.markWorkName = formData.markWorkName;
-        this.searchSetting();
+        this.doPie();
         this.getCourses();
+        this.searchSetting();
       }
     }
   },

src/modules/marking/views/Marker.vue

@@ -120,7 +120,7 @@
           </el-table>
           <div class="page pull-right">
             <el-pagination
-              background
+              v-if="paginationShow"
               @current-change="handleSettingCurrentChange"
               @size-change="handleSizeChange"
               :current-page="currentPage"
@@ -153,9 +153,8 @@ export default {
       total: 10,
       loading: false,
       workId: "",
-      examId: "",
-      markWorkName: "",
-      markWorkList: []
+      markWorkList: [],
+      paginationShow: false
     };
   },
   methods: {
@@ -167,19 +166,6 @@ export default {
       this.pageSize = val;
       this.searchSetting();
     },
-    pagingSetting() {
-      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]);
-      }
-      this.tableData = tempData;
-    },
     searchSetting() {
       if (!this.formSearch.markId) {
         this.$notify({
@@ -189,15 +175,6 @@ export default {
         });
         return false;
       }
-      let obj = {};
-      for (let item of this.markWorkList) {
-        if (item.id === this.formSearch.markId) {
-          obj = item;
-          break;
-        }
-      }
-      this.examId = obj.examId;
-      this.markWorkName = obj.name;
       this.workId = this.formSearch.markId;
       this.loading = true;
       this.$http
@@ -221,6 +198,9 @@ export default {
               "/marking/marker?" +
               new URLSearchParams(JSON.parse(JSON.stringify(this.formSearch)))
           });
+          this.$nextTick(function() {
+            this.paginationShow = true;
+          });
         });
     },
     markerDetail(row) {
@@ -228,10 +208,6 @@ export default {
         "/marking/marker_detail/" +
         this.workId +
         "/" +
-        this.examId +
-        "/" +
-        this.markWorkName +
-        "/" +
         row.userId +
         "/" +
         row.userName;

src/modules/marking/views/MarkerDetail.vue

@@ -114,9 +114,7 @@ export default {
       total: 10,
       loading: true,
       workId: "",
-      examId: "",
-      courseCode: "",
-      examName: ""
+      courseCode: ""
     };
   },
   components: {
@@ -194,8 +192,6 @@ export default {
   },
   created() {
     this.workId = this.$route.params.workId;
-    this.examId = this.$route.params.examId;
-    this.examName = this.$route.params.name;
     this.userName = this.$route.params.userName;
     this.userId = this.$route.params.markerId;
     this.initSetting();

src/modules/marking/views/TpScoreBoard.vue

@@ -346,7 +346,7 @@ export default {
         "(" +
         this.resultItem.markItem.orders +
         ")";
-      this.$message({
+      this.$notify({
         showClose: true,
         message: "当前选择题目为" + title,
         type: "warning"

src/modules/questions/views/GenPaper.vue

@@ -457,6 +457,7 @@ export default {
         if (course.code == courseNo) {
           return course;
         }
+        return "";
       }
     },
     exportGenPaper(row) {
@@ -465,7 +466,10 @@ export default {
       );
     },
     editGenPaper(row) {
-      this.getCourseName(this.formSearch.courseNo);
+      var course = this.getCourseObj(this.formSearch.courseNo);
+      if (course) {
+        this.formSearch.courseName = course.name;
+      }
       sessionStorage.setItem("gen_paper", JSON.stringify(this.formSearch));
       sessionStorage.setItem("gen_paper_currentPage", this.currentPage);
       this.$router.push({