浏览代码

修改单科分数显示

liurongli 5 月之前
父节点
当前提交
67276517ba

+ 8 - 5
src/views/analysisReport/studentPage/downloadPdf/studentReport.vue

@@ -67,9 +67,9 @@
                                                         </template>
                                                         <template v-else>{{ scope.row?.[header.prop] ?? '-' }}</template>
                                                     </template>
-                                                    <template v-else>{{ scope.row?.[header.prop] || '-' }}</template>
+                                                    <template v-else>{{ scope.row?.[header.prop] ?? '-' }}</template>
                                                 </template>
-                                                <template v-else>{{ scope.row?.[header.prop] || '-' }}</template>
+                                                <template v-else>{{ scope.row?.[header.prop] ?? '-' }}</template>
                                                 </template>
                                         </el-table-column>
                                     </el-table>
@@ -129,9 +129,12 @@
                                                         * 3-得分显示对错,小题分显示分数,4-得分显示对错,小题分显示对错
                                                         * 5-得分显示等级,小题分显示分数,6-得分显示等级,小题分显示对错 -->
                                                         <template v-if="(scope.row.studentOpenness == 3 || scope.row.studentOpenness == 4) && scope.row?.score">
-                                                            <img class="right_or_wrong_icon" v-if="scope.row.fullScore == scope.row.score" src="@/assets/report/score_yes_icon.webp" />
-                                                            <img class="right_or_wrong_icon" v-else-if="scope.row.score === 0" src="@/assets/report/score_no_icon.webp" />
-                                                            <img class="right_or_wrong_icon" v-else src="@/assets/report/score_dimidiate_icon.webp" />
+                                                            <template v-if="!isNaN(scope.row.score)">
+                                                                <img class="right_or_wrong_icon" v-if="scope.row.fullScore == scope.row.score" src="@/assets/report/score_yes_icon.webp" />
+                                                                <img class="right_or_wrong_icon" v-else-if="scope.row.score === 0" src="@/assets/report/score_no_icon.webp" />
+                                                                <img class="right_or_wrong_icon" v-else src="@/assets/report/score_dimidiate_icon.webp" />
+                                                            </template>
+                                                            <template v-else>{{ scope.row.score }}</template>
                                                         </template>
                                                         <template v-else>{{ scope?.row?.[header.prop] ?? '-' }}</template>
                                                     </template>

+ 7 - 4
src/views/analysisReport/studentPage/scrolReport/transcript_single.vue

@@ -236,11 +236,14 @@
                       groupData[group.value].studentOpenness == 6
                     "
                   >
-                    <img v-if="scope.row.fullScore == scope.row.score" src="@/assets/stuIcon/icon_right.png" />
-                    <img v-else-if="scope.row.score == 0" src="@/assets/stuIcon/icon_error.png" />
-                    <img v-else src="@/assets/stuIcon/icon_half_right.png" />
+                    <template v-if="!isNaN(scope.row.score)">
+                      <img v-if="scope.row.fullScore == scope.row.score" src="@/assets/stuIcon/icon_right.png" />
+                      <img v-else-if="scope.row.score == 0" src="@/assets/stuIcon/icon_error.png" />
+                      <img v-else src="@/assets/stuIcon/icon_half_right.png" />
+                    </template>
+                    <template v-else>{{ scope.row.score ?? '-' }}</template>
                   </template>
-                  <template v-else>{{ scope.row.score || '-' }}</template>
+                  <template v-else>{{ scope.row.score ?? '-' }}</template>
                 </template>
                 <!-- 包含小题 -->
                 <template

+ 2 - 2
src/views/analysisReport/studentPage/scrolReport/transcript_total.vue

@@ -41,9 +41,9 @@
                   </template>
                   <template v-else>{{ scope.row?.[title.prop] ?? '-' }}</template>
                 </template>
-                <template v-else>{{ scope.row?.[title.prop] || '-' }}</template>
+                <template v-else>{{ scope.row?.[title.prop] ?? '-' }}</template>
               </template>
-              <template v-else>{{ scope.row?.[title.prop] || '-' }}</template>
+              <template v-else>{{ scope.row?.[title.prop] ?? '-' }}</template>
             </template>
           </el-table-column>
           <!-- 查看答题卡列固定在右侧 -->