xiatian 4 жил өмнө
parent
commit
17ab987c96

+ 1 - 1
src/modules/questions/routes/routes.js

@@ -80,7 +80,7 @@ export default [
         component: ImportPaperInfo,
       },
       {
-        path: "gen_paper_detail/:courseNo/:level", //组卷页面
+        path: "gen_paper_detail/:courseNo", //组卷页面
         component: GenPaperDetail,
       },
       {

+ 7 - 4
src/modules/questions/views/GenPaper.vue

@@ -652,11 +652,10 @@ export default {
       } else {
         var course = this.getCourseObj(courseNo);
         this.formSearch.courseName = course.name;
-        var level = course.level;
         sessionStorage.setItem("gen_paper", JSON.stringify(this.formSearch));
         sessionStorage.setItem("gen_paper_currentPage", this.currentPage);
         this.$router.push({
-          path: "/questions/gen_paper_detail/" + courseNo + "/" + level,
+          path: "/questions/gen_paper_detail/" + courseNo,
         });
       }
     },
@@ -757,7 +756,9 @@ export default {
     },
     //查询所有课程
     getCourses(query) {
-      query = query.trim();
+      if (query) {
+        query = query.trim();
+      }
       this.courseLoading = true;
       this.$http
         .get(CORE_API + "/course/query?name=" + query + "&enable=true")
@@ -918,7 +919,9 @@ export default {
     },
     //查询考试
     getExams(query) {
-      query = query.trim();
+      if (query) {
+        query = query.trim();
+      }
       this.$http
         .get(
           EXAM_WORK_API + "/exam/queryByNameLike?name=" + query + "&enable=true"

+ 19 - 6
src/modules/questions/views/GenPaperDetail.vue

@@ -737,8 +737,8 @@
 </template>
 
 <script>
-import { QUESTION_API } from "@/constants/constants";
-
+import { QUESTION_API, CORE_API } from "@/constants/constants";
+import { mapState } from "vuex";
 export default {
   data() {
     return {
@@ -783,6 +783,7 @@ export default {
     };
   },
   computed: {
+    ...mapState({ user: (state) => state.user }),
     selectedPapers() {
       var selectedPapers = [];
       for (let paper of this.tempPapers) {
@@ -806,10 +807,20 @@ export default {
   },
   created() {
     this.genPaper.courseNo = this.$route.params.courseNo;
-    this.genPaper.courseName = JSON.parse(
-      sessionStorage.getItem("gen_paper")
-    ).courseName;
-    this.genPaper.level = this.$route.params.level;
+    var url =
+      CORE_API +
+      "/course/byCode?" +
+      "rootOrgId=" +
+      this.user.rootOrgId +
+      "&code=" +
+      this.genPaper.courseNo;
+    this.$httpWithMsg
+      .get(url)
+      .then((response) => {
+        this.genPaper.courseName = response.data.name;
+        this.genPaper.level = response.data.level;
+      })
+      .finally(() => {});
     this.searchPaper();
     this.getCoursePropertyList();
   },
@@ -877,6 +888,7 @@ export default {
             console.log("response:", response);
             this.selectPapers = response.data.content;
             this.totalSelect = response.data.totalElements;
+            this.curSelect = response.data.pageable.pageNumber + 1;
             this.loading = false;
           });
       } else if (this.paperType == "GENERATE") {
@@ -895,6 +907,7 @@ export default {
           .then((response) => {
             this.selectPapers = response.data.content;
             this.totalSelect = response.data.totalElements;
+            this.curSelect = response.data.pageable.pageNumber + 1;
             this.loading = false;
           });
       } else {