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

@@ -37,7 +37,8 @@
                                 <span style="float: left;" v-if="item.currency === 1">
                                     <!-- 总计学时是所有分钟相加得到，会与所有能力点已学的学时相加相冲突，所以只show总计的学时 -->
                                     {{ $t('jyzx.online.timeStudy') }}：
-                                    {{ (setting.limitMinutes != -1 && (item.total > setting.limitMinutes)) ? setting.limitMinutes : item.total }}
+                                    <!-- 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) }}
                                     {{ $t('jyzx.online.minute') }}
                                 </span>
                                 <span v-show="item.done && item.currency === 1" style="background-color: #16c18e;color: #fff; padding: 2px 5px;border-radius: 5px;">{{ $t('jyzx.common.complete') }}</span>
@@ -389,6 +390,9 @@ export default {
                                         if(item.id === this.needId.abilityId) {
                                             item.total = parseInt(arr.view / 60)
                                         }
+                                        if(!item.done && this.setting.limitMinutes != -1 && item.total > this.setting.limitMinutes) {
+                                            item.done = true
+                                        }
                                     }
                                 }
                             })

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

@@ -280,8 +280,19 @@ export default {
                     this.onlineInfo.total = res.setting.onlineTime
                     this.onlineInfo.value = res.teacherTrain.onlineTime > res.setting.onlineTime ? res.setting.onlineTime : res.teacherTrain.onlineTime
                     // limitMinutes: -1（按照之前的时间）  limitMinutes > -1（取limitMinutes，并且所学时间超过limitMinutes，就取limitMinutes）
-                    this.onlineInfo.minute = (res.setting.limitMinutes != -1 && (res.teacherTrain.currency.videoTime > res.setting.limitMinutes)) ? res.setting.limitMinutes : res.teacherTrain.currency.videoTime
-                    this.onlineInfo.minuteTotal = res.setting.limitMinutes != -1 ? res.setting.limitMinutes : (res.setting.onlineTime * res.setting.lessonMinutes)
+                    /* this.onlineInfo.minute = (res.setting.limitMinutes != -1 && (res.teacherTrain.currency.videoTime > res.setting.limitMinutes)) ? res.setting.limitMinutes : res.teacherTrain.currency.videoTime
+                    this.onlineInfo.minuteTotal = res.setting.limitMinutes != -1 ? res.setting.limitMinutes : (res.setting.onlineTime * res.setting.lessonMinutes) */
+
+                    // limitMinutes：-1，只显示最大学时，不是-1，就显示limitMinutes*必修个数
+                    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
+                        });
+                    } 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.offlineInfo.total = res.setting.offlineTime