Merge branch 'master' into gzu_1st_main_20260830(考试培训)

src/views/safetyEducationExaminationNew/safetyTest/onlineExam/index.vue

@@ -56,7 +56,9 @@
             <div class="bottom-box">
               <p class="text-big-p">{{item.examTypeName}}</p>
               <p class="text-p">{{parseTime(item.startTime,"{y}-{m}-{d} {h}:{i}")}} 至 {{parseTime(item.endTime,"{y}-{m}-{d} {h}:{i}")}}</p>
-              <p class="time-p">时长：{{item.answerDuration}}分钟 丨 总分：{{item.totalScore}}分 丨 及格分：{{item.passScore}}分 丨 可考试次数：{{item.attemptLimit===0?'无限':item.attemptCount+'/'+item.attemptLimit}}次 <span v-if="item.studyHoursRequirement>0"> 丨 学时要求：{{item.completedStudyHours}} / {{item.studyHoursRequirement}} 学时</span></p>
+              <p class="time-p">时长：{{item.answerDuration}}分钟 丨 总分：{{item.totalScore}}分 丨 及格分：{{item.passScore}}分 丨 可考试次数：{{item.attemptLimit===0?'无限':item.attemptCount+'/'+item.attemptLimit}}次
+                <span v-if="item.studyHoursRequirement>0"> 丨 学时要求：{{item.completedStudyHours>=item.studyHoursRequirement?'已满足':item.completedStudyHours + '/' + item.studyHoursRequirement + ' 学时'}}</span>
+              </p>
             </div>
             <p class="position-p-1" v-if="item.conditionType == 1" @click="tableButton(1,item)">完成学时要求后解锁</p>
             <p class="position-p-1" v-if="item.conditionType == 2" @click="tableButton(2,item)">完成考前课程学习后解锁</p>