fb5fd137 by 杨炀

国内赛

1 parent 182c235a
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 <div style="margin: 0 4px 10px;display: flex"> 24 <div style="margin: 0 4px 10px;display: flex">
25 <el-select multiple v-model="choosedchoosed" collapse-tags-tooltip filterable 25 <el-select multiple v-model="choosedchoosed" collapse-tags-tooltip filterable
26 @change="changechoosed"> 26 @change="changechoosed">
27 <el-option v-for="c in athletesList" :key="c.id" :label="c.xing + c.ming" :value="c.id"> 27 <el-option v-for="c in athletesList" :key="c.id" :label="c.realName" :value="c.id">
28 <div class="flexOption"> 28 <div class="flexOption">
29 {{ c.realName }} 29 {{ c.realName }}
30 <img v-if="c.sex=='0'" src="@/assets/img/female.png"/> 30 <img v-if="c.sex=='0'" src="@/assets/img/female.png"/>
......
...@@ -40,8 +40,9 @@ ...@@ -40,8 +40,9 @@
40 <!-- <el-table-column type="selection" :label="language==0?'选择':'Selection'" :selectable="selectable"/>--> 40 <!-- <el-table-column type="selection" :label="language==0?'选择':'Selection'" :selectable="selectable"/>-->
41 <el-table-column align="center" type="index" :label="language==0?'序号':'Index'" width="70" :selectable="selectable"/> 41 <el-table-column align="center" type="index" :label="language==0?'序号':'Index'" width="70" :selectable="selectable"/>
42 <el-table-column v-if="isNational" :label="language==0?'WDSF 会员号':'WDSF MIN'" prop="wdsfMin" width="100"/> 42 <el-table-column v-if="isNational" :label="language==0?'WDSF 会员号':'WDSF MIN'" prop="wdsfMin" width="100"/>
43 <el-table-column align="center" :label="language==0?'姓氏':'Surname'" prop="xing" min-width="100"/> 43 <el-table-column align="center" v-if="!isNational" :label="language==0?'姓名':'Real Name'" prop="realName" min-width="100"/>
44 <el-table-column align="center" :label="language==0?'名':'Name'" prop="ming" min-width="100"/> 44 <el-table-column align="center" v-if="isNational" :label="language==0?'姓氏':'Surname'" prop="xing" min-width="100"/>
45 <el-table-column align="center" v-if="isNational" :label="language==0?'名':'Name'" prop="ming" min-width="100"/>
45 <el-table-column align="center" v-if="isNational" :label="language==0?'代表':'Representing'" prop="representing" min-width="120"/> 46 <el-table-column align="center" v-if="isNational" :label="language==0?'代表':'Representing'" prop="representing" min-width="120"/>
46 <el-table-column align="center" v-if="!isNational" :label="language==0?'所属国家/地区':'Nationality'" prop="countryName" min-width="110"/> 47 <el-table-column align="center" v-if="!isNational" :label="language==0?'所属国家/地区':'Nationality'" prop="countryName" min-width="110"/>
47 <el-table-column :label="language==0?'性别':'Gender'" prop="sexStr"/> 48 <el-table-column :label="language==0?'性别':'Gender'" prop="sexStr"/>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 </el-col> 8 </el-col>
9 <el-col :span="20"> 9 <el-col :span="20">
10 <div class="item" v-if="groupInfo.type=='4'"><label>{{ language==0?'代表队':'Represent' }}</label>{{ groupInfo.name?.substring(0,3) }}</div> 10 <div class="item" v-if="groupInfo.type=='4'"><label>{{ language==0?'代表队':'Represent' }}</label>{{ groupInfo.name?.substring(0,3) }}</div>
11 <div class="item" v-if="groupInfo.type!='4'"><label>{{ language==0?'团体名称':'Team name' }}</label>{{ groupInfo.name?.substring(0,3) }}</div> 11 <div class="item" v-if="groupInfo.type!='4'"><label>{{ language==0?'团体名称':'Team name' }}</label>{{ groupInfo.name }}</div>
12 <div class="item"><label>{{ language==0?'团体类型':'Group type' }}</label> 12 <div class="item"><label>{{ language==0?'团体类型':'Group type' }}</label>
13 <text v-if="groupInfo.type=='0'">{{language==0?'普通院校':'School'}}</text> 13 <text v-if="groupInfo.type=='0'">{{language==0?'普通院校':'School'}}</text>
14 <text v-if="groupInfo.type=='1'">{{language==0?'专业舞蹈学校':'Professional dance school'}}</text> 14 <text v-if="groupInfo.type=='1'">{{language==0?'专业舞蹈学校':'Professional dance school'}}</text>
...@@ -39,7 +39,7 @@ import {useStorage} from "@vueuse/core/index"; ...@@ -39,7 +39,7 @@ import {useStorage} from "@vueuse/core/index";
39 const language= useStorage('language',0) 39 const language= useStorage('language',0)
40 const props = defineProps({ 40 const props = defineProps({
41 groupId: { 41 groupId: {
42 type: Object, 42 type: String,
43 required: false 43 required: false
44 }, 44 },
45 matchId: { 45 matchId: {
......
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
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 :label="language==0?'姓氏':'Surname'" prop="personInfo.xing" min-width="100"/> 7 <el-table-column v-if="!isNational" :label="language==0?'姓名':'Real Name'" prop="personInfo.realName" min-width="100"/>
8 <el-table-column :label="language==0?'名':'Name'" prop="personInfo.ming" 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 :label="language==0?'所属国家/地区':'Country'" min-width="120"> 10 <el-table-column :label="language==0?'所属国家/地区':'Country'" min-width="120">
10 <template #default="scope"> 11 <template #default="scope">
11 <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>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!