浏览代码

extractConfig

xiatian 4 年之前
父节点
当前提交
fc1cc186f0

+ 27 - 0
src/modules/questions/views/EditPaper.vue

@@ -602,6 +602,33 @@
             </el-col>
           </el-row>
           <!-- end by weiwenhai -->
+          <div v-if="paper.paperType != 'IMPORT'">
+            <el-row>
+              <el-col>
+                <el-form-item label="题目">
+                  <span v-html="quesModel.quesBody"></span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-form-item
+              v-for="(quesOption, optIndex) in quesModel.quesOptions"
+              :key="optIndex"
+              ><el-col :span="2">
+                <span>{{ optIndex | optionOrderWordFilter }}</span>
+              </el-col>
+              <el-col :span="20">
+                <span v-html="quesOption.optionBody"></span>
+              </el-col>
+            </el-form-item>
+
+            <div>
+              <el-form-item label="答案">
+                <span v-html="quesModel.quesAnswer"></span>
+              </el-form-item>
+            </div>
+            <!-- 单选或多选 -->
+          </div>
           <div v-if="paper.paperType == 'IMPORT'">
             <el-row>
               <el-col>

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

@@ -232,6 +232,15 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row v-if="isbuildFile == '1'">
+              <el-form-item label="小题序号">
+                <el-radio-group v-model="seqMode" class="input">
+                  <el-radio label="MODE1">单题型连续</el-radio>
+                  <el-radio label="MODE2">客观题整体连续</el-radio>
+                  <el-radio label="MODE3">按大题独立</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-row>
             <el-row :gutter="20">
               <el-col :span="12" :offset="1">
                 <el-button type="primary" @click="submitForm"> 保存 </el-button>
@@ -256,6 +265,7 @@ export default {
   data() {
     return {
       loading: false,
+      seqMode: "MODE1",
       extractConfig: {
         examId: "", //考试ID
         examName: "", //考试名称
@@ -553,7 +563,12 @@ export default {
         this.extractConfig.examPaperList = myExamPaperList;
         this.$http
           .put(
-            QUESTION_API + "/extractConfig" + "/" + this.isbuildFile,
+            QUESTION_API +
+              "/extractConfig" +
+              "/" +
+              this.isbuildFile +
+              "?seqMode=" +
+              this.seqMode,
             this.extractConfig
           )
           .then(

+ 16 - 10
src/modules/questions/views/GenPaper.vue

@@ -318,6 +318,15 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-form-item label="小题序号">
+            <el-radio-group v-model="exportModel.seqMode" class="input">
+              <el-radio label="MODE1">单题型连续</el-radio>
+              <el-radio label="MODE2">客观题整体连续</el-radio>
+              <el-radio label="MODE3">按大题独立</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-row>
         <el-row>
           <el-col :md="24" class="text-center">
             <el-button type="primary" @click="exportPaperInfo"
@@ -507,6 +516,7 @@ export default {
         courseCode: "",
         courseName: "",
         exportContentList: [],
+        seqMode: "MODE1",
       },
       isShow: true,
       examList: [],
@@ -827,17 +837,15 @@ export default {
           this.exportModel.id +
           "/" +
           this.exportModel.exportContentList +
-          "/" +
-          this.user.rootOrgId +
-          "/" +
-          this.user.displayName +
           "/onLine" +
           "?psw=" +
           this.printExamPackagePassword +
           "&$key=" +
           key +
           "&$token=" +
-          token;
+          token +
+          "&seqMode=" +
+          this.exportModel.seqMode;
         this.exportDialog = false;
       } else {
         var paperIds = this.paperIds;
@@ -847,15 +855,13 @@ export default {
           paperIds +
           "/" +
           this.exportModel.exportContentList +
-          "/" +
-          this.user.rootOrgId +
-          "/" +
-          this.user.displayName +
           "/onLine" +
           "?$key=" +
           key +
           "&$token=" +
-          token;
+          token +
+          "&seqMode=" +
+          this.exportModel.seqMode;
         this.exportDialog = false;
       }
     },

+ 1 - 13
src/modules/questions/views/SelectQuestion.vue

@@ -213,7 +213,7 @@
           <!--非套题答案-->
           <div v-if="quesModel.questionType !== 'NESTED_ANSWER_QUESTION'">
             <el-form-item label="答案">
-              <span v-html="answer"></span>
+              <span v-html="quesModel.quesAnswer"></span>
             </el-form-item>
           </div>
         </el-form>
@@ -253,18 +253,6 @@ export default {
       multipleRightAnswer: [], //接收多选答案
     };
   },
-  computed: {
-    answer: function () {
-      if (this.quesModel.questionType == "SINGLE_ANSWER_QUESTION") {
-        return this.singleRightAnswer;
-      } else if (this.quesModel.questionType == "MULTIPLE_ANSWER_QUESTION") {
-        var obj = Object.assign({}, this.multipleRightAnswer); //浅拷贝;
-        return obj.sort().toString();
-      } else {
-        return this.quesModel.quesAnswer;
-      }
-    },
-  },
   //钩子函数
   created() {
     this.paperId = this.$route.params.id;