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 107 additions and 84 deletions
src/apiPc/match.js
...@@ -39,11 +39,12 @@ export function getMySignDetailById(params) { ...@@ -39,11 +39,12 @@ export function getMySignDetailById(params) {
39 } 39 }
40 40
41 // 获取赛事下的已报团队 41 // 获取赛事下的已报团队
42 export function getGroupListByCptId(cptId) { 42 export function getGroupListByCptId(cptId,query) {
43 return request({ 43 return request({
44 // url: `/league/group/getGroupListByCptId/${cptId}`, 44 // url: `/league/group/getGroupListByCptId/${cptId}`,
45 url: `/league/sign/getSignInfoDataByCptId/${cptId}`, 45 url: `/league/sign/getSignInfoDataByCptId/${cptId}`,
46 method: 'get' 46 method: 'get',
47 params: query
47 }) 48 })
48 } 49 }
49 50
...@@ -363,6 +364,13 @@ export function savePersonForMyPerson(data) { ...@@ -363,6 +364,13 @@ export function savePersonForMyPerson(data) {
363 data: data 364 data: data
364 }) 365 })
365 } 366 }
367 export function savePersonForMyPerson2(data) {
368 return request({
369 url: `/systemj/personInfo/savePersonForMyPerson2`,
370 method: 'post',
371 data: data
372 })
373 }
366 374
367 // 人员修改 375 // 人员修改
368 export function editPersonInfo(params) { 376 export function editPersonInfo(params) {
...@@ -380,6 +388,13 @@ export function delPerson(id) { ...@@ -380,6 +388,13 @@ export function delPerson(id) {
380 method: 'delete' 388 method: 'delete'
381 }) 389 })
382 } 390 }
391 //个人账号
392 export function delPersonForPersonal(id) {
393 return request({
394 url: `/systemj/personInfo/singleDelete/${id}`,
395 method: 'delete'
396 })
397 }
383 398
384 export function singleSignSavePerson(data) { 399 export function singleSignSavePerson(data) {
385 return request({ 400 return request({
...@@ -657,6 +672,13 @@ export function checkIdcCode(query) { ...@@ -657,6 +672,13 @@ export function checkIdcCode(query) {
657 params:query 672 params:query
658 }) 673 })
659 } 674 }
675 export function getProjectByCptId(cptId,query) {
676 return request({
677 url: `/league/competitionProject/getTableByLanguageSourceAndCptId/${cptId}`,
678 method: 'get',
679 params: query
680 })
681 }
660 export function addInvitation(data) { 682 export function addInvitation(data) {
661 return request({ 683 return request({
662 url: `/league/person`, 684 url: `/league/person`,
......
src/layoutPc/components/AppBottom.vue
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
95 </div> 95 </div>
96 <div @click="goHelp"> 96 <div @click="goHelp">
97 <img class="kf" src="@/assets/logo/btn02.png"/> 97 <img class="kf" src="@/assets/logo/btn02.png"/>
98 <div class="text-center gradient-text">GUIDELINE</div> 98 <div class="text-center gradient-text uppercase">Video Guide</div>
99 </div> 99 </div>
100 </div> 100 </div>
101 </div> 101 </div>
......
src/viewsPc/match/components/addWdsf.vue
...@@ -281,7 +281,7 @@ function submitForm() { ...@@ -281,7 +281,7 @@ function submitForm() {
281 } 281 }
282 } 282 }
283 function addPersonal() { 283 function addPersonal() {
284 match.savePersonForMyPerson(form.value).then(res => { 284 match.savePersonForMyPerson2(form.value).then(res => {
285 ElMessage.success('保存成功') 285 ElMessage.success('保存成功')
286 show.value = false 286 show.value = false
287 emit('submitForm', res.data) 287 emit('submitForm', res.data)
......
src/viewsPc/match/components/matchInfo-projectList.vue
1 <template> 1 <template>
2 <div class="collapsebox"> 2 <div class="collapsebox">
3 <div class="pd20"> 3 <div class="pd20">
4 <div class="fr mb20">
5 <el-input size="small" v-model="query.projectName" :prefix-icon="Search"
6 @change="getList" clearable/>
7 </div>
4 <el-table :data="list" border> 8 <el-table :data="list" border>
5 <el-table-column :label="language==0?'组别编号':'Event Code'" prop="code" align="center"></el-table-column> 9 <el-table-column :label="language==0?'组别编号':'Event Code'" prop="code" align="center" :min-width="language==0?70:100">
10
11 </el-table-column>
6 <el-table-column :label="language==0?'组别名称':'Event'" min-width="150" prop="name" align="center"></el-table-column> 12 <el-table-column :label="language==0?'组别名称':'Event'" min-width="150" prop="name" align="center"></el-table-column>
7 <el-table-column :label="language==0?'舞种':'DISCIPLINE'" width="110" prop="danceType" align="center"> 13 <el-table-column :label="language==0?'舞种':'DISCIPLINE'" width="110" prop="danceType" align="center">
8 </el-table-column> 14 </el-table-column>
9 <el-table-column :label="language==0?'舞种明细':'Dance Detail'" width="120" prop="danceTypeDetailStr" align="center"></el-table-column> 15 <el-table-column :label="language==0?'舞种明细':'Dance Detail'" width="120" prop="danceTypeDetailStr" align="center">
16
17 </el-table-column>
10 18
11 <el-table-column :label="language==0?'参赛性别':'Sex'" align="center"> 19 <el-table-column :label="language==0?'参赛性别':'Sex'" align="center">
12 <template #default="scope"> 20 <template #default="scope">
...@@ -45,76 +53,40 @@ ...@@ -45,76 +53,40 @@
45 </template> 53 </template>
46 </el-table-column> 54 </el-table-column>
47 </el-table> 55 </el-table>
48 56 <PaginationPc
49 <!-- <table class="table" cellspacing="0" cellpadding="0" v-if="list.length > 0">--> 57 v-show="total>0"
50 <!-- <tr v-if="language==0">--> 58 :total="total"
51 <!-- <th>组别编号</th>--> 59 v-model:page="query.pageNum"
52 <!-- <th>组别名称</th>--> 60 v-model:limit="query.pageSize"
53 <!-- <th>舞种</th>--> 61 @pagination="getList"
54 <!-- <th>舞种明细</th>--> 62 />
55 <!-- <th>参赛性别</th>-->
56 <!-- <th>参赛年龄</th>-->
57 <!-- <th>服务费（元）</th>-->
58 <!-- </tr>-->
59 <!-- <tr v-else>-->
60 <!-- <th>EVENT code</th>-->
61 <!-- <th>EVENT</th>-->
62 <!-- <th>DISCIPLINE</th>-->
63 <!-- <th>Dance Detail</th>-->
64 <!-- <th>Sex</th>-->
65 <!-- <th>Age</th>-->
66 <!-- <th>Registration Fee</th>-->
67 <!-- </tr>-->
68 <!-- <tr v-for="(p,index) in list" :key="index">-->
69 <!-- <td>{{ p.code }}</td>-->
70 <!-- <td>{{ p.name }}</td>-->
71 <!-- <td>{{ p.danceType }}</td>-->
72 <!-- <td>{{ p.danceTypeDetailStr }}</td>-->
73 <!-- <td>{{ p.playTypeStr }}</td>-->
74 <!-- <td>-->
75 <!--&lt;!&ndash; {{ isNational }}&ndash;&gt;-->
76 <!-- <div v-if="isNational">-->
77 <!-- <span v-if="p.ageGroup == '0'" >{{ language==0?'不限制':'Unlimited' }}</span>-->
78 <!-- <span v-if="p.ageGroup == '1'" >Juvenile I</span>-->
79 <!-- <span v-if="p.ageGroup == '2'" >Juvenile II</span>-->
80 <!-- <span v-if="p.ageGroup == '3'" >Juv1& II (comb.)</span>-->
81 <!-- <span v-if="p.ageGroup == '4'" >Junior I</span>-->
82 <!-- <span v-if="p.ageGroup == '5'" >Junior II</span>-->
83 <!-- <span v-if="p.ageGroup == '6'" >Juv I & II (comb.)</span>-->
84 <!-- <span v-if="p.ageGroup == '7'" >Youth</span>-->
85 <!-- <span v-if="p.ageGroup == '8'" >Under 21</span>-->
86 <!-- <span v-if="p.ageGroup == '9'" >Adult</span>-->
87 <!-- <span v-if="p.ageGroup == '10'" >Senior I</span>-->
88 <!-- <span v-if="p.ageGroup == '11'" >Senior II</span>-->
89 <!-- <span v-if="p.ageGroup == '12'" >Senior III</span>-->
90 <!-- <span v-if="p.ageGroup == '13'" >Senior IV</span>-->
91 <!-- <span v-if="p.ageGroup == '14'" >Senior V</span>-->
92 <!-- </div>-->
93 <!-- <div v-else>-->
94 <!-- <div>{{ p.birthPeriod }}</div>-->
95 <!-- <div>{{p.birthPeriodSecond}}</div>-->
96 <!-- </div>-->
97
98 <!-- &lt;!&ndash; <div>{{ p.birthAgeGroup }};{{p.birthAgeSecondGroup}}</div>&ndash;&gt;-->
99 <!-- </td>-->
100 <!-- <td>{{ language==0?'¥':'€' }}{{ p.serviceFee }}</td>-->
101 <!-- </tr>-->
102 <!-- </table>-->
103
104 </div> 63 </div>
105 <!-- <el-empty :image="`/img/order_no.png`" :image-size="228" v-if="list.length == 0" description=""/>--> 64 <!-- <el-empty :image="`/img/order_no.png`" :image-size="228" v-if="list.length == 0" description=""/>-->
106 </div> 65 </div>
107 </template> 66 </template>
108 67
109 <script setup> 68 <script setup>
69 import {Search} from "@element-plus/icons-vue";
110 import {useStorage} from "@vueuse/core/index" 70 import {useStorage} from "@vueuse/core/index"
71 import {getProjectByCptId} from "@/apiPc/match";
72 import PaginationPc from "@/components/PaginationPc";
111 const language= useStorage('language',0) 73 const language= useStorage('language',0)
112 74 const list = ref([])
75 const total = ref(0)
76 const query = ref({
77 projectName:'',
78 pageSize:10,
79 pageNum:1
80 })
113 const props = defineProps({ 81 const props = defineProps({
114 list: { 82 // list: {
115 type: Array, 83 // type: Array,
116 required: true, 84 // required: true,
117 default:[] 85 // default:[]
86 // },
87 matchId: {
88 type: String,
89 required: false
118 }, 90 },
119 isNational: { 91 isNational: {
120 type: Boolean, 92 type: Boolean,
...@@ -122,6 +94,13 @@ const props = defineProps({ ...@@ -122,6 +94,13 @@ const props = defineProps({
122 default: false 94 default: false
123 }, 95 },
124 }) 96 })
97 getList()
98 function getList() {
99 getProjectByCptId(props.matchId,query.value).then(res=>{
100 list.value = res.rows
101 total.value = res.total
102 })
103 }
125 </script> 104 </script>
126 105
127 <style scoped lang="scss"> 106 <style scoped lang="scss">
......
src/viewsPc/match/components/matchInfo.vue
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
82 <!-- </div>--> 82 <!-- </div>-->
83 <div class="indexTitle" v-if="form.type==1 && form.cptProjectList?.length > 0"><h3 class="leftboderTT">Event settings</h3></div> 83 <div class="indexTitle" v-if="form.type==1 && form.cptProjectList?.length > 0"><h3 class="leftboderTT">Event settings</h3></div>
84 <div v-if="form.type==1 && form.cptProjectList?.length > 0"> 84 <div v-if="form.type==1 && form.cptProjectList?.length > 0">
85 <match-info-project-list :list="form.cptProjectList" :is-national="form.languageSource!='100'"/> 85 <match-info-project-list :match-id="form.id" :is-national="form.languageSource!='100'"/>
86 </div> 86 </div>
87 </div> 87 </div>
88 </template> 88 </template>
......
src/viewsPc/match/detail.vue
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
99 </div> 99 </div>
100 <matchInfo :form="matchData" v-if="menu[0].active==1"/> 100 <matchInfo :form="matchData" v-if="menu[0].active==1"/>
101 <div v-if="menu[1].active==1"> 101 <div v-if="menu[1].active==1">
102 <match-info-project-list :list="matchData.cptProjectList" /> 102 <match-info-project-list :match-id="matchData.id" />
103 </div> 103 </div>
104 <match-schedule-list :match-data="matchData" v-if="menu[2].active==1"/> 104 <match-schedule-list :match-data="matchData" v-if="menu[2].active==1"/>
105 <div v-if="menu[3].active==1"> 105 <div v-if="menu[3].active==1">
......
src/viewsPc/match/detail_en.vue
...@@ -185,10 +185,11 @@ ...@@ -185,10 +185,11 @@
185 </div> 185 </div>
186 <matchInfo :form="matchData" v-if="menu[0].active==1"/> 186 <matchInfo :form="matchData" v-if="menu[0].active==1"/>
187 <div v-if="menu[1].active==1"> 187 <div v-if="menu[1].active==1">
188 <match-info-project-list :list="matchData.cptProjectList" :is-national="isNational"/> 188 <match-info-project-list :match-id="matchData.id" :is-national="isNational"/>
189 </div> 189 </div>
190 <match-schedule-list :match-data="matchData" v-if="menu[2].active==1"/> 190 <match-schedule-list :match-data="matchData" v-if="menu[2].active==1"/>
191 <div v-if="menu[3].active==1"> 191 <div v-if="menu[3].active==1">
192 <div v-if="matchData.showPersonFlag=='1'">
192 <el-row :gutter="20" v-if="matchData.signType == '0'"> 193 <el-row :gutter="20" v-if="matchData.signType == '0'">
193 <el-col v-for="t in signDoneGroupList" :key="t.id" :span="8"> 194 <el-col v-for="t in signDoneGroupList" :key="t.id" :span="8">
194 <div class="teamItem"> 195 <div class="teamItem">
...@@ -199,18 +200,33 @@ ...@@ -199,18 +200,33 @@
199 </el-row> 200 </el-row>
200 <el-row :gutter="20" class="pd20" v-else> 201 <el-row :gutter="20" class="pd20" v-else>
201 <el-col :span="24"> 202 <el-col :span="24">
203 <div class="fr mb20">
204 <el-input size="small" v-model="queryGroupList.name" :prefix-icon="Search"
205 @change="getGroupListByCptId" clearable/>
206 </div>
202 <el-table :data="signDoneGroupList"> 207 <el-table :data="signDoneGroupList">
203 <el-table-column prop="groupCode" :label="language == 0 ? '组别代码' :'EVENT CODE'" min-width="120"/> 208 <el-table-column prop="groupCode" align="center" :label="language == 0 ? '组别代码' :'EVENT CODE'" min-width="120"/>
204 <el-table-column prop="EVENT" :label="language == 0 ?'组别':'Group'" min-width="120"/> 209 <el-table-column prop="group" :label="language == 0 ?'组别':'EVENT'" min-width="120"/>
205 <el-table-column prop="maleAthName" :label="language == 0 ?'男运动员':'man name'" min-width="150"/> 210 <el-table-column prop="maleAthName" :label="language == 0 ?'男运动员':'man name'" min-width="150"/>
206 <el-table-column prop="femaleAthName" :label="language == 0 ?'女运动员':'woman name'" min-width="150"/> 211 <el-table-column prop="femaleAthName" :label="language == 0 ?'女运动员':'woman name'" min-width="150"/>
207 <el-table-column prop="danceType" :label="language == 0 ?'舞种':'Division'" min-width="120"/> 212 <el-table-column prop="danceType" :label="language == 0 ?'舞种':'Division'" min-width="120"/>
208 <el-table-column prop="countryName" :label="language == 0 ?'国籍':'Representing'" min-width="130"/> 213 <el-table-column prop="countryName" align="center" :label="language == 0 ?'国籍':'Representing'" min-width="130"/>
209 <el-table-column prop="groupName" :label="language == 0 ?'参赛队名称':'Team name'" min-width="150"/> 214 <el-table-column prop="groupName" align="center" :label="language == 0 ?'参赛队名称':'Team name'" min-width="150"/>
210 </el-table> 215 </el-table>
216 <PaginationPc
217 v-show="signDoneGroupListToTal>0"
218 :total="signDoneGroupListToTal"
219 v-model:page="queryGroupList.pageNum"
220 v-model:limit="queryGroupList.pageSize"
221 @pagination="getGroupListByCptId"
222 />
211 </el-col> 223 </el-col>
212 </el-row> 224 </el-row>
213 </div> 225 </div>
226 <div v-else>
227 <el-empty :image="`/img/order_no.png`" :image-size="228" description=""/>
228 </div>
229 </div>
214 <div v-if="menu[4].active==1"> 230 <div v-if="menu[4].active==1">
215 <!--成绩--> 231 <!--成绩-->
216 <el-empty :image="`/img/order_no.png`" :image-size="228" description=""/> 232 <el-empty :image="`/img/order_no.png`" :image-size="228" description=""/>
...@@ -309,9 +325,9 @@ const {proxy} = getCurrentInstance() ...@@ -309,9 +325,9 @@ const {proxy} = getCurrentInstance()
309 import * as match from '@/apiPc/match' 325 import * as match from '@/apiPc/match'
310 import {toRefs} from '@vueuse/shared' 326 import {toRefs} from '@vueuse/shared'
311 import {dayjs, ElMessage, ElMessageBox} from 'element-plus' 327 import {dayjs, ElMessage, ElMessageBox} from 'element-plus'
312 import useUserStore from "@/store/modules/user"; 328 import useUserStore from "@/store/modules/user"
313 import {useStorage} from "@vueuse/core/index"; 329 import {useStorage} from "@vueuse/core/index"
314 330 import {Search} from "@element-plus/icons-vue"
315 const user = useUserStore().user 331 const user = useUserStore().user
316 const group = useUserStore().group 332 const group = useUserStore().group
317 const data = reactive({ 333 const data = reactive({
...@@ -333,6 +349,12 @@ const data = reactive({ ...@@ -333,6 +349,12 @@ const data = reactive({
333 {name: 'Event details', cn: '赛事详情', active: 0}, 349 {name: 'Event details', cn: '赛事详情', active: 0},
334 {name: 'Schedule', cn: '日程', active: 0}], 350 {name: 'Schedule', cn: '日程', active: 0}],
335 signDoneGroupList: [], 351 signDoneGroupList: [],
352 signDoneGroupListToTal:0,
353 queryGroupList:{
354 name:'',
355 pageSize:10,
356 pageNum:1
357 },
336 time: '', 358 time: '',
337 startSign: '', 359 startSign: '',
338 isNational:false 360 isNational:false
...@@ -343,10 +365,9 @@ const { ...@@ -343,10 +365,9 @@ const {
343 matchData, 365 matchData,
344 matchId, 366 matchId,
345 groupId, 367 groupId,
346 activeName2,
347 menu, 368 menu,
348 menu1, 369 menu1,
349 signDoneGroupList, 370 signDoneGroupList,signDoneGroupListToTal,queryGroupList,
350 time, startSign,isNational 371 time, startSign,isNational
351 } = toRefs(data) 372 } = toRefs(data)
352 const signTypePop = ref(false) 373 const signTypePop = ref(false)
...@@ -370,7 +391,7 @@ function getMatchId() { ...@@ -370,7 +391,7 @@ function getMatchId() {
370 match.getMaList({topFlag: 1, status: 1}).then((res) => { 391 match.getMaList({topFlag: 1, status: 1}).then((res) => {
371 matchId.value = res.rows[0].id 392 matchId.value = res.rows[0].id
372 getMatch(matchId.value) 393 getMatch(matchId.value)
373 getGroupListByCptId(matchId.value) 394 getGroupListByCptId()
374 }) 395 })
375 } 396 }
376 397
...@@ -394,9 +415,10 @@ function getMatch(id) { ...@@ -394,9 +415,10 @@ function getMatch(id) {
394 }) 415 })
395 } 416 }
396 417
397 function getGroupListByCptId(id) { 418 function getGroupListByCptId() {
398 match.getGroupListByCptId(id).then(res => { 419 match.getGroupListByCptId(matchId.value,queryGroupList.value).then(res => {
399 signDoneGroupList.value = res.data 420 signDoneGroupList.value = res.rows
421 signDoneGroupListToTal.value = res.total
400 }) 422 })
401 } 423 }
402 424
......
src/viewsPc/register/personal.vue
...@@ -330,7 +330,7 @@ function bigNext(){ ...@@ -330,7 +330,7 @@ function bigNext(){
330 ElMessage.warning(language.value == 0 ? '请选择性别' : 'Please select your gender') 330 ElMessage.warning(language.value == 0 ? '请选择性别' : 'Please select your gender')
331 return 331 return
332 } 332 }
333 if(user.utype=='3'){ 333 if(user&&user.utype=='3'){
334 let obj = { 334 let obj = {
335 card: form.value.card, 335 card: form.value.card,
336 userId: user.userId, 336 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!