xiatian преди 4 години
родител
ревизия
3bfc7d31c2
променени са 3 файла, в които са добавени 12 реда и са изтрити 4 реда
  1. 1 1
      src/modules/questions/views/GenPaper.vue
  2. 9 1
      src/modules/questions/views/ImportPaperInfo.vue
  3. 2 2
      src/modules/questions/views/Question.vue

+ 1 - 1
src/modules/questions/views/GenPaper.vue

@@ -185,7 +185,7 @@
           label="创建时间"
           width="153"
           sortable
-          prop="createTime"
+          prop="creationDate"
         >
         </el-table-column>
         <el-table-column label="修改人" width="150">

+ 9 - 1
src/modules/questions/views/ImportPaperInfo.vue

@@ -79,7 +79,7 @@
             <el-upload
               ref="upload"
               class="form_left"
-              accept=".docx,.zip"
+              :accept="importFileType"
               :action="uploadAction"
               :headers="uploadHeaders"
               :data="uploadData"
@@ -163,6 +163,14 @@ export default {
       }
       return courseList;
     },
+    importFileType() {
+      if (this.importType == "word") {
+        return ".docx";
+      } else if (this.importType == "zip") {
+        return ".zip";
+      }
+      return ".docx";
+    },
   },
   watch: {
     scoreCheck: function () {

+ 2 - 2
src/modules/questions/views/Question.vue

@@ -457,7 +457,7 @@ export default {
       this.searchQues();
     },
     searchQues() {
-      var pageNo = Number(this.currentPage | 1);
+      var pageNo = this.currentPage;
       this.currentPage = 1;
       this.tableData = [];
       var url = QUESTION_API + "/question/" + pageNo + "/" + this.pageSize;
@@ -465,7 +465,7 @@ export default {
       this.$http.get(url, { params: this.formSearch }).then((response) => {
         this.tableData = response.data.content;
         this.total = response.data.totalElements;
-        this.currentPage = Number(pageNo);
+        this.currentPage = pageNo;
         this.loading = false;
       });
     },