Browse Source

fix(navbar): 注释掉租户选择器组件

- 在Navbar.vue中临时注释掉了el-select租户选择器组件
- 保留了原有组件结构和相关逻辑代码

feat(game-event): 优化运动员团队名称显示逻辑

- 在比赛事件详情页中优先显示运动员所属团队名称
- 当团队名称不存在时回退到原有的getTeamName方法获取团队名称
- 提升了团队信息展示的准确性和用户体验
zhou 1 month ago
parent
commit
c8c09c4a3e
2 changed files with 3 additions and 3 deletions
  1. 2 2
      src/layout/components/Navbar.vue
  2. 1 1
      src/views/system/gameEventGroup/detail.vue

+ 2 - 2
src/layout/components/Navbar.vue

@@ -16,7 +16,7 @@
 
     <div class="right-menu flex align-center">
       <template v-if="appStore.device !== 'mobile'">
-        <el-select
+        <!-- <el-select
           v-if="userId === 1 && tenantEnabled"
           v-model="companyName"
           class="min-w-244px"
@@ -29,7 +29,7 @@
         >
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
           <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
-        </el-select>
+        </el-select> -->
 
         <search-menu ref="searchMenuRef" />
         <el-tooltip content="搜索" effect="dark" placement="bottom">

+ 1 - 1
src/views/system/gameEventGroup/detail.vue

@@ -66,7 +66,7 @@
                  <div v-if="getAthleteByGroupAndTrack(groupIndex, track)" class="space-y-1">
                    <div class="font-medium text-blue-600">{{ getAthleteByGroupAndTrack(groupIndex, track)?.athleteCode }}</div>
                    <div class="text-sm">{{ getAthleteByGroupAndTrack(groupIndex, track)?.name }}</div>
-                   <div class="text-xs text-gray-500">{{ getTeamName(getAthleteByGroupAndTrack(groupIndex, track)?.teamId) }}</div>
+                   <div class="text-xs text-gray-500">{{ getAthleteByGroupAndTrack(groupIndex, track)?.teamName || getTeamName(getAthleteByGroupAndTrack(groupIndex, track)?.teamId) }}</div>
                  </div>
                 <div v-else class="text-gray-400 text-sm">-</div>
               </td>