Merge branch 'dev_1.2.0' of http://git.qmth.com.cn/union-question/union-question-web into dev_1.2.0

src/modules/questions/views/BluePaperStructure.vue

@@ -22,10 +22,10 @@
             @clear="getCourses('')"
           >
             <el-option
-              v-for="item in courseInfoSelect"
-              :key="item.courseId"
-              :label="item.courseInfo"
-              :value="item.courseId"
+              v-for="item in courseList"
+              :key="item.id"
+              :label="item.name + '(' + item.code + ')'"
+              :value="item.id"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -162,15 +162,6 @@ export default {
       }
       return selectedIdsStr;
     },
-    courseInfoSelect() {
-      var courseList = [];
-      for (let course of this.courseList) {
-        var courseInfo = course.name + "(" + course.code + ")";
-        var courseId = course.id;
-        courseList.push({ courseId: courseId, courseInfo: courseInfo });
-      }
-      return courseList;
-    },
     noBatchSelected() {
       return this.selectedList.length === 0;
     },
@@ -266,7 +257,7 @@ export default {
     },
     getCourseName(courseId) {
       for (let course of this.courseList) {
-        if (course.courseId == courseId) {
+        if (course.id == courseId) {
           this.formSearch.courseName = course.name;
         }
       }
@@ -352,7 +343,6 @@ export default {
           courseName: "",
         };
         this.currentPage = 1;
-        this.getCourses("");
       } else {
         this.formSearch = JSON.parse(
           sessionStorage.getItem("blue_paper_stucture")
@@ -361,9 +351,7 @@ export default {
           sessionStorage.getItem("blue_paper_stucture_currentPage")
         );
       }
-      if (this.formSearch.courseName) {
-        this.getCourses(this.formSearch.courseName);
-      }
+      this.getCourses(this.formSearch.courseName);
       this.searchAll();
     },
   },

src/modules/questions/views/PaperStructure.vue

@@ -29,10 +29,10 @@
           >
             <el-option label="公用" value="-1"></el-option>
             <el-option
-              v-for="item in courseInfoSelect"
-              :key="item.courseId"
-              :label="item.courseInfo"
-              :value="item.courseId"
+              v-for="item in courseList"
+              :key="item.id"
+              :label="item.name + '(' + item.code + ')'"
+              :value="item.id"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -181,15 +181,6 @@ export default {
       }
       return selectedIdsStr;
     },
-    courseInfoSelect() {
-      var courseList = [];
-      for (let course of this.courseList) {
-        var courseInfo = course.name + "(" + course.code + ")";
-        var courseId = course.id;
-        courseList.push({ courseId: courseId, courseInfo: courseInfo });
-      }
-      return courseList;
-    },
     noBatchSelected() {
       return this.selectedList.length === 0;
     },
@@ -239,7 +230,7 @@ export default {
     },
     getCourseName(courseId) {
       for (let course of this.courseList) {
-        if (course.courseId == courseId) {
+        if (course.id == courseId) {
           this.formSearch.courseName = course.name;
         }
       }
@@ -361,18 +352,13 @@ export default {
           courseName: "",
         };
         this.currentPage = 1;
-        this.getCourses("");
       } else {
         this.formSearch = JSON.parse(sessionStorage.getItem("paper_stucture"));
         this.currentPage = parseInt(
           sessionStorage.getItem("paper_stucture_currentPage")
         );
       }
-      if (this.formSearch.courseName) {
-        this.getCourses(this.formSearch.courseName);
-      } else {
-        this.getCourses("");
-      }
+      this.getCourses(this.formSearch.courseName);
       this.searchPaperStructs();
     },
   },

src/modules/questions/views/data_previllege_add_course.vue

@@ -108,6 +108,7 @@ export default {
   },
   methods: {
     async search() {
+      this.currentPage = 1;
       var param = new URLSearchParams(this.form);
       var url =
         QUESTION_API +