Commit ab315758b51ccf7ff6e3b8e324b52f630d8edcff

Authored by 梁保满
1 parent 7f5613f1

即时测主观题列表设置操作

Showing 1 changed file with 15 additions and 5 deletions
src/views/basic/test/list.vue
@@ -115,7 +115,9 @@ @@ -115,7 +115,9 @@
115 <template slot-scope="scoped"> 115 <template slot-scope="scoped">
116 <el-tooltip 116 <el-tooltip
117 v-if=" 117 v-if="
118 - scoped.row.answerNum != 0 || scoped.row.recordStatus != 0 118 + scoped.row.answerNum != 0 ||
  119 + (scoped.row.recordStatus != 0 &&
  120 + scoped.row.subjectiveScore == scoped.row.examPaperScore)
119 " 121 "
120 effect="dark" 122 effect="dark"
121 content="详情" 123 content="详情"
@@ -129,7 +131,12 @@ @@ -129,7 +131,12 @@
129 @click="linkTo(scoped.row)" 131 @click="linkTo(scoped.row)"
130 ></el-button> 132 ></el-button>
131 </el-tooltip> 133 </el-tooltip>
132 - <template v-if="scoped.row.answerNum == 0"> 134 + <template
  135 + v-if="
  136 + scoped.row.answerNum == 0 &&
  137 + scoped.row.subjectiveScore != scoped.row.examPaperScore
  138 + "
  139 + >
133 <el-tooltip 140 <el-tooltip
134 v-if="role != 'ROLE_BANZHUREN'" 141 v-if="role != 'ROLE_BANZHUREN'"
135 effect="dark" 142 effect="dark"
@@ -147,7 +154,10 @@ @@ -147,7 +154,10 @@
147 <template v-else>未设置答案</template> 154 <template v-else>未设置答案</template>
148 </template> 155 </template>
149 <el-tooltip 156 <el-tooltip
150 - v-else 157 + v-if="
  158 + scoped.row.subjectiveScore == scoped.row.examPaperScore ||
  159 + scoped.row.answerNum != 0
  160 + "
151 effect="dark" 161 effect="dark"
152 content="答卷录分" 162 content="答卷录分"
153 placement="top" 163 placement="top"
@@ -295,7 +305,7 @@ export default { @@ -295,7 +305,7 @@ export default {
295 id: obj.id, 305 id: obj.id,
296 title: obj.title, 306 title: obj.title,
297 score: obj.examPaperScore || 0, 307 score: obj.examPaperScore || 0,
298 - type: 1,//试卷类型 308 + type: 1, //试卷类型
299 subjectName: obj.subjectName, 309 subjectName: obj.subjectName,
300 classId: this.query.classId[0], 310 classId: this.query.classId[0],
301 params: this.$route.query.params, 311 params: this.$route.query.params,
@@ -404,7 +414,7 @@ export default { @@ -404,7 +414,7 @@ export default {
404 query: { 414 query: {
405 paperId: item.id, 415 paperId: item.id,
406 title: item.title, 416 title: item.title,
407 - type: 2,//搜索题目详情类型 417 + type: 2, //搜索题目详情类型
408 examType: item.examPaperId == 0 ? 1 : 2, 418 examType: item.examPaperId == 0 ? 1 : 2,
409 }, 419 },
410 }); 420 });