wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-28 20:41:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

赛会比赛结果数据

Browse Source
This commit is contained in:
wuyibo
2022-11-16 10:58:13 +08:00
parent 8137884e19
commit e94f9101f3
15 changed files with 264 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java
View File

@@ -91,7 +91,13 @@ public class CompetitionResultController extends BaseController
{ {
return toAjax(competitionResultService.updateCompetitionResult(competitionResult)); return toAjax(competitionResultService.updateCompetitionResult(competitionResult));
} }
@RequiresPermissions("system:competitionResult:batchEdit")
@Log(title = "赛会中-批量保存赛程结果记录", businessType = BusinessType.UPDATE)
@PutMapping("/batchEdit")
public AjaxResult batchEdit(@RequestBody List<CompetitionResult> list)
{
return toAjax(competitionResultService.batchUpdateCompetitionResult(list));
}
/** /**
* 删除赛会中-赛程结果记录 * 删除赛会中-赛程结果记录
*/ */

7
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java
View File

@@ -106,4 +106,11 @@ public class CompetitionTeamVsTeamController extends BaseController
public AjaxResult getCompetitionUnifiedRecordById(@PathVariable("id") Long id) { public AjaxResult getCompetitionUnifiedRecordById(@PathVariable("id") Long id) {
return AjaxResult.success(competitionTeamVsTeamService.getCompetitionUnifiedRecordById(id)); return AjaxResult.success(competitionTeamVsTeamService.getCompetitionUnifiedRecordById(id));
} }
@Log(title = "赛会中-球队VS球队比赛结果数据2", businessType = BusinessType.OTHER)
@ApiOperation("根据ID获取当前比赛赛程的所有统分结果2")
@GetMapping("/getCompetitionVsRecordById/{id}")
public AjaxResult getCompetitionVsRecordById(@PathVariable("id") Long id) {
return AjaxResult.success(competitionTeamVsTeamService.getCompetitionVsRecordById(id));
}
} }

19
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionResultVo.java Normal file
View File

@@ -0,0 +1,19 @@
package com.ruoyi.system.domain.vo;
import com.ruoyi.system.domain.CompetitionMembersScore;
import com.ruoyi.system.domain.CompetitionResult;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author 吴一博
* @date 2022年11月16日 9:48
* @Description
*/
@Data
public class CompetitionResultVo extends CompetitionResult {
@ApiModelProperty(value = "客队队员数据", required = false)
private List<CompetitionMembersScore> membersScoreList;
}

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionUnifiedRecordVo.java
View File

@@ -18,7 +18,7 @@ public class CompetitionUnifiedRecordVo implements Serializable {
private CompetitionTeamVsTeamVo teamVsTeamVo; private CompetitionTeamVsTeamVo teamVsTeamVo;
@ApiModelProperty(value = "对阵节数统分数据", required = false) @ApiModelProperty(value = "对阵节数统分数据", required = false)
private List<CompetitionResult> competitionResultList; private List<CompetitionResultVo> competitionResultList;
@ApiModelProperty(value = "赛程队员数据", required = false) @ApiModelProperty(value = "赛程队员数据", required = false)
private List<CompetitionMembersScore> competitionMembersScoreList; private List<CompetitionMembersScore> competitionMembersScoreList;

26
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionVsRecordVo.java Normal file
View File

@@ -0,0 +1,26 @@
package com.ruoyi.system.domain.vo;
import com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
/**
* @author 吴一博
* @date 2022年11月16日 9:46
* @Description
*/
@ApiModel(value = "比赛-赛程-统分2Vo")
@Setter
@Getter
public class CompetitionVsRecordVo implements Serializable {
@ApiModelProperty(value = "对阵数据", required = false)
private CompetitionTeamVsTeamVo teamVsTeamVo;
private CompetitionResultVo mainTeam;
private CompetitionResultVo guestTeam;
}

3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.system.domain.CompetitionResult; import com.ruoyi.system.domain.CompetitionResult;
import com.ruoyi.system.domain.vo.CompetitionResultVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
/** /**
@@ -60,5 +61,5 @@ public interface CompetitionResultMapper
*/ */
public int deleteCompetitionResultByIds(Long[] ids); public int deleteCompetitionResultByIds(Long[] ids);
public List<CompetitionResult> findByCompetitionVsId(@Param("competitionId") Long competitionId,@Param("competitionVsId") Long competitionVsId); public List<CompetitionResultVo> findByCompetitionVsId(@Param("competitionId") Long competitionId, @Param("competitionVsId") Long competitionVsId);
} }

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java
View File

@@ -58,4 +58,6 @@ public interface ICompetitionResultService
* @return 结果 * @return 结果
*/ */
public int deleteCompetitionResultById(Long id); public int deleteCompetitionResultById(Long id);
public int batchUpdateCompetitionResult(List<CompetitionResult> list);
} }

3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java
View File

@@ -4,6 +4,7 @@ import java.util.List;
import com.ruoyi.system.domain.CompetitionTeamVsTeam; import com.ruoyi.system.domain.CompetitionTeamVsTeam;
import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo; import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo;
import com.ruoyi.system.domain.vo.CompetitionUnifiedRecordVo; import com.ruoyi.system.domain.vo.CompetitionUnifiedRecordVo;
import com.ruoyi.system.domain.vo.CompetitionVsRecordVo;
/** /**
* 赛会中-球队VS球队关系Service接口 * 赛会中-球队VS球队关系Service接口
@@ -62,4 +63,6 @@ public interface ICompetitionTeamVsTeamService
public int deleteCompetitionTeamVsTeamById(Long id); public int deleteCompetitionTeamVsTeamById(Long id);
public CompetitionUnifiedRecordVo getCompetitionUnifiedRecordById(Long id); public CompetitionUnifiedRecordVo getCompetitionUnifiedRecordById(Long id);
public CompetitionVsRecordVo getCompetitionVsRecordById(Long id);
} }

12
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
View File

@@ -90,4 +90,16 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService
{ {
return competitionResultMapper.deleteCompetitionResultById(id); return competitionResultMapper.deleteCompetitionResultById(id);
} }
@Override
public int batchUpdateCompetitionResult(List<CompetitionResult> list) {
for (CompetitionResult result:list){
if(result.getId()==null){
competitionResultMapper.insertCompetitionResult(result);
}else {
competitionResultMapper.updateCompetitionResult(result);
}
}
return 1;
}
} }

34
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java
View File

@@ -2,13 +2,17 @@ package com.ruoyi.system.service.impl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.system.domain.CompetitionMembersScore; import com.ruoyi.system.domain.CompetitionMembersScore;
import com.ruoyi.system.domain.CompetitionResult; import com.ruoyi.system.domain.CompetitionResult;
import com.ruoyi.system.domain.vo.CompetitionResultVo;
import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo; import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo;
import com.ruoyi.system.domain.vo.CompetitionUnifiedRecordVo; import com.ruoyi.system.domain.vo.CompetitionUnifiedRecordVo;
import com.ruoyi.system.domain.vo.CompetitionVsRecordVo;
import com.ruoyi.system.mapper.CompetitionMembersScoreMapper; import com.ruoyi.system.mapper.CompetitionMembersScoreMapper;
import com.ruoyi.system.mapper.CompetitionResultMapper; import com.ruoyi.system.mapper.CompetitionResultMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -120,7 +124,7 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS
unifiedRecordVo.setTeamVsTeamVo(competitionTeamVsTeamVo); unifiedRecordVo.setTeamVsTeamVo(competitionTeamVsTeamVo);
//查询队伍数据 //查询队伍数据
List<CompetitionResult> competitionResultList = competitionResultMapper.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId()); List<CompetitionResultVo> competitionResultList = competitionResultMapper.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
unifiedRecordVo.setCompetitionResultList(competitionResultList); unifiedRecordVo.setCompetitionResultList(competitionResultList);
//查询赛程中个人成绩 //查询赛程中个人成绩
@@ -157,4 +161,32 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS
} }
return unifiedRecordVo; return unifiedRecordVo;
} }
@Override
public CompetitionVsRecordVo getCompetitionVsRecordById(Long id) {
CompetitionVsRecordVo recordVo = new CompetitionVsRecordVo();
CompetitionTeamVsTeamVo competitionTeamVsTeamVo = competitionTeamVsTeamMapper.getCompetitionById(id);
if(StringUtils.isEmpty(competitionTeamVsTeamVo)){
throw new ServiceException("赛程不存在");
}
//获取主队每节数据
List<CompetitionResultVo> competitionResultList = competitionResultMapper.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
Optional<CompetitionResultVo> main = competitionResultList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).findFirst();
Optional<CompetitionResultVo> guest = competitionResultList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).findFirst();
List<CompetitionMembersScore> membersScoreList = competitionMembersScoreMapper.findMembersScoreByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
if(main.isPresent()){
CompetitionResultVo resultVo = main.get();
List<CompetitionMembersScore> membersScores = membersScoreList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).collect(Collectors.toList());
resultVo.setMembersScoreList(membersScores);
recordVo.setMainTeam(resultVo);
}
if(guest.isPresent()){
CompetitionResultVo resultVo = guest.get();
List<CompetitionMembersScore> membersScores = membersScoreList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).collect(Collectors.toList());
resultVo.setMembersScoreList(membersScores);
recordVo.setGuestTeam(resultVo);
}
recordVo.setTeamVsTeamVo(competitionTeamVsTeamVo);
return recordVo;
}
} }

2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml
View File

@@ -76,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="findMembersScoreByCompetitionVsId" <select id="findMembersScoreByCompetitionVsId"
resultType="com.ruoyi.system.domain.CompetitionMembersScore"> resultType="com.ruoyi.system.domain.CompetitionMembersScore">
SELECT SELECT
DISTINCT
sco.id, sco.id,
vs.competition_id as competitionId, vs.competition_id as competitionId,
vs.id as competitionVsId, vs.id as competitionVsId,
@@ -114,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="competitionVsId != null "> <if test="competitionVsId != null ">
AND vs.id = #{competitionVsId} AND vs.id = #{competitionVsId}
</if> </if>
ORDER BY sco.is_first_launch desc
</select> </select>
<insert id="insertCompetitionMembersScore" parameterType="CompetitionMembersScore" useGeneratedKeys="true" keyProperty="id"> <insert id="insertCompetitionMembersScore" parameterType="CompetitionMembersScore" useGeneratedKeys="true" keyProperty="id">
insert into competition_members_score insert into competition_members_score

2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml
View File

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectCompetitionResultVo"/> <include refid="selectCompetitionResultVo"/>
where id = #{id} where id = #{id}
</select> </select>
<select id="findByCompetitionVsId" resultType="com.ruoyi.system.domain.CompetitionResult"> <select id="findByCompetitionVsId" resultType="com.ruoyi.system.domain.vo.CompetitionResultVo">
select rs.id, select rs.id,
vs.competition_id as competitionId, vs.competition_id as competitionId,
vs.id as competitionVsId, vs.id as competitionVsId,

8
ruoyi-ui/src/api/system/competitionResult.js
View File

@@ -34,7 +34,13 @@ export function updateCompetitionResult(data) {
data: data data: data
}) })
} }
export function batchUpdateCompetitionResult(list) {
return request({
url: '/system/competitionResult/batchEdit',
method: 'put',
data: list
})
}
// 删除赛会中-赛程结果记录 // 删除赛会中-赛程结果记录
export function delCompetitionResult(id) { export function delCompetitionResult(id) {
return request({ return request({

6
ruoyi-ui/src/api/system/competitionTeamVsTeam.js
View File

@@ -31,6 +31,12 @@ export function getCompetitionUnifiedRecord(id) {
method: 'get' method: 'get'
}) })
} }
export function getCompetitionVsRecordById(id) {
return request({
url: '/system/competitionTeamVsTeam/getCompetitionVsRecordById/' + id,
method: 'get'
})
}
// 修改赛会中-球队VS球队关系 // 修改赛会中-球队VS球队关系
export function updateCompetitionTeamVsTeam(data) { export function updateCompetitionTeamVsTeam(data) {

244
ruoyi-ui/src/views/system/competitionSet/index.vue
View File

@@ -424,66 +424,81 @@
<!--赛程比赛数据记录--> <!--赛程比赛数据记录-->
<el-dialog :title="vsRecordTitle" :visible.sync="vsRecordOpen" width="850px" append-to-body> <el-dialog :title="vsRecordTitle" :visible.sync="vsRecordOpen" width="850px" append-to-body>
<el-row> <el-row>
<el-col :span="16" style="font-size: large;font-weight: bold"><i class="el-icon-time">比赛时间：</i>{{ competitionUnifiedRecord.teamVsTeamVo.competitionTime }} {{ competitionUnifiedRecord.teamVsTeamVo.weekDayName }}</el-col> <el-col :span="16" style="font-size: large;font-weight: bold"><i class="el-icon-time">比赛时间：</i>{{ competitionRecord.teamVsTeamVo.competitionTime }} {{ competitionRecord.teamVsTeamVo.weekDayName }}</el-col>
</el-row> </el-row>
<div class="s-div">
<el-row> <el-row>
<el-col :span="8" style="font-size: large;font-weight: bold" > <el-col :span="8" style="font-size: large;font-weight: bold" >
<el-avatar :src="competitionUnifiedRecord.teamVsTeamVo.mainTeamLogo"></el-avatar> <el-avatar :src="competitionRecord.teamVsTeamVo.mainTeamLogo"></el-avatar>
<span style="position: absolute;margin-left: 10px;margin-top: 8px">{{competitionUnifiedRecord.teamVsTeamVo.mainTeamName}}</span> <span style="position: absolute;margin-left: 10px;margin-top: 8px">{{competitionRecord.teamVsTeamVo.mainTeamName}}</span>
</el-col> </el-col>
<el-col :span="8" style="text-align: center"> <el-col :span="8" style="text-align: center">
<span style="font-weight: bold;font-size: xx-large;color: #ae192a"> <span style="font-weight: bold;font-size: xx-large;color: #ae192a">
{{competitionUnifiedRecord.teamVsTeamVo.mainTeamScore===null?0:competitionUnifiedRecord.teamVsTeamVo.mainTeamScore}}:{{competitionUnifiedRecord.teamVsTeamVo.guestTeamScore===null?0:competitionUnifiedRecord.teamVsTeamVo.guestTeamScore}}</span> {{competitionRecord.teamVsTeamVo.mainTeamScore===null?0:competitionRecord.teamVsTeamVo.mainTeamScore}}:{{competitionRecord.teamVsTeamVo.guestTeamScore===null?0:competitionRecord.teamVsTeamVo.guestTeamScore}}</span>
</el-col> </el-col>
<el-col :span="8" style="font-size: large;font-weight: bold"> <el-col :span="8" style="font-size: large;font-weight: bold">
<el-avatar :src="competitionUnifiedRecord.teamVsTeamVo.guestTeamLogo"></el-avatar> <el-avatar :src="competitionRecord.teamVsTeamVo.guestTeamLogo"></el-avatar>
<span style="position: absolute;margin-left: 10px;margin-top: 8px">{{competitionUnifiedRecord.teamVsTeamVo.guestTeamName}}</span> <span style="position: absolute;margin-left: 10px;margin-top: 8px">{{competitionRecord.teamVsTeamVo.guestTeamName}}</span>
</el-col> </el-col>
</el-row> </el-row>
<el-form> <el-form>
<el-container> <el-container>
<el-aside style="width: 50%;margin-top:10px"> <el-aside style="width: 50%;margin-top:10px">
<el-form-item label="第一节"> <el-form-item label="第一节">
<el-input-number v-model="competitionUnifiedRecord.competitionResultList[0].oneNodeScore" @change="handleMainOneNodeChange" :min="0"></el-input-number> <el-input-number v-model="competitionRecord.mainTeam.oneNodeScore" @change="handleMainOneNodeChange" :min="0"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="第二节"> <el-form-item label="第二节">
<el-input-number v-model="competitionUnifiedRecord.competitionResultList[0].twoNodeScore" @change="handleMainTwoNodeChange" :min="0"></el-input-number> <el-input-number v-model="competitionRecord.mainTeam.twoNodeScore" @change="handleMainTwoNodeChange" :min="0"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="第三节"> <el-form-item label="第三节">
<el-input-number v-model="competitionUnifiedRecord.competitionResultList[0].threeNodeScore" @change="handleMainThreeNodeChange" :min="0"></el-input-number> <el-input-number v-model="competitionRecord.mainTeam.threeNodeScore" @change="handleMainThreeNodeChange" :min="0"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="第四节"> <el-form-item label="第四节">
<el-input-number v-model="competitionUnifiedRecord.competitionResultList[0].fourNodeScore" @change="handleMainFourNodeChange" :min="0"></el-input-number> <el-input-number v-model="competitionRecord.mainTeam.fourNodeScore" @change="handleMainFourNodeChange" :min="0"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="第五节"> <el-form-item label="第五节">
<el-input-number v-model="competitionUnifiedRecord.competitionResultList[0].fiveNodeScore" @change="handleMainFiveNodeChange" :min="0"></el-input-number> <el-input-number v-model="competitionRecord.mainTeam.fiveNodeScore" @change="handleMainFiveNodeChange" :min="0"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="第六节"> <el-form-item label="第六节">
<el-input-number v-model="competitionUnifiedRecord.competitionResultList[0].sixNodeScore" @change="handleMainSixNodeChange" :min="0"></el-input-number> <el-input-number v-model="competitionRecord.mainTeam.sixNodeScore" @change="handleMainSixNodeChange" :min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-aside> </el-aside>
<el-main style="width: 45%; background-color: white;"> <el-main style="width: 45%; background-color: white;">
<el-form-item label="第一节"> <el-form-item label="第一节">
<el-input-number v-model="competitionUnifiedRecord.competitionResultList[1].oneNodeScore" @change="handleGuestOneNodeChange" :min="0"></el-input-number> <el-input-number v-model="competitionRecord.guestTeam.oneNodeScore" @change="handleGuestOneNodeChange" :min="0"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="第二节"> <el-form-item label="第二节">
<el-input-number v-model="competitionUnifiedRecord.competitionResultList[1].twoNodeScore" @change="handleGuestTwoNodeChange" :min="0"></el-input-number> <el-input-number v-model="competitionRecord.guestTeam.twoNodeScore" @change="handleGuestTwoNodeChange" :min="0"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="第三节"> <el-form-item label="第三节">
<el-input-number v-model="competitionUnifiedRecord.competitionResultList[1].threeNodeScore" @change="handleGuestThreeNodeChange" :min="0"></el-input-number> <el-input-number v-model="competitionRecord.guestTeam.threeNodeScore" @change="handleGuestThreeNodeChange" :min="0"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="第四节"> <el-form-item label="第四节">
<el-input-number v-model="competitionUnifiedRecord.competitionResultList[1].fourNodeScore" @change="handleGuestFourNodeChange" :min="0"></el-input-number> <el-input-number v-model="competitionRecord.guestTeam.fourNodeScore" @change="handleGuestFourNodeChange" :min="0"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="第五节"> <el-form-item label="第五节">
<el-input-number v-model="competitionUnifiedRecord.competitionResultList[1].fiveNodeScore" @change="handleGuestFiveNodeChange" :min="0"></el-input-number> <el-input-number v-model="competitionRecord.guestTeam.fiveNodeScore" @change="handleGuestFiveNodeChange" :min="0"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="第六节"> <el-form-item label="第六节">
<el-input-number v-model="competitionUnifiedRecord.competitionResultList[1].sixNodeScore" @change="handleGuestSixNodeChange" :min="0" label="描述文字"></el-input-number> <el-input-number v-model="competitionRecord.guestTeam.sixNodeScore" @change="handleGuestSixNodeChange" :min="0" label="描述文字"></el-input-number>
</el-form-item> </el-form-item>
</el-main> </el-main>
</el-container> </el-container>
<el-row style="width: 100% ;text-align: center">
<el-button
type="primary"
icon="el-icon-check"
@click="handleTeamVsTeamRecordSave(competitionRecord)"
v-hasPermi="['system:competitionOfTeam:save']"
>数据保存</el-button>
<el-button
type="primary"
icon="el-icon-close"
@click="vsRecordOpen=false"
>取消</el-button>
</el-row>
</el-form> </el-form>
</div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@@ -493,8 +508,9 @@ import { listCompetition, getCompetition, delCompetition, addCompetition, update
import { listCompetitionOfTeam, batchEditById, intoTeamGroup, removeTeamGroup, updateCompetitionOfTeam } from "@/api/system/competitionOfTeam"; import { listCompetitionOfTeam, batchEditById, intoTeamGroup, removeTeamGroup, updateCompetitionOfTeam } from "@/api/system/competitionOfTeam";
import { listCompetitionMembers, getCompetitionMembers, delCompetitionMembers, addCompetitionMembers, updateCompetitionMembers } from "@/api/system/competitionMembers"; import { listCompetitionMembers, getCompetitionMembers, delCompetitionMembers, addCompetitionMembers, updateCompetitionMembers } from "@/api/system/competitionMembers";
import { listCompetitionTeamGroup, arrangeTeamGroupSchedule, delCompetitionTeamGroup, addCompetitionTeamGroup, updateCompetitionTeamGroup } from "@/api/system/competitionTeamGroup"; import { listCompetitionTeamGroup, arrangeTeamGroupSchedule, delCompetitionTeamGroup, addCompetitionTeamGroup, updateCompetitionTeamGroup } from "@/api/system/competitionTeamGroup";
import { listCompetitionTeamVsTeam, getCompetitionUnifiedRecord, delCompetitionTeamVsTeam, addCompetitionTeamVsTeam, updateCompetitionTeamVsTeam } from "@/api/system/competitionTeamVsTeam"; import { listCompetitionTeamVsTeam,getCompetitionVsRecordById, delCompetitionTeamVsTeam, addCompetitionTeamVsTeam, updateCompetitionTeamVsTeam } from "@/api/system/competitionTeamVsTeam";
import { listWxBuilding, getWxBuilding, delWxBuilding, addWxBuilding, updateWxBuilding } from "@/api/system/WxBuilding"; import { listWxBuilding, getWxBuilding, delWxBuilding, addWxBuilding, updateWxBuilding } from "@/api/system/WxBuilding";
import { listCompetitionResult, getCompetitionResult, delCompetitionResult, batchUpdateCompetitionResult, updateCompetitionResult } from "@/api/system/competitionResult";
export default { export default {
name: "CompetitionSet", name: "CompetitionSet",
@@ -551,26 +567,27 @@ export default {
buildLoading:false, buildLoading:false,
vsRecordTitle:"", vsRecordTitle:"",
vsRecordOpen:false, vsRecordOpen:false,
competitionUnifiedRecord:{ competitionRecord:{
competitionResultList:[ mainTeam:{
{ id:null,
fiveNodeScore: 0, fiveNodeScore: 0,
fourNodeScore: 0, fourNodeScore: 0,
oneNodeScore: 0, oneNodeScore: 0,
sixNodeScore: 0, sixNodeScore: 0,
threeNodeScore:0, threeNodeScore:0,
twoNodeScore: 0, twoNodeScore: 0,
membersScoreList:[]
}, },
{ guestTeam:{
fiveNodeScore: 0, id:null,
fourNodeScore: 0, fiveNodeScore: 0,
oneNodeScore: 0, fourNodeScore: 0,
sixNodeScore: 0, oneNodeScore: 0,
threeNodeScore:0, sixNodeScore: 0,
twoNodeScore: 0, threeNodeScore:0,
} twoNodeScore: 0,
], membersScoreList:[]
competitionMembersScoreList:[], },
teamVsTeamVo:{ teamVsTeamVo:{
competitionTime:null, competitionTime:null,
mainTeamName:null, mainTeamName:null,
@@ -897,8 +914,8 @@ export default {
this.vsRecordOpen=true; this.vsRecordOpen=true;
this.vsRecordTitle = "比赛数据记录"; this.vsRecordTitle = "比赛数据记录";
//获取比赛数据 //获取比赛数据
getCompetitionUnifiedRecord(row.id).then(response=>{ getCompetitionVsRecordById(row.id).then(response=>{
this.competitionUnifiedRecord = response.data this.competitionRecord = response.data
}) })
}, },
handleTeamVsTeamDel(row){ handleTeamVsTeamDel(row){
@@ -912,6 +929,13 @@ export default {
this.$modal.msgSuccess("删除赛程成功"); this.$modal.msgSuccess("删除赛程成功");
}).catch(() => {}); }).catch(() => {});
}, },
handleTeamVsTeamRecordSave(list){
batchUpdateCompetitionResult(list).then(response => {
this.$modal.msgSuccess("比赛结果记录成功");
this.vsRecordOpen = false;
});
console.info(data)
},
/** 提交按钮 */ /** 提交按钮 */
submitTeamVsTeamForm() { submitTeamVsTeamForm() {
this.$refs["vsform"].validate(valid => { this.$refs["vsform"].validate(valid => {
@@ -939,102 +963,102 @@ export default {
}); });
}, },
handleMainOneNodeChange(currentValue, oldValue){ handleMainOneNodeChange(currentValue, oldValue){
let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[0].twoNodeScore) let totalScore =currentValue + parseInt(this.competitionRecord.mainTeam.twoNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].threeNodeScore) + parseInt(this.competitionRecord.mainTeam.threeNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].fourNodeScore) + parseInt(this.competitionRecord.mainTeam.fourNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].fiveNodeScore) + parseInt(this.competitionRecord.mainTeam.fiveNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].sixNodeScore); + parseInt(this.competitionRecord.mainTeam.sixNodeScore);
this.competitionUnifiedRecord.teamVsTeamVo.mainTeamScore = totalScore; this.competitionRecord.teamVsTeamVo.mainTeamScore = totalScore;
}, },
handleMainTwoNodeChange(currentValue, oldValue){ handleMainTwoNodeChange(currentValue, oldValue){
let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[0].oneNodeScore) let totalScore =currentValue + parseInt(this.competitionRecord.mainTeam.oneNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].threeNodeScore) + parseInt(this.competitionRecord.mainTeam.threeNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].fourNodeScore) + parseInt(this.competitionRecord.mainTeam.fourNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].fiveNodeScore) + parseInt(this.competitionRecord.mainTeam.fiveNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].sixNodeScore); + parseInt(this.competitionRecord.mainTeam.sixNodeScore);
this.competitionUnifiedRecord.teamVsTeamVo.mainTeamScore = totalScore; this.competitionRecord.teamVsTeamVo.mainTeamScore = totalScore;
}, },
handleMainThreeNodeChange(currentValue, oldValue){ handleMainThreeNodeChange(currentValue, oldValue){
let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[0].oneNodeScore) let totalScore =currentValue + parseInt(this.competitionRecord.mainTeam.oneNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].twoNodeScore) + parseInt(this.competitionRecord.mainTeam.twoNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].fourNodeScore) + parseInt(this.competitionRecord.mainTeam.fourNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].fiveNodeScore) + parseInt(this.competitionRecord.mainTeam.fiveNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].sixNodeScore); + parseInt(this.competitionRecord.mainTeam.sixNodeScore);
this.competitionUnifiedRecord.teamVsTeamVo.mainTeamScore = totalScore; this.competitionRecord.teamVsTeamVo.mainTeamScore = totalScore;
}, },
handleMainFourNodeChange(currentValue, oldValue){ handleMainFourNodeChange(currentValue, oldValue){
let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[0].oneNodeScore) let totalScore =currentValue + parseInt(this.competitionRecord.mainTeam.oneNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].twoNodeScore) + parseInt(this.competitionRecord.mainTeam.twoNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].threeNodeScore) + parseInt(this.competitionRecord.mainTeam.threeNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].fiveNodeScore) + parseInt(this.competitionRecord.mainTeam.fiveNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].sixNodeScore); + parseInt(this.competitionRecord.mainTeam.sixNodeScore);
this.competitionUnifiedRecord.teamVsTeamVo.mainTeamScore = totalScore; this.competitionRecord.teamVsTeamVo.mainTeamScore = totalScore;
}, },
handleMainFiveNodeChange(currentValue, oldValue){ handleMainFiveNodeChange(currentValue, oldValue){
let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[0].oneNodeScore) let totalScore =currentValue + parseInt(this.competitionRecord.mainTeam.oneNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].twoNodeScore) + parseInt(this.competitionRecord.mainTeam.twoNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].fourNodeScore) + parseInt(this.competitionRecord.mainTeam.fourNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].threeNodeScore) + parseInt(this.competitionRecord.mainTeam.threeNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].sixNodeScore); + parseInt(this.competitionRecord.mainTeam.sixNodeScore);
this.competitionUnifiedRecord.teamVsTeamVo.mainTeamScore = totalScore; this.competitionRecord.teamVsTeamVo.mainTeamScore = totalScore;
}, },
handleMainSixNodeChange(currentValue, oldValue){ handleMainSixNodeChange(currentValue, oldValue){
let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[0].oneNodeScore) let totalScore =currentValue + parseInt(this.competitionRecord.mainTeam.oneNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].twoNodeScore) + parseInt(this.competitionRecord.mainTeam.twoNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].fourNodeScore) + parseInt(this.competitionRecord.mainTeam.fourNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].threeNodeScore) + parseInt(this.competitionRecord.mainTeam.threeNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[0].fiveNodeScore); + parseInt(this.competitionRecord.mainTeam.fiveNodeScore);
this.competitionUnifiedRecord.teamVsTeamVo.mainTeamScore = totalScore; this.competitionRecord.teamVsTeamVo.mainTeamScore = totalScore;
}, },
handleGuestOneNodeChange(currentValue, oldValue){ handleGuestOneNodeChange(currentValue, oldValue){
let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[1].twoNodeScore) let totalScore =currentValue + parseInt(this.competitionRecord.guestTeam.twoNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].threeNodeScore) + parseInt(this.competitionRecord.guestTeam.threeNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].fourNodeScore) + parseInt(this.competitionRecord.guestTeam.fourNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].fiveNodeScore) + parseInt(this.competitionRecord.guestTeam.fiveNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].sixNodeScore); + parseInt(this.competitionRecord.guestTeam.sixNodeScore);
this.competitionUnifiedRecord.teamVsTeamVo.guestTeamScore = totalScore; this.competitionRecord.teamVsTeamVo.guestTeamScore = totalScore;
}, },
handleGuestTwoNodeChange(currentValue, oldValue){ handleGuestTwoNodeChange(currentValue, oldValue){
let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[1].oneNodeScore) let totalScore =currentValue + parseInt(this.competitionRecord.guestTeam.oneNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].threeNodeScore) + parseInt(this.competitionRecord.guestTeam.threeNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].fourNodeScore) + parseInt(this.competitionRecord.guestTeam.fourNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].fiveNodeScore) + parseInt(this.competitionRecord.guestTeam.fiveNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].sixNodeScore); + parseInt(this.competitionRecord.guestTeam.sixNodeScore);
this.competitionUnifiedRecord.teamVsTeamVo.guestTeamScore = totalScore; this.competitionRecord.teamVsTeamVo.guestTeamScore = totalScore;
}, },
handleGuestThreeNodeChange(currentValue, oldValue){ handleGuestThreeNodeChange(currentValue, oldValue){
let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[1].oneNodeScore) let totalScore =currentValue + parseInt(this.competitionRecord.guestTeam.oneNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].twoNodeScore) + parseInt(this.competitionRecord.guestTeam.twoNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].fourNodeScore) + parseInt(this.competitionRecord.guestTeam.fourNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].fiveNodeScore) + parseInt(this.competitionRecord.guestTeam.fiveNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].sixNodeScore); + parseInt(this.competitionRecord.guestTeam.sixNodeScore);
this.competitionUnifiedRecord.teamVsTeamVo.guestTeamScore = totalScore; this.competitionRecord.teamVsTeamVo.guestTeamScore = totalScore;
}, },
handleGuestFiveNodeChange(currentValue, oldValue){ handleGuestFiveNodeChange(currentValue, oldValue){
let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[1].oneNodeScore) let totalScore =currentValue + parseInt(this.competitionRecord.guestTeam.oneNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].twoNodeScore) + parseInt(this.competitionRecord.guestTeam.twoNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].threeNodeScore) + parseInt(this.competitionRecord.guestTeam.threeNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].fourNodeScore) + parseInt(this.competitionRecord.guestTeam.fourNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].sixNodeScore); + parseInt(this.competitionRecord.guestTeam.sixNodeScore);
this.competitionUnifiedRecord.teamVsTeamVo.guestTeamScore = totalScore; this.competitionRecord.teamVsTeamVo.guestTeamScore = totalScore;
}, },
handleGuestSixNodeChange(currentValue, oldValue){ handleGuestSixNodeChange(currentValue, oldValue){
let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[1].oneNodeScore) let totalScore =currentValue + parseInt(this.competitionRecord.guestTeam.oneNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].twoNodeScore) + parseInt(this.competitionRecord.guestTeam.twoNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].threeNodeScore) + parseInt(this.competitionRecord.guestTeam.threeNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].fourNodeScore) + parseInt(this.competitionRecord.guestTeam.fourNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].fiveNodeScore); + parseInt(this.competitionRecord.guestTeam.fiveNodeScore);
this.competitionUnifiedRecord.teamVsTeamVo.guestTeamScore = totalScore; this.competitionRecord.teamVsTeamVo.guestTeamScore = totalScore;
}, },
handleGuestFourNodeChange(currentValue, oldValue){ handleGuestFourNodeChange(currentValue, oldValue){
let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[1].oneNodeScore) let totalScore =currentValue + parseInt(this.competitionRecord.guestTeam.oneNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].twoNodeScore) + parseInt(this.competitionRecord.guestTeam.twoNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].threeNodeScore) + parseInt(this.competitionRecord.guestTeam.threeNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].fiveNodeScore) + parseInt(this.competitionRecord.guestTeam.fiveNodeScore)
+ parseInt(this.competitionUnifiedRecord.competitionResultList[1].sixNodeScore); + parseInt(this.competitionRecord.guestTeam.sixNodeScore);
this.competitionUnifiedRecord.teamVsTeamVo.guestTeamScore = totalScore; this.competitionRecord.teamVsTeamVo.guestTeamScore = totalScore;
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
@@ -1052,7 +1076,13 @@ export default {
border-style: solid; border-style: solid;
border-color:#d3dce6; border-color:#d3dce6;
} }
.s-div {
background: white;
border-width: 1px 1px 1px 1px;
border-style: solid;
border-color:#d3dce6;
border-radius: 15px;
}
.item { .item {
margin-bottom: 18px; margin-bottom: 18px;
} }