diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionTeamVsTeamVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionTeamVsTeamVo.java index 5cc3591e..4feb7fcb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionTeamVsTeamVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionTeamVsTeamVo.java @@ -3,6 +3,7 @@ package com.ruoyi.system.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.system.domain.CompetitionTeamVsTeam; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -14,6 +15,14 @@ import java.util.Date; */ @Data public class CompetitionTeamVsTeamVo extends CompetitionTeamVsTeam { + @ApiModelProperty(value = "主队logo", required = false) + private String mainTeamLogo; + + @ApiModelProperty(value = "客队logo", required = false) + private String guestTeamLogo; + + @ApiModelProperty(value = "中文状态", required = false) + private String statusName; @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "比赛时间", width = 30, dateFormat = "yyyy-MM-dd") private Date competitionDate; diff --git a/ruoyi-ui/src/views/system/competitionSet/index.vue b/ruoyi-ui/src/views/system/competitionSet/index.vue index 9493cbea..6fbb1f6d 100644 --- a/ruoyi-ui/src/views/system/competitionSet/index.vue +++ b/ruoyi-ui/src/views/system/competitionSet/index.vue @@ -422,17 +422,68 @@ - + -
{{ competitionUnifiedRecord.teamVsTeamVo.competitionTime }}
+ 比赛时间:{{ competitionUnifiedRecord.teamVsTeamVo.competitionTime }} {{ competitionUnifiedRecord.teamVsTeamVo.weekDayName }}
-
{{competitionUnifiedRecord.teamVsTeamVo.mainTeamName}}
-
{{competitionUnifiedRecord.teamVsTeamVo.mainTeamScore}} : - {{competitionUnifiedRecord.teamVsTeamVo.guestTeamScore}} -
-
{{competitionUnifiedRecord.teamVsTeamVo.guestTeamName}}
+ + + {{competitionUnifiedRecord.teamVsTeamVo.mainTeamName}} + + + + {{competitionUnifiedRecord.teamVsTeamVo.mainTeamScore}}:{{competitionUnifiedRecord.teamVsTeamVo.guestTeamScore}} + + + + {{competitionUnifiedRecord.teamVsTeamVo.guestTeamName}} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -506,7 +557,8 @@ export default { mainTeamName:null, guestTeamName: null, mainTeamScore:null, - guestTeamScore:null + guestTeamScore:null, + weekDayName:null }, } }; @@ -887,17 +939,11 @@ export default { };