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

TEAMModeBI/Controllers/BIHome/HomeStatisController.cs

@@ -451,7 +451,7 @@ namespace TEAMModeBI.Controllers.BIHome
                 foreach (var itemStandrd in standards)
                 {
                     CitySchool citySchool = new CitySchool();
-                    var tempCode = citySchools.Find(x => x.cityCode.Equals(itemStandrd.cityCode));
+                    var tempCode = citySchools.Find(x => x.cityCode == itemStandrd.cityCode);
                     if (tempCode != null)
                     {
                         await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: $"select c.id from c where c.standard='{itemStandrd.standard}'", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base") }))
@@ -490,14 +490,14 @@ namespace TEAMModeBI.Controllers.BIHome
                                 }
                             }
                         }
+                        citySchools.Add(citySchool);
                     }
-                    citySchools.Add(citySchool);
                 }
                 return Ok(new { state = 200, citySchools });
             }
             catch (Exception ex)
             {
-                await _dingDing.SendBotMsg($"BI, {_option.Location}   /homestatis/get-cityschoolranking   \n {ex.Message}{ex.StackTrace}", GroupNames.醍摩豆服務運維群組);
+                await _dingDing.SendBotMsg($"BI, {_option.Location}   /homestatis/get-cityschool   \n {ex.Message}{ex.StackTrace}", GroupNames.醍摩豆服務運維群組);
                 return BadRequest();
             }
         }

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

@@ -1185,7 +1185,10 @@ export default {
                                 if(abliy.abilityId === this.pointList[this.activePointIndex].id
                                 && abliy.nodeId === this.chapterId && abliy.taskId === this.topChapterId) {
                                     console.log("找到了");
-                                    this.studyVideoNum += 1
+                                    let have = this.resourceInfo.filter(res => {
+                                        return res.hash === item.hash
+                                    })
+                                    this.studyVideoNum += (have ? have.length : 0)
                                 }
                             })
                         }
@@ -1471,12 +1474,12 @@ export default {
                 if(e.target.id !== this.videoEle) return
                 // 不能前进
 
-                if (e.target.currentTime - this.currentTime > 1) {
+                /* if (e.target.currentTime - this.currentTime > 1) {
                     // 判断前一秒和后一秒的视频时间差大于一秒的话，就让进度设置成前一秒的进度
                     var video = document.getElementById(e.target.id);
                     video.currentTime = this.currentTime
                     return
-                }
+                } */
                 var min = parseInt(e.target.currentTime / 60)
                 let startTimes = parseInt(this.startTimes / 60)
                 let studyTime = parseInt(this.studyTime / 60)