Merge branch 'iteration-20241107-hoework' into jenkins-main

src/views/afterSchoolManager/components/examinationDetail.vue

@@ -60,12 +60,10 @@
         <el-table-column prop="memo" align="left" label="练习说明">
           <template slot-scope="scope">
             <Tooltip
-              :content="
-                scope.row.memo
-                  ? scope.row.memo
-                  : '--'
-              "
+              v-if="scope.row.memo"
+              :content="scope.row.memo"
             />
+            <span v-else>--</span>
           </template>
         </el-table-column>
         <el-table-column prop="trainingTime" align="left" label="完成时间">
@@ -76,7 +74,7 @@
         </el-table-column>
         <el-table-column prop="finishFlag" align="left" label="测验分数">
           <template slot-scope="scope">
-            <div>{{ scope.row.trainingScore || 0 }}</div>
+            <div>{{ scope.row.trainingScore == -1 ? '--' : (scope.row.trainingScore || 0) }}</div>
           </template>
         </el-table-column>
         <el-table-column prop="finishFlag" align="right" label="操作">

src/views/afterSchoolManager/modal/homework-detail.vue

@@ -21,7 +21,7 @@
                     :class="
                       scope.row.trainingScore >= scope.row.standardScore ? '' : 'red'
                     "
-                    >{{ scope.row.trainingScore }}</span
+                    >{{ scope.row.trainingScore == -1 ? '--' : scope.row.trainingScore }}</span
                   >
                   / {{ scope.row.standardScore }} 分</template
           >