wenkai 1 dag geleden
bovenliggende
commit
df65e7fccd
2 gewijzigde bestanden met toevoegingen van 21 en 20 verwijderingen
  1. 12 16
      src/layout/components/Navbar.vue
  2. 9 4
      src/views/system/gameTeam/index.vue

+ 12 - 16
src/layout/components/Navbar.vue

@@ -32,11 +32,11 @@
         </el-select>
 
         <search-menu ref="searchMenuRef" />
-        <el-tooltip content="搜索" effect="dark" placement="bottom">
-          <div class="right-menu-item hover-effect" @click="openSearchMenu">
-            <svg-icon class-name="search-icon" icon-class="search" />
-          </div>
-        </el-tooltip>
+<!--        <el-tooltip content="搜索" effect="dark" placement="bottom">-->
+<!--          <div class="right-menu-item hover-effect" @click="openSearchMenu">-->
+<!--            <svg-icon class-name="search-icon" icon-class="search" />-->
+<!--          </div>-->
+<!--        </el-tooltip>-->
         <!-- 消息 -->
         <el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">
           <div>
@@ -52,13 +52,9 @@
             </el-popover>
           </div>
         </el-tooltip>
-        <el-tooltip content="Github" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip :content="proxy.$t('navbar.document')" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+<!--        <el-tooltip :content="proxy.$t('navbar.document')" effect="dark" placement="bottom">-->
+<!--          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
+<!--        </el-tooltip>-->
 
         <el-tooltip :content="proxy.$t('navbar.full')" effect="dark" placement="bottom">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
@@ -277,18 +273,18 @@ watch(
     background: rgba(64, 158, 255, 0.1);
     border-radius: 4px;
     border: 1px solid rgba(64, 158, 255, 0.2);
-    
+
     .event-icon {
       font-size: 16px;
       color: #409eff;
     }
-    
+
     .event-label {
       font-size: 14px;
       color: #606266;
       font-weight: 500;
     }
-    
+
     .event-name {
       font-size: 14px;
       color: #409eff;
@@ -298,7 +294,7 @@ watch(
       text-overflow: ellipsis;
       white-space: nowrap;
     }
-    
+
     .event-code {
       font-size: 12px;
       height: 20px;

+ 9 - 4
src/views/system/gameTeam/index.vue

@@ -47,17 +47,22 @@
 
       <el-table v-loading="loading" border :data="gameTeamList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键" align="center" prop="teamId" v-if="columns[0].visible" />
-        <el-table-column label="队伍编号" align="center" prop="teamCode" v-if="columns[1].visible" />
+        <!--        <el-table-column label="主键" align="center" prop="teamId" v-if="columns[0].visible" />-->
+        <!--        <el-table-column label="队伍编号" align="center" prop="teamCode" v-if="columns[1].visible" />-->
         <el-table-column label="赛事名称" align="center" prop="eventName" v-if="columns[2].visible" />
         <el-table-column label="队伍名称" align="center" prop="teamName" v-if="columns[3].visible" />
-        <el-table-column label="团队描述" align="center" prop="teamDescribe" v-if="columns[4].visible" />
+        <el-table-column label="团队描述" align="center" prop="teamDescribe" v-if="columns[4].visible">
+          <template #default="scope">
+            <span v-if="scope.row.teamDescribe">{{ scope.row.teamDescribe }}</span>
+            <span v-else>该团队暂无描述</span>
+          </template>
+        </el-table-column>
         <el-table-column label="领队" align="center" prop="leader" v-if="columns[5].visible" />
         <el-table-column label="人数" align="center" prop="athleteNum" v-if="columns[6].visible" />
         <el-table-column label="号码段" align="center" prop="numberRange" v-if="columns[7].visible" />
         <el-table-column label="状态" align="center" prop="status" v-if="columns[8].visible">
           <template #default="scope">
-            <dict-tag :options="sys_normal_disable" :value="scope.row.status"/>
+            <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[9].visible" />