Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

TEAMModelOS/ClientApp/src/view/jyzx/index.vue

@@ -38,10 +38,10 @@
                                     <!-- 总计学时是所有分钟相加得到，会与所有能力点已学的学时相加相冲突，所以只show总计的学时 -->
                                     {{ $t('jyzx.online.timeStudy') }}：
                                     <!-- limitMinutes：-1，只显示最大学时，不是-1，就显示limitMinutes -->
-                                    {{ setting.limitMinutes === -1 ? (item.total > (setting.lessonMinutes * item.hour) ? (setting.lessonMinutes * item.hour) : item.total) : (item.total > setting.limitMinutes ? setting.limitMinutes : item.total) }}
+                                    {{ setting.limitMinutes === -1 ? (item.total >= (setting.lessonMinutes * item.hour) ? (setting.lessonMinutes * item.hour) : item.total) : (item.total >= setting.limitMinutes ? setting.limitMinutes : item.total) }}
                                     {{ $t('jyzx.online.minute') }}
                                 </span>
-                                <span v-show="item.currency === 1 && (setting.limitMinutes === -1 ? item.done : (item.total > setting.limitMinutes))" style="background-color: #16c18e;color: #fff; padding: 2px 5px;border-radius: 5px;">{{ $t('jyzx.common.complete') }}</span>
+                                <span v-show="item.currency === 1 && (setting.limitMinutes === -1 ? item.done : (item.total >= setting.limitMinutes))" style="background-color: #16c18e;color: #fff; padding: 2px 5px;border-radius: 5px;">{{ $t('jyzx.common.complete') }}</span>
                             </p>
                             <p v-if="item.from" style="text-align:right; margin-right: 20px">来源：省平台</p>
                         </div>
@@ -1488,7 +1488,7 @@ export default {
                 }
                 console.log("视频学完");
                 this.studyRecord.done = true
-                this.studyRecord.view = parseInt(e.target.currentTime)
+                this.studyRecord.view = parseInt(e.target.duration)
                 var newArr = {
                     hash: this.studyRecord.hash,
                     done: this.studyRecord.done,

TEAMModelOS/ClientApp/src/view/jyzx/newHomePage.vue

@@ -287,11 +287,11 @@ export default {
                     if(res.setting.limitMinutes != -1) {
                         res.teacherTrain.currency.teacherAilities.forEach(item => {
                             this.onlineInfo.minuteTotal += res.setting.limitMinutes
-                            this.onlineInfo.minute += (item.videoTime > res.setting.limitMinutes) ? res.setting.limitMinutes : item.videoTime
+                            this.onlineInfo.minute += (item.videoTime >= res.setting.limitMinutes) ? res.setting.limitMinutes : item.videoTime
                         });
                     } else {
                         this.onlineInfo.minuteTotal = res.setting.onlineTime * res.setting.lessonMinutes
-                        this.onlineInfo.minute = (res.teacherTrain.currency.videoTime > (res.setting.onlineTime * res.setting.lessonMinutes)) ? (res.setting.onlineTime * res.setting.lessonMinutes) : res.teacherTrain.currency.videoTime
+                        this.onlineInfo.minute = (res.teacherTrain.currency.videoTime >= (res.setting.onlineTime * res.setting.lessonMinutes)) ? (res.setting.onlineTime * res.setting.lessonMinutes) : res.teacherTrain.currency.videoTime
                     }
                     
                     // 校本研修