Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-admin-web

src/modules/basic/view/school.vue

@@ -629,11 +629,14 @@ export default {
       this.removeFile();
       this.searchForm();
     },
-    uploadError() {
-      this.$notify({
-        message: "上传失败",
-        type: "error"
-      });
+    uploadError(response) {
+      let json = JSON.parse(response.message);
+      if (response.status == 500) {
+        this.$notify({
+          message: json.desc,
+          type: "error"
+        });
+      }
       this.fileLoading = false;
     },
     //确定上传

src/modules/questions/views/EditOtherQuestion.vue

@@ -66,12 +66,7 @@
 
           <el-form-item
             label="作答类型"
-            v-if="
-              quesModel.questionType != 'NESTED_ANSWER_QUESTION' &&
-                quesModel.questionType != 'SINGLE_ANSWER_QUESTION' &&
-                quesModel.questionType != 'MULTIPLE_ANSWER_QUESTION' &&
-                quesModel.questionType != 'BOOL_ANSWER_QUESTION'
-            "
+            v-if="quesModel.questionType == 'TEXT_ANSWER_QUESTION'"
           >
             <el-select v-model="quesModel.answerType">
               <el-option

src/modules/questions/views/EditPaper.vue

@@ -407,12 +407,7 @@
               :sm="10"
               :md="10"
               :lg="10"
-              v-if="
-                quesModel.questionType != 'NESTED_ANSWER_QUESTION' &&
-                  quesModel.questionType != 'SINGLE_ANSWER_QUESTION' &&
-                  quesModel.questionType != 'MULTIPLE_ANSWER_QUESTION' &&
-                  quesModel.questionType != 'BOOL_ANSWER_QUESTION'
-              "
+              v-if="quesModel.questionType == 'TEXT_ANSWER_QUESTION'"
             >
               <el-form-item label="作答类型">
                 <el-select

src/modules/questions/views/EditSelectQuestion.vue

@@ -69,12 +69,7 @@
 
           <el-form-item
             label="作答类型"
-            v-if="
-              quesModel.questionType != 'NESTED_ANSWER_QUESTION' &&
-                quesModel.questionType != 'SINGLE_ANSWER_QUESTION' &&
-                quesModel.questionType != 'MULTIPLE_ANSWER_QUESTION' &&
-                quesModel.questionType != 'BOOL_ANSWER_QUESTION'
-            "
+            v-if="quesModel.questionType == 'TEXT_ANSWER_QUESTION'"
           >
             <el-select v-model="quesModel.answerType">
               <el-option