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/EditPaper.vue

@@ -1970,7 +1970,7 @@ export default {
         return false;
       }
       var quesProperty = {
-        id: "",
+        id: null,
         courseProperty: {},
         firstProperty: {},
         secondProperty: {},
@@ -1981,16 +1981,6 @@ export default {
       ) {
         this.quesModel.quesProperties = [];
       }
-      if (this.secondPropertyId) {
-        quesProperty.id =
-          this.coursePropertyId +
-          "-" +
-          this.firstPropertyId +
-          "-" +
-          this.secondPropertyId;
-      } else {
-        quesProperty.id = this.coursePropertyId + "-" + this.firstPropertyId;
-      }
       for (let quesPro of this.quesModel.quesProperties) {
         if (quesPro.id == quesProperty.id) {
           this.$notify({

src/modules/questions/views/ImportPaper.vue

@@ -7,7 +7,7 @@
       <el-form class="part-filter-form" :inline="true" :model="formSearch">
         <el-form-item label="课程名称">
           <el-select
-            v-model="formSearch.courseNo"
+            v-model="formSearch.courseId"
             filterable
             :remote-method="getCourses"
             remote
@@ -17,9 +17,9 @@
           >
             <el-option
               v-for="item in courseInfoSelect"
-              :key="item.courseNo"
+              :key="item.courseId"
               :label="item.courseInfo"
-              :value="item.courseNo"
+              :value="item.courseId"
             >
             </el-option>
           </el-select>
@@ -304,9 +304,9 @@
             placeholder="请输试卷名称"
           ></el-input>
         </el-form-item>
-        <el-form-item label="课程名称" prop="courseNo">
+        <el-form-item label="课程名称" prop="courseId">
           <el-select
-            v-model="copyPaperForm.courseNo"
+            v-model="copyPaperForm.courseId"
             class="dialog-input-width"
             :remote-method="getCourses"
             remote
@@ -317,9 +317,9 @@
           >
             <el-option
               v-for="item in courseInfoSelect"
-              :key="item.courseNo"
+              :key="item.courseId"
               :label="item.courseInfo"
-              :value="item.courseNo"
+              :value="item.courseId"
             >
             </el-option>
           </el-select>
@@ -413,7 +413,7 @@ export default {
       courseLoading: false,
       quesLoading: false,
       formSearch: {
-        courseNo: "",
+        courseId: "",
         courseName: "",
         creator: "",
         lastModifyName: "",
@@ -434,7 +434,7 @@ export default {
       copyPaperDialog: false,
       copyPaperForm: {
         paperName: "",
-        courseNo: null,
+        courseId: null,
       },
       copyPaperId: "",
       quesPropertyDialog: false,
@@ -458,7 +458,7 @@ export default {
         paperName: [
           { required: true, message: "请输试卷名称", trigger: "blur" },
         ],
-        courseNo: [
+        courseId: [
           { required: true, message: "请选择课程名称", trigger: "change" },
         ],
       },
@@ -480,8 +480,8 @@ export default {
       var courseList = [];
       for (let course of this.courseList) {
         var courseInfo = course.name + "(" + course.code + ")";
-        var courseNo = course.code;
-        courseList.push({ courseNo: courseNo, courseInfo: courseInfo });
+        var courseId = course.id;
+        courseList.push({ courseId: courseId, courseInfo: courseInfo });
       }
       return courseList;
     },
@@ -526,16 +526,16 @@ export default {
       this.currentPage = 1;
       this.searchImportPaper();
     },
-    getCourseName(courseNo) {
+    getCourseName(courseId) {
       for (let course of this.courseList) {
-        if (course.code == courseNo) {
+        if (course.code == courseId) {
           this.formSearch.courseName = course.name;
         }
       }
     },
     editImportPaper(row) {
       //缓存查询对象
-      this.getCourseName(this.formSearch.courseNo);
+      this.getCourseName(this.formSearch.courseId);
       sessionStorage.setItem("import_paper", JSON.stringify(this.formSearch));
       sessionStorage.setItem("import_paper_currentPage", this.currentPage);
       sessionStorage.setItem("question_back", "false");
@@ -646,7 +646,7 @@ export default {
     //克隆试卷
     copyImportPaper(row) {
       this.copyPaperForm.paperName = "";
-      this.copyPaperForm.courseNo = "";
+      this.copyPaperForm.courseId = "";
       this.copyPaperId = row.id;
       this.copyPaperDialog = true;
     },
@@ -662,8 +662,8 @@ export default {
                 this.copyPaperId +
                 "?paperName=" +
                 encodeURIComponent(this.copyPaperForm.paperName) +
-                "&courseNo=" +
-                encodeURIComponent(this.copyPaperForm.courseNo)
+                "&courseId=" +
+                encodeURIComponent(this.copyPaperForm.courseId)
             )
             .then(() => {
               this.$notify({
@@ -691,7 +691,7 @@ export default {
       sessionStorage.removeItem("import_paper_currentPage");
     },
     expQuesType() {
-      if (!this.formSearch.courseNo) {
+      if (!this.formSearch.courseId) {
         this.$notify({
           title: "警告",
           message: "请输入课程",
@@ -704,7 +704,7 @@ export default {
       window.location.href =
         QUESTION_API +
         "/paper/export/course/question/" +
-        this.formSearch.courseNo +
+        this.formSearch.courseId +
         "?$key=" +
         key +
         "&$token=" +
@@ -749,7 +749,7 @@ export default {
     },
     resetForm2(formData) {
       this.copyPaperForm.paperName = "";
-      this.copyPaperForm.courseNo = "";
+      this.copyPaperForm.courseId = "";
       this.$refs[formData].clearValidate();
     },
     back2(formData) {
@@ -771,7 +771,7 @@ export default {
     },
     //课程修改属性 openQuesProC
     openQuesProC() {
-      if (!this.formSearch.courseNo) {
+      if (!this.formSearch.courseId) {
         this.$notify({
           title: "警告",
           message: "请输入课程",
@@ -828,7 +828,7 @@ export default {
         .put(
           QUESTION_API +
             "/question/updatePro/courseCode/" +
-            this.formSearch.courseNo +
+            this.formSearch.courseId +
             "/" +
             this.difficultyDegree +
             "/" +
@@ -858,7 +858,7 @@ export default {
       if (this.isClear == 0 || !this.isClear) {
         this.removeItem();
         this.formSearch = {
-          courseNo: "",
+          courseId: "",
           level: "",
           name: "",
         };

src/modules/questions/views/OrgProperty.vue

@@ -60,7 +60,7 @@
         >
           <el-checkbox-group v-model="form.properties.ROOT_ORG_QUESTION_TYPES2">
             <el-checkbox label="READING_COMPREHENSION" class="checkbox_length"
-              >普通阅读</el-checkbox
+              >阅读理解</el-checkbox
             >
             <el-checkbox label="CLOZE" class="checkbox_length"
               >完形填空</el-checkbox

src/modules/questions/views/School.vue

@@ -367,8 +367,8 @@ export default {
       this.$httpWithMsg
         .get(url)
         .then((response) => {
-          this.tableData = response.data.list;
-          this.total = response.data.total;
+          this.tableData = response.data.content;
+          this.total = response.data.totalElements;
           this.loading = false;
         })
         .finally(() => {