From e94f9101f3c68b503078238d436498d89e56a61b Mon Sep 17 00:00:00 2001 From: wuyibo <771227828@qq.com> Date: Wed, 16 Nov 2022 10:58:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E4=BC=9A=E6=AF=94=E8=B5=9B=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionResultController.java | 8 +- .../CompetitionTeamVsTeamController.java | 7 + .../system/domain/vo/CompetitionResultVo.java | 19 ++ .../domain/vo/CompetitionUnifiedRecordVo.java | 2 +- .../domain/vo/CompetitionVsRecordVo.java | 26 ++ .../mapper/CompetitionResultMapper.java | 3 +- .../service/ICompetitionResultService.java | 2 + .../ICompetitionTeamVsTeamService.java | 3 + .../impl/CompetitionResultServiceImpl.java | 12 + .../CompetitionTeamVsTeamServiceImpl.java | 34 ++- .../system/CompetitionMembersScoreMapper.xml | 2 +- .../mapper/system/CompetitionResultMapper.xml | 2 +- ruoyi-ui/src/api/system/competitionResult.js | 8 +- .../src/api/system/competitionTeamVsTeam.js | 6 + .../src/views/system/competitionSet/index.vue | 244 ++++++++++-------- 15 files changed, 264 insertions(+), 114 deletions(-) create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionResultVo.java create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionVsRecordVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java index 52973656f..3a487c905 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java @@ -91,7 +91,13 @@ public class CompetitionResultController extends BaseController { return toAjax(competitionResultService.updateCompetitionResult(competitionResult)); } - + @RequiresPermissions("system:competitionResult:batchEdit") + @Log(title = "赛会中-批量保存赛程结果记录", businessType = BusinessType.UPDATE) + @PutMapping("/batchEdit") + public AjaxResult batchEdit(@RequestBody List list) + { + return toAjax(competitionResultService.batchUpdateCompetitionResult(list)); + } /** * 删除赛会中-赛程结果记录 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java index bd0c7f4c7..7c118fab2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java @@ -106,4 +106,11 @@ public class CompetitionTeamVsTeamController extends BaseController public AjaxResult getCompetitionUnifiedRecordById(@PathVariable("id") Long 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)); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionResultVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionResultVo.java new file mode 100644 index 000000000..37056c7cb --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionResultVo.java @@ -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 membersScoreList; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionUnifiedRecordVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionUnifiedRecordVo.java index c89d78a80..ba3a82d00 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionUnifiedRecordVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionUnifiedRecordVo.java @@ -18,7 +18,7 @@ public class CompetitionUnifiedRecordVo implements Serializable { private CompetitionTeamVsTeamVo teamVsTeamVo; @ApiModelProperty(value = "对阵节数统分数据", required = false) - private List competitionResultList; + private List competitionResultList; @ApiModelProperty(value = "赛程队员数据", required = false) private List competitionMembersScoreList; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionVsRecordVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionVsRecordVo.java new file mode 100644 index 000000000..e18026cc4 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionVsRecordVo.java @@ -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; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java index cb57769a1..b22cfe2c5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionResultMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.system.mapper; import java.util.List; import com.ruoyi.system.domain.CompetitionResult; +import com.ruoyi.system.domain.vo.CompetitionResultVo; import org.apache.ibatis.annotations.Param; /** @@ -60,5 +61,5 @@ public interface CompetitionResultMapper */ public int deleteCompetitionResultByIds(Long[] ids); - public List findByCompetitionVsId(@Param("competitionId") Long competitionId,@Param("competitionVsId") Long competitionVsId); + public List findByCompetitionVsId(@Param("competitionId") Long competitionId, @Param("competitionVsId") Long competitionVsId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java index e9a41122c..1bdb23e38 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionResultService.java @@ -58,4 +58,6 @@ public interface ICompetitionResultService * @return 结果 */ public int deleteCompetitionResultById(Long id); + + public int batchUpdateCompetitionResult(List list); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java index 733b3622c..d0b9537cb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionTeamVsTeamService.java @@ -4,6 +4,7 @@ import java.util.List; import com.ruoyi.system.domain.CompetitionTeamVsTeam; import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo; import com.ruoyi.system.domain.vo.CompetitionUnifiedRecordVo; +import com.ruoyi.system.domain.vo.CompetitionVsRecordVo; /** * 赛会中-球队VS球队关系Service接口 @@ -62,4 +63,6 @@ public interface ICompetitionTeamVsTeamService public int deleteCompetitionTeamVsTeamById(Long id); public CompetitionUnifiedRecordVo getCompetitionUnifiedRecordById(Long id); + + public CompetitionVsRecordVo getCompetitionVsRecordById(Long id); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java index cddcb0cf2..2c1df3556 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java @@ -90,4 +90,16 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService { return competitionResultMapper.deleteCompetitionResultById(id); } + + @Override + public int batchUpdateCompetitionResult(List list) { + for (CompetitionResult result:list){ + if(result.getId()==null){ + competitionResultMapper.insertCompetitionResult(result); + }else { + competitionResultMapper.updateCompetitionResult(result); + } + } + return 1; + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java index 26cbddd56..e6bc65e87 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java @@ -2,13 +2,17 @@ package com.ruoyi.system.service.impl; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; +import java.util.stream.Stream; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.system.domain.CompetitionMembersScore; 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.CompetitionUnifiedRecordVo; +import com.ruoyi.system.domain.vo.CompetitionVsRecordVo; import com.ruoyi.system.mapper.CompetitionMembersScoreMapper; import com.ruoyi.system.mapper.CompetitionResultMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -120,7 +124,7 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS unifiedRecordVo.setTeamVsTeamVo(competitionTeamVsTeamVo); //查询队伍数据 - List competitionResultList = competitionResultMapper.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId()); + List competitionResultList = competitionResultMapper.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId()); unifiedRecordVo.setCompetitionResultList(competitionResultList); //查询赛程中个人成绩 @@ -157,4 +161,32 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS } 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 competitionResultList = competitionResultMapper.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId()); + Optional main = competitionResultList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).findFirst(); + Optional guest = competitionResultList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).findFirst(); + List membersScoreList = competitionMembersScoreMapper.findMembersScoreByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId()); + if(main.isPresent()){ + CompetitionResultVo resultVo = main.get(); + List 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 membersScores = membersScoreList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).collect(Collectors.toList()); + resultVo.setMembersScoreList(membersScores); + recordVo.setGuestTeam(resultVo); + } + recordVo.setTeamVsTeamVo(competitionTeamVsTeamVo); + return recordVo; + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml index 6725b75de..70f8b692b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml @@ -76,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into competition_members_score diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml index 7ce8fc3c9..42398ec22 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml @@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - select rs.id, vs.competition_id as competitionId, vs.id as competitionVsId, diff --git a/ruoyi-ui/src/api/system/competitionResult.js b/ruoyi-ui/src/api/system/competitionResult.js index ba840cd32..3fdc8ed7c 100644 --- a/ruoyi-ui/src/api/system/competitionResult.js +++ b/ruoyi-ui/src/api/system/competitionResult.js @@ -34,7 +34,13 @@ export function updateCompetitionResult(data) { data: data }) } - +export function batchUpdateCompetitionResult(list) { + return request({ + url: '/system/competitionResult/batchEdit', + method: 'put', + data: list + }) +} // 删除赛会中-赛程结果记录 export function delCompetitionResult(id) { return request({ diff --git a/ruoyi-ui/src/api/system/competitionTeamVsTeam.js b/ruoyi-ui/src/api/system/competitionTeamVsTeam.js index 4864c0ee0..bb9a6f520 100644 --- a/ruoyi-ui/src/api/system/competitionTeamVsTeam.js +++ b/ruoyi-ui/src/api/system/competitionTeamVsTeam.js @@ -31,6 +31,12 @@ export function getCompetitionUnifiedRecord(id) { method: 'get' }) } +export function getCompetitionVsRecordById(id) { + return request({ + url: '/system/competitionTeamVsTeam/getCompetitionVsRecordById/' + id, + method: 'get' + }) +} // 修改赛会中-球队VS球队关系 export function updateCompetitionTeamVsTeam(data) { diff --git a/ruoyi-ui/src/views/system/competitionSet/index.vue b/ruoyi-ui/src/views/system/competitionSet/index.vue index 036d8cefb..676c342bf 100644 --- a/ruoyi-ui/src/views/system/competitionSet/index.vue +++ b/ruoyi-ui/src/views/system/competitionSet/index.vue @@ -424,66 +424,81 @@ - 比赛时间：{{ competitionUnifiedRecord.teamVsTeamVo.competitionTime }} {{ competitionUnifiedRecord.teamVsTeamVo.weekDayName }} + 比赛时间：{{ competitionRecord.teamVsTeamVo.competitionTime }} {{ competitionRecord.teamVsTeamVo.weekDayName }} +
- - {{competitionUnifiedRecord.teamVsTeamVo.mainTeamName}} + + {{competitionRecord.teamVsTeamVo.mainTeamName}} - {{competitionUnifiedRecord.teamVsTeamVo.mainTeamScore===null?0:competitionUnifiedRecord.teamVsTeamVo.mainTeamScore}}:{{competitionUnifiedRecord.teamVsTeamVo.guestTeamScore===null?0:competitionUnifiedRecord.teamVsTeamVo.guestTeamScore}} + {{competitionRecord.teamVsTeamVo.mainTeamScore===null?0:competitionRecord.teamVsTeamVo.mainTeamScore}}:{{competitionRecord.teamVsTeamVo.guestTeamScore===null?0:competitionRecord.teamVsTeamVo.guestTeamScore}} - - {{competitionUnifiedRecord.teamVsTeamVo.guestTeamName}} + + {{competitionRecord.teamVsTeamVo.guestTeamName}} - + - + - + - + - + - + - + - + - + - + - + - + + + 数据保存 + 取消 + +
@@ -493,8 +508,9 @@ import { listCompetition, getCompetition, delCompetition, addCompetition, update import { listCompetitionOfTeam, batchEditById, intoTeamGroup, removeTeamGroup, updateCompetitionOfTeam } from "@/api/system/competitionOfTeam"; import { listCompetitionMembers, getCompetitionMembers, delCompetitionMembers, addCompetitionMembers, updateCompetitionMembers } from "@/api/system/competitionMembers"; 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 { listCompetitionResult, getCompetitionResult, delCompetitionResult, batchUpdateCompetitionResult, updateCompetitionResult } from "@/api/system/competitionResult"; export default { name: "CompetitionSet", @@ -551,26 +567,27 @@ export default { buildLoading:false, vsRecordTitle:"", vsRecordOpen:false, - competitionUnifiedRecord:{ - competitionResultList:[ - { + competitionRecord:{ + mainTeam:{ + id:null, fiveNodeScore: 0, fourNodeScore: 0, oneNodeScore: 0, sixNodeScore: 0, threeNodeScore:0, twoNodeScore: 0, + membersScoreList:[] }, - { - fiveNodeScore: 0, - fourNodeScore: 0, - oneNodeScore: 0, - sixNodeScore: 0, - threeNodeScore:0, - twoNodeScore: 0, - } - ], - competitionMembersScoreList:[], + guestTeam:{ + id:null, + fiveNodeScore: 0, + fourNodeScore: 0, + oneNodeScore: 0, + sixNodeScore: 0, + threeNodeScore:0, + twoNodeScore: 0, + membersScoreList:[] + }, teamVsTeamVo:{ competitionTime:null, mainTeamName:null, @@ -897,8 +914,8 @@ export default { this.vsRecordOpen=true; this.vsRecordTitle = "比赛数据记录"; //获取比赛数据 - getCompetitionUnifiedRecord(row.id).then(response=>{ - this.competitionUnifiedRecord = response.data + getCompetitionVsRecordById(row.id).then(response=>{ + this.competitionRecord = response.data }) }, handleTeamVsTeamDel(row){ @@ -912,6 +929,13 @@ export default { this.$modal.msgSuccess("删除赛程成功"); }).catch(() => {}); }, + handleTeamVsTeamRecordSave(list){ + batchUpdateCompetitionResult(list).then(response => { + this.$modal.msgSuccess("比赛结果记录成功"); + this.vsRecordOpen = false; + }); + console.info(data) + }, /** 提交按钮 */ submitTeamVsTeamForm() { this.$refs["vsform"].validate(valid => { @@ -939,102 +963,102 @@ export default { }); }, handleMainOneNodeChange(currentValue, oldValue){ - let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[0].twoNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].threeNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].fourNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].fiveNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].sixNodeScore); - this.competitionUnifiedRecord.teamVsTeamVo.mainTeamScore = totalScore; + let totalScore =currentValue + parseInt(this.competitionRecord.mainTeam.twoNodeScore) + + parseInt(this.competitionRecord.mainTeam.threeNodeScore) + + parseInt(this.competitionRecord.mainTeam.fourNodeScore) + + parseInt(this.competitionRecord.mainTeam.fiveNodeScore) + + parseInt(this.competitionRecord.mainTeam.sixNodeScore); + this.competitionRecord.teamVsTeamVo.mainTeamScore = totalScore; }, handleMainTwoNodeChange(currentValue, oldValue){ - let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[0].oneNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].threeNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].fourNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].fiveNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].sixNodeScore); - this.competitionUnifiedRecord.teamVsTeamVo.mainTeamScore = totalScore; + let totalScore =currentValue + parseInt(this.competitionRecord.mainTeam.oneNodeScore) + + parseInt(this.competitionRecord.mainTeam.threeNodeScore) + + parseInt(this.competitionRecord.mainTeam.fourNodeScore) + + parseInt(this.competitionRecord.mainTeam.fiveNodeScore) + + parseInt(this.competitionRecord.mainTeam.sixNodeScore); + this.competitionRecord.teamVsTeamVo.mainTeamScore = totalScore; }, handleMainThreeNodeChange(currentValue, oldValue){ - let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[0].oneNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].twoNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].fourNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].fiveNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].sixNodeScore); - this.competitionUnifiedRecord.teamVsTeamVo.mainTeamScore = totalScore; + let totalScore =currentValue + parseInt(this.competitionRecord.mainTeam.oneNodeScore) + + parseInt(this.competitionRecord.mainTeam.twoNodeScore) + + parseInt(this.competitionRecord.mainTeam.fourNodeScore) + + parseInt(this.competitionRecord.mainTeam.fiveNodeScore) + + parseInt(this.competitionRecord.mainTeam.sixNodeScore); + this.competitionRecord.teamVsTeamVo.mainTeamScore = totalScore; }, handleMainFourNodeChange(currentValue, oldValue){ - let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[0].oneNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].twoNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].threeNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].fiveNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].sixNodeScore); - this.competitionUnifiedRecord.teamVsTeamVo.mainTeamScore = totalScore; + let totalScore =currentValue + parseInt(this.competitionRecord.mainTeam.oneNodeScore) + + parseInt(this.competitionRecord.mainTeam.twoNodeScore) + + parseInt(this.competitionRecord.mainTeam.threeNodeScore) + + parseInt(this.competitionRecord.mainTeam.fiveNodeScore) + + parseInt(this.competitionRecord.mainTeam.sixNodeScore); + this.competitionRecord.teamVsTeamVo.mainTeamScore = totalScore; }, handleMainFiveNodeChange(currentValue, oldValue){ - let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[0].oneNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].twoNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].fourNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].threeNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].sixNodeScore); - this.competitionUnifiedRecord.teamVsTeamVo.mainTeamScore = totalScore; + let totalScore =currentValue + parseInt(this.competitionRecord.mainTeam.oneNodeScore) + + parseInt(this.competitionRecord.mainTeam.twoNodeScore) + + parseInt(this.competitionRecord.mainTeam.fourNodeScore) + + parseInt(this.competitionRecord.mainTeam.threeNodeScore) + + parseInt(this.competitionRecord.mainTeam.sixNodeScore); + this.competitionRecord.teamVsTeamVo.mainTeamScore = totalScore; }, handleMainSixNodeChange(currentValue, oldValue){ - let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[0].oneNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].twoNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].fourNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].threeNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[0].fiveNodeScore); - this.competitionUnifiedRecord.teamVsTeamVo.mainTeamScore = totalScore; + let totalScore =currentValue + parseInt(this.competitionRecord.mainTeam.oneNodeScore) + + parseInt(this.competitionRecord.mainTeam.twoNodeScore) + + parseInt(this.competitionRecord.mainTeam.fourNodeScore) + + parseInt(this.competitionRecord.mainTeam.threeNodeScore) + + parseInt(this.competitionRecord.mainTeam.fiveNodeScore); + this.competitionRecord.teamVsTeamVo.mainTeamScore = totalScore; }, handleGuestOneNodeChange(currentValue, oldValue){ - let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[1].twoNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].threeNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].fourNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].fiveNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].sixNodeScore); - this.competitionUnifiedRecord.teamVsTeamVo.guestTeamScore = totalScore; + let totalScore =currentValue + parseInt(this.competitionRecord.guestTeam.twoNodeScore) + + parseInt(this.competitionRecord.guestTeam.threeNodeScore) + + parseInt(this.competitionRecord.guestTeam.fourNodeScore) + + parseInt(this.competitionRecord.guestTeam.fiveNodeScore) + + parseInt(this.competitionRecord.guestTeam.sixNodeScore); + this.competitionRecord.teamVsTeamVo.guestTeamScore = totalScore; }, handleGuestTwoNodeChange(currentValue, oldValue){ - let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[1].oneNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].threeNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].fourNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].fiveNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].sixNodeScore); - this.competitionUnifiedRecord.teamVsTeamVo.guestTeamScore = totalScore; + let totalScore =currentValue + parseInt(this.competitionRecord.guestTeam.oneNodeScore) + + parseInt(this.competitionRecord.guestTeam.threeNodeScore) + + parseInt(this.competitionRecord.guestTeam.fourNodeScore) + + parseInt(this.competitionRecord.guestTeam.fiveNodeScore) + + parseInt(this.competitionRecord.guestTeam.sixNodeScore); + this.competitionRecord.teamVsTeamVo.guestTeamScore = totalScore; }, handleGuestThreeNodeChange(currentValue, oldValue){ - let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[1].oneNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].twoNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].fourNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].fiveNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].sixNodeScore); - this.competitionUnifiedRecord.teamVsTeamVo.guestTeamScore = totalScore; + let totalScore =currentValue + parseInt(this.competitionRecord.guestTeam.oneNodeScore) + + parseInt(this.competitionRecord.guestTeam.twoNodeScore) + + parseInt(this.competitionRecord.guestTeam.fourNodeScore) + + parseInt(this.competitionRecord.guestTeam.fiveNodeScore) + + parseInt(this.competitionRecord.guestTeam.sixNodeScore); + this.competitionRecord.teamVsTeamVo.guestTeamScore = totalScore; }, handleGuestFiveNodeChange(currentValue, oldValue){ - let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[1].oneNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].twoNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].threeNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].fourNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].sixNodeScore); - this.competitionUnifiedRecord.teamVsTeamVo.guestTeamScore = totalScore; + let totalScore =currentValue + parseInt(this.competitionRecord.guestTeam.oneNodeScore) + + parseInt(this.competitionRecord.guestTeam.twoNodeScore) + + parseInt(this.competitionRecord.guestTeam.threeNodeScore) + + parseInt(this.competitionRecord.guestTeam.fourNodeScore) + + parseInt(this.competitionRecord.guestTeam.sixNodeScore); + this.competitionRecord.teamVsTeamVo.guestTeamScore = totalScore; }, handleGuestSixNodeChange(currentValue, oldValue){ - let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[1].oneNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].twoNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].threeNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].fourNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].fiveNodeScore); - this.competitionUnifiedRecord.teamVsTeamVo.guestTeamScore = totalScore; + let totalScore =currentValue + parseInt(this.competitionRecord.guestTeam.oneNodeScore) + + parseInt(this.competitionRecord.guestTeam.twoNodeScore) + + parseInt(this.competitionRecord.guestTeam.threeNodeScore) + + parseInt(this.competitionRecord.guestTeam.fourNodeScore) + + parseInt(this.competitionRecord.guestTeam.fiveNodeScore); + this.competitionRecord.teamVsTeamVo.guestTeamScore = totalScore; }, handleGuestFourNodeChange(currentValue, oldValue){ - let totalScore =currentValue + parseInt(this.competitionUnifiedRecord.competitionResultList[1].oneNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].twoNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].threeNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].fiveNodeScore) - + parseInt(this.competitionUnifiedRecord.competitionResultList[1].sixNodeScore); - this.competitionUnifiedRecord.teamVsTeamVo.guestTeamScore = totalScore; + let totalScore =currentValue + parseInt(this.competitionRecord.guestTeam.oneNodeScore) + + parseInt(this.competitionRecord.guestTeam.twoNodeScore) + + parseInt(this.competitionRecord.guestTeam.threeNodeScore) + + parseInt(this.competitionRecord.guestTeam.fiveNodeScore) + + parseInt(this.competitionRecord.guestTeam.sixNodeScore); + this.competitionRecord.teamVsTeamVo.guestTeamScore = totalScore; }, /** 导出按钮操作 */ handleExport() { @@ -1052,7 +1076,13 @@ export default { border-style: solid; border-color:#d3dce6; } - +.s-div { + background: white; + border-width: 1px 1px 1px 1px; + border-style: solid; + border-color:#d3dce6; + border-radius: 15px; +} .item { margin-bottom: 18px; }