Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
9cbbd2b9 by 杨炀
Options

个人报名 选多人 bug 修改

1 parent 6bbdee8b
Inline Side-by-side
Showing 8 changed files with 32 additions and 59 deletions
src/viewsPc/center/myMember.vue
......@@ -120,7 +120,12 @@ function addMember() {
id: 0,
groupId: groupId.value
}
proxy.$refs['dialogAddCoachEn'].open(params)
if(language.value==1){
proxy.$refs['dialogAddCoachEn'].open(params)
} else {
proxy.$refs['dialogAddCoach'].open(params)
}
}
function importSportman() {
......@@ -156,6 +161,8 @@ function editCoach(row,title) {
}
if(row.label=='0'&&row.wdsfMin){
proxy.$refs['dialogAddWDSF'].open(params)
} else if(row.idcType == '0'){
proxy.$refs['dialogAddCoach'].open(params)
} else {
proxy.$refs['dialogAddCoachEn'].open(params)
}
......
src/viewsPc/center/teamInfo.vue
......@@ -7,7 +7,7 @@
{{userName}}
</el-form-item>
<el-form-item :label="language==0?'所属国家/地区':'Country'" required>
<el-select filterable v-model="form.countryId">
<el-select filterable v-model="form.countryId" :disabled="form.type!='4'">
<el-option v-for="item in countryList" :key="item.id" :label="language==0?item.name:item.enName" :value="item.id" />
</el-select>
</el-form-item>
......
src/viewsPc/match/chooseProject.vue
......@@ -18,52 +18,16 @@
</div>
<div class="panel-body">
<div class="chooseForm" style="display: flex;flex-wrap: wrap;">
<!-- <div @click="editPerson" class="mb20" style="width: 50%;text-align: center;">-->
<!-- <el-avatar fit="cover" v-if="form.picUrl" :size="60" :src="fillImgUrl(form.picUrl)"/>-->
<!-- <div v-else>-->
<!-- <el-avatar fit="cover" v-if="form.sex == 0" :size="60" src="/img/head1.png"/>-->
<!-- <el-avatar fit="cover" v-if="form.sex == 1" :size="60" src="/img/head0.png"/>-->
<!-- </div>-->
<!-- <div class="text-center mt10">-->
<!-- <span class="mName">{{ form.realName }}</span>-->
<!-- <el-icon size="20">-->
<!-- <Edit/>-->
<!-- </el-icon>-->
<!-- </div>-->
<!-- </div>-->
<!-- &lt;!&ndash;舞伴&ndash;&gt;-->
<!-- <div style="width:50%;text-align: center;" v-if="form.danceMate">-->
<!-- <el-checkbox-group v-model="mateChosed" @change="changeMate">-->
<!-- <el-checkbox :label="form.danceMate.id">-->
<!-- <div>-->
<!-- <el-avatar fit="cover" v-if="form.danceMate.picUrl" :size="60" :src="fillImgUrl(form.danceMate.picUrl)"/>-->
<!-- <el-avatar fit="cover" v-else-if="form.danceMate.sex == 0" :size="60"-->
<!-- src="/img/head1.png"/>-->
<!-- <el-avatar fit="cover" v-else-if="form.danceMate.sex == 1" :size="60"-->
<!-- src="/img/head0.png"/>-->
<!-- <div class="text-center mt10" @click="editMate(form.danceMate)">-->
<!-- <span class="mName">{{ form.danceMate.realName }}</span>-->
<!-- <el-icon @click.stop="editMate(form.danceMate)" size="20">-->
<!-- <Edit/>-->
<!-- </el-icon>-->
<!--&lt;!&ndash; <el-icon @click.stop="delMate(form.danceMate)">&ndash;&gt;-->
<!--&lt;!&ndash; <Delete/>&ndash;&gt;-->
<!--&lt;!&ndash; </el-icon>&ndash;&gt;-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-checkbox>-->
<!-- </el-checkbox-group>-->
<!-- </div>-->
<div style="width:50%;text-align: center;" v-for="s in choosedList">
<div>
<el-avatar fit="cover" v-if="s.picUrl" :size="60" :src="fillImgUrl(form.danceMate.picUrl)"/>
<el-avatar fit="cover" v-if="s.picUrl" :size="60" :src="fillImgUrl(s.picUrl)"/>
<el-avatar fit="cover" v-else-if="s.sex == 0" :size="60"
src="/img/head1.png"/>
<el-avatar fit="cover" v-else-if="s.sex == 1" :size="60"
src="/img/head0.png"/>
<div class="text-center mt10" @click="editMate(s)">
<span class="mName">{{ s.realName }}</span>
<el-icon @click.stop="editMate(s)" size="20">
<el-icon size="20">
<Edit/>
</el-icon>
</div>
......@@ -241,7 +205,6 @@ const data = reactive({
teamList: [],
extraform: [],
groupId: 0,
signType: '',
coachOrLeaderFlag: null,
noPhotoCanSign: null,
showResult: false,
......@@ -270,7 +233,6 @@ const {
choosedList,isNational,
extraform,
groupId,
signType,
coachOrLeaderFlag,
noPhotoCanSign,
projectIds,
......@@ -292,7 +254,6 @@ onMounted(() => {
if (useUserStore().user) {
userId.value = useUserStore().user.userId
}
signType.value = route.query.signType || null
getSignInfoList()
getMatch(matchId.value)
getMyInfo()
......@@ -340,7 +301,7 @@ function addAccompany() {
function changeMeDone(mateId) {
console.log(mateId)
getMyInfo()
// getMyInfo()
getProjectList()
}
......@@ -475,6 +436,9 @@ function getChoosed(list) {
getProjectList()
}
function getProjectList() {
if(choosedList.value.length==0){
return
}
let arr = []
for(var l of choosedList.value){
arr.push(l.id)
......@@ -596,10 +560,10 @@ function removeThis(id) {
}
function switchPerson(){
console.log( choosedList.value)
const params = {
title: language.value == 0 ? '选择运动员' : 'Participating athletes',
matchId: matchId.value,
signType: signType.value,
noPhotoCanSign: noPhotoCanSign.value,
coachOrLeaderFlag: coachOrLeaderFlag.value,
choosedList: choosedList.value,
......
src/viewsPc/match/components/personTable.vue
......@@ -2,6 +2,7 @@
<!-- 人员表格-->
<el-table :data="tableData" class="mt20">
<el-table-column type="index" :label="language==0?'序号':'Index'" width="80" align="center"/>
<el-table-column :label="language==0?'姓名':'RealName'" prop="realName" min-width="140"/>
<el-table-column :label="language==0?'姓氏':'Surname'" prop="xing" min-width="100"/>
<el-table-column :label="language==0?'名':'Name'" prop="ming" min-width="100"/>
<el-table-column :label="language==0?'所属国家/地区':'Nationality'" prop="countryName" min-width="120"/>
......
src/viewsPc/match/detail_en.vue
......@@ -190,15 +190,15 @@
<match-schedule-list :match-data="matchData" v-if="menu[2].active==1"/>
<div v-if="menu[3].active==1">
<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-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">
<el-col :span="24">
<div class="fr mb20">
<div class="flex">
......
src/viewsPc/match/teamSign.vue
......@@ -23,8 +23,9 @@
</el-form-item>
</el-col>
<el-col :lg="10">
<el-form-item :label="language==0?'代表国家/地区':'Representing'" required>
<el-select filterable v-model="form.countryId" @change="changeCountryId">
<el-form-item :label="language==0?'代表国家/地区':'Representing'">
<el-select filterable v-model="form.countryId" @change="changeCountryId"
:disabled="form.type!='4'">
<!-- <el-option v-for="item in countryList" :key="item.id" :label="language==0?item.name:item.enName" :value="item.id"/>-->
<el-option v-for="item in countryList" :key="item.id" :label="item.noc||item.enName" :value="item.id"/>
</el-select>
......
src/viewsPc/match/teamSign_Cn.vue
......@@ -30,7 +30,7 @@
<el-input v-model="form.name" :placeholder="language==0?'请输入团体名称':''" />
</el-form-item>
<el-form-item :label="language==0?'所属国家/地区':'Country'" required>
<el-select filterable v-model="form.countryId">
<el-select filterable v-model="form.countryId" :disabled="form.type!='4'">
<el-option v-for="item in countryList" :key="item.id" :label="language==0?item.name:item.enName" :value="item.id" />
</el-select>
</el-form-item>
......
vite.config.js
......@@ -82,8 +82,8 @@ export default defineConfig(({ mode, command }) => {
rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
},
'/dev-api': {
target: 'http://192.168.1.118:8081/',
// target: 'https://dance.itechtop.cn/stage-api',
// target: 'http://192.168.1.131:8081/',
target: 'https://dance.itechtop.cn/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!