Commit 391f66b96a3643279cb45396dd42ec757ad7168e
1 parent
66f2f9c2
异常设备信息显示问题,单题型总分错误
Showing
2 changed files
with
29 additions
and
22 deletions
src/views/examinationPaper/edit.vue
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | <div> | 2 | <div> |
3 | <back-box> | 3 | <back-box> |
4 | <template slot="title"> | 4 | <template slot="title"> |
5 | - <span>{{type == 1?'修改试卷':'修改答案'}}</span> | 5 | + <span>{{ type == 1 ? "修改试卷" : "修改答案" }}</span> |
6 | </template> | 6 | </template> |
7 | </back-box> | 7 | </back-box> |
8 | <div class="content"> | 8 | <div class="content"> |
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | }}老师修改了答案 | 14 | }}老师修改了答案 |
15 | </p></template | 15 | </p></template |
16 | > | 16 | > |
17 | - <div class="answer-title" :class="type == 1?'t-left':''"> | 17 | + <div class="answer-title" :class="type == 1 ? 't-left' : ''"> |
18 | <p class="name-box" v-if="type == 1"> | 18 | <p class="name-box" v-if="type == 1"> |
19 | <span>试卷名称:</span> | 19 | <span>试卷名称:</span> |
20 | <el-input class="ipt-name" v-model="form.title"></el-input> | 20 | <el-input class="ipt-name" v-model="form.title"></el-input> |
@@ -310,7 +310,8 @@ | @@ -310,7 +310,8 @@ | ||
310 | <el-button type="danger" plain round @click="linkBack">取消</el-button> | 310 | <el-button type="danger" plain round @click="linkBack">取消</el-button> |
311 | <el-button type="primary" round @click="save">保存</el-button> | 311 | <el-button type="primary" round @click="save">保存</el-button> |
312 | </div> | 312 | </div> |
313 | - <el-dialog :close-on-click-modal="false" | 313 | + <el-dialog |
314 | + :close-on-click-modal="false" | ||
314 | title="批量设置答案" | 315 | title="批量设置答案" |
315 | :visible.sync="diaSetAns" | 316 | :visible.sync="diaSetAns" |
316 | width="400" | 317 | width="400" |
@@ -394,7 +395,8 @@ | @@ -394,7 +395,8 @@ | ||
394 | <el-button @click="diaSetAns = false">取 消</el-button> | 395 | <el-button @click="diaSetAns = false">取 消</el-button> |
395 | </div> | 396 | </div> |
396 | </el-dialog> | 397 | </el-dialog> |
397 | - <el-dialog :close-on-click-modal="false" | 398 | + <el-dialog |
399 | + :close-on-click-modal="false" | ||
398 | :title="stem.type == 1 ? '上传题干' : '上传题目解析'" | 400 | :title="stem.type == 1 ? '上传题干' : '上传题目解析'" |
399 | :visible.sync="dialogStem" | 401 | :visible.sync="dialogStem" |
400 | v-if="dialogStem" | 402 | v-if="dialogStem" |
@@ -427,7 +429,12 @@ | @@ -427,7 +429,12 @@ | ||
427 | <el-button @click="dialogStem = false">关闭弹窗</el-button> | 429 | <el-button @click="dialogStem = false">关闭弹窗</el-button> |
428 | </div> | 430 | </div> |
429 | </el-dialog> | 431 | </el-dialog> |
430 | - <el-dialog :close-on-click-modal="false" title="题目打标" :visible.sync="dialogTag" width="500"> | 432 | + <el-dialog |
433 | + :close-on-click-modal="false" | ||
434 | + title="题目打标" | ||
435 | + :visible.sync="dialogTag" | ||
436 | + width="500" | ||
437 | + > | ||
431 | <div> | 438 | <div> |
432 | <el-form ref="form" :model="stem" label-width="160px"> | 439 | <el-form ref="form" :model="stem" label-width="160px"> |
433 | <el-form-item label="题目难度:"> | 440 | <el-form-item label="题目难度:"> |
@@ -520,7 +527,7 @@ export default { | @@ -520,7 +527,7 @@ export default { | ||
520 | return a + (Number(b.score) || 0); | 527 | return a + (Number(b.score) || 0); |
521 | }, 0); | 528 | }, 0); |
522 | } else { | 529 | } else { |
523 | - score += item.score; | 530 | + score += (item.score || 0); |
524 | } | 531 | } |
525 | }, 0); | 532 | }, 0); |
526 | return Number(score).toFixed(2); | 533 | return Number(score).toFixed(2); |
@@ -1126,7 +1133,7 @@ export default { | @@ -1126,7 +1133,7 @@ export default { | ||
1126 | color: #333; | 1133 | color: #333; |
1127 | font-weight: 700; | 1134 | font-weight: 700; |
1128 | padding: 20px 0; | 1135 | padding: 20px 0; |
1129 | - &.t-left{ | 1136 | + &.t-left { |
1130 | text-align: left; | 1137 | text-align: left; |
1131 | } | 1138 | } |
1132 | .totals { | 1139 | .totals { |
src/views/standard/device/error.vue
@@ -13,21 +13,6 @@ | @@ -13,21 +13,6 @@ | ||
13 | align="center" | 13 | align="center" |
14 | width="160" | 14 | width="160" |
15 | ></el-table-column> | 15 | ></el-table-column> |
16 | - <el-table-column prop="abnormalSource" label="信息来源" align="center"> | ||
17 | - <template slot-scope="scoped"> | ||
18 | - {{ | ||
19 | - scoped.row.abnormalSource == 0 | ||
20 | - ? "无" | ||
21 | - : scoped.row.abnormalSource == 1 | ||
22 | - ? "云平台" | ||
23 | - : scoped.row.abnormalSource == 2 | ||
24 | - ? "授课端" | ||
25 | - : scoped.row.abnormalSource == 3 | ||
26 | - ? "出厂工具" | ||
27 | - : "发卡工具" | ||
28 | - }} | ||
29 | - </template> | ||
30 | - </el-table-column> | ||
31 | <el-table-column prop="deviceType" label="设备类型" align="center"> | 16 | <el-table-column prop="deviceType" label="设备类型" align="center"> |
32 | <template slot-scope="scoped"> | 17 | <template slot-scope="scoped"> |
33 | {{ | 18 | {{ |
@@ -83,6 +68,21 @@ | @@ -83,6 +68,21 @@ | ||
83 | label="状态" | 68 | label="状态" |
84 | align="center" | 69 | align="center" |
85 | ></el-table-column> | 70 | ></el-table-column> |
71 | + <el-table-column prop="abnormalSource" label="信息来源" align="center"> | ||
72 | + <template slot-scope="scoped"> | ||
73 | + {{ | ||
74 | + scoped.row.abnormalSource == 0 | ||
75 | + ? "无" | ||
76 | + : scoped.row.abnormalSource == 1 | ||
77 | + ? "云平台" | ||
78 | + : scoped.row.abnormalSource == 2 | ||
79 | + ? "授课端" | ||
80 | + : scoped.row.abnormalSource == 3 | ||
81 | + ? "出厂工具" | ||
82 | + : "发卡工具" | ||
83 | + }} | ||
84 | + </template> | ||
85 | + </el-table-column> | ||
86 | <el-table-column label="操作" align="center" width="100" | 86 | <el-table-column label="操作" align="center" width="100" |
87 | ><template slot-scope="scoped"> | 87 | ><template slot-scope="scoped"> |
88 | <el-link | 88 | <el-link |