no message
Showing
2 changed files
with
13 additions
and
8 deletions
| ... | @@ -243,7 +243,7 @@ const data = reactive({ | ... | @@ -243,7 +243,7 @@ const data = reactive({ |
| 243 | currProjectId: '', | 243 | currProjectId: '', |
| 244 | openTour: false, | 244 | openTour: false, |
| 245 | isNational: false, | 245 | isNational: false, |
| 246 | languageSource:'' | 246 | languageSource:'',singlePersonEntryLimit:'' |
| 247 | }) | 247 | }) |
| 248 | const { | 248 | const { |
| 249 | activeTeam, | 249 | activeTeam, |
| ... | @@ -271,7 +271,7 @@ const { | ... | @@ -271,7 +271,7 @@ const { |
| 271 | tableType, | 271 | tableType, |
| 272 | zuQuery, | 272 | zuQuery, |
| 273 | openTour, currProjectId, | 273 | openTour, currProjectId, |
| 274 | tourCurrent, isNational,languageSource | 274 | tourCurrent, isNational,languageSource,singlePersonEntryLimit |
| 275 | } = toRefs(data) | 275 | } = toRefs(data) |
| 276 | const nextButtonProps = ref({}) | 276 | const nextButtonProps = ref({}) |
| 277 | const matchId = ref(route.query.matchId) | 277 | const matchId = ref(route.query.matchId) |
| ... | @@ -291,7 +291,7 @@ function getAthletesList() { | ... | @@ -291,7 +291,7 @@ function getAthletesList() { |
| 291 | athletesList.value = res.rows | 291 | athletesList.value = res.rows |
| 292 | if(!isNational.value){ | 292 | if(!isNational.value){ |
| 293 | for(let ath of athletesList.value){ | 293 | for(let ath of athletesList.value){ |
| 294 | if(!ath.picUrl||!ath.phone){ | 294 | if(!ath.phone){ |
| 295 | ath.disabled = true | 295 | ath.disabled = true |
| 296 | } else { | 296 | } else { |
| 297 | ath.disabled = false | 297 | ath.disabled = false |
| ... | @@ -305,6 +305,7 @@ function getMatch(id) { | ... | @@ -305,6 +305,7 @@ function getMatch(id) { |
| 305 | match.getMatchById({ | 305 | match.getMatchById({ |
| 306 | id: id | 306 | id: id |
| 307 | }).then(res => { | 307 | }).then(res => { |
| 308 | singlePersonEntryLimit.value = res.data.singlePersonEntryLimit | ||
| 308 | noPhotoCanSign.value = res.data.noPhotoCanSign | 309 | noPhotoCanSign.value = res.data.noPhotoCanSign |
| 309 | coachOrLeaderFlag.value = res.data.coachOrLeaderFlag | 310 | coachOrLeaderFlag.value = res.data.coachOrLeaderFlag |
| 310 | extraform.value = JSON.parse(res.data.participantsInfo) | 311 | extraform.value = JSON.parse(res.data.participantsInfo) |
| ... | @@ -582,6 +583,7 @@ let hasPproperty='' | ... | @@ -582,6 +583,7 @@ let hasPproperty='' |
| 582 | let hasPlevel='' | 583 | let hasPlevel='' |
| 583 | let hasAlmighty={} | 584 | let hasAlmighty={} |
| 584 | let hasPpropertyLength=0 | 585 | let hasPpropertyLength=0 |
| 586 | let isDanNum=0 | ||
| 585 | watch(projectIds, (newVal, oldVal) => { | 587 | watch(projectIds, (newVal, oldVal) => { |
| 586 | let currProject = {} | 588 | let currProject = {} |
| 587 | if (newVal.length > oldVal.length) { | 589 | if (newVal.length > oldVal.length) { |
| ... | @@ -598,6 +600,7 @@ watch(projectIds, (newVal, oldVal) => { | ... | @@ -598,6 +600,7 @@ watch(projectIds, (newVal, oldVal) => { |
| 598 | hasPproperty='' | 600 | hasPproperty='' |
| 599 | hasPlevel='' | 601 | hasPlevel='' |
| 600 | hasAlmighty={} | 602 | hasAlmighty={} |
| 603 | isDanNum = 0 | ||
| 601 | hasPpropertyLength=0 | 604 | hasPpropertyLength=0 |
| 602 | for(let hh of projectList.value){ | 605 | for(let hh of projectList.value){ |
| 603 | if(projectIds.value.indexOf(hh.id)>-1&&hh.pproperty){ | 606 | if(projectIds.value.indexOf(hh.id)>-1&&hh.pproperty){ |
| ... | @@ -610,6 +613,9 @@ watch(projectIds, (newVal, oldVal) => { | ... | @@ -610,6 +613,9 @@ watch(projectIds, (newVal, oldVal) => { |
| 610 | if(projectIds.value.indexOf(hh.id)>-1&&hh.almightyFlag=='1'){ | 613 | if(projectIds.value.indexOf(hh.id)>-1&&hh.almightyFlag=='1'){ |
| 611 | hasAlmighty = hh | 614 | hasAlmighty = hh |
| 612 | } | 615 | } |
| 616 | if(projectIds.value.indexOf(hh.id)>-1&&hh.singleFlag=='1'){ | ||
| 617 | isDanNum += 1 | ||
| 618 | } | ||
| 613 | } | 619 | } |
| 614 | console.log(hasPproperty,hasPlevel,hasPpropertyLength) | 620 | console.log(hasPproperty,hasPlevel,hasPpropertyLength) |
| 615 | filterProjectList(currProject) | 621 | filterProjectList(currProject) |
| ... | @@ -621,11 +627,10 @@ watch(projectIds, (newVal, oldVal) => { | ... | @@ -621,11 +627,10 @@ watch(projectIds, (newVal, oldVal) => { |
| 621 | function filterProjectList(currProject){ | 627 | function filterProjectList(currProject){ |
| 622 | for(let pp of projectList.value){ | 628 | for(let pp of projectList.value){ |
| 623 | if( | 629 | if( |
| 624 | (currProject.pproperty&&pp.pproperty&&(pp.pproperty!=currProject.pproperty)) | 630 | (pp.pproperty==hasPproperty)&&((pp.danceTypeDetailStr.split(',').length>=4&&hasPpropertyLength<4)||(pp.danceTypeDetailStr.split(',').length<4&&hasPpropertyLength>=4)) |
| 625 | ||(currProject.plevel&&pp.plevel&&(pp.plevel!=currProject.plevel)) | ||
| 626 | ||(pp.pproperty==hasPproperty)&&(pp.danceTypeDetailStr.split(',').length<hasPpropertyLength) | ||
| 627 | ||(hasPproperty&&pp.pproperty&&pp.pproperty!=hasPproperty) | 631 | ||(hasPproperty&&pp.pproperty&&pp.pproperty!=hasPproperty) |
| 628 | ||(hasPlevel&&pp.plevel&&pp.plevel!=hasPlevel) | 632 | ||(hasPlevel&&pp.plevel&&pp.plevel!=hasPlevel) |
| 633 | ||(isDanNum==Number(singlePersonEntryLimit.value) && pp.singleFlag=='1') | ||
| 629 | ){ | 634 | ){ |
| 630 | pp.disabled = true | 635 | pp.disabled = true |
| 631 | } else if((hasAlmighty.almightyFlag=='1'&&pp.almightyFlag=='1') | 636 | } else if((hasAlmighty.almightyFlag=='1'&&pp.almightyFlag=='1') | ... | ... |
| ... | @@ -83,8 +83,8 @@ export default defineConfig(({ mode, command }) => { | ... | @@ -83,8 +83,8 @@ export default defineConfig(({ mode, command }) => { |
| 83 | }, | 83 | }, |
| 84 | '/dev-api': { | 84 | '/dev-api': { |
| 85 | // target: 'http://192.168.1.118:8081/', | 85 | // target: 'http://192.168.1.118:8081/', |
| 86 | target: 'http://192.168.1.131:8081/', | 86 | // target: 'http://192.168.1.131:8081/', |
| 87 | // target: 'https://jijin.wtwuxicenter.com/stage-api', | 87 | target: 'https://jijin.wtwuxicenter.com/stage-api', |
| 88 | // target: 'https://wdsfwuxicenter.com/stage-api/', | 88 | // target: 'https://wdsfwuxicenter.com/stage-api/', |
| 89 | changeOrigin: true, | 89 | changeOrigin: true, |
| 90 | rewrite: (p) => p.replace(/^\/dev-api/, '') | 90 | rewrite: (p) => p.replace(/^\/dev-api/, '') | ... | ... |
-
Please register or sign in to post a comment