{{competition.name}}
@@ -433,6 +511,7 @@ import { getInfo } from '@/utils/auth'
import * as competitionApi from '@/api/competition'
import PaoMaDeng from '@/components/paomadeng.vue'
import Tips from '@/components/tips'
+import * as gradeApi from '@/api/grade'
export default {
props:{
competition:{
@@ -442,6 +521,10 @@ export default {
},
watch:{
competition:function(nv){
+ if(this.competition.type==2){
+ this.queryData.type2=2
+ this.rankingSubType =2
+ }
this.loadData()
}
},
@@ -459,7 +542,7 @@ export default {
stageList:[],
regionList:[],
levelList:[],
- classList:[{id: 1, name: '测试1班'}],
+ classList:[],
rankList:[],
teamRankList: [],
dialogVisibale: false,
@@ -585,14 +668,15 @@ export default {
this.rankingSubType = t
this.queryData.type2 = t
this.loadMemberRank()
+ if(t===3){
+ this.fullScreen()
+ }
},
fullScreen(){
- this.isFullScreen =true
this.$nextTick(function(){
let full = document.getElementById("fullScreen")
this.launchIntoFullscreen(full)
})
-
},
launchIntoFullscreen(element){
if (element.requestFullscreen) {
@@ -618,10 +702,20 @@ export default {
if(this.queryData.type2 == 3){
if(this.levelList){
let ids = ''
- this.fullInfo.name = this.levelList[0].name
- this.levelList[0].catList.forEach(cat=>{
- ids+=cat.id+","
- })
+ console.log( this.levelList)
+ if(!this.levelList||this.levelList.length==0){
+ this.fullInfo.name =''
+ }else{
+ this.fullInfo.name = this.levelList[0].name
+ }
+ if(!this.levelList||this.levelList.length==0){
+
+ }else{
+ this.levelList[0].catList.forEach(cat=>{
+ ids+=cat.id+","
+ })
+ }
+
if(ids.endsWith(",")){
ids = ids.substring(0,ids.length-1)
}
@@ -798,6 +892,13 @@ export default {
})
})
}
+ gradeApi.list(this.competition.schoolId).then(res=>{
+ console.log(res.data.list.content)
+ if(res.code == 200){
+ this.classList = res.data.list.content
+ }
+
+ })
competitionApi.getGroup(this.competition.id,this.stageId).then(res=>{
if(res.code == 200){
res.data.list.forEach(g=>{
@@ -820,21 +921,23 @@ export default {
this.wordLen = 7
}
this.userInfo = getInfo()
+
this.loadData()
},
mounted(){
let that = this
- // window.addEventListener("resize",function(){
- // if (window.outerHeight === screen.availHeight){
- // if(window.outerWidth === screen.availWidth){
- // that.isFullScreen = true
- // }else{
- // that.isFullScreen =false
- // }
- // }else{
- // that.isFullScreen = false
- // }
- // })
+ document.addEventListener("fullscreenchange", function (e) {
+
+ if (document.fullscreenElement) {
+ console.log('进入全屏')
+ that.isFullScreen =true
+ document.getElementById("fullScreen").style="display:block";
+ } else {
+ console.log('退出全屏')
+ that.isFullScreen =false
+ document.getElementById("fullScreen").style="display:none";
+ }
+ })
},
components:{
"tz-paomadeng": PaoMaDeng,
@@ -1284,4 +1387,27 @@ export default {
width: 2rem;
text-align: center;
}
+
+ .s_container {
+ position: relative;
+ /* 父容器需要有明确的高度 */
+ height: 330px;
+ width: 100%;
+ margin: auto;
+ overflow: hidden;
+ }
+ .s_container > .scroll-list {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ animation: scroll 6s linear infinite normal;
+ }
+
+ @keyframes scroll {
+ 100% {
+ /* 需要滚动内容的总高度 */
+ top: -300px;
+ }
+ }
\ No newline at end of file
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/CompetitionDTO.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/CompetitionDTO.java
index 404b8e0..8e6e538 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/CompetitionDTO.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/CompetitionDTO.java
@@ -34,4 +34,5 @@ public class CompetitionDTO implements Serializable {
private String prize;
private List
news;
private List schoolNews;
+ private Integer schoolId;
}
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/MemberRankingDTO.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/MemberRankingDTO.java
index a971a01..1386337 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/MemberRankingDTO.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/MemberRankingDTO.java
@@ -20,4 +20,6 @@ public class MemberRankingDTO implements Serializable {
private Integer regionId;
private Integer provinceId;
private String className;
+ private Double totalRatio;
+ private Double yearRatio;
}
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/MarketNotePcController.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/MarketNotePcController.java
index 488b530..f1664f9 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/MarketNotePcController.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/MarketNotePcController.java
@@ -9,7 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+@RestController
@RequestMapping(value = "/pc/competition/note")
public class MarketNotePcController {
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/system/api/SystemController.java b/tz/system/system-service/src/main/java/com/tz/platform/system/api/SystemController.java
index 9f9f21e..6ae4bbd 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/system/api/SystemController.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/system/api/SystemController.java
@@ -2,9 +2,12 @@ package com.tz.platform.system.api;
import com.tz.platform.common.core.api.ZhiYunApi;
import com.tz.platform.common.core.base.Result;
+import com.tz.platform.feign.vo.GradeVo;
+import com.tz.platform.system.pc.biz.GradeBiz;
import com.tz.platform.system.pc.biz.PCProvinceBiz;
import com.tz.platform.system.pc.biz.PCStudentLevelBiz;
import com.tz.platform.system.pc.biz.SchoolBiz;
+import com.tz.platform.system.pc.dto.ListGradeDTO;
import com.tz.platform.system.pc.dto.ListStudentLevelDTO;
import com.tz.platform.system.pc.dto.ProvinceDTO;
import com.tz.platform.system.pc.dto.SchoolDTO;
@@ -25,6 +28,9 @@ public class SystemController {
@Autowired
private SchoolBiz schoolBiz;
+ @Autowired
+ private GradeBiz gradeBiz;
+
@GetMapping(value = "province")
public Result provinceList(){
@@ -42,4 +48,10 @@ public class SystemController {
public Result addSchool(@RequestParam("id") Integer id,@RequestParam("name") String name,@RequestParam("level") Integer level,@RequestParam("province") String province){
return schoolBiz.save(id,name,level);
}
+
+ @RequestMapping(value = "grade")
+ public Result gradeList(@RequestParam("schoolId") Integer schoolId){
+ GradeVo vo = new GradeVo();
+ return gradeBiz.listBySchoolId(schoolId);
+ }
}
diff --git a/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/GradeBiz.java b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/GradeBiz.java
index 5fea394..c5c90b7 100644
--- a/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/GradeBiz.java
+++ b/tz/system/system-service/src/main/java/com/tz/platform/system/pc/biz/GradeBiz.java
@@ -65,6 +65,13 @@ public class GradeBiz {
return Result.success(dto);
}
+ public Result listBySchoolId(Integer schoolId){
+ ListGradeDTO dto = new ListGradeDTO();
+ Pageable pageable = PageRequest.of(0,100);
+ dto.setList(gradeDao.findAllBySchoolId(schoolId,pageable));
+ return Result.success(dto);
+ }
+
public Result list(GradeVO vo,Long userNo){
Integer pageNo = vo.getPageNo();
if(pageNo == null||pageNo<=0){