zhangjie 2 년 전
부모
커밋
a66b7b8276

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

@@ -59,11 +59,11 @@ export default {
   },
   data() {
     return {
-      basePaperId: null,
+      basePaperId: "",
       loading: false,
       ignoreIds: [],
       from: "",
-      curQuestionId: null,
+      curQuestionId: "",
       curQuestion: {},
       duplicateQuestion: {},
       duplicateQuestions: [],

+ 14 - 19
src/modules/questions/views/CheckDuplicateList.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>
@@ -43,12 +43,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="题干">
-          <el-input
-            v-model="formSearch.quesBodyText"
-            placeholder="题干"
-          ></el-input>
-        </el-form-item>
         <el-form-item label="题型">
           <el-select
             v-model="formSearch.questionType"
@@ -146,7 +140,7 @@
         </el-table-column>
         <el-table-column label="创建时间" width="100">
           <template slot-scope="scope">
-            <span>{{ scope.row.creationDate }}</span>
+            <span>{{ scope.row.creationTime }}</span>
           </template>
         </el-table-column>
         <el-table-column label="创建人" width="100">
@@ -240,9 +234,8 @@ export default {
       selectedQuesIds: [],
       formSearch: {
         basePaperId: "",
-        quesBodyText: "",
         questionType: "",
-        courseNo: "",
+        courseId: "",
         courseName: "",
       },
       paperList: [],
@@ -268,8 +261,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;
     },
@@ -424,9 +417,9 @@ export default {
       this.currentPage = 1;
       this.searchQues();
     },
-    getCourseName(courseNo) {
+    getCourseName(courseId) {
       for (let course of this.courseList) {
-        if (course.code == courseNo) {
+        if (course.courseId == courseId) {
           this.formSearch.courseName = course.name;
         }
       }
@@ -468,7 +461,7 @@ export default {
     resetSearchForm() {
       this.formSearch = {
         questionType: "",
-        courseNo: "",
+        courseId: "",
       };
     },
     /*处理选择题答案显示,处理套题下选择题答案显示*/
@@ -525,7 +518,8 @@ export default {
           basePaperId: "",
           quesBodyText: "",
           questionType: "",
-          courseNo: "",
+          courseId: "",
+          courseLevel: "",
           courseName: "",
         };
         this.currentPage = 1;
@@ -542,7 +536,8 @@ export default {
           basePaperId: "",
           quesBodyText: "",
           questionType: "",
-          courseNo: "",
+          courseId: "",
+          courseLevel: "",
           courseName: "",
         };
         this.getCourses("");

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

@@ -166,7 +166,7 @@
           label="创建时间"
           width="153"
           sortable
-          prop="creationDate"
+          prop="creationTime"
         >
         </el-table-column>
         <el-table-column label="修改人" width="150">
@@ -178,7 +178,7 @@
           label="修改时间"
           width="153"
           sortable
-          prop="updateDate"
+          prop="updateTime"
         >
         </el-table-column>
         <el-table-column label="操作" width="270" fixed="right">

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

@@ -156,7 +156,7 @@
           label="创建时间"
           width="153"
           sortable
-          prop="creationDate"
+          prop="creationTime"
         >
         </el-table-column>
         <el-table-column label="修改人" width="150">
@@ -168,7 +168,7 @@
           label="修改时间"
           width="153"
           sortable
-          prop="updateDate"
+          prop="updateTime"
         >
         </el-table-column>
         <el-table-column label="操作" width="180" fixed="right">

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

@@ -177,7 +177,7 @@
           label="创建时间"
           width="153"
           sortable
-          prop="creationDate"
+          prop="creationTime"
         >
         </el-table-column>
         <el-table-column label="修改人" width="150">
@@ -189,7 +189,7 @@
           label="修改时间"
           width="153"
           sortable
-          prop="updateDate"
+          prop="updateTime"
         >
         </el-table-column>
         <el-table-column

+ 13 - 21
src/modules/questions/views/PaperPendingTrial.vue

@@ -6,7 +6,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
@@ -16,9 +16,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>
@@ -166,7 +166,7 @@
           label="创建时间"
           width="153"
           sortable
-          prop="creationDate"
+          prop="creationTime"
         >
         </el-table-column>
         <el-table-column label="修改人" width="150">
@@ -178,7 +178,7 @@
           label="修改时间"
           width="153"
           sortable
-          prop="updateDate"
+          prop="updateTime"
         >
         </el-table-column>
         <el-table-column label="操作" width="255" fixed="right">
@@ -321,7 +321,7 @@ export default {
       isClear: 0,
       courseLoading: false,
       formSearch: {
-        courseNo: "",
+        courseId: "",
         courseName: "",
         creator: "",
         lastModifyName: "",
@@ -374,10 +374,10 @@ export default {
       var courseList = [];
       for (let course of this.courseList) {
         var courseInfo = course.name + "(" + course.code + ")";
-        var courseNo = course.code;
+        var courseId = course.id;
         var courseName = course.name;
         courseList.push({
-          courseNo: courseNo,
+          courseId: courseId,
           courseInfo: courseInfo,
           courseName: courseName,
         });
@@ -395,16 +395,16 @@ export default {
     this.initVue();
   },
   methods: {
-    getCourseName(courseNo) {
+    getCourseName(courseId) {
       for (let course of this.courseList) {
-        if (course.code == courseNo) {
+        if (course.courseId == courseId) {
           this.formSearch.courseName = course.name;
         }
       }
     },
     editImportPaper(row) {
       //缓存查询对象
-      this.getCourseName(this.formSearch.courseNo);
+      this.getCourseName(this.formSearch.courseId);
       sessionStorage.setItem("paper", JSON.stringify(this.formSearch));
       sessionStorage.setItem("paper_currentPage", this.currentPage);
       sessionStorage.setItem("question_back", "false");
@@ -679,7 +679,7 @@ export default {
     },
     resetForm() {
       this.formSearch = {
-        courseNo: "",
+        courseId: "",
         courseName: "",
         level: "",
         name: "",
@@ -713,14 +713,6 @@ export default {
       this.currentPage = 1;
       this.searchPaper();
     },
-    getCourseObj(courseNo) {
-      for (let course of this.courseList) {
-        if (course.code == courseNo) {
-          return course;
-        }
-      }
-      return "";
-    },
     selectChange(row) {
       this.selectedPaperIds = [];
       row.forEach((element) => {
@@ -757,7 +749,7 @@ export default {
       if (this.isClear == 0 || !this.isClear) {
         this.removeItem();
         this.formSearch = {
-          courseNo: "",
+          courseId: "",
           courseName: "",
           level: "",
           name: "",

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

@@ -122,7 +122,7 @@
           label="创建时间"
           width="153"
           sortable
-          prop="createTime"
+          prop="creationTime"
         >
         </el-table-column>
         <el-table-column label="修改人" width="150">
@@ -134,7 +134,7 @@
           label="修改时间"
           width="153"
           sortable
-          prop="updateDate"
+          prop="updateTime"
         >
         </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">