Merge branch 'dev_1.2.1' of http://git.qmth.com.cn/union-question/union-question-web into dev_1.2.1

src/modules/questions/views/ExportTemplate.vue

@@ -36,7 +36,12 @@
             <el-option label="离线试卷" value="OUTLINE_PAPER_EXPORT">
             </el-option>
             <el-option label="试卷预览" value="PAPER_VIEW"> </el-option>
-            <el-option label="答案预览" value="ANWSER_VIEW"> </el-option>
+            <el-option label="综合卷预览" value="SYNTHESIZE_PAPER_VIEW">
+            </el-option>
+            <el-option label="综合卷导出" value="SYNTHESIZE_PAPER_EXPORT">
+            </el-option>
+            <el-option label="综合卷答案导出" value="SYNTHESIZE_ANWSER_EXPORT">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -171,7 +176,12 @@
             <el-option label="离线试卷" value="OUTLINE_PAPER_EXPORT">
             </el-option>
             <el-option label="试卷预览" value="PAPER_VIEW"> </el-option>
-            <el-option label="答案预览" value="ANWSER_VIEW"> </el-option>
+            <el-option label="综合卷预览" value="SYNTHESIZE_PAPER_VIEW">
+            </el-option>
+            <el-option label="综合卷导出" value="SYNTHESIZE_PAPER_EXPORT">
+            </el-option>
+            <el-option label="综合卷答案导出" value="SYNTHESIZE_ANWSER_EXPORT">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="文件" prop="dataFile">