Commit 0625c764 authored by 刘帅's avatar 刘帅

1.BUG修复

parent 2105746b
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<!-- 上传提示 --> <!-- 上传提示 -->
<div class="el-upload__tip" slot="tip" v-if="showTip"> <div class="el-upload__tip" slot="tip" v-if="showTip">
请上传 请上传
<template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template> <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">1GB</b> </template>
<template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template> <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
的文件 的文件
</div> </div>
...@@ -47,7 +47,7 @@ export default { ...@@ -47,7 +47,7 @@ export default {
// 大小限制(MB) // 大小限制(MB)
fileSize: { fileSize: {
type: Number, type: Number,
default: 100, default: 1024,
}, },
// 文件类型, 例如['png', 'jpg', 'jpeg'] // 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: { fileType: {
......
...@@ -410,7 +410,7 @@ export default { ...@@ -410,7 +410,7 @@ export default {
if (subjectType === 3) { if (subjectType === 3) {
this.form.score = 1; this.form.score = 1;
} }
if (subjectType === 4) { if (subjectType === 4 || subjectType === 5 || subjectType === 6) {
this.form.score = 10; this.form.score = 10;
} }
}, },
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<!-- <el-table-column label="考试题目ID" align="center" prop="examSubjectId" />--> <!-- <el-table-column label="考试题目ID" align="center" prop="examSubjectId" />-->
<!-- <el-table-column label="考试题目编号" align="center" prop="examSubjectNo" />--> <!-- <el-table-column label="考试题目编号" align="center" prop="examSubjectNo" />-->
<!-- <el-table-column label="题目类型" align="center" prop="subjectType" />--> <!-- <el-table-column label="题目类型" align="center" prop="subjectType" />-->
<el-table-column label="选项" align="center" prop="subjectOption" v-if="this.subjectType !== 4"> <el-table-column label="选项" align="center" prop="subjectOption" v-if="this.subjectType !== 4 && this.subjectType !== 5 && this.subjectType !== 6">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.tb_subject_option" :value="scope.row.subjectOption"/> <dict-tag :options="dict.type.tb_subject_option" :value="scope.row.subjectOption"/>
</template> </template>
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
{{scope.row.subjectName}} {{scope.row.subjectName}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="分数" align="center" prop="score" v-if="this.subjectType === 4" > <el-table-column label="分数" align="center" prop="score" v-if="this.subjectType === 4 || this.subjectType === 5 || this.subjectType === 6" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.score}} {{scope.row.score}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否答案" align="center" prop="isAnswer" v-if="this.subjectType !== 4" > <el-table-column label="是否答案" align="center" prop="isAnswer" v-if="this.subjectType !== 4 && this.subjectType !== 5 && this.subjectType !== 6" >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.isAnswer === 0"></div> <div v-if="scope.row.isAnswer === 0"></div>
<div v-if="scope.row.isAnswer === 1"></div> <div v-if="scope.row.isAnswer === 1"></div>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<!-- <el-form-item label="考试题目编号" prop="examSubjectNo">--> <!-- <el-form-item label="考试题目编号" prop="examSubjectNo">-->
<!-- <el-input v-model="form.examSubjectNo" placeholder="请输入考试题目编号" />--> <!-- <el-input v-model="form.examSubjectNo" placeholder="请输入考试题目编号" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="选项" prop="subjectOption" v-if="this.subjectType !== 4"> <el-form-item label="选项" prop="subjectOption" v-if="this.subjectType !== 4 && this.subjectType !== 5 && this.subjectType !== 6">
<el-select v-model="form.subjectOption" placeholder="请选择选项"> <el-select v-model="form.subjectOption" placeholder="请选择选项">
<el-option <el-option
v-for="dict in dict.type.tb_subject_option" v-for="dict in dict.type.tb_subject_option"
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<el-form-item label="选项内容" prop="subjectName"> <el-form-item label="选项内容" prop="subjectName">
<el-input v-model="form.subjectName" placeholder="请输入选项内容" /> <el-input v-model="form.subjectName" placeholder="请输入选项内容" />
</el-form-item> </el-form-item>
<el-form-item label="分数" prop="score" v-if="this.subjectType === 4"> <el-form-item label="分数" prop="score" v-if="this.subjectType === 4 || this.subjectType === 5 || this.subjectType === 6">
<el-input v-model="form.score" type="number" placeholder="请输入分数" /> <el-input v-model="form.score" type="number" placeholder="请输入分数" />
</el-form-item> </el-form-item>
<el-form-item label="是否答案" v-if="this.subjectType === 1 || this.subjectType === 2"> <el-form-item label="是否答案" v-if="this.subjectType === 1 || this.subjectType === 2">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment