功能调整

master
tianea 3 years ago
parent 0d2e46a1cb
commit 8723e1f5f0

@ -359,7 +359,7 @@ export default {
methods: { methods: {
copyTeam(){ copyTeam(){
if(this.toTeamId>0){ if(this.toTeamId>0){
teamApi.copyTeam(this.cmpId, this.toTeamId ).then(res=>{ teamApi.copyTeam(this.competitionId, this.toTeamId).then(res=>{
this.$notify({ this.$notify({
title: '提示信息', title: '提示信息',
message: res.msg, message: res.msg,

@ -90,3 +90,11 @@ export function memberRank(q){
params: q params: q
}) })
} }
export function getTask(q){
return request({
url: authUrl+"task/get",
method: 'get',
params: q
})
}

@ -149,7 +149,7 @@
</div> </div>
</div> </div>
<tz-footer /> <tz-footer />
<tz-dialog msg="确认后开始考试,答题时间为1个小时,是否现在开始答题?" :ok.sync="confirm" :visiable="dlgVisiable" /> <tz-dialog :msg="'确认后开始考试,答题时间为'+ limiteTime +'个小时,是否现在开始答题?'" :ok.sync="confirm" :visiable="dlgVisiable" />
</div> </div>
</template> </template>
<script> <script>
@ -162,6 +162,7 @@ import { getInfo } from '@/utils/auth'
export default { export default {
data(){ data(){
return { return {
limiteTime: 1,
singleInfo: { singleInfo: {
size: 0, size: 0,
score: 0, score: 0,
@ -417,6 +418,9 @@ export default {
if(this.$route.query){ if(this.$route.query){
this.compId = this.$route.query.id this.compId = this.$route.query.id
this.stageId = this.$route.query.stageId this.stageId = this.$route.query.stageId
examApi.getTask({compId:this.compId,stageId: this.stageId}).then((res)=>{
this.limiteTime = res.data.examDuration
})
examApi.get({compId: this.compId}).then(res=>{ examApi.get({compId: this.compId}).then(res=>{
if(res.code == 200){ if(res.code == 200){
this.competition = res.data this.competition = res.data

@ -252,7 +252,6 @@ export default {
}, },
methods:{ methods:{
getStatus(cq){ getStatus(cq){
console.log(cq.item)
var myAnswer = this.getMyAnswer(cq.item.id,0) var myAnswer = this.getMyAnswer(cq.item.id,0)
if(myAnswer == ''){ if(myAnswer == ''){
@ -260,7 +259,7 @@ export default {
} }
var rightAnswer = this.getRightAnswer(cq.item,0) var rightAnswer = this.getRightAnswer(cq.item,0)
console.log("my:"+myAnswer,"right:"+rightAnswer)
if(myAnswer == rightAnswer){ if(myAnswer == rightAnswer){
return "right"; return "right";
} }
@ -302,7 +301,7 @@ export default {
qList=qList.concat(this.getQList(this.judgeQuestion)) qList=qList.concat(this.getQList(this.judgeQuestion))
qList=qList.concat(this.getQList(this.anliQuestion)) qList=qList.concat(this.getQList(this.anliQuestion))
examApi.submit(this.compId,this.stageId,qList).then(res=>{ examApi.submit(this.compId,this.stageId,qList).then(res=>{
console.log(res)
if(res.code == 200){ if(res.code == 200){
alert("考试得分"+res.data.score) alert("考试得分"+res.data.score)
}else{ }else{

@ -115,7 +115,7 @@ public class CompetitionMemberBiz {
Competition competition =competitionDao.getById(compId); Competition competition =competitionDao.getById(compId);
Stage cStage = competition.getStageList().stream().filter(stage -> stage.getId() == stageId).findFirst().orElse(null); Stage cStage = competition.getStageList().stream().filter(stage -> stage.getId() == stageId).findFirst().orElse(null);
//未开赛后不生成交易系统权限 //未开赛后不生成交易系统权限
if(competitionTask.getOperationStartTime().getTime()> System.currentTimeMillis()||!cStage.isEnableFinance()){ if(!cStage.isEnableFinance()||competitionTask.getOperationStartTime().getTime()> System.currentTimeMillis()){
return Result.success(BeanUtils.copyProperties(member,CompetitionMemberDTO.class)); return Result.success(BeanUtils.copyProperties(member,CompetitionMemberDTO.class));
} }

@ -18,4 +18,5 @@ public class CompetitionTaskDTO implements Serializable {
private Long initCapital; private Long initCapital;
private String operationLogo; private String operationLogo;
private String examLogo; private String examLogo;
private Integer examDuration;
} }

Loading…
Cancel
Save