Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
42450b62 by 杨炀
Options

国内赛修改

1 parent 0cb2e2e0
Expand all
Inline Side-by-side
Showing 11 changed files with 124 additions and 101 deletions
src/apiPc/match.js
......@@ -39,11 +39,12 @@ export function getMySignDetailById(params) {
}
// 获取赛事下的已报团队
export function getGroupListByCptId(cptId) {
export function getGroupListByCptId(cptId,query) {
return request({
// url: `/league/group/getGroupListByCptId/${cptId}`,
url: `/league/sign/getSignInfoDataByCptId/${cptId}`,
method: 'get'
method: 'get',
params: query
})
}
......@@ -363,6 +364,13 @@ export function savePersonForMyPerson(data) {
data: data
})
}
export function savePersonForMyPerson2(data) {
return request({
url: `/systemj/personInfo/savePersonForMyPerson2`,
method: 'post',
data: data
})
}
// 人员修改
export function editPersonInfo(params) {
......@@ -380,6 +388,13 @@ export function delPerson(id) {
method: 'delete'
})
}
//个人账号
export function delPersonForPersonal(id) {
return request({
url: `/systemj/personInfo/singleDelete/${id}`,
method: 'delete'
})
}
export function singleSignSavePerson(data) {
return request({
......@@ -657,6 +672,13 @@ export function checkIdcCode(query) {
params:query
})
}
export function getProjectByCptId(cptId,query) {
return request({
url: `/league/competitionProject/getTableByLanguageSourceAndCptId/${cptId}`,
method: 'get',
params: query
})
}
export function addInvitation(data) {
return request({
url: `/league/person`,
......
src/layoutPc/components/AppBottom.vue
......@@ -95,7 +95,7 @@
</div>
<div @click="goHelp">
<img class="kf" src="@/assets/logo/btn02.png"/>
<div class="text-center gradient-text">GUIDELINE</div>
<div class="text-center gradient-text uppercase">Video Guide</div>
</div>
</div>
</div>
......
src/viewsPc/match/components/addWdsf.vue
......@@ -281,7 +281,7 @@ function submitForm() {
}
}
function addPersonal() {
match.savePersonForMyPerson(form.value).then(res => {
match.savePersonForMyPerson2(form.value).then(res => {
ElMessage.success('保存成功')
show.value = false
emit('submitForm', res.data)
......
src/viewsPc/match/components/matchInfo-projectList.vue
<template>
<div class="collapsebox">
<div class="pd20">
<div class="fr mb20">
<el-input size="small" v-model="query.projectName" :prefix-icon="Search"
@change="getList" clearable/>
</div>
<el-table :data="list" border>
<el-table-column :label="language==0?'组别编号':'Event Code'" prop="code" align="center"></el-table-column>
<el-table-column :label="language==0?'组别编号':'Event Code'" prop="code" align="center" :min-width="language==0?70:100">
</el-table-column>
<el-table-column :label="language==0?'组别名称':'Event'" min-width="150" prop="name" align="center"></el-table-column>
<el-table-column :label="language==0?'舞种':'DISCIPLINE'" width="110" prop="danceType" align="center">
</el-table-column>
<el-table-column :label="language==0?'舞种明细':'Dance Detail'" width="120" prop="danceTypeDetailStr" align="center"></el-table-column>
<el-table-column :label="language==0?'舞种明细':'Dance Detail'" width="120" prop="danceTypeDetailStr" align="center">
</el-table-column>
<el-table-column :label="language==0?'参赛性别':'Sex'" align="center">
<template #default="scope">
......@@ -45,76 +53,40 @@
</template>
</el-table-column>
</el-table>
<!-- <table class="table" cellspacing="0" cellpadding="0" v-if="list.length > 0">-->
<!-- <tr v-if="language==0">-->
<!-- <th>组别编号</th>-->
<!-- <th>组别名称</th>-->
<!-- <th>舞种</th>-->
<!-- <th>舞种明细</th>-->
<!-- <th>参赛性别</th>-->
<!-- <th>参赛年龄</th>-->
<!-- <th>服务费（元）</th>-->
<!-- </tr>-->
<!-- <tr v-else>-->
<!-- <th>EVENT code</th>-->
<!-- <th>EVENT</th>-->
<!-- <th>DISCIPLINE</th>-->
<!-- <th>Dance Detail</th>-->
<!-- <th>Sex</th>-->
<!-- <th>Age</th>-->
<!-- <th>Registration Fee</th>-->
<!-- </tr>-->
<!-- <tr v-for="(p,index) in list" :key="index">-->
<!-- <td>{{ p.code }}</td>-->
<!-- <td>{{ p.name }}</td>-->
<!-- <td>{{ p.danceType }}</td>-->
<!-- <td>{{ p.danceTypeDetailStr }}</td>-->
<!-- <td>{{ p.playTypeStr }}</td>-->
<!-- <td>-->
<!--&lt;!&ndash; {{ isNational }}&ndash;&gt;-->
<!-- <div v-if="isNational">-->
<!-- <span v-if="p.ageGroup == '0'" >{{ language==0?'不限制':'Unlimited' }}</span>-->
<!-- <span v-if="p.ageGroup == '1'" >Juvenile I</span>-->
<!-- <span v-if="p.ageGroup == '2'" >Juvenile II</span>-->
<!-- <span v-if="p.ageGroup == '3'" >Juv1& II (comb.)</span>-->
<!-- <span v-if="p.ageGroup == '4'" >Junior I</span>-->
<!-- <span v-if="p.ageGroup == '5'" >Junior II</span>-->
<!-- <span v-if="p.ageGroup == '6'" >Juv I & II (comb.)</span>-->
<!-- <span v-if="p.ageGroup == '7'" >Youth</span>-->
<!-- <span v-if="p.ageGroup == '8'" >Under 21</span>-->
<!-- <span v-if="p.ageGroup == '9'" >Adult</span>-->
<!-- <span v-if="p.ageGroup == '10'" >Senior I</span>-->
<!-- <span v-if="p.ageGroup == '11'" >Senior II</span>-->
<!-- <span v-if="p.ageGroup == '12'" >Senior III</span>-->
<!-- <span v-if="p.ageGroup == '13'" >Senior IV</span>-->
<!-- <span v-if="p.ageGroup == '14'" >Senior V</span>-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- <div>{{ p.birthPeriod }}</div>-->
<!-- <div>{{p.birthPeriodSecond}}</div>-->
<!-- </div>-->
<!-- &lt;!&ndash; <div>{{ p.birthAgeGroup }};{{p.birthAgeSecondGroup}}</div>&ndash;&gt;-->
<!-- </td>-->
<!-- <td>{{ language==0?'¥':'€' }}{{ p.serviceFee }}</td>-->
<!-- </tr>-->
<!-- </table>-->
<PaginationPc
v-show="total>0"
:total="total"
v-model:page="query.pageNum"
v-model:limit="query.pageSize"
@pagination="getList"
/>
</div>
<!-- <el-empty :image="`/img/order_no.png`" :image-size="228" v-if="list.length == 0" description=""/>-->
</div>
</template>
<script setup>
import {Search} from "@element-plus/icons-vue";
import {useStorage} from "@vueuse/core/index"
import {getProjectByCptId} from "@/apiPc/match";
import PaginationPc from "@/components/PaginationPc";
const language= useStorage('language',0)
const list = ref([])
const total = ref(0)
const query = ref({
projectName:'',
pageSize:10,
pageNum:1
})
const props = defineProps({
list: {
type: Array,
required: true,
default:[]
// list: {
// type: Array,
// required: true,
// default:[]
// },
matchId: {
type: String,
required: false
},
isNational: {
type: Boolean,
......@@ -122,6 +94,13 @@ const props = defineProps({
default: false
},
})
getList()
function getList() {
getProjectByCptId(props.matchId,query.value).then(res=>{
list.value = res.rows
total.value = res.total
})
}
</script>
<style scoped lang="scss">
......
src/viewsPc/match/components/matchInfo.vue
......@@ -82,7 +82,7 @@
<!-- </div>-->
<div class="indexTitle" v-if="form.type==1 && form.cptProjectList?.length > 0"><h3 class="leftboderTT">Event settings</h3></div>
<div v-if="form.type==1 && form.cptProjectList?.length > 0">
<match-info-project-list :list="form.cptProjectList" :is-national="form.languageSource!='100'"/>
<match-info-project-list :match-id="form.id" :is-national="form.languageSource!='100'"/>
</div>
</div>
</template>
......
src/viewsPc/match/detail.vue
......@@ -99,7 +99,7 @@
</div>
<matchInfo :form="matchData" v-if="menu[0].active==1"/>
<div v-if="menu[1].active==1">
<match-info-project-list :list="matchData.cptProjectList" />
<match-info-project-list :match-id="matchData.id" />
</div>
<match-schedule-list :match-data="matchData" v-if="menu[2].active==1"/>
<div v-if="menu[3].active==1">
......
src/viewsPc/match/detail_en.vue
......@@ -185,31 +185,47 @@
</div>
<matchInfo :form="matchData" v-if="menu[0].active==1"/>
<div v-if="menu[1].active==1">
<match-info-project-list :list="matchData.cptProjectList" :is-national="isNational"/>
<match-info-project-list :match-id="matchData.id" :is-national="isNational"/>
</div>
<match-schedule-list :match-data="matchData" v-if="menu[2].active==1"/>
<div v-if="menu[3].active==1">
<el-row :gutter="20" v-if="matchData.signType == '0'">
<el-col v-for="t in signDoneGroupList" :key="t.id" :span="8">
<div class="teamItem">
<el-avatar :size="60" :src="fillImgUrl(t.imgUrl||t.avatar)"/>
<span class="name">{{ t.name }}</span>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="pd20" v-else>
<el-col :span="24">
<el-table :data="signDoneGroupList">
<el-table-column prop="groupCode" :label="language == 0 ? '组别代码' :'EVENT CODE'" min-width="120"/>
<el-table-column prop="EVENT" :label="language == 0 ?'组别':'Group'" min-width="120"/>
<el-table-column prop="maleAthName" :label="language == 0 ?'男运动员':'man name'" min-width="150"/>
<el-table-column prop="femaleAthName" :label="language == 0 ?'女运动员':'woman name'" min-width="150"/>
<el-table-column prop="danceType" :label="language == 0 ?'舞种':'Division'" min-width="120"/>
<el-table-column prop="countryName" :label="language == 0 ?'国籍':'Representing'" min-width="130"/>
<el-table-column prop="groupName" :label="language == 0 ?'参赛队名称':'Team name'" min-width="150"/>
</el-table>
</el-col>
</el-row>
<div v-if="matchData.showPersonFlag=='1'">
<el-row :gutter="20" v-if="matchData.signType == '0'">
<el-col v-for="t in signDoneGroupList" :key="t.id" :span="8">
<div class="teamItem">
<el-avatar :size="60" :src="fillImgUrl(t.imgUrl||t.avatar)"/>
<span class="name">{{ t.name }}</span>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="pd20" v-else>
<el-col :span="24">
<div class="fr mb20">
<el-input size="small" v-model="queryGroupList.name" :prefix-icon="Search"
@change="getGroupListByCptId" clearable/>
</div>
<el-table :data="signDoneGroupList">
<el-table-column prop="groupCode" align="center" :label="language == 0 ? '组别代码' :'EVENT CODE'" min-width="120"/>
<el-table-column prop="group" :label="language == 0 ?'组别':'EVENT'" min-width="120"/>
<el-table-column prop="maleAthName" :label="language == 0 ?'男运动员':'man name'" min-width="150"/>
<el-table-column prop="femaleAthName" :label="language == 0 ?'女运动员':'woman name'" min-width="150"/>
<el-table-column prop="danceType" :label="language == 0 ?'舞种':'Division'" min-width="120"/>
<el-table-column prop="countryName" align="center" :label="language == 0 ?'国籍':'Representing'" min-width="130"/>
<el-table-column prop="groupName" align="center" :label="language == 0 ?'参赛队名称':'Team name'" min-width="150"/>
</el-table>
<PaginationPc
v-show="signDoneGroupListToTal>0"
:total="signDoneGroupListToTal"
v-model:page="queryGroupList.pageNum"
v-model:limit="queryGroupList.pageSize"
@pagination="getGroupListByCptId"
/>
</el-col>
</el-row>
</div>
<div v-else>
<el-empty :image="`/img/order_no.png`" :image-size="228" description=""/>
</div>
</div>
<div v-if="menu[4].active==1">
<!--成绩-->
......@@ -309,9 +325,9 @@ const {proxy} = getCurrentInstance()
import * as match from '@/apiPc/match'
import {toRefs} from '@vueuse/shared'
import {dayjs, ElMessage, ElMessageBox} from 'element-plus'
import useUserStore from "@/store/modules/user";
import {useStorage} from "@vueuse/core/index";
import useUserStore from "@/store/modules/user"
import {useStorage} from "@vueuse/core/index"
import {Search} from "@element-plus/icons-vue"
const user = useUserStore().user
const group = useUserStore().group
const data = reactive({
......@@ -333,6 +349,12 @@ const data = reactive({
{name: 'Event details', cn: '赛事详情', active: 0},
{name: 'Schedule', cn: '日程', active: 0}],
signDoneGroupList: [],
signDoneGroupListToTal:0,
queryGroupList:{
name:'',
pageSize:10,
pageNum:1
},
time: '',
startSign: '',
isNational:false
......@@ -343,10 +365,9 @@ const {
matchData,
matchId,
groupId,
activeName2,
menu,
menu1,
signDoneGroupList,
signDoneGroupList,signDoneGroupListToTal,queryGroupList,
time, startSign,isNational
} = toRefs(data)
const signTypePop = ref(false)
......@@ -370,7 +391,7 @@ function getMatchId() {
match.getMaList({topFlag: 1, status: 1}).then((res) => {
matchId.value = res.rows[0].id
getMatch(matchId.value)
getGroupListByCptId(matchId.value)
getGroupListByCptId()
})
}
......@@ -394,9 +415,10 @@ function getMatch(id) {
})
}
function getGroupListByCptId(id) {
match.getGroupListByCptId(id).then(res => {
signDoneGroupList.value = res.data
function getGroupListByCptId() {
match.getGroupListByCptId(matchId.value,queryGroupList.value).then(res => {
signDoneGroupList.value = res.rows
signDoneGroupListToTal.value = res.total
})
}
......
src/viewsPc/register/personal.vue
......@@ -330,7 +330,7 @@ function bigNext(){
ElMessage.warning(language.value == 0 ? '请选择性别' : 'Please select your gender')
return
}
if(user.utype=='3'){
if(user&&user.utype=='3'){
let obj = {
card: form.value.card,
userId: user.userId,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!