功能调整

backend/src/views/competition/components/team.vue

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

front/src/api/competition.js

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

front/src/views/system/exam.vue

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

front/src/views/system/examresult.vue

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

tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/biz/CompetitionMemberBiz.java

@@ -115,7 +115,7 @@ public class CompetitionMemberBiz {
         Competition competition =competitionDao.getById(compId);
         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));
         }
 

tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/CompetitionTaskDTO.java

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