merge from 4.0

src/modules/questions/views/EditPaper.vue

@@ -1119,6 +1119,13 @@ export default {
         this.quesModel.answerType = "DIVERSIFIED_TEXT";
       }
 
+      if (this.quesModel.questionType == "FILL_BLANK_QUESTION") {
+        this.quesModel.quesBody = this.quesModel.quesBody.replace(
+          /______/g,
+          "###"
+        );
+      }
+
       this.assignAnswers(); //给singleRightAnswer或multipleRightAnswer赋值
       this.openQuesDialog();
     },
@@ -1382,6 +1389,13 @@ export default {
             this.dialogLoading = false;
             this.closeQuesDialog();
             this.initPaper();
+          })
+          .catch((err) => {
+            this.dialogLoading = false;
+            this.$notify({
+              type: "error",
+              message: err.response.data.desc,
+            });
           });
       }
     },

src/modules/questions/views/GenPaper.vue

@@ -63,6 +63,28 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="录入人">
+              <el-input
+                class="search_width"
+                v-model="formSearch.creator"
+                placeholder="录入人"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="修改人">
+              <el-input
+                class="search_width"
+                v-model="formSearch.lastModifyName"
+                placeholder="修改人"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <div class="search_down">
               <el-button size="small" type="primary" @click="searchFrom"
@@ -450,6 +472,8 @@ export default {
       formSearch: {
         courseNo: "",
         courseName: "",
+        creator: "",
+        lastModifyName: "",
         level: "",
         name: "",
       },

src/modules/questions/views/ImportPaper.vue

@@ -64,6 +64,28 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="录入人">
+              <el-input
+                class="search_width"
+                v-model="formSearch.creator"
+                placeholder="录入人"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="修改人">
+              <el-input
+                class="search_width"
+                v-model="formSearch.lastModifyName"
+                placeholder="修改人"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <div class="search_down">
               <el-button size="small" type="primary" @click="searchFrom"
@@ -216,6 +238,15 @@
                       ><i class="el-icon-download"></i> 下载</el-button
                     >
                   </el-dropdown-item>
+                  <el-dropdown-item>
+                    <el-button
+                      size="mini"
+                      type="primary"
+                      @click="exportPaperAnswer(scope.row)"
+                      plain
+                      ><i class="el-icon-download"></i>导出答案</el-button
+                    >
+                  </el-dropdown-item>
                   <el-dropdown-item>
                     <el-button
                       size="mini"
@@ -368,6 +399,8 @@ export default {
       formSearch: {
         courseNo: "",
         courseName: "",
+        creator: "",
+        lastModifyName: "",
         level: "",
         name: "",
       },
@@ -645,6 +678,19 @@ export default {
           token
       );
     },
+    exportPaperAnswer(row) {
+      var key = this.user.key;
+      var token = this.user.token;
+      window.open(
+        QUESTION_API +
+          "/paper/answer/export/" +
+          row.id +
+          "?$key=" +
+          key +
+          "&$token=" +
+          token
+      );
+    },
     openInit() {
       this.difficultyDegree = 0.1;
       this.publicity = true;