国内赛

@@ -24,7 +24,7 @@
                 <div style="margin: 0 4px 10px;display: flex">
                   <el-select multiple v-model="choosedchoosed" collapse-tags-tooltip filterable
                              @change="changechoosed">
-                    <el-option v-for="c in athletesList" :key="c.id" :label="c.xing + c.ming" :value="c.id">
+                    <el-option v-for="c in athletesList" :key="c.id" :label="c.realName" :value="c.id">
                       <div class="flexOption">
                         {{ c.realName }}
                         <img v-if="c.sex=='0'" src="@/assets/img/female.png"/>

@@ -40,8 +40,9 @@
 <!--      <el-table-column type="selection" :label="language==0?'选择':'Selection'" :selectable="selectable"/>-->
       <el-table-column align="center" type="index" :label="language==0?'序号':'Index'" width="70" :selectable="selectable"/>
       <el-table-column v-if="isNational" :label="language==0?'WDSF 会员号':'WDSF MIN'" prop="wdsfMin" width="100"/>
-      <el-table-column align="center" :label="language==0?'姓氏':'Surname'" prop="xing" min-width="100"/>
-      <el-table-column align="center" :label="language==0?'名':'Name'" prop="ming" min-width="100"/>
+      <el-table-column align="center" v-if="!isNational" :label="language==0?'姓名':'Real Name'" prop="realName" min-width="100"/>
+      <el-table-column align="center" v-if="isNational" :label="language==0?'姓氏':'Surname'" prop="xing" min-width="100"/>
+      <el-table-column align="center" v-if="isNational" :label="language==0?'名':'Name'" prop="ming" min-width="100"/>
       <el-table-column  align="center" v-if="isNational" :label="language==0?'代表':'Representing'" prop="representing" min-width="120"/>
       <el-table-column align="center" v-if="!isNational" :label="language==0?'所属国家/地区':'Nationality'" prop="countryName" min-width="110"/>
       <el-table-column :label="language==0?'性别':'Gender'" prop="sexStr"/>

@@ -8,7 +8,7 @@
           </el-col>
           <el-col :span="20">
             <div class="item" v-if="groupInfo.type=='4'"><label>{{ language==0?'代表队':'Represent' }}</label>{{ groupInfo.name?.substring(0,3) }}</div>
-            <div class="item" v-if="groupInfo.type!='4'"><label>{{ language==0?'团体名称':'Team name' }}</label>{{ groupInfo.name?.substring(0,3) }}</div>
+            <div class="item" v-if="groupInfo.type!='4'"><label>{{ language==0?'团体名称':'Team name' }}</label>{{ groupInfo.name }}</div>
             <div class="item"><label>{{ language==0?'团体类型':'Group type' }}</label>
               <text v-if="groupInfo.type=='0'">{{language==0?'普通院校':'School'}}</text>
               <text v-if="groupInfo.type=='1'">{{language==0?'专业舞蹈学校':'Professional dance school'}}</text>
@@ -39,7 +39,7 @@ import {useStorage} from "@vueuse/core/index";
 const language= useStorage('language',0)
 const props = defineProps({
   groupId: {
-    type: Object,
+    type: String,
     required: false
   },
   matchId: {

@@ -4,8 +4,9 @@
   </div>
   <el-table :data="list"  :sum-text="sumText" border style="width: 100%" v-loading="loading">
     <el-table-column :label="language==0?'序号':'Index'" type="index" width="70" align="center"/>
-    <el-table-column :label="language==0?'姓氏':'Surname'" prop="personInfo.xing" min-width="100"/>
-    <el-table-column :label="language==0?'名':'Name'" prop="personInfo.ming" min-width="100"/>
+    <el-table-column v-if="!isNational" :label="language==0?'姓名':'Real Name'" prop="personInfo.realName" min-width="100"/>
+    <el-table-column v-if="isNational" :label="language==0?'姓氏':'Surname'" prop="personInfo.xing" min-width="100"/>
+    <el-table-column v-if="isNational" :label="language==0?'名':'Name'" prop="personInfo.ming" min-width="100"/>
     <el-table-column :label="language==0?'所属国家/地区':'Country'" min-width="120">
       <template #default="scope">
         <span v-if="scope.row.personInfo.countryName">{{scope.row.personInfo.countryName}}</span>