msb-public-java
/
RuoYi-Cloud
mirror of https://gitee.com/y_project/RuoYi-Cloud.git
1
0
Code Issues Projects Releases Wiki Activity

赛会选择球队2

Browse Source
pull/371/head
wuyibo 3 years ago
parent 8c7b52353c
commit 4d0c485193
7 changed files with 162 additions and 287 deletions
Show Stats Download Patch File Download Diff File

14
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersScoreVo.java
Unescape View File

@ -0,0 +1,14 @@
package com.ruoyi.system.domain.vo;
import com.ruoyi.system.domain.CompetitionMembersScore;
import lombok.Data;
/**
* @author 吴一博
* @date 2022年11月16日 14:43
* @Description
*/
@Data
public class CompetitionMembersScoreVo extends CompetitionMembersScore {
private String realName;
}

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamGroupServiceImpl.java
Unescape View File

@ -130,10 +130,10 @@ public class CompetitionTeamGroupServiceImpl implements ICompetitionTeamGroupSer
} }
//获取比赛时间 //获取比赛时间
Competition competition = competitionMapper.selectCompetitionById(teamGroup.getCompetitionId()); Competition competition = competitionMapper.selectCompetitionById(teamGroup.getCompetitionId());
Date competitionBeginTime = competition.getCompetitionBeginTime(); Date competitionBeginTime = new Date();
Calendar calendar = new GregorianCalendar(); Calendar calendar = new GregorianCalendar();
calendar.setTime(competitionBeginTime); calendar.setTime(competitionBeginTime);
calendar.add(Calendar.DATE,1); //把日期往后增加一天,整数 往后推,负数往前移动 calendar.add(Calendar.DATE,5); //把日期往后增加一天,整数 往后推,负数往前移动
//按报名优先级来排序 //按报名优先级来排序
CompetitionOfTeam ofTeam = new CompetitionOfTeam(); CompetitionOfTeam ofTeam = new CompetitionOfTeam();
ofTeam.setCompetitionId(teamGroup.getCompetitionId()); ofTeam.setCompetitionId(teamGroup.getCompetitionId());

25
ruoyi-ui/src/views/system/WxBuilding/index.vue
Unescape View File

@ -169,28 +169,6 @@
<!-- 添加或修改球场管理对话框 --> <!-- 添加或修改球场管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="创建时间" prop="createdTime">
<el-date-picker clearable
v-model="form.createdTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="创建人" prop="createdBy">
<el-input v-model="form.createdBy" placeholder="请输入创建人" />
</el-form-item>
<el-form-item label="更新人" prop="modifiedBy">
<el-input v-model="form.modifiedBy" placeholder="请输入更新人" />
</el-form-item>
<el-form-item label="更新时间" prop="lastUpdatedTime">
<el-date-picker clearable
v-model="form.lastUpdatedTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择更新时间">
</el-date-picker>
</el-form-item>
<el-form-item label="名称" prop="buildingName"> <el-form-item label="名称" prop="buildingName">
<el-input v-model="form.buildingName" placeholder="请输入名称" /> <el-input v-model="form.buildingName" placeholder="请输入名称" />
</el-form-item> </el-form-item>
@ -236,9 +214,6 @@
<el-form-item label="微信管理员二维码路径" prop="chatGroupUrl"> <el-form-item label="微信管理员二维码路径" prop="chatGroupUrl">
<el-input v-model="form.chatGroupUrl" placeholder="请输入微信管理员二维码路径" /> <el-input v-model="form.chatGroupUrl" placeholder="请输入微信管理员二维码路径" />
</el-form-item> </el-form-item>
<el-form-item label="创建人ID" prop="createdId">
<el-input v-model="form.createdId" placeholder="请输入创建人ID" />
</el-form-item>
<el-form-item label="描述" prop="desc"> <el-form-item label="描述" prop="desc">
<el-input v-model="form.desc" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.desc" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>

28
ruoyi-ui/src/views/system/basketBallTeam/index.vue
Unescape View File

@ -144,31 +144,6 @@
<!-- 添加或修改球队管理对话框 --> <!-- 添加或修改球队管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="删除" prop="isDeleted">
<el-input v-model="form.isDeleted" placeholder="请输入删除" />
</el-form-item>
<el-form-item label="创建时间" prop="createdTime">
<el-date-picker clearable
v-model="form.createdTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="创建人" prop="createdBy">
<el-input v-model="form.createdBy" placeholder="请输入创建人" />
</el-form-item>
<el-form-item label="更新人" prop="modifiedBy">
<el-input v-model="form.modifiedBy" placeholder="请输入更新人" />
</el-form-item>
<el-form-item label="更新时间" prop="lastUpdatedTime">
<el-date-picker clearable
v-model="form.lastUpdatedTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择更新时间">
</el-date-picker>
</el-form-item>
<el-form-item label="球队名称" prop="teamName"> <el-form-item label="球队名称" prop="teamName">
<el-input v-model="form.teamName" placeholder="请输入球队名称" /> <el-input v-model="form.teamName" placeholder="请输入球队名称" />
</el-form-item> </el-form-item>
@ -187,9 +162,6 @@
<el-form-item label="球馆名称" prop="buildingName"> <el-form-item label="球馆名称" prop="buildingName">
<el-input v-model="form.buildingName" placeholder="请输入球馆名称" /> <el-input v-model="form.buildingName" placeholder="请输入球馆名称" />
</el-form-item> </el-form-item>
<el-form-item label="创建人ID" prop="createdId">
<el-input v-model="form.createdId" placeholder="请输入创建人ID" />
</el-form-item>
<el-form-item label="球队联系人电话" prop="contactTel"> <el-form-item label="球队联系人电话" prop="contactTel">
<el-input v-model="form.contactTel" placeholder="请输入球队联系人电话" /> <el-input v-model="form.contactTel" placeholder="请输入球队联系人电话" />
</el-form-item> </el-form-item>

250
ruoyi-ui/src/views/system/competition/index.vue
Unescape View File

@ -209,7 +209,7 @@
icon="el-icon-setting" icon="el-icon-setting"
@click="handleCompetitionSet(scope.row)" @click="handleCompetitionSet(scope.row)"
v-hasPermi="['system:competition:edit']" v-hasPermi="['system:competition:edit']"
>赛会设置</el-button> >设置</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -223,153 +223,93 @@
/> />
<!-- 添加或修改比赛信息对话框 --> <!-- 添加或修改比赛信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="主队ID" prop="mainTeamId"> <el-form-item label="比赛名称" prop="competitionName" >
<el-input v-model="form.mainTeamId" placeholder="请输入主队ID" /> <el-input v-model="form.competitionName" disabled />
</el-form-item> </el-form-item>
<el-form-item label="主队名" prop="mainTeamName"> <el-form-item label="比赛球场" prop="buildingName">
<el-input v-model="form.mainTeamName" placeholder="请输入主队名" /> <el-select v-model="form.buildingName" filterable @change="changeBuildName" remote reserve-keyword
</el-form-item> placeholder="请输入球场名称" :remote-method="remoteMethod" :loading="buildLoading">
<el-form-item label="客队ID" prop="guestTeamId"> <el-option
<el-input v-model="form.guestTeamId" placeholder="请输入客队ID" /> v-for="item in buildingList"
</el-form-item> :key="item.id"
<el-form-item label="客队名" prop="guestTeamName"> :label="item.buildingName"
<el-input v-model="form.guestTeamName" placeholder="请输入客队名" /> :value="item.id">
</el-form-item> </el-option>
<el-form-item label="赛事编号" prop="competitionCode"> </el-select>
<el-input v-model="form.competitionCode" placeholder="请输入赛事编号" />
</el-form-item>
<el-form-item label="比赛名称" prop="competitionName">
<el-input v-model="form.competitionName" placeholder="请输入比赛名称" />
</el-form-item>
<el-form-item label="是否指定对手" prop="designated">
<el-input v-model="form.designated" placeholder="请输入是否指定对手" />
</el-form-item>
<el-form-item label="比赛时间" prop="competitionTime">
<el-date-picker clearable
v-model="form.competitionTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择比赛时间">
</el-date-picker>
</el-form-item>
<el-form-item label="球场ID" prop="buildingId">
<el-input v-model="form.buildingId" placeholder="请输入球场ID" />
</el-form-item>
<el-form-item label="球场名称" prop="buildingName">
<el-input v-model="form.buildingName" placeholder="请输入球场名称" />
</el-form-item> </el-form-item>
<el-form-item label="比赛地址" prop="competitionAddress"> <el-form-item label="比赛地址" prop="competitionAddress">
<el-input v-model="form.competitionAddress" placeholder="请输入比赛地址" /> <el-input v-model="form.competitionAddress" disabled />
</el-form-item>
<el-form-item label="发起人ID" prop="founder">
<el-input v-model="form.founder" placeholder="请输入发起人ID" />
</el-form-item>
<el-form-item label="城市编码" prop="cityCode">
<el-input v-model="form.cityCode" placeholder="请输入城市编码" />
</el-form-item>
<el-form-item label="城市名称" prop="cityName">
<el-input v-model="form.cityName" placeholder="请输入城市名称" />
</el-form-item> </el-form-item>
<el-form-item label="最大参与人数" prop="maxPlayer"> <el-form-item label="报名开始时间" prop="enrollBeginTime">
<el-input v-model="form.maxPlayer" placeholder="请输入最大参与人数" />
</el-form-item>
<el-form-item label="创建时间" prop="createdTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.createdTime" v-model="form.enrollBeginTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择创建时间"> placeholder="请选择报名开始时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="最后修改时间" prop="lastUpdatedTime"> <el-form-item label="报名结束时间" prop="enrollEndTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.lastUpdatedTime" v-model="form.enrollEndTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择最后修改时间"> placeholder="请选择报名结束时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="创建人" prop="createdBy"> <el-form-item label="比赛开始时间" prop="competitionBeginTime">
<el-input v-model="form.createdBy" placeholder="请输入创建人" />
</el-form-item>
<el-form-item label="最后修改人" prop="modifiedBy">
<el-input v-model="form.modifiedBy" placeholder="请输入最后修改人" />
</el-form-item>
<el-form-item label="是否删除" prop="isDeleted">
<el-input v-model="form.isDeleted" placeholder="请输入是否删除" />
</el-form-item>
<el-form-item label="经度" prop="longitude">
<el-input v-model="form.longitude" placeholder="请输入经度" />
</el-form-item>
<el-form-item label="纬度" prop="latitude">
<el-input v-model="form.latitude" placeholder="请输入纬度" />
</el-form-item>
<el-form-item label="备注说明" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="比赛性质" prop="competitionNature">
<el-input v-model="form.competitionNature" placeholder="请输入比赛性质" />
</el-form-item>
<el-form-item label="报名开始时间" prop="enrollBeginTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.enrollBeginTime" v-model="form.competitionBeginTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择报名开始时间"> placeholder="请选择比赛开始时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="报名结束时间" prop="enrollEndTime"> <el-form-item label="比赛结束时间" prop="competitionEndTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.enrollEndTime" v-model="form.competitionEndTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择报名结束时间"> placeholder="请选择比赛结束时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="赛事联系人" prop="contacts"> <el-form-item label="赛事联系人" prop="contacts">
<el-input v-model="form.contacts" placeholder="请输入赛事联系人" /> <el-input v-model="form.contacts" placeholder="请输入赛事联系人" />
</el-form-item> </el-form-item>
<el-form-item label="赛事联系人电话区号" prop="contactsAreaCode">
<el-input v-model="form.contactsAreaCode" placeholder="请输入赛事联系人电话区号" />
</el-form-item>
<el-form-item label="赛事联系人电话" prop="contactsTel"> <el-form-item label="赛事联系人电话" prop="contactsTel">
<el-input v-model="form.contactsTel" placeholder="请输入赛事联系人电话" /> <el-input v-model="form.contactsTel" placeholder="请输入赛事联系人电话" />
</el-form-item> </el-form-item>
<el-form-item label="比赛开始时间" prop="competitionBeginTime">
<el-date-picker clearable
v-model="form.competitionBeginTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择比赛开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="比赛结束时间" prop="competitionEndTime">
<el-date-picker clearable
v-model="form.competitionEndTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择比赛结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="主办方" prop="organizer"> <el-form-item label="主办方" prop="organizer">
<el-input v-model="form.organizer" placeholder="请输入主办方" /> <el-input v-model="form.organizer" placeholder="请输入主办方" />
</el-form-item> </el-form-item>
<el-form-item label="承办方" prop="undertake"> <el-form-item label="承办方" prop="undertake">
<el-input v-model="form.undertake" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.undertake" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
<el-form-item label="赛会背景图" prop="competitionBackImg"> <el-form-item label="赞助商" prop="sponsor">
<el-input v-model="form.competitionBackImg" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.sponsor" type="textarea" placeholder="请输入赞助商" />
</el-form-item>
<el-form-item label="创建人userId" prop="createdId">
<el-input v-model="form.createdId" placeholder="请输入创建人userId" />
</el-form-item> </el-form-item>
<el-form-item label="身高隐藏 0不隐藏 1=隐藏" prop="heightHide"> <el-form-item label="赛会背景图" prop="competitionBackImg">
<el-input v-model="form.heightHide" placeholder="请输入身高隐藏 0不隐藏 1=隐藏" /> <el-upload
multiple
class="avatar-uploader"
action="https://adu.shjmall.cn/liguanghui/file/uploadMore"
:show-file-list="false"
name="files"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<img v-if="imageUrl" :src="imageUrl" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
<el-form-item label="身高" prop="heightHide">
<el-select v-model="form.heightHide" >
<el-option label="隐藏" :value="1"/>
<el-option label="显示" :value="0" />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="赞助商" prop="sponsor"> <el-form-item label="备注说明" prop="remark">
<el-input v-model="form.sponsor" placeholder="请输入赞助商" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -382,6 +322,7 @@
<script> <script>
import { listCompetition, getCompetition, delCompetition, addCompetition, updateCompetition } from "@/api/system/competition"; import { listCompetition, getCompetition, delCompetition, addCompetition, updateCompetition } from "@/api/system/competition";
import {listWxBuilding} from "@/api/system/WxBuilding";
export default { export default {
name: "Competition", name: "Competition",
@ -389,6 +330,7 @@ export default {
data() { data() {
return { return {
imgfit:"fill", imgfit:"fill",
imageUrl:null,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -404,8 +346,10 @@ export default {
total: 0, total: 0,
// 比赛信息表格数据 // 比赛信息表格数据
competitionList: [], competitionList: [],
buildingList:[],
// 弹出层标题 // 弹出层标题
title: "", title: "",
buildLoading:false,
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 查询参数 // 查询参数
@ -472,6 +416,45 @@ export default {
this.open = false; this.open = false;
this.reset(); this.reset();
}, },
handleAvatarSuccess(res, file) {
this.imageUrl = URL.createObjectURL(file.raw);
let imgUrl = res.data[0];
this.form.competitionBackImg = "https://adu.shjmall.cn/liguanghui/image/"+imgUrl;
},
beforeAvatarUpload(file) {
console.info(file.type)
const isJPG = (file.type === 'image/jpeg'||file.type === 'image/png');
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isJPG) {
this.$message.error('上传头像图片只能是 JPG/PNG 格式!');
}
if (!isLt2M) {
this.$message.error('上传头像图片大小不能超过 2MB!');
}
return isJPG && isLt2M;
},
changeBuildName(val){
let obj={}
obj = this.buildingList.find(function(i){
return i.id ===val
});
this.form.buildingName = obj.buildingName;
this.form.buildingId = val;
this.form.competitionAddress=obj.address ;
console.info(this.form)
},
//远程查询球场信息
remoteMethod(query) {
this.buildLoading = true;
let queryParam = {
"pageNum": 1, "pageSize": 30,"status":2,"isDeleted":0,"buildingName":query
}
listWxBuilding(queryParam).then(response => {
this.buildingList = response.rows;
this.buildLoading = false;
});
},
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
@ -539,7 +522,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加比赛信息"; this.title = "添加赛会信息";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
@ -548,7 +531,7 @@ export default {
getCompetition(id).then(response => { getCompetition(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改比赛信息"; this.title = "修改赛会信息";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
@ -595,3 +578,28 @@ export default {
} }
}; };
</script> </script>
<style>
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409EFF;
}
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 178px;
height: 178px;
line-height: 178px;
text-align: center;
}
.avatar {
width: 178px;
height: 178px;
display: block;
}
</style>

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

@ -71,18 +71,16 @@
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status" > <el-table-column label="状态" align="center" prop="status" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.status==0">申请</el-tag> <el-tag v-if="scope.row.status===0" style="color: #0656fa;">申请中</el-tag>
<el-tag v-if="scope.row.status==1">同意</el-tag> <el-tag v-if="scope.row.status===1" style="color: #04fa08">已同意</el-tag>
<el-tag v-if="scope.row.status==-1">驳回</el-tag> <el-tag v-if="scope.row.status===-1" style="color: #bfc2c5">已驳回</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="联系人" align="center" prop="contacts" /> <el-table-column label="联系人" align="center" prop="contacts" />
<el-table-column label="联系人电话" align="center" prop="contactsTel" /> <el-table-column label="联系人电话" align="center" prop="contactsTel" />
<el-table-column label="组内的序号" align="center" prop="serialNumber" />
<el-table-column label="备注说明" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popconfirm v-if="competitionObj.status==0" @confirm="bindConfirm(scope.row.id,1)" <el-popconfirm v-if="competitionObj.status===0" @confirm="bindConfirm(scope.row.id,1)"
title="你确定同意此球队加入赛会吗？" title="你确定同意此球队加入赛会吗？"
> >
<el-button <el-button
@ -93,7 +91,7 @@
v-hasPermi="['system:competitionOfTeam:edit']" v-hasPermi="['system:competitionOfTeam:edit']"
>同意</el-button> >同意</el-button>
</el-popconfirm> </el-popconfirm>
<el-popconfirm v-if="competitionObj.status==0" @confirm="bindConfirm(scope.row.id,-1)" <el-popconfirm v-if="competitionObj.status===0" @confirm="bindConfirm(scope.row.id,-1)"
title="你确定不同意此球队加入赛会吗？" title="你确定不同意此球队加入赛会吗？"
> >
<el-button <el-button
@ -873,10 +871,11 @@ export default {
this.reset(); this.reset();
}, },
bindConfirm(id,tage){ bindConfirm(id,tage){
console.info(id)
console.info(tage)
updateCompetitionOfTeam({"id":id,"status":tage}).then(response => { updateCompetitionOfTeam({"id":id,"status":tage}).then(response => {
this.$modal.msgSuccess("球队审核成功");
listCompetitionOfTeam({"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
this.competitionOfTeamList = response.rows;
});
}); });
}, },
handleTeamUser(row){ handleTeamUser(row){
@ -954,7 +953,7 @@ export default {
this.competitionTeamGroupList.push({"competitionGroup":"未分","id":null}) this.competitionTeamGroupList.push({"competitionGroup":"未分","id":null})
}); });
}else if(tab.name=='competitionVsSet'){ }else if(tab.name=='competitionVsSet'){
listCompetitionTeamVsTeam({"orderByColumn":"competition_time","pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => { listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
this.competitionTeamVsTeamList = response.rows; this.competitionTeamVsTeamList = response.rows;
}); });
}else if(tab.name=='competitionSpread'){ }else if(tab.name=='competitionSpread'){
@ -1004,12 +1003,12 @@ export default {
mindSetOk(){ mindSetOk(){
let param ={ let param ={
id:this.selectGroupValue, id:this.selectGroupValue,
status:1 status:0
} }
arrangeTeamGroupSchedule(param).then(response => { arrangeTeamGroupSchedule(param).then(response => {
this.$modal.msgSuccess("赛程智能设置成功"); this.$modal.msgSuccess("赛程智能设置成功");
this.mindVisible = false; this.mindVisible = false;
listCompetitionTeamVsTeam({"orderByColumn":"competition_time","pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => { listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
this.competitionTeamVsTeamList = response.rows; this.competitionTeamVsTeamList = response.rows;
}); });
}); });
@ -1075,7 +1074,7 @@ export default {
this.$modal.confirm('是否确认删除赛会中的赛程数据？').then(function() { this.$modal.confirm('是否确认删除赛会中的赛程数据？').then(function() {
return delCompetitionTeamVsTeam(ids); return delCompetitionTeamVsTeam(ids);
}).then(() => { }).then(() => {
listCompetitionTeamVsTeam({"orderByColumn":"competition_time","pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => { listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
this.competitionTeamVsTeamList = response.rows; this.competitionTeamVsTeamList = response.rows;
}); });
this.$modal.msgSuccess("删除赛程成功"); this.$modal.msgSuccess("删除赛程成功");
@ -1085,7 +1084,7 @@ export default {
editDataCompetitionResult(this.competitionRecord).then(response => { editDataCompetitionResult(this.competitionRecord).then(response => {
this.$modal.msgSuccess("比赛结果记录成功"); this.$modal.msgSuccess("比赛结果记录成功");
this.vsRecordOpen = false; this.vsRecordOpen = false;
listCompetitionTeamVsTeam({"orderByColumn":"competition_time","pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => { listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
this.competitionTeamVsTeamList = response.rows; this.competitionTeamVsTeamList = response.rows;
}); });
}); });
@ -1099,7 +1098,7 @@ export default {
updateCompetitionTeamVsTeam(this.vsform).then(response => { updateCompetitionTeamVsTeam(this.vsform).then(response => {
this.$modal.msgSuccess("编辑赛程成功"); this.$modal.msgSuccess("编辑赛程成功");
this.vsOpen = false; this.vsOpen = false;
listCompetitionTeamVsTeam({"orderByColumn":"competition_time","pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => { listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
this.competitionTeamVsTeamList = response.rows; this.competitionTeamVsTeamList = response.rows;
}); });
}); });
@ -1108,7 +1107,7 @@ export default {
addCompetitionTeamVsTeam(this.vsform).then(response => { addCompetitionTeamVsTeam(this.vsform).then(response => {
this.$modal.msgSuccess("新增赛程成功"); this.$modal.msgSuccess("新增赛程成功");
this.vsOpen = false; this.vsOpen = false;
listCompetitionTeamVsTeam({"orderByColumn":"competition_time","pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => { listCompetitionTeamVsTeam({"orderByColumn":"competition_time","isDeleted":0,"pageNum": 1, "pageSize": 1000,"competitionId":this.competitionObj.id}).then(response => {
this.competitionTeamVsTeamList = response.rows; this.competitionTeamVsTeamList = response.rows;
}); });
}); });

95
ruoyi-ui/src/views/system/vs/index.vue
Unescape View File

@ -169,7 +169,7 @@
<!-- 添加或修改约战对话框 --> <!-- 添加或修改约战对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="主队ID" prop="mainTeamId"> <el-form-item label="主队ID" prop="mainTeamId">
<el-input v-model="form.mainTeamId" placeholder="请输入主队ID" /> <el-input v-model="form.mainTeamId" placeholder="请输入主队ID" />
</el-form-item> </el-form-item>
@ -182,12 +182,6 @@
<el-form-item label="客队名" prop="guestTeamName"> <el-form-item label="客队名" prop="guestTeamName">
<el-input v-model="form.guestTeamName" placeholder="请输入客队名" /> <el-input v-model="form.guestTeamName" placeholder="请输入客队名" />
</el-form-item> </el-form-item>
<el-form-item label="赛事编号" prop="competitionCode">
<el-input v-model="form.competitionCode" placeholder="请输入赛事编号" />
</el-form-item>
<el-form-item label="比赛名称" prop="competitionName">
<el-input v-model="form.competitionName" placeholder="请输入比赛名称" />
</el-form-item>
<el-form-item label="是否指定对手" prop="designated"> <el-form-item label="是否指定对手" prop="designated">
<el-input v-model="form.designated" placeholder="请输入是否指定对手" /> <el-input v-model="form.designated" placeholder="请输入是否指定对手" />
</el-form-item> </el-form-item>
@ -220,31 +214,6 @@
<el-form-item label="最大参与人数" prop="maxPlayer"> <el-form-item label="最大参与人数" prop="maxPlayer">
<el-input v-model="form.maxPlayer" placeholder="请输入最大参与人数" /> <el-input v-model="form.maxPlayer" placeholder="请输入最大参与人数" />
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createdTime">
<el-date-picker clearable
v-model="form.createdTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="最后修改时间" prop="lastUpdatedTime">
<el-date-picker clearable
v-model="form.lastUpdatedTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择最后修改时间">
</el-date-picker>
</el-form-item>
<el-form-item label="创建人" prop="createdBy">
<el-input v-model="form.createdBy" placeholder="请输入创建人" />
</el-form-item>
<el-form-item label="最后修改人" prop="modifiedBy">
<el-input v-model="form.modifiedBy" placeholder="请输入最后修改人" />
</el-form-item>
<el-form-item label="是否删除" prop="isDeleted">
<el-input v-model="form.isDeleted" placeholder="请输入是否删除" />
</el-form-item>
<el-form-item label="经度" prop="longitude"> <el-form-item label="经度" prop="longitude">
<el-input v-model="form.longitude" placeholder="请输入经度" /> <el-input v-model="form.longitude" placeholder="请输入经度" />
</el-form-item> </el-form-item>
@ -254,68 +223,6 @@
<el-form-item label="备注说明" prop="remark"> <el-form-item label="备注说明" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
<el-form-item label="比赛性质" prop="competitionNature">
<el-input v-model="form.competitionNature" placeholder="请输入比赛性质" />
</el-form-item>
<el-form-item label="报名开始时间" prop="enrollBeginTime">
<el-date-picker clearable
v-model="form.enrollBeginTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择报名开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="报名结束时间" prop="enrollEndTime">
<el-date-picker clearable
v-model="form.enrollEndTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择报名结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="赛事联系人" prop="contacts">
<el-input v-model="form.contacts" placeholder="请输入赛事联系人" />
</el-form-item>
<el-form-item label="赛事联系人电话区号" prop="contactsAreaCode">
<el-input v-model="form.contactsAreaCode" placeholder="请输入赛事联系人电话区号" />
</el-form-item>
<el-form-item label="赛事联系人电话" prop="contactsTel">
<el-input v-model="form.contactsTel" placeholder="请输入赛事联系人电话" />
</el-form-item>
<el-form-item label="比赛开始时间" prop="competitionBeginTime">
<el-date-picker clearable
v-model="form.competitionBeginTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择比赛开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="比赛结束时间" prop="competitionEndTime">
<el-date-picker clearable
v-model="form.competitionEndTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择比赛结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="主办方" prop="organizer">
<el-input v-model="form.organizer" placeholder="请输入主办方" />
</el-form-item>
<el-form-item label="承办方" prop="undertake">
<el-input v-model="form.undertake" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="赛会背景图" prop="competitionBackImg">
<el-input v-model="form.competitionBackImg" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="创建人userId" prop="createdId">
<el-input v-model="form.createdId" placeholder="请输入创建人userId" />
</el-form-item>
<el-form-item label="身高隐藏 0不隐藏 1=隐藏" prop="heightHide">
<el-input v-model="form.heightHide" placeholder="请输入身高隐藏 0不隐藏 1=隐藏" />
</el-form-item>
<el-form-item label="赞助商" prop="sponsor">
<el-input v-model="form.sponsor" placeholder="请输入赞助商" />
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>

Write Preview
Loading…
Cancel
Save