diff --git a/ruoyi-ui/src/api/system/competitionResult.js b/ruoyi-ui/src/api/system/competitionResult.js index 3fdc8ed7..08ddcf0a 100644 --- a/ruoyi-ui/src/api/system/competitionResult.js +++ b/ruoyi-ui/src/api/system/competitionResult.js @@ -41,6 +41,14 @@ export function batchUpdateCompetitionResult(list) { data: list }) } +export function editDataCompetitionResult(data) { + return request({ + url: '/system/competitionResult/editData', + method: 'put', + data: data + }) +} + // 删除赛会中-赛程结果记录 export function delCompetitionResult(id) { return request({ diff --git a/ruoyi-ui/src/views/system/competitionSet/index.vue b/ruoyi-ui/src/views/system/competitionSet/index.vue index 775c037b..f1282d27 100644 --- a/ruoyi-ui/src/views/system/competitionSet/index.vue +++ b/ruoyi-ui/src/views/system/competitionSet/index.vue @@ -423,6 +423,8 @@ + + 比赛时间:{{ competitionRecord.teamVsTeamVo.competitionTime }} {{ competitionRecord.teamVsTeamVo.weekDayName }} @@ -441,7 +443,6 @@ {{competitionRecord.teamVsTeamVo.guestTeamName}} - @@ -497,8 +498,9 @@ @click="vsRecordOpen=false" >取消 - + + @@ -510,7 +512,7 @@ import { listCompetitionMembers, getCompetitionMembers, delCompetitionMembers, a import { listCompetitionTeamGroup, arrangeTeamGroupSchedule, delCompetitionTeamGroup, addCompetitionTeamGroup, updateCompetitionTeamGroup } from "@/api/system/competitionTeamGroup"; 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"; +import { listCompetitionResult, getCompetitionResult, editDataCompetitionResult, batchUpdateCompetitionResult, updateCompetitionResult } from "@/api/system/competitionResult"; export default { name: "CompetitionSet", @@ -562,6 +564,7 @@ export default { { required: true, message: "比赛类型不能为空", trigger: "blur" } ] }, + skeletonLoading:false, vsOpen:false, buildingList: [], buildLoading:false, @@ -912,11 +915,13 @@ export default { this.vsTitle = "编辑赛程" }, handleTeamVsTeamRecord(row){ + this.skeletonLoading = true; this.vsRecordOpen=true; this.vsRecordTitle = "比赛数据记录"; //获取比赛数据 getCompetitionVsRecordById(row.id).then(response=>{ - this.competitionRecord = response.data + this.competitionRecord = response.data; + this.skeletonLoading = false }) }, handleTeamVsTeamDel(row){ @@ -931,14 +936,13 @@ export default { }).catch(() => {}); }, handleTeamVsTeamRecordSave(){ - let list2 = []; - list2.push(this.competitionRecord.mainTeam); - list2.push(this.competitionRecord.guestTeam); - batchUpdateCompetitionResult(list2).then(response => { + editDataCompetitionResult(this.competitionRecord).then(response => { this.$modal.msgSuccess("比赛结果记录成功"); this.vsRecordOpen = false; + listCompetitionTeamVsTeam({"orderByColumn":"competition_time","pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => { + this.competitionTeamVsTeamList = response.rows; + }); }); - console.info(list2) }, /** 提交按钮 */ submitTeamVsTeamForm() {