Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
4886ba68 by 杨炀
Options

no message

1 parent 86bfc22a
Inline Side-by-side
Showing 14 changed files with 120 additions and 57 deletions
src/assets/styles/ruoyi.scss
...@@ -1078,7 +1078,8 @@ img{display: block;} ...@@ -1078,7 +1078,8 @@ img{display: block;}
1078 text-decoration: underline;} 1078 text-decoration: underline;}
1079 } 1079 }
1080 .panel-title{font-size: 16px;line-height: 50px;margin: 0; 1080 .panel-title{font-size: 16px;line-height: 50px;margin: 0;
1081 color: var(--el-color-primary)} 1081 color: var(--el-color-primary)
1082 }
1082 .panel-body{padding: 20px;} 1083 .panel-body{padding: 20px;}
1083 &.border{border: 1px solid #EEEEEE;} 1084 &.border{border: 1px solid #EEEEEE;}
1084 } 1085 }
......
src/layoutPc/components/AppHeader.vue
...@@ -12,12 +12,13 @@ ...@@ -12,12 +12,13 @@
12 > 12 >
13 <el-menu-item index="/">{{ language==0?'首页':'HOME' }}</el-menu-item> 13 <el-menu-item index="/">{{ language==0?'首页':'HOME' }}</el-menu-item>
14 <el-menu-item index="/news">{{ language==0?'新闻资讯':'NEWS' }}</el-menu-item> 14 <el-menu-item index="/news">{{ language==0?'新闻资讯':'NEWS' }}</el-menu-item>
15 <el-menu-item index="/notice">{{ language==0?'通知公告':'NOTICEBOARD' }}</el-menu-item> 15 <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item>
16 <el-menu-item index="/match/list">{{ language==0?'大赛报名':'REGISTRATION' }}</el-menu-item> 16 <el-menu-item index="/match/list">{{ language==0?'大赛报名':'REGISTRATION' }}</el-menu-item>
17 <el-menu-item index="/saiC">{{ language==0?'赛程安排':'COMPETITIONS' }}</el-menu-item> 17 <el-menu-item index="/saiC">{{ language==0?'赛程安排':'COMPETITIONS' }}</el-menu-item>
18 <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item> 18 <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item>
19 <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item> 19 <el-menu-item index="/notice">{{ language==0?'通知公告':'NOTICEBOARD' }}</el-menu-item>
20 <!-- <el-sub-menu index="/about">--> 20
21 <!-- <el-sub-menu index="/about">-->
21 <!-- <template #title>{{ language==0?'关于我们':'CONTACT & MORE' }}</template>--> 22 <!-- <template #title>{{ language==0?'关于我们':'CONTACT & MORE' }}</template>-->
22 <!-- <el-menu-item index="/about/wuDao">{{ language==0?'舞蹈节':'About Us' }}</el-menu-item>--> 23 <!-- <el-menu-item index="/about/wuDao">{{ language==0?'舞蹈节':'About Us' }}</el-menu-item>-->
23 <!-- <el-menu-item index="/about/regulations" v-if="language==1">Rules & Regulations</el-menu-item>--> 24 <!-- <el-menu-item index="/about/regulations" v-if="language==1">Rules & Regulations</el-menu-item>-->
...@@ -30,12 +31,13 @@ ...@@ -30,12 +31,13 @@
30 > 31 >
31 <el-menu-item index="/">{{ language==0?'首页':'HOME' }}</el-menu-item> 32 <el-menu-item index="/">{{ language==0?'首页':'HOME' }}</el-menu-item>
32 <el-menu-item index="/news">{{ language==0?'新闻资讯':'NEWS' }}</el-menu-item> 33 <el-menu-item index="/news">{{ language==0?'新闻资讯':'NEWS' }}</el-menu-item>
33 <el-menu-item index="/notice">{{ language==0?'通知公告':'NOTICEBOARD' }}</el-menu-item> 34 <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item>
34 <el-menu-item index="/match/list">{{ language==0?'大赛报名':'REGISTRATION' }}</el-menu-item> 35 <el-menu-item index="/match/list">{{ language==0?'大赛报名':'REGISTRATION' }}</el-menu-item>
35 <el-menu-item index="/saiC">{{ language==0?'赛程安排':'COMPETITIONS' }}</el-menu-item> 36 <el-menu-item index="/saiC">{{ language==0?'赛程安排':'COMPETITIONS' }}</el-menu-item>
36 <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item> 37 <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item>
37 <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item> 38 <el-menu-item index="/notice">{{ language==0?'通知公告':'NOTICEBOARD' }}</el-menu-item>
38 <!-- <el-sub-menu index="/about">--> 39
40 <!-- <el-sub-menu index="/about">-->
39 <!-- <template #title>{{ language==0?'关于我们':'CONTACT & MORE' }}</template>--> 41 <!-- <template #title>{{ language==0?'关于我们':'CONTACT & MORE' }}</template>-->
40 <!-- <el-menu-item index="/about/wuDaoEn">{{ language==0?'舞蹈节':'About Us' }}</el-menu-item>--> 42 <!-- <el-menu-item index="/about/wuDaoEn">{{ language==0?'舞蹈节':'About Us' }}</el-menu-item>-->
41 <!-- <el-menu-item index="/about/regulations" v-if="language==1">Rules & Regulations</el-menu-item>--> 43 <!-- <el-menu-item index="/about/regulations" v-if="language==1">Rules & Regulations</el-menu-item>-->
......
src/viewsPc/center/myMember.vue
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
24 </el-form-item> 24 </el-form-item>
25 <el-form-item :label="language==0?'会员角色':'Role'"> 25 <el-form-item :label="language==0?'会员角色':'Role'">
26 <el-select v-model="labelArr" multiple style="width: 100px;"> 26 <el-select v-model="labelArr" multiple style="width: 100px;">
27 <el-option v-for="l in labels" :key="l.value" :value="l.value" :label="language==0?(l.label):(l.enlabel)"/> 27 <el-option v-if="group.type=='4'" v-for="l in labels" :key="l.value" :value="l.value" :label="language==0?(l.label):(l.enlabel)"/>
28 <el-option v-else v-for="l in labelsForType4" :key="l.value" :value="l.value" :label="language==0?(l.label):(l.enlabel)"/>
28 </el-select> 29 </el-select>
29 </el-form-item> 30 </el-form-item>
30 <el-form-item :label="language==0?'WDSF':'WDSF'"> 31 <el-form-item :label="language==0?'WDSF':'WDSF'">
...@@ -73,6 +74,8 @@ import useUserStore from "@/store/modules/user"; ...@@ -73,6 +74,8 @@ import useUserStore from "@/store/modules/user";
73 import {useStorage} from "@vueuse/core/index"; 74 import {useStorage} from "@vueuse/core/index";
74 import AddWdsf from "@/viewsPc/match/components/addWdsf"; 75 import AddWdsf from "@/viewsPc/match/components/addWdsf";
75 const language= useStorage('language',0) 76 const language= useStorage('language',0)
77 const group = useUserStore().group || {}
78
76 const tableData = ref([]) 79 const tableData = ref([])
77 const labelArr = ref([]) 80 const labelArr = ref([])
78 const labels = ref([ 81 const labels = ref([
...@@ -84,6 +87,15 @@ const labels = ref([ ...@@ -84,6 +87,15 @@ const labels = ref([
84 {value: '6', label: '官员', enlabel: 'Official'}, 87 {value: '6', label: '官员', enlabel: 'Official'},
85 {value: '3', label: '其他', enlabel: 'Other'} 88 {value: '3', label: '其他', enlabel: 'Other'}
86 ]) 89 ])
90 const labelsForType4 = ref([
91 {value: '0', label: '运动员', enlabel: 'Sportsman'},
92 {value: '1', label: '教练', enlabel: 'Coach'},
93 {value: '2', label: '领队', enlabel: 'Head of team'},
94 {value: '4', label: '管理', enlabel: 'Manager'},
95 {value: '5', label: '翻译', enlabel: 'Interpreter'},
96 {value: '6', label: '官员', enlabel: 'Official'},
97 {value: '3', label: '其他', enlabel: 'Other'}
98 ])
87 const certificates = ref([ 99 const certificates = ref([
88 { 100 {
89 value: '0', 101 value: '0',
...@@ -102,7 +114,6 @@ const query = ref({ ...@@ -102,7 +114,6 @@ const query = ref({
102 pageNum: 1, pageSize: 10 114 pageNum: 1, pageSize: 10
103 }) 115 })
104 const total = ref(0) 116 const total = ref(0)
105 const group = useUserStore().group || {}
106 const props = defineProps({ 117 const props = defineProps({
107 user: { 118 user: {
108 type: Object, 119 type: Object,
......
src/viewsPc/match/chooseCoach.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <div class="box ph-30"> 4 <div class="box ph-30">
5 <el-card v-if="user"> 5 <el-card v-if="user">
6 <single-sign-step v-if="user.utype=='1'" activeStep="1" :language="language"/> 6 <single-sign-step v-if="user.utype=='1'" activeStep="1" :language="language"/>
7 <team-sign-step v-if="user.utype=='2'" activeStep="2" :language="language"/> 7 <team-sign-step v-if="user.utype=='2'" :activeStep="1" :language="language"/>
8 </el-card> 8 </el-card>
9 9
10 <el-card class="mt20"> 10 <el-card class="mt20">
...@@ -73,10 +73,14 @@ ...@@ -73,10 +73,14 @@
73 <el-col :lg="12"> 73 <el-col :lg="12">
74 <el-card class="mt20" v-loading="loading"> 74 <el-card class="mt20" v-loading="loading">
75 <template #header> 75 <template #header>
76 <div class="card-header"> 76 <div class="card-header" v-if="isNational">
77 <img src="@/assets/sign/tag03.png"/> 77 <img src="@/assets/sign/tag03.png"/>
78 {{ language==0?'队医':'Team doctor' }} 78 {{ language==0?'队医':'Team doctor' }}
79 </div> 79 </div>
80 <div class="card-header" v-else>
81 <img src="@/assets/sign/gl.png"/>
82 管理
83 </div>
80 </template> 84 </template>
81 <div class="chooseForm"> 85 <div class="chooseForm">
82 <el-checkbox-group v-model="form.doctor"> 86 <el-checkbox-group v-model="form.doctor">
...@@ -198,7 +202,7 @@ import DialogAddCoach_En from './components/addCoach_en' ...@@ -198,7 +202,7 @@ import DialogAddCoach_En from './components/addCoach_en'
198 const {proxy} = getCurrentInstance() 202 const {proxy} = getCurrentInstance()
199 const router = useRouter() 203 const router = useRouter()
200 const route = useRoute() 204 const route = useRoute()
201 import {ElMessage} from 'element-plus' 205 import {ElMessage, ElMessageBox} from 'element-plus'
202 import {useRoute, useRouter} from 'vue-router' 206 import {useRoute, useRouter} from 'vue-router'
203 import useUserStore from "@/store/modules/user"; 207 import useUserStore from "@/store/modules/user";
204 import {useStorage} from "@vueuse/core/index"; 208 import {useStorage} from "@vueuse/core/index";
...@@ -242,7 +246,7 @@ onMounted(() => { ...@@ -242,7 +246,7 @@ onMounted(() => {
242 }) 246 })
243 247
244 function getList() { 248 function getList() {
245 console.log(user.utype) 249 // console.log(user.utype)
246 if (user.utype == '1') { 250 if (user.utype == '1') {
247 geren() 251 geren()
248 } 252 }
...@@ -252,7 +256,7 @@ function getList() { ...@@ -252,7 +256,7 @@ function getList() {
252 } 256 }
253 257
254 function changecoachs(e) { 258 function changecoachs(e) {
255 console.log(e) 259 // console.log(e)
256 } 260 }
257 261
258 // 获取报名时是否已选过 262 // 获取报名时是否已选过
...@@ -309,11 +313,31 @@ function geren() { ...@@ -309,11 +313,31 @@ function geren() {
309 } 313 }
310 314
311 function goNext() { 315 function goNext() {
312 console.log(form.value) 316 console.log(personAllList.value.teamDoctors,form.value)
313 // if ((form.value.coachs.length < 1) && (form.value.leader.length < 1)) { 317 // if ((form.value.coachs.length < 1) && (form.value.leader.length < 1)) {
314 // ElMessage.warning(language.value==0?'至少选一个教练或领队':'Coach/Team Leader, select at least one') 318 // ElMessage.warning(language.value==0?'至少选一个教练或领队':'Coach/Team Leader, select at least one')
315 // return 319 // return
316 // } 320 // }
321 if((personAllList.value.coaches.length>=0 && form.value.coachs?.toString().length == 0)&&
322 (personAllList.value.teamDoctors.length>=0 && form.value.doctor?.toString().length == 0)&&
323 (personAllList.value.translators.length>=0 && form.value.translator?.toString().length == 0)&&
324 (personAllList.value.others.length>=0 && form.value.other?.toString().length == 0)&&
325 (personAllList.value.officials.length>=0 && form.value.official?.toString().length == 0)&&
326 (personAllList.value.leaders.length>=0 && form.value.leader?.toString().length == 0)
327 ){
328 ElMessageBox.confirm(language.value==0?'您已添加随行人员，但尚未选中，是否进行下一步？':'You have added a follower, but have not selected, do you want to continue?', {
329 confirmButtonText: language.value==0?'下一步':'Next',
330 cancelButtonText: language.value==0?'取消':'Cancel',
331 type: 'warning'
332 }).then(()=>{
333 next()
334 })
335 return
336 }
337 next()
338 }
339
340 function next() {
317 var obj = { 341 var obj = {
318 cptId: matchId, 342 cptId: matchId,
319 coachIds: form.value.coachs?.toString() || '', 343 coachIds: form.value.coachs?.toString() || '',
...@@ -332,7 +356,6 @@ function goNext() { ...@@ -332,7 +356,6 @@ function goNext() {
332 if (user.utype == '1') { 356 if (user.utype == '1') {
333 // 个人报名 357 // 个人报名
334 match.singleSignSavePerson(obj).then(res => { 358 match.singleSignSavePerson(obj).then(res => {
335 console.log(res)
336 router.push({ 359 router.push({
337 name: 'chooseProject', 360 name: 'chooseProject',
338 query: { 361 query: {
...@@ -357,11 +380,8 @@ function goNext() { ...@@ -357,11 +380,8 @@ function goNext() {
357 }) 380 })
358 } 381 }
359 382
360 console.log(form.value)
361 } 383 }
362
363 function goPrev() { 384 function goPrev() {
364 console.log(languageSource.value)
365 if(languageSource.value=='100'){ 385 if(languageSource.value=='100'){
366 router.push({ 386 router.push({
367 name: `teamSignCn`, 387 name: `teamSignCn`,
......
src/viewsPc/match/chooseProject.vue
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 <el-col :lg="18"> 49 <el-col :lg="18">
50 <div class="panel border"> 50 <div class="panel border">
51 <div class="panel-header "> 51 <div class="panel-header ">
52 <h3 class="panel-title" v-if="language==0">可参与报名的项目</h3> 52 <h3 class="panel-title" v-if="language==0">可参与报名的项目 <span>已报项目在下方查看</span></h3>
53 <h3 class="panel-title" v-else>Search Events</h3> 53 <h3 class="panel-title" v-else>Search Events</h3>
54 <div class="fr"> 54 <div class="fr">
55 <el-input size="small" v-model="projectQuery.name" :prefix-icon="Search" @change="getProjectList" 55 <el-input size="small" v-model="projectQuery.name" :prefix-icon="Search" @change="getProjectList"
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 <el-checkbox class="flexBetweenBox" v-for="c in projectList" :label="c.id" :key="c.id" :disabled="cantBao.flag"> 62 <el-checkbox class="flexBetweenBox" v-for="c in projectList" :label="c.id" :key="c.id" :disabled="cantBao.flag">
63 <div class="flexBetween w100"> 63 <div class="flexBetween w100">
64 <div class="l"> 64 <div class="l">
65 {{ c.code }}:{{ c.name }} 65 {{ c.code }}:{{ c.name }} （{{c.danceType}}）
66 <div>{{ c.danceTypeDetailStr }}</div> 66 <div>{{ c.danceTypeDetailStr }}</div>
67 </div> 67 </div>
68 <div class="text-primary">{{ language == 0 ? '¥' : '€' }}{{ c.serviceFee }}</div> 68 <div class="text-primary">{{ language == 0 ? '¥' : '€' }}{{ c.serviceFee }}</div>
...@@ -796,4 +796,8 @@ function switchTabletype() { ...@@ -796,4 +796,8 @@ function switchTabletype() {
796 } 796 }
797 .mName{color: #000;font-size: 15px;display: inline-block;max-width: 6.5em;text-overflow: ellipsis; 797 .mName{color: #000;font-size: 15px;display: inline-block;max-width: 6.5em;text-overflow: ellipsis;
798 overflow: hidden;} 798 overflow: hidden;}
799
800 .panel h3.panel-title{
801 span{ color: #999;font-size: 12px;}
802 }
799 </style> 803 </style>
......
src/viewsPc/match/chooseSportsman.vue
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
32 32
33 {{c.representing}} 33 {{c.representing}}
34 {{c.ageGroup}} 34 {{c.ageGroup}}
35 {{c.division}} 35 {{c.division}}<span v-if="c.age"> -{{ c.age }}{{language==0 ? '岁' : 'years'}}</span>
36 <!-- @click="editPerson(c.id)"--> 36 <!-- @click="editPerson(c.id)"-->
37 <span v-if="c.disabled" class="text-danger po-right">需补全信息</span> 37 <span v-if="c.disabled" class="text-danger po-right">需补全信息</span>
38 <!-- -{{ c.age }}--> 38
39 </div> 39 </div>
40 </el-option> 40 </el-option>
41 <!-- <template #tag>--> 41 <!-- <template #tag>-->
...@@ -78,7 +78,9 @@ ...@@ -78,7 +78,9 @@
78 <el-col :lg="14"> 78 <el-col :lg="14">
79 <div class="panel border"> 79 <div class="panel border">
80 <div class="panel-header "> 80 <div class="panel-header ">
81 <h3 class="panel-title" v-if="language==0">可参与报名的项目</h3> 81 <h3 class="panel-title" v-if="language==0">可参与报名的项目
82 <span>已报项目在下方查看</span>
83 </h3>
82 <h3 class="panel-title" v-else>Search Events</h3> 84 <h3 class="panel-title" v-else>Search Events</h3>
83 <div class="fr"> 85 <div class="fr">
84 <el-input size="small" v-model="projectQuery.name" :prefix-icon="Search" 86 <el-input size="small" v-model="projectQuery.name" :prefix-icon="Search"
...@@ -91,7 +93,7 @@ ...@@ -91,7 +93,7 @@
91 <el-checkbox class="flexBetweenBox" v-for="c in projectList" :value="c.id" :key="c.id"> 93 <el-checkbox class="flexBetweenBox" v-for="c in projectList" :value="c.id" :key="c.id">
92 <div class="flexBetween w100"> 94 <div class="flexBetween w100">
93 <div class="l"> 95 <div class="l">
94 {{ c.code }}:{{ c.name }} 96 {{ c.code }}:{{ c.name }}（{{c.danceType}}）
95 <div>{{ c.danceTypeDetailStr }}</div> 97 <div>{{ c.danceTypeDetailStr }}</div>
96 </div> 98 </div>
97 <div class="text-primary">{{ language == 0 ? '¥' : '€' }}{{ c.serviceFee }}</div> 99 <div class="text-primary">{{ language == 0 ? '¥' : '€' }}{{ c.serviceFee }}</div>
...@@ -868,4 +870,7 @@ watch(choosedchoosed, (newVal, oldVal) => { ...@@ -868,4 +870,7 @@ watch(choosedchoosed, (newVal, oldVal) => {
868 } 870 }
869 :deep(.el-select__tags-text){color: #000;font-size: 14px;} 871 :deep(.el-select__tags-text){color: #000;font-size: 14px;}
870 .po-right{position: absolute;right: 0;} 872 .po-right{position: absolute;right: 0;}
873 .panel h3.panel-title{
874 span{ color: #999;font-size: 13px;}
875 }
871 </style> 876 </style>
......
src/viewsPc/match/components/addCoach.vue
...@@ -164,7 +164,7 @@ const data = reactive({ ...@@ -164,7 +164,7 @@ const data = reactive({
164 {value: '0', label: '运动员', enlabel: 'Sportsman'}, 164 {value: '0', label: '运动员', enlabel: 'Sportsman'},
165 {value: '1', label: '教练', enlabel: 'Coach'}, 165 {value: '1', label: '教练', enlabel: 'Coach'},
166 {value: '2', label: '领队', enlabel: 'Head Of Team'}, 166 {value: '2', label: '领队', enlabel: 'Head Of Team'},
167 {value: '4', label: '队医', enlabel: 'Team doctor'}, 167 {value: '4', label: '管理', enlabel: 'Team doctor'},
168 {value: '5', label: '翻译', enlabel: 'Interpreter'}, 168 {value: '5', label: '翻译', enlabel: 'Interpreter'},
169 {value: '6', label: '官员', enlabel: 'Official'}, 169 {value: '6', label: '官员', enlabel: 'Official'},
170 {value: '3', label: '其他', enlabel: 'Other'} 170 {value: '3', label: '其他', enlabel: 'Other'}
......
src/viewsPc/match/components/allSportsmanList.vue
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
4 <el-button type="primary" @click="addMember"> 4 <el-button type="primary" @click="addMember">
5 {{ language == 0 ? '添加选手' : 'Add Player' }} 5 {{ language == 0 ? '添加选手' : 'Add Player' }}
6 </el-button> 6 </el-button>
7 <el-button type="primary" plain @click="importSportman" v-if="!isNational"> 7 <!-- <el-button type="primary" plain @click="importSportman" v-if="!isNational">-->
8 {{language == 0 ? '导入选手' : 'Import Player'}} 8 <!-- {{language == 0 ? '导入选手' : 'Import Player'}}-->
9 </el-button> 9 <!-- </el-button>-->
10 </div> 10 </div>
11 <div class="from-Card"> 11 <div class="from-Card">
12 <el-form :inline="true" :model="query" class="mt20" label-width="60" size="small"> 12 <el-form :inline="true" :model="query" class="mt20" label-width="60" size="small">
......
src/viewsPc/match/components/coachInfo-row.vue
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
25 </el-col> 25 </el-col>
26 <el-col :lg="8"> 26 <el-col :lg="8">
27 <div class="item"> 27 <div class="item">
28 <label>{{ language == 0 ? '队医' : 'TEAM DOCTOR' }}</label> 28 <label v-if="group.type=='4'">{{ language == 0 ? '队医' : 'TEAM DOCTOR' }}</label>
29 <label v-else>{{ language == 0 ? '管理' : 'MANAGER' }}</label>
29 <span class="mr5" v-for="c in names.teamDoctorList"> 30 <span class="mr5" v-for="c in names.teamDoctorList">
30 {{ c.realName }}, 31 {{ c.realName }},
31 </span> 32 </span>
......
src/viewsPc/match/components/personTable.vue
...@@ -27,7 +27,12 @@ ...@@ -27,7 +27,12 @@
27 <span v-if="item==='0'" class="ml5">{{ language == 0 ? '运动员' : 'Athletes' }}</span> 27 <span v-if="item==='0'" class="ml5">{{ language == 0 ? '运动员' : 'Athletes' }}</span>
28 <span v-if="item==='1'" class="ml5">{{ language == 0 ? '教练' : 'Coach' }}</span> 28 <span v-if="item==='1'" class="ml5">{{ language == 0 ? '教练' : 'Coach' }}</span>
29 <span v-if="item==='2'" class="ml5">{{ language == 0 ? '领队' : 'Head of team' }}</span> 29 <span v-if="item==='2'" class="ml5">{{ language == 0 ? '领队' : 'Head of team' }}</span>
30 <span v-if="item==='4'" class="ml5">{{ language == 0 ? '队医' : 'Team Doctor' }}</span> 30 <span v-if="item==='4'&&group.type!='4'" class="ml5">
31 {{ language == 0 ? '管理' : 'Manager' }}
32 </span>
33 <span v-if="item==='4'&&group.type=='4'" class="ml5">
34 {{ language == 0 ? '队医' : 'Team Doctor' }}
35 </span>
31 <span v-if="item==='5'" class="ml5">{{ language == 0 ? '翻译' : 'Interpreter' }}</span> 36 <span v-if="item==='5'" class="ml5">{{ language == 0 ? '翻译' : 'Interpreter' }}</span>
32 <span v-if="item==='6'" class="ml5">{{ language == 0 ? '官员' : 'Official' }}</span> 37 <span v-if="item==='6'" class="ml5">{{ language == 0 ? '官员' : 'Official' }}</span>
33 <span v-if="item==='3'" class="ml5">{{ language == 0 ? '其他' : 'Other' }}</span> 38 <span v-if="item==='3'" class="ml5">{{ language == 0 ? '其他' : 'Other' }}</span>
...@@ -61,7 +66,8 @@ ...@@ -61,7 +66,8 @@
61 <script setup> 66 <script setup>
62 import {ref} from "vue"; 67 import {ref} from "vue";
63 import {useStorage} from "@vueuse/core/index"; 68 import {useStorage} from "@vueuse/core/index";
64 69 import useUserStore from "@/store/modules/user";
70 const group = useUserStore().group || {}
65 const language = useStorage('language', 0) 71 const language = useStorage('language', 0)
66 const emit = defineEmits(['edit', 'delete']) 72 const emit = defineEmits(['edit', 'delete'])
67 let title = '' 73 let title = ''
......
src/viewsPc/match/components/signInfo-table.vue
...@@ -4,22 +4,22 @@ ...@@ -4,22 +4,22 @@
4 </div> 4 </div>
5 <el-table :data="list" :sum-text="sumText" border style="width: 100%" v-loading="loading"> 5 <el-table :data="list" :sum-text="sumText" border style="width: 100%" v-loading="loading">
6 <el-table-column :label="language==0?'序号':'Index'" type="index" width="70" align="center"/> 6 <el-table-column :label="language==0?'序号':'Index'" type="index" width="70" align="center"/>
7 <el-table-column v-if="!isNational" :label="language==0?'姓名':'Real Name'" prop="personInfo.realName" min-width="100"/> 7 <el-table-column v-if="!isNational" :label="language==0?'姓名':'Real Name'" prop="personInfo.realName" align="center" min-width="100"/>
8 <el-table-column v-if="isNational" :label="language==0?'姓氏':'Surname'" prop="personInfo.xing" min-width="100"/> 8 <el-table-column v-if="isNational" :label="language==0?'姓氏':'Surname'" prop="personInfo.xing" min-width="100"/>
9 <el-table-column v-if="isNational" :label="language==0?'名':'Name'" prop="personInfo.ming" min-width="100"/> 9 <el-table-column v-if="isNational" :label="language==0?'名':'Name'" prop="personInfo.ming" min-width="100"/>
10 <el-table-column :label="language==0?'所属国家/地区':'Country'" min-width="120"> 10 <el-table-column :label="language==0?'所属国家/地区':'Country'" min-width="120" header-align="center" align="center">
11 <template #default="scope"> 11 <template #default="scope">
12 <span v-if="scope.row.personInfo.countryName">{{scope.row.personInfo.countryName}}</span> 12 <span v-if="scope.row.personInfo.countryName">{{scope.row.personInfo.countryName}}</span>
13 <span v-if="scope.row.personInfo.representing">{{scope.row.personInfo.representing}}</span> 13 <span v-if="scope.row.personInfo.representing">{{scope.row.personInfo.representing}}</span>
14 </template> 14 </template>
15 </el-table-column> 15 </el-table-column>
16 <el-table-column :label="language==0?'性别':'Gender'" prop="personInfo.sexStr"/> 16 <el-table-column :label="language==0?'性别':'Gender'" prop="personInfo.sexStr" align="center"/>
17 <el-table-column v-if="!isNational" :label="language==0?'证件类型':'ID Type'" :width="language==0?'':'140'" prop="personInfo.idcTypeStr"/> 17 <el-table-column v-if="!isNational" :label="language==0?'证件类型':'ID Type'" align="center" :width="language==0?'':'140'" prop="personInfo.idcTypeStr" header-align="center"/>
18 <el-table-column v-if="!isNational" :label="language==0?'证件号码':'ID NO.'" prop="personInfo.idcCode" width="200"/> 18 <el-table-column v-if="!isNational" :label="language==0?'证件号码':'ID NO.'" prop="personInfo.idcCode" width="200" header-align="center"/>
19 <el-table-column v-if="isNational" :label="language==0?'WDSF 会员号':'WDSF MIN'" prop="personInfo.wdsfMin" width="200"/> 19 <el-table-column v-if="isNational" :label="language==0?'WDSF 会员号':'WDSF MIN'" prop="personInfo.wdsfMin" width="200" header-align="center"/>
20 <el-table-column v-if="!isNational" :label="language==0?'出生日期':'Date of Birth'" prop="personInfo.birth" width="130"/> 20 <el-table-column v-if="!isNational" :label="language==0?'出生日期':'Date of Birth'" align="center" prop="personInfo.birth" width="130" header-align="center"/>
21 <el-table-column v-if="isNational" :label="language==0?'年龄组':'Age group'" prop="personInfo.ageGroup" width="110"/> 21 <el-table-column v-if="isNational" :label="language==0?'年龄组':'Age group'" prop="personInfo.ageGroup" width="110" header-align="center"/>
22 <el-table-column v-if="isNational" :label="language==0?'舞种':'Division'" prop="personInfo.division" width="110"/> 22 <el-table-column v-if="isNational" :label="language==0?'舞种':'Division'" prop="personInfo.division" width="110" header-align="center"/>
23 <!-- <el-table-column :label="language==0?'会员角色':'Role'" width="150">--> 23 <!-- <el-table-column :label="language==0?'会员角色':'Role'" width="150">-->
24 <!-- <template #default="scope">--> 24 <!-- <template #default="scope">-->
25 <!-- <div class="esp">--> 25 <!-- <div class="esp">-->
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 <!-- </template>--> 36 <!-- </template>-->
37 <!-- </el-table-column>--> 37 <!-- </el-table-column>-->
38 <!-- <el-table-column :label="language==0?'详细地址':'Detailed Address'" prop="personInfo.address" min-width="140"/>--> 38 <!-- <el-table-column :label="language==0?'详细地址':'Detailed Address'" prop="personInfo.address" min-width="140"/>-->
39 <el-table-column :label="language==0?'报项':'REGISTERED COMPETITION'" min-width="300" :fixed="hasAction?false:'right'"> 39 <el-table-column :label="language==0?'报项':'REGISTERED COMPETITION'" min-width="300" header-align="center" :fixed="hasAction?false:'right'">
40 <template #default="props"> 40 <template #default="props">
41 <ol> 41 <ol>
42 <li v-for="s in props.row.signInfo"> 42 <li v-for="s in props.row.signInfo">
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
51 </ol> 51 </ol>
52 </template> 52 </template>
53 </el-table-column> 53 </el-table-column>
54 <el-table-column :fixed="hasAction?false:'right'" min-width="100" :label="language==0?'保险费':'Premium'" prop="insuranceFee"> 54 <el-table-column :fixed="hasAction?false:'right'" min-width="100" align="center" :label="language==0?'保险费':'Premium'" prop="insuranceFee">
55 <template #default="scope"> 55 <template #default="scope">
56 <span class="text-primary">{{ language==0?'¥':'€' }}{{ scope.row.insuranceFee }}</span> 56 <span class="text-primary">{{ language==0?'¥':'€' }}{{ scope.row.insuranceFee }}</span>
57 </template> 57 </template>
......
src/viewsPc/match/components/zu-table.vue
...@@ -2,22 +2,35 @@ ...@@ -2,22 +2,35 @@
2 <div class="mt20"></div> 2 <div class="mt20"></div>
3 <el-table :data="list" border style="width: 100%"> 3 <el-table :data="list" border style="width: 100%">
4 <el-table-column :label="language==0?'序号':'Index'" type="index" width="70" align="center"/> 4 <el-table-column :label="language==0?'序号':'Index'" type="index" width="70" align="center"/>
5 <el-table-column :label="language==0?'组别代码':'EVENT code'" width="120px" prop="project.code"/> 5 <el-table-column :label="language==0?'组别代码':'EVENT code'" width="120px" align="center" prop="project.code"/>
6 <el-table-column :label="language==0?'组别':'EVENT'" prop="project.name"/> 6 <el-table-column :label="language==0?'组别':'EVENT'" min-width="150px" header-align="center" prop="project.name">
7 <el-table-column :label="language==0?'舞种':'DISCIPLINE'" width="120px" prop="project.danceType"/>
8 <el-table-column :label="language==0?'参赛说明':'Participation Instructions'" min-width="160px">
9 <template #default="scope"> 7 <template #default="scope">
10 <div v-html="scope.row.project.remarks"></div> 8 <el-tooltip effect="dark" :content="scope.row.project.name">
9 <div class="esp">{{scope.row.project.name}}</div>
10 </el-tooltip>
11 </template> 11 </template>
12 </el-table-column> 12 </el-table-column>
13 <el-table-column :label="language==0?'参赛运动员':'PARTICIPATING ATHLETES'" min-width="140px"> 13 <el-table-column :label="language==0?'舞种':'DISCIPLINE'" align="center" width="120px" prop="project.danceType"/>
14 <el-table-column :label="language==0?'参赛说明':'Participation Instructions'" header-align="center" min-width="160px">
14 <template #default="scope"> 15 <template #default="scope">
15 <div> 16 <el-tooltip effect="dark" :content="scope.row.project.remarks">
17 <div class="esp" v-html="scope.row.project.remarks"></div>
18 </el-tooltip>
19 </template>
20 </el-table-column>
21 <el-table-column :label="language==0?'参赛运动员':'PARTICIPATING ATHLETES'" header-align="center" min-width="140px">
22 <template #default="scope">
23 <el-tooltip effect="dark">
24 <template #content>
25 <span v-for="s in scope.row.athletes">{{ s.name }},</span>
26 </template>
27 <div class="esp">
16 <span v-for="s in scope.row.athletes">{{ s.name }},</span> 28 <span v-for="s in scope.row.athletes">{{ s.name }},</span>
17 </div> 29 </div>
30 </el-tooltip>
18 </template> 31 </template>
19 </el-table-column> 32 </el-table-column>
20 <el-table-column :label="language==0?'参赛服务费':'REGISTRATION FEE'" width="150px" prop=""> 33 <el-table-column :label="language==0?'参赛服务费':'REGISTRATION FEE'" align="center" width="150px" prop="">
21 <template #default="scope"> 34 <template #default="scope">
22 <div class="text-primary"> 35 <div class="text-primary">
23 {{ language==0?'¥':'€' }}{{ scope.row.project.serviceFee }} 36 {{ language==0?'¥':'€' }}{{ scope.row.project.serviceFee }}
......
src/viewsPc/match/teamSign_Cn.vue
...@@ -43,12 +43,12 @@ ...@@ -43,12 +43,12 @@
43 <el-form-item :label="language==0?'邮箱':'Email'" required prop="contactEmail"> 43 <el-form-item :label="language==0?'邮箱':'Email'" required prop="contactEmail">
44 <el-input v-model="form.contactEmail" type="email" :placeholder="language==0?'请输入内容':''"/> 44 <el-input v-model="form.contactEmail" type="email" :placeholder="language==0?'请输入内容':''"/>
45 </el-form-item> 45 </el-form-item>
46 <!-- <el-form-item :label="language==0?'专业/业余':'Professional/Amateur'" required prop="majorFlag">--> 46 <el-form-item :label="language==0?'专业/业余':'Professional/Amateur'" required prop="majorFlag">
47 <!-- <el-select v-model="form.majorFlag">--> 47 <el-select v-model="form.majorFlag">
48 <!-- <el-option :label="language==0?'专业':'Professional'" value="1" />--> 48 <el-option :label="language==0?'专业':'Professional'" value="1" />
49 <!-- <el-option :label="language==0?'业余':'Amateur'" value="0" />--> 49 <el-option :label="language==0?'业余':'Amateur'" value="0" />
50 <!-- </el-select>--> 50 </el-select>
51 <!-- </el-form-item>--> 51 </el-form-item>
52 <el-form-item :label="language==0?'团体类型':'Group type'" prop="type"> 52 <el-form-item :label="language==0?'团体类型':'Group type'" prop="type">
53 <el-select :disabled="form.type=='4'" v-model="form.type" :placeholder="typeOptions[language].selectPlaceholder" style="width: 100%;"> 53 <el-select :disabled="form.type=='4'" v-model="form.type" :placeholder="typeOptions[language].selectPlaceholder" style="width: 100%;">
54 <el-option v-for="(o,index) in typeOptions[language].options" :label="o.text" 54 <el-option v-for="(o,index) in typeOptions[language].options" :label="o.text"
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!