刘洋 преди 2 години
родител
ревизия
92cd3c478c

+ 3 - 1
src/modules/questions/styles/Common.css

@@ -6,7 +6,9 @@
 .search_width_80px {
 .search_width_80px {
   width: 80px;
   width: 80px;
 }
 }
-
+.search_width_130px {
+  width: 130px;
+}
 .form_width {
 .form_width {
   width: 200px;
   width: 200px;
 }
 }

+ 14 - 2
src/modules/questions/views/AddPaperSelect.vue

@@ -51,7 +51,7 @@
             </el-select>
             </el-select>
             <p style="display: inline-block; margin-left: 40px">
             <p style="display: inline-block; margin-left: 40px">
               难度:<span style="color: #409eff; font-weight: bold">{{
               难度:<span style="color: #409eff; font-weight: bold">{{
-                curStruct?.difficulty
+                difficultyDegree
               }}</span>
               }}</span>
             </p>
             </p>
           </el-form-item>
           </el-form-item>
@@ -196,7 +196,7 @@ export default {
     return {
     return {
       hasError: false,
       hasError: false,
       form: {
       form: {
-        paperStructType: "BLUEPRINT",
+        paperStructType: "EXACT",
         name: "",
         name: "",
         paperStructId: "",
         paperStructId: "",
         paperType: "IMPORT",
         paperType: "IMPORT",
@@ -205,6 +205,7 @@ export default {
       paperIdsArr: [],
       paperIdsArr: [],
       options1: [],
       options1: [],
       tableData1: [],
       tableData1: [],
+      difficultyDegree: "",
       tableColumns1: [
       tableColumns1: [
         { label: "题型", prop: "detailName", minWidth: "100" },
         { label: "题型", prop: "detailName", minWidth: "100" },
         { label: "总分", prop: "totalScore", minWidth: "80" },
         { label: "总分", prop: "totalScore", minWidth: "80" },
@@ -282,6 +283,7 @@ export default {
       this.form.paperStructId = "";
       this.form.paperStructId = "";
       this.getStruct();
       this.getStruct();
       this.tableData1 = [];
       this.tableData1 = [];
+      this.difficultyDegree = "";
       this.$refs.table2.clearSelection();
       this.$refs.table2.clearSelection();
     },
     },
     async getTplData() {
     async getTplData() {
@@ -335,6 +337,15 @@ export default {
               .then(() => {
               .then(() => {
                 this.$message.success("保存成功");
                 this.$message.success("保存成功");
                 this.$router.back();
                 this.$router.back();
+              })
+              .catch((err) => {
+                if (
+                  err.response &&
+                  err.response.data &&
+                  err.response.data.desc
+                ) {
+                  this.$message.error(err.response.data.desc);
+                }
               });
               });
           }
           }
         } else {
         } else {
@@ -358,6 +369,7 @@ export default {
         })
         })
         .then((res) => {
         .then((res) => {
           this.tableData1 = res.data.structQuestionInfo || [];
           this.tableData1 = res.data.structQuestionInfo || [];
+          this.difficultyDegree = res.data.difficultyDegree;
           this.tableLoading1 = false;
           this.tableLoading1 = false;
         });
         });
     },
     },

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

@@ -382,7 +382,7 @@ export default {
       },
       },
       extractConfig2: {
       extractConfig2: {
         randomPaperId: "", //抽题模板id
         randomPaperId: "", //抽题模板id
-        playTime: 1,
+        playTime: 2,
       },
       },
       curId: "",
       curId: "",
       randomTplInfo: {
       randomTplInfo: {

+ 11 - 4
src/modules/questions/views/ExtractPaperTemplate.vue

@@ -7,11 +7,15 @@
           clearable
           clearable
           placeholder="请选择课程"
           placeholder="请选择课程"
           size="small"
           size="small"
+          filterable
+          :remote-method="getAllCourses"
+          remote
+          @focus="(e) => getAllCourses(e.target.value)"
         >
         >
           <el-option
           <el-option
             v-for="item in allCourseList"
             v-for="item in allCourseList"
             :key="item.id"
             :key="item.id"
-            :label="item.name"
+            :label="`${item.name}(${item.code})`"
             :value="item.id"
             :value="item.id"
           ></el-option>
           ></el-option>
         </el-select>
         </el-select>
@@ -114,7 +118,7 @@ export default {
     };
     };
   },
   },
   created() {
   created() {
-    this.getAllCourses();
+    this.getAllCourses("");
     this.search();
     this.search();
   },
   },
   methods: {
   methods: {
@@ -145,12 +149,15 @@ export default {
         `/questions/add_paper_select/${row.id}?courseNo=${row.courseCode}&courseName=${row.courseName}&courseId=${row.courseId}`
         `/questions/add_paper_select/${row.id}?courseNo=${row.courseCode}&courseName=${row.courseName}&courseId=${row.courseId}`
       );
       );
     },
     },
-    getAllCourses() {
+    getAllCourses(query) {
+      if (query) {
+        query = query.trim();
+      }
       this.$http
       this.$http
         .get("/api/ecs_core/course/query", {
         .get("/api/ecs_core/course/query", {
           params: {
           params: {
             enable: true,
             enable: true,
-            query: "",
+            name: query,
           },
           },
         })
         })
         .then((response) => {
         .then((response) => {

+ 23 - 17
src/modules/questions/views/GenPaper.vue

@@ -11,11 +11,11 @@
         label-width="70px"
         label-width="70px"
       >
       >
         <el-row>
         <el-row>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-form-item label="课程名称">
             <el-form-item label="课程名称">
               <el-select
               <el-select
                 v-model="formSearch.courseNo"
                 v-model="formSearch.courseNo"
-                class="search_width"
+                class="search_width_130px"
                 filterable
                 filterable
                 :remote-method="getCourses"
                 :remote-method="getCourses"
                 remote
                 remote
@@ -34,21 +34,21 @@
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-form-item label="试卷名称">
             <el-form-item label="试卷名称">
               <el-input
               <el-input
                 v-model="formSearch.name"
                 v-model="formSearch.name"
-                class="search_width"
+                class="search_width_130px"
                 placeholder="试卷名称"
                 placeholder="试卷名称"
                 size="small"
                 size="small"
               ></el-input>
               ></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-form-item label="层次">
             <el-form-item label="层次">
               <el-select
               <el-select
                 v-model="formSearch.level"
                 v-model="formSearch.level"
-                class="search_width"
+                class="search_width_130px"
                 clearable
                 clearable
                 placeholder="请选择"
                 placeholder="请选择"
                 size="small"
                 size="small"
@@ -63,11 +63,11 @@
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-form-item label="录入人">
             <el-form-item label="录入人">
               <el-input
               <el-input
                 v-model="formSearch.creator"
                 v-model="formSearch.creator"
-                class="search_width"
+                class="search_width_130px"
                 placeholder="录入人"
                 placeholder="录入人"
                 size="small"
                 size="small"
               ></el-input>
               ></el-input>
@@ -75,21 +75,21 @@
           </el-col>
           </el-col>
         </el-row>
         </el-row>
         <el-row>
         <el-row>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-form-item label="修改人">
             <el-form-item label="修改人">
               <el-input
               <el-input
                 v-model="formSearch.lastModifyName"
                 v-model="formSearch.lastModifyName"
-                class="search_width"
+                class="search_width_130px"
                 placeholder="修改人"
                 placeholder="修改人"
                 size="small"
                 size="small"
               ></el-input>
               ></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-form-item label="调用状态">
             <el-form-item label="调用状态">
               <el-select
               <el-select
                 v-model="formSearch.inUse"
                 v-model="formSearch.inUse"
-                class="search_width"
+                class="search_width_130px"
                 clearable
                 clearable
                 placeholder="请选择"
                 placeholder="请选择"
                 size="small"
                 size="small"
@@ -99,11 +99,11 @@
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-form-item label="审核状态">
             <el-form-item label="审核状态">
               <el-select
               <el-select
                 v-model="formSearch.auditStatus"
                 v-model="formSearch.auditStatus"
-                class="search_width"
+                class="search_width_130px"
                 clearable
                 clearable
                 placeholder="请选择"
                 placeholder="请选择"
                 size="small"
                 size="small"
@@ -113,7 +113,7 @@
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="9">
             <div class="search_down">
             <div class="search_down">
               <el-button size="small" type="primary" @click="searchFrom"
               <el-button size="small" type="primary" @click="searchFrom"
                 ><i class="el-icon-search"></i> 查 询</el-button
                 ><i class="el-icon-search"></i> 查 询</el-button
@@ -124,16 +124,22 @@
               <el-button size="small" type="primary" @click="genPaperDetail"
               <el-button size="small" type="primary" @click="genPaperDetail"
                 ><i class="el-icon-plus"></i> 组卷</el-button
                 ><i class="el-icon-plus"></i> 组卷</el-button
               >
               >
+              <el-button
+                size="small"
+                type="primary"
+                @click="toAddPaperSelect(0)"
+                ><i class="el-icon-plus"></i>随机抽卷模板</el-button
+              >
             </div>
             </div>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :span="12">
           <el-col :span="12">
             <el-button size="small" type="primary" @click="toAddPaperSelect(0)"
             <el-button size="small" type="primary" @click="toAddPaperSelect(0)"
               ><i class="el-icon-plus"></i>随机抽卷模板</el-button
               ><i class="el-icon-plus"></i>随机抽卷模板</el-button
             >
             >
           </el-col>
           </el-col>
-        </el-row>
+        </el-row> -->
         <div
         <div
           style="width: 100%; border-bottom: 1px solid #ddd; margin: 10px 0"
           style="width: 100%; border-bottom: 1px solid #ddd; margin: 10px 0"
         ></div>
         ></div>