From bdb3ffba439948dab246fc8d7d62c190b5ad44d2 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 13 Jan 2023 17:58:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                      |   2 +
 src/pages/match/details/index.vue     | 463 ++++++++++++++------------
 src/pages/match/list/index.vue        |  44 ++-
 src/pages/screen/index.vue            |   7 +-
 src/pages/touristMatch/list/index.vue |  30 +-
 src/setting.js                        |   2 +-
 src/store/modules/match.js            |   2 +-
 7 files changed, 319 insertions(+), 231 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index e4ebbc1..c2d26de 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -99,6 +99,8 @@ export default {
     allowedParticipateCompetition: `competition/competition/management/allowedParticipateCompetition`,
     stageSelectParticipants: `competition/competition/teamParticipant/stageSelectParticipants`,
     getCustomerBySchoolId: `nakadai/nakadai/customer/getCustomerBySchoolId`,
+    isParticipant: `competition/competition/management/isParticipant`,
+    editCompetitionTeam: `competition/competition/team/editCompetitionTeam`,
     frontDeskOverallRanking: `${host1}competition/competition/rank/frontDeskOverallRanking`,
     frontOfficeCompetitionRanking: `${host1}competition/competition/rank/frontOfficeCompetitionRanking`,
     stageGradeManagementList: `${host1}competition/competition/performance/stageGradeManagementList`,
diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue
index 8833c91..f13e4ed 100644
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@@ -22,75 +22,83 @@
                     <h6 class="title">{{ form.name }}</h6>
                     <div class="meta">最近编辑时间：{{ form.updateTime }}</div>
                   </div>
+                  
+                  <div v-show="curType != 4 && curType != 5">
+                    <div class="l-title" id="part1"><img src="@/assets/img/label.png" alt=""> 竞赛信息</div>
+                    <div v-if="form.description" class="texts ql-editor" v-html="form.description"></div>
+                    <template v-if="form.contestAnnexList">
+                      <h6 class="p-title">附件下载</h6>
+                      <ul class="files">
+                        <li v-for="(item, i) in form.contestAnnexList" :key="i">
+                          <el-link v-if="item.canPreview" class="m-r-10" type="primary" @click="preview(item)">{{ item.fileName }}</el-link>
+                          <span v-else class="fileName">{{ item.fileName }}</span>
+                          <el-link type="primary" :underline="false" @click="download(item)">下载</el-link>
+                        </li>
+                      </ul>
+                    </template>
 
-                  <div class="l-title" id="part1"><img src="@/assets/img/label.png" alt=""> 竞赛信息</div>
-                  <div v-if="form.description" class="texts ql-editor" v-html="form.description"></div>
-                  <template v-if="form.contestAnnexList">
-                    <h6 class="p-title">附件下载</h6>
-                    <ul class="files">
-                      <li v-for="(item, i) in form.contestAnnexList" :key="i">
-                        <el-link v-if="item.canPreview" class="m-r-10" type="primary" @click="preview(item)">{{ item.fileName }}</el-link>
-                        <span v-else class="fileName">{{ item.fileName }}</span>
-                        <el-link type="primary" :underline="false" @click="download(item)">下载</el-link>
+                    
+                    <div class="l-title"><img src="@/assets/img/label.png" alt=""> 赛程、规则与内容</div>
+                    <h6 class="rule-title">共{{ form.competitionStage.length }}个竞赛阶段，同一个团队每个成员只能参加一个阶段赛项</h6>
+                    <div v-for="(rule, i) in form.competitionStage" :key="i" class="rule">
+                      <p style="font-size: 16px;color: #333;">{{ rule.stageName }}</p>
+                      <p>比赛时间：{{ rule.startTime && rule.startTime + ' ~ ' + rule.endTime }}</p>
+                      <p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p>
+                      <p v-if="!rule.method">课程系统：{{ rule.systemName }}</p>
+                      <template v-if="rule.method === 2">
+                        <p>比赛内容：</p>
+                        <div v-html="form.description"></div>
+                        <p class="m-t-10">评分规则：专家打分</p>
+                      </template>
+                      
+                      <template v-if="form.completeCompetitionSetup.competitionType">
+                        <p>团队参赛人数限制：{{ rule.teamNumLimit }}</p>
+                        <p>团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) && teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}</p>
+                      </template>
+                      <p>阶段比赛结束后{{ rule.resultAnnouncementTime }}小时，公布阶段比赛成绩。</p>
+                    </div>
+                    
+                    <!-- 进展 -->
+                    <div class="l-title" id="part2"><img src="@/assets/img/label.png" alt=""> 竞赛进展</div>
+                    <ul class="progress" v-if="progress.length">
+                        <li v-for="(item,index) in progress" :key="index" :class="item.status == 0 ? 'not' : (item.status == 1 ? 'ing' : 'done')">
+                            <i class="dot"></i>
+                            <p class="name">{{item.title}}</p>
+                            <p class="desc">{{item.description}}</p>
+                        </li>
+                        <img class="rocket" src="@/assets/img/rocket.png" alt="">
+                    </ul>
+                    <template v-else>
+                        <div class="empty">
+                            <div>
+                                <img src="@/assets/img/none.png" alt="">
+                                <p>暂无数据</p>
+                            </div>
+                        </div>
+                    </template>
+                    
+                    <!-- 公告 -->
+                    <div class="l-title" id="part3"><img src="@/assets/img/label.png" alt=""> 通知公告</div>
+                    <ul class="notice-list" v-if="notices.length">
+                      <li v-for="(item, i) in notices" :key="i" @click="toNotice(item)">
+                        <h6>{{ item.announcementTitle }}</h6>
+                        <p class="meta">{{ item.updateTime }}</p>
+                        <div class="des" v-html="item.announcementText"></div>
                       </li>
                     </ul>
-                  </template>
-
-                  
-                  <div class="l-title" id="part1"><img src="@/assets/img/label.png" alt=""> 赛程、规则与内容</div>
-                  <h6 class="rule-title">共3个竞赛阶段，同一个团队每个成员只能参加一个阶段赛项</h6>
-                  <div v-for="(rule, i) in form.competitionStage" :key="i" class="rule">
-                    <p>{{ rule.stageName }}</p>
-                    <p>比赛时间：{{ rule.startTime + ' ~ ' + rule.endTime }}</p>
-                    <p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p>
-                    <p>课程系统：{{ rule.systemName }}</p>
-                    <template v-if="form.completeCompetitionSetup.competitionType">
-                      <p>团队参赛人数限制：{{ rule.teamNumLimit }}</p>
-                      <p>团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) && teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}</p>
+                    <template v-else>
+                        <div class="empty">
+                            <div>
+                                <img src="@/assets/img/none.png" alt="">
+                                <p>暂无通知公告</p>
+                            </div>
+                        </div>
                     </template>
-                    <p>（阶段）比赛结束后{{ rule.resultAnnouncementTime }}小时，公布（阶段）比赛成绩。</p>
                   </div>
-                  
-                  <!-- 进展 -->
-                  <div class="l-title" id="part2"><img src="@/assets/img/label.png" alt=""> 竞赛进展</div>
-                  <ul class="progress" v-if="progress.length">
-                      <li v-for="(item,index) in progress" :key="index" :class="item.status == 0 ? 'not' : (item.status == 1 ? 'ing' : 'done')">
-                          <i class="dot"></i>
-                          <p class="name">{{item.title}}</p>
-                          <p class="desc">{{item.description}}</p>
-                      </li>
-                      <img class="rocket" src="@/assets/img/rocket.png" alt="">
-                  </ul>
-                  <template v-else>
-                      <div class="empty">
-                          <div>
-                              <img src="@/assets/img/none.png" alt="">
-                              <p>暂无数据</p>
-                          </div>
-                      </div>
-                  </template>
-                  
-                  <!-- 公告 -->
-                  <div class="l-title" id="part3"><img src="@/assets/img/label.png" alt=""> 通知公告</div>
-                  <ul class="notice-list" v-if="notices.length">
-                    <li v-for="(item, i) in notices" :key="i" @click="toNotice(item)">
-                      <h6>{{ item.announcementTitle }}</h6>
-                      <p class="meta">{{ item.updateTime }}</p>
-                      <div class="des" v-html="item.announcementText"></div>
-                    </li>
-                  </ul>
-                  <template v-else>
-                      <div class="empty">
-                          <div>
-                              <img src="@/assets/img/none.png" alt="">
-                              <p>暂无通知公告</p>
-                          </div>
-                      </div>
-                  </template>
 
                   <!-- 竞赛排名 -->
-                  <template v-if="form.competitionRegistration && form.competitionRegistration.teamId">
-                    <div class="l-title" id="part4"><img src="@/assets/img/label.png" alt=""> 竞赛排名</div>
+                  <template v-if="curType == 4 && form.competitionRegistration && form.competitionRegistration.teamId">
+                    <div class="l-title"><img src="@/assets/img/label.png" alt=""> 竞赛排名</div>
                     <el-tabs v-model="curArch" @tab-click="getRank">
                       <el-tab-pane v-for="(item, index) in arches" :key="index" :label="item.stageName + '排名'" :name="item.stageId"></el-tab-pane>
                     </el-tabs>
@@ -108,141 +116,142 @@
                     </el-table>
                   </template>
 
-                  <div class="l-title m-t-20" id="part4"><img src="@/assets/img/label.png" alt=""> 参赛信息</div>
-                  <table class="table">
-                    <template v-if="!form.completeCompetitionSetup.competitionType || info.team.captain">
-                      <tr>
-                        <th width="150">姓名：</th>
-                        <td>{{ info.person.userName }}</td>
-                      </tr>
-                      <tr>
-                        <th>学号：</th>
-                        <td>{{ info.person.workNumber }}</td>
-                      </tr>
-                      <tr>
-                        <th>学校：</th>
-                        <td>{{ info.person.schoolName }}</td>
-                      </tr>
-                    </template>
-                    <template v-if="form.completeCompetitionSetup.competitionType">
-                      <tr>
-                        <th>团队名称：</th>
-                        <td>
-                          <el-input v-if="info.team.captain === 0" :disabled="!editing" v-model="info.team.teamName"></el-input>
-                          <span v-else>{{ info.team.teamName }}</span>
-                        </td>
-                      </tr>
-                      <template v-if="info.team.captain">
+                  <template v-if="curType == 5">
+                    <div class="l-title m-t-20"><img src="@/assets/img/label.png" alt=""> 参赛信息</div>
+                    <table class="table">
+                      <template v-if="!form.completeCompetitionSetup.competitionType || info.team.captain">
+                        <tr>
+                          <th width="150">姓名：</th>
+                          <td>{{ info.person.userName }}</td>
+                        </tr>
                         <tr>
-                          <th>队长：</th>
-                          <td>{{ info.caption.userName }}{{ info.caption.schoolName && '，' + info.caption.schoolName }}{{ info.caption.workNumber && '，' + info.caption.workNumber }}</td>
+                          <th>学号：</th>
+                          <td>{{ info.person.workNumber }}</td>
                         </tr>
                         <tr>
-                          <th>团队成员：</th>
+                          <th>学校：</th>
+                          <td>{{ info.person.schoolName }}</td>
+                        </tr>
+                      </template>
+                      <template v-if="form.completeCompetitionSetup.competitionType">
+                        <tr>
+                          <th width="150">团队名称：</th>
                           <td>
-                            <el-tag v-for="(item, i) in info.teamDetail" :key="i" style="margin-right: 5px">{{ item.userName }}</el-tag>
+                            <el-input v-if="info.team.captain === 0" :disabled="!editing" v-model="info.team.teamName"></el-input>
+                            <span v-else>{{ info.team.teamName }}</span>
                           </td>
                         </tr>
-                      </template>
-                    </template>
-                    <tr>
-                      <th>指导老师：</th>
-                      <td v-if="info.team.captain === 0 || !form.completeCompetitionSetup.competitionType">
-                        <div class="plus">
-                          <i class="el-icon-circle-plus-outline icon" @click="addAdvisor"></i>
-                        </div>
-                        <div v-for="(item, i) in info.teamInstructors" :key="i" class="line">
-                          <el-input placeholder="请输入姓名" v-model="item.name" clearable size="mini"></el-input>
-                          <el-input placeholder="请输入职务" maxlength="10" v-model="item.position" clearable size="mini"></el-input>
-                          <el-input placeholder="请输入联系方式" maxlength="11" v-model="item.phone" clearable size="mini"></el-input>
-                          <i class="el-icon-check icon" @click="submitAdvisor(item)"></i>
-                          <i class="el-icon-delete icon" @click="delAdvisor(item, i)"></i>
-                        </div>
-                      </td>
-                      <td v-else>
-                        {{ info.teamInstructors.map(e => e.name).join('，')}}
-                      </td>
-                    </tr>
-                    <tr v-if="form.completeCompetitionSetup.competitionType">
-                      <th>团队邀请码：</th>
-                      <td>
-                        <el-input v-if="info.team.captain === 0" :disabled="!editing" v-model="info.team.invitationCode"></el-input>
-                        <span v-else>{{ info.team.invitationCode }}</span>
-                      </td>
-                    </tr>
-                    <tr>
-                      <th>竞赛阶段：</th>
-                      <td>
-                        <table class="table tc">
+                        <template v-if="info.team.captain">
                           <tr>
-                            <th width="80">序号</th>
-                            <th>赛项阶段名称</th>
-                            <template v-if="form.completeCompetitionSetup.competitionType">
-                              <th>参赛人数限制</th>
-                              <th>允许参赛人员</th>
-                              <th v-if="info.team.captain === 0 && form.rule === 0">总分</th>
-                            </template>
-                            <th>竞赛成绩</th>
+                            <th>队长：</th>
+                            <td>{{ info.caption.userName }}{{ info.caption.schoolName && '，' + info.caption.schoolName }}{{ info.caption.workNumber && '，' + info.caption.workNumber }}</td>
                           </tr>
-                          <template v-if="info.stages.length">
-                            <tr v-for="(item, i) in info.stages" :key="i">
-                              <td>{{ i + 1 }}</td>
-                              <td>{{ item.stageName }}</td>
+                          <tr>
+                            <th>团队成员：</th>
+                            <td>
+                              <el-tag v-for="(item, i) in info.teamDetail" :key="i" style="margin-right: 5px">{{ item.userName }}</el-tag>
+                            </td>
+                          </tr>
+                        </template>
+                      </template>
+                      <tr>
+                        <th>指导老师：</th>
+                        <td v-if="info.team.captain === 0 || !form.completeCompetitionSetup.competitionType">
+                          <div class="plus">
+                            <i class="el-icon-circle-plus-outline icon" @click="addAdvisor"></i>
+                          </div>
+                          <div v-for="(item, i) in info.teamInstructors" :key="i" class="line">
+                            <el-input placeholder="请输入姓名" v-model="item.name" clearable size="mini"></el-input>
+                            <el-input placeholder="请输入职务" maxlength="10" v-model="item.position" clearable size="mini"></el-input>
+                            <el-input placeholder="请输入手机号" maxlength="11" v-model="item.phone" clearable size="mini"></el-input>
+                            <i class="el-icon-check icon" @click="submitAdvisor(item)"></i>
+                            <i class="el-icon-delete icon" @click="delAdvisor(item, i)"></i>
+                          </div>
+                        </td>
+                        <td v-else>
+                          {{ info.teamInstructors.map(e => e.name).join('，')}}
+                        </td>
+                      </tr>
+                      <tr v-if="form.completeCompetitionSetup.competitionType">
+                        <th>团队邀请码：</th>
+                        <td>
+                          <el-input v-if="info.team.captain === 0" :disabled="!editing" v-model="info.team.invitationCode"></el-input>
+                          <span v-else>{{ info.team.invitationCode }}</span>
+                        </td>
+                      </tr>
+                      <tr>
+                        <th>竞赛阶段：</th>
+                        <td>
+                          <table class="table tc">
+                            <tr>
+                              <th width="80">序号</th>
+                              <th>赛项阶段名称</th>
                               <template v-if="form.completeCompetitionSetup.competitionType">
-                                <td>{{ item.peopleLimit }}</td>
+                                <th width="110">参赛人数限制</th>
+                                <th>允许参赛人员</th>
+                                <th v-if="info.team.captain === 0 && form.rule === 0">总分</th>
+                              </template>
+                              <th>竞赛成绩</th>
+                            </tr>
+                            <template v-if="info.stages.length">
+                              <tr v-for="(item, i) in info.stages" :key="i">
+                                <td>{{ i + 1 }}</td>
+                                <td>{{ item.stageName }}</td>
+                                <template v-if="form.completeCompetitionSetup.competitionType">
+                                  <td>{{ item.teamNumLimit || 0 }}</td>
+                                  <td>
+                                    <span class="m-r-5">{{ item.teamParticipantIds }}</span>
+                                    <el-button type="danger" size="mini" @click="selectPar(item)">修改</el-button>
+                                  </td>
+                                  <td v-if="info.team.captain === 0 && form.rule === 0 && !i" :rowspan="info.stages.length">{{ info.totalScore }}</td>
+                                </template>
                                 <td>
-                                  <el-button :disabled="!editing" type="danger" size="mini" @click="selectPar(item)">修改</el-button>
-                                  <span class="m-l-5">{{ item.teamParticipantIds }}</span>
+                                  <span v-if="item.score" class="m-r-10">分数{{item.score}}</span>
+                                  <el-button type="text" :disabled="item.resultsDetails === 1" @click="show(item)">查看成绩详情</el-button>
                                 </td>
-                                <td v-if="info.team.captain === 0 && form.rule === 0"></td>
-                              </template>
-                              <td>
-                                <span v-if="item.score" class="m-r-10">分数{{item.score}}</span>
-                                <el-button type="text" :disabled="item.resultsDetails === 1" @click="show(item)">查看成绩详情</el-button>
-                              </td>
+                              </tr>
+                            </template>
+                            <tr v-else>
+                              <td colspan="6">暂无数据</td>
                             </tr>
-                          </template>
-                          <tr v-else>
-                            <td colspan="6">暂无数据</td>
-                          </tr>
-                        </table>
-                        <el-alert
-                          v-if="form.completeCompetitionSetup.competitionType && info.team.captain === 0"
-                          style="margin-top: 10px;"
-                          title="注：请团长（团队创建人）设置各阶段参赛成员，只有被选择的允许参赛成员可进入对应阶段比赛，每个团队成员只能参加一个赛项阶段！"
-                          type="warning"
-                          show-icon>
-                        </el-alert>
-                      </td>
-                    </tr>
-                  </table>
-                  <div v-if="form.completeCompetitionSetup.competitionType && info.team.captain === 0" class="m-t-20 text-center">
-                    <el-button type="primary" @click="edit">{{ editing ? '保存' : '编辑' }}</el-button>
-                  </div>
-                  
-                  <template v-if="form.completeCompetitionSetup.competitionType && info.team.captain === 0">
-                    <div class="l-title m-t-20">团队成员</div>
-                    <div class="flex-center">
-                      <p>队长：{{ info.caption.userName }}</p>
-                      <el-button type="primary" :disabled="status > 3" @click="transfer">转让队长</el-button>
+                          </table>
+                          <el-alert
+                            v-if="form.completeCompetitionSetup.competitionType && info.team.captain === 0"
+                            style="margin-top: 10px;"
+                            title="注：请团长（团队创建人）设置各阶段参赛成员，只有被选择的允许参赛成员可进入对应阶段比赛，每个团队成员只能参加一个赛项阶段！"
+                            type="warning"
+                            show-icon>
+                          </el-alert>
+                        </td>
+                      </tr>
+                    </table>
+                    <div v-if="form.completeCompetitionSetup.competitionType && info.team.captain === 0" class="m-t-20 text-center">
+                      <el-button type="primary" @click="edit">{{ editing ? '保存' : '编辑' }}</el-button>
                     </div>
-                    <el-table :data="info.teamDetail" stripe header-align="center">
-                      <el-table-column prop="userName" label="成员姓名" min-width="100" align="center"></el-table-column>
-                      <el-table-column prop="schoolName" label="学校" min-width="100" align="center"></el-table-column>
-                      <el-table-column prop="workNumber" label="学号" min-width="100" align="center"></el-table-column>
-                      <el-table-column prop="createTime" label="加入时间" width="180" align="center"></el-table-column>
-                      <el-table-column label="操作" align="center" width="160">
-                          <template slot-scope="scope">
-                              <el-button v-if="scope.row.captain" type="text" :disabled="status > 3" @click="removeLine(scope.row)">踢出团队</el-button>
-                          </template>
-                      </el-table-column>
-                    </el-table>
+                    
+                    <template v-if="form.completeCompetitionSetup.competitionType && info.team.captain === 0">
+                      <div class="l-title m-t-20">团队成员</div>
+                      <div class="flex-center">
+                        <p>队长：{{ info.caption.userName }}</p>
+                        <el-button type="primary" :disabled="status > 3" @click="transfer">转让队长</el-button>
+                      </div>
+                      <el-table :data="info.teamDetail" stripe header-align="center">
+                        <el-table-column prop="userName" label="成员姓名" min-width="100" align="center"></el-table-column>
+                        <el-table-column prop="schoolName" label="学校" min-width="100" align="center"></el-table-column>
+                        <el-table-column prop="workNumber" label="学号" min-width="100" align="center"></el-table-column>
+                        <el-table-column prop="createTime" label="加入时间" width="180" align="center"></el-table-column>
+                        <el-table-column label="操作" align="center" width="160">
+                            <template slot-scope="scope">
+                                <el-button v-if="scope.row.captain" type="text" :disabled="status > 3" @click="removeLine(scope.row)">踢出团队</el-button>
+                            </template>
+                        </el-table-column>
+                      </el-table>
+                    </template>
                   </template>
               </div>
           </div>
         </div>
 
-        
         <el-dialog title="报名" :visible.sync="enterVisible" :close-on-click-modal="false" width="300px" @close="enterClose">
           <el-form class="dia-form">
             <p style="margin-bottom: 5px">请选择要加入的团队</p>
@@ -283,7 +292,6 @@
             <el-button size="small" @click="teamVisible = false">取消</el-button>
           </span>
         </el-dialog>
-
         
         <el-dialog title="选择参赛成员" :visible.sync="transferVisible" :close-on-click-modal="false" width="400px">
           <template v-for="(item, i) in info.teamDetail">
@@ -318,15 +326,20 @@
               <th width="100">分数</th>
               <th width="100">得分详情</th>
             </tr>
-            <tr v-for="(item, i) in members" :key="i">
-              <td>{{ i + 1 }}</td>
-              <td>{{ item.userName }}</td>
-              <td>{{ item.schoolName }}</td>
-              <td>{{ item.timeSum }}min</td>
-              <td>{{ item.score }}</td>
-              <td>
-                <el-button type="text" @click="toReport(item)">查看</el-button>
-              </td>
+            <template v-if="members.length">
+              <tr v-for="(item, i) in members" :key="i">
+                <td>{{ i + 1 }}</td>
+                <td>{{ item.userName }}</td>
+                <td>{{ item.schoolName }}</td>
+                <td>{{ item.timeSum }}min</td>
+                <td>{{ item.score }}</td>
+                <td>
+                  <el-button type="text" @click="toReport(item)">查看</el-button>
+                </td>
+              </tr>
+            </template>
+            <tr v-else>
+              <td colspan="6">暂无数据</td>
             </tr>
           </table>
           <span slot="footer" class="dialog-footer">
@@ -362,6 +375,7 @@ export default {
               signUpEndTime: '',
               playStartTime: '',
               playEndTime: '',
+              competitionStage: [],
               completeCompetitionSetup: {},
               competitionRegistration: {}
             },
@@ -378,6 +392,14 @@ export default {
                 {
                     id: '3',
                     name: '通知公告'
+                },
+                {
+                    id: '4',
+                    name: '竞赛排名'
+                },
+                {
+                    id: '5',
+                    name: '参赛信息'
                 }
             ],
             progress: [],
@@ -542,6 +564,7 @@ export default {
               this.form = competition
               const type = competition.completeCompetitionSetup.competitionType
               const reg = competition.competitionRegistration
+              reg || this.typeList.pop()
               if (!type || (type && reg)) this.getInfo()
               reg && reg.teamId && this.getRank()
               this.$refs.breadcrumb.update('全部赛事/' + competition.name)
@@ -596,7 +619,7 @@ export default {
         getInfo() {
           this.$post(`${this.api.entryInformation}?competitionId=${this.id}`).then(res => {
             const info = res.entryInformation
-            if (!info.teamInstructors.length) info.teamInstructors.push(this.originIns)
+            if (!info.teamInstructors.length) info.teamInstructors.push(JSON.parse(JSON.stringify(this.originIns)))
             if (info.personalDetail) {
               info.team = {}
               info.teamDetail = []
@@ -613,7 +636,7 @@ export default {
         edit() {
           if (this.editing) {
             const { teamId, teamName, invitationCode } = this.info.team
-            this.$post(this.api.addCompetitionTeam, {
+            this.$post(this.api.editCompetitionTeam, {
               competitionId: this.id,
               teamId,
               teamName,
@@ -656,7 +679,13 @@ export default {
         },
         // tab切换
         typeChange() {
-          document.querySelector(`#part${this.curType}`).scrollIntoView()
+          // 前三个滚动，后两个切换
+          const type = +this.curType
+          if (type > 3) {
+            this.editing = false
+          } else {
+            document.querySelector(`#part${type}`).scrollIntoView()
+          }
         },
         // 跳转公告详情
         toNotice(item) {
@@ -694,21 +723,23 @@ export default {
             }).then(() => {
               this.$post(`${this.api.deleteAnAdvisor}?id=${row.id}`).then(res => {
                 util.successMsg('删除成功')
-                // this.getClassification()
+                this.getInfo()
               }).catch(res => {})
             }).catch(() => {})
           } else {
-            this.classifications.splice(i, 1)
+            this.info.teamInstructors.splice(i, 1)
           }
         },
         // 添加指导老师
         addAdvisor() {
-          if (this.info.teamInstructors.length > 5)
+          if (this.info.teamInstructors.length > 4) return util.errorMsg('指导老师仅限添加5个！')
           this.info.teamInstructors.push(JSON.parse(JSON.stringify(this.originIns)))
         },
         // 提交指导老师
         submitAdvisor(row) {
           if (!row.name) return util.errorMsg('请输入姓名')
+          const { phone } = row
+          if (phone && !/^1[3456789]\d{9}$/.test(phone)) return util.errorMsg('请输入正确手机号格式')
           this.$post(this.api.addAnAdvisor, {
             name: row.name,
             competitionId: this.id,
@@ -792,9 +823,13 @@ export default {
               this.members = []
             }
           } else if (row.reportId) { // 团员或者个人比赛，并且有reportId，则进入实验报告
-            this.$router.push(`/record/show?reportId=${row.reportId}`)
+            this.toReport(row)
           }
         },
+        // 跳转实验报告
+        toReport(row) {
+          this.$router.push(`/record/show?reportId=${row.reportId}`)
+        },
         
         // 报名提交
         enterSubmit() {
@@ -858,30 +893,45 @@ export default {
           }
         },
 
+        // 判断是否能进赛事
+        getAllow() {
+          // 是否允许参加赛事（淘汰赛制）
+          if (this.form.rule === 1) {
+            this.$post(this.api.allowedParticipateCompetition, {
+              competitionId: this.id,
+              number: this.curStage.number,
+              stageId: this.curStage.stageId,
+              teamId: this.form.competitionRegistration.teamId,
+            }).then(res => {
+              this.toSub()
+            }).catch(res => {})
+          } else {
+            this.toSub()
+          }
+        },
         // 立即报名
         signup(){
           const { status, form } = this
           // 如果登录了
           if (util.local.get(Setting.tokenKey)) {
+            const { competitionType } = form.completeCompetitionSetup
             if (status == 4) { // 进入比赛
-              if (form.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛
-              // 是否允许参加赛事（淘汰赛制）
-              if (form.rule === 1) {
-                this.$post(this.api.allowedParticipateCompetition, {
+              if (form.competitionRegistration.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛
+              // 团队赛，则判断是否为参赛人员
+              if (competitionType) {
+                this.$post(this.api.isParticipant, {
                   competitionId: this.id,
-                  number: this.curStage.number,
                   stageId: this.curStage.stageId,
                   teamId: form.competitionRegistration.teamId,
                 }).then(res => {
-                  // this.toSub()
+                  this.getAllow()
                 }).catch(res => {})
               } else {
-                this.toSub()
+                this.getAllow()
               }
-              this.toSub()
             } else if (status == 2) { // 报名
               // 团队赛报名
-              if (form.completeCompetitionSetup.competitionType) {
+              if (competitionType) {
                 this.enterVisible = true
               } else { // 个人赛报名
                 this.$post(this.api.addCompetitionRegistration, {
@@ -986,6 +1036,7 @@ export default {
   p {
     font-size: 14px;
     line-height: 30px;
+    color: #6e6e6e;
   }
 }
 .content{
@@ -1003,6 +1054,7 @@ export default {
     .tool {
       position: sticky;
       top: 64px;
+      margin-bottom: 20px;
       background-color: #fff;
     }
     .info .meta{
@@ -1293,6 +1345,7 @@ export default {
   .line {
     display: flex;
     align-items: center;
+    margin-bottom: 10px;
     .el-input {
       margin-right: 15px;
     }
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index 0853ad2..6c2fe98 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -190,14 +190,14 @@ export default {
             statusList: ["等待报名", "取消报名", "立即报名", "报名截止", "进入初赛", "已结束"],
             endList: ["报名开始", "报名截止", "报名截止", "竞赛开始", "竞赛结束", ""],
             typeList: [
-                {
-                    id: 1,
-                    name: "本校赛事"
-                },
                 {
                     id: 2,
                     name: "赛事广场"
                 },
+                {
+                    id: 1,
+                    name: "本校赛事"
+                },
                 {
                     id: 3,
                     name: "已报名"
@@ -210,7 +210,7 @@ export default {
               cityId: '',
               sequence: 2, // 排序(1:近期排名 2.最近更新)
               competitionScope: 3, // 大赛范围(0:本校内 1:全平台 2.指定区域、院校)
-              eventType: 1 // 赛事类型(1.本校赛事/2.赛事广场/3.已报名赛事)
+              eventType: 2 // 赛事类型(1.本校赛事/2.赛事广场/3.已报名赛事)
             },
             squareScopes: [
               {
@@ -376,7 +376,7 @@ export default {
     },
     mounted() {
       this.form.eventType = this.eventType
-      this.SET_TYPE(1)
+      this.SET_TYPE(2)
       this.getProvince()
       this.getData()
       this.$once('hook:beforeDestroy', function() {
@@ -578,30 +578,46 @@ export default {
             util.successMsg('报名成功！')
           }).catch(res => {})
         },
+        // 判断是否能进赛事
+        getAllow(item) {
+          // 是否允许参加赛事（淘汰赛制）
+          if (item.rule === 1) {
+            this.$post(this.api.allowedParticipateCompetition, {
+              competitionId: item.id,
+              number: item.curStage.number,
+              stageId: item.curStage.stageId,
+              teamId: item.teamId,
+            }).then(res => {
+              this.toSub()
+            }).catch(res => {})
+          } else {
+            this.toSub()
+          }
+        },
         // 报名
         signup(item) {
-          const { status, id, rule } = item
+          const { status, id } = item
+          const { competitionType } = item.setup
           // 如果没登录，提示去登录
           if (util.local.get(Setting.tokenKey)) {
             this.curItem = item
             if (status == 4) { // 进入比赛
               if (item.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛
-              // 是否允许参加赛事（淘汰赛制）
-              if (rule === 1) {
-                this.$post(this.api.allowedParticipateCompetition, {
+              // 团队赛，则判断是否为参赛人员
+              if (competitionType) {
+                this.$post(this.api.isParticipant, {
                   competitionId: id,
-                  number: item.curStage.number,
                   stageId: item.curStage.stageId,
                   teamId: item.teamId,
                 }).then(res => {
-                  this.toSub()
+                  this.getAllow(item)
                 }).catch(res => {})
               } else {
-                this.toSub()
+                this.getAllow(item)
               }
             } else if (status == 2) { // 报名
               // 团队赛报名
-              if (item.setup.competitionType) {
+              if (competitionType) {
                 this.getTeam()
                 this.enterForm = {
                   competitionId: id,
diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue
index 831921d..52955b6 100644
--- a/src/pages/screen/index.vue
+++ b/src/pages/screen/index.vue
@@ -372,13 +372,14 @@ export default {
         }).catch(res => {})
 
         // 学霸排行榜
-        this.$post(this.api.academicLeadersRanking).then(({ data }) => {
+        this.$post(`${this.api.academicLeadersRanking}?pageNum=1&pageSize=20`).then(({ data }) => {
+          const list = data.records
           // 优先排序平均分，然后再排序练习次数
-          data.sort((a, b) => {
+          list.sort((a, b) => {
             if (a.avgScore == b.avgScore) return b.practiceNumber - a.practiceNumber
             return b.avgScore - a.avgScore
           })
-          this.achs = data
+          this.achs = list
         }).catch(res => {})
         this.scrollTable()
       },
diff --git a/src/pages/touristMatch/list/index.vue b/src/pages/touristMatch/list/index.vue
index 0cb84fb..94f2436 100644
--- a/src/pages/touristMatch/list/index.vue
+++ b/src/pages/touristMatch/list/index.vue
@@ -543,26 +543,42 @@ export default {
             util.successMsg('报名成功！')
           }).catch(res => {})
         },
+        // 判断是否能进赛事
+        getAllow(item) {
+          // 是否允许参加赛事（淘汰赛制）
+          if (item.rule === 1) {
+            this.$post(this.api.allowedParticipateCompetition, {
+              competitionId: item.id,
+              number: item.curStage.number,
+              stageId: item.curStage.stageId,
+              teamId: item.teamId,
+            }).then(res => {
+              this.toSub()
+            }).catch(res => {})
+          } else {
+            this.toSub()
+          }
+        },
         // 报名
         signup(item) {
-          const { status, id, rule } = item
+          const { status, id } = item
+          const { competitionType } = item.setup
           // 如果没登录，提示去登录
           if (util.local.get(Setting.tokenKey)) {
             this.curItem = item
             if (status == 4) { // 进入比赛
               if (item.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛
-              // 是否允许参加赛事（淘汰赛制）
-              if (rule === 1) {
-                this.$post(this.api.allowedParticipateCompetition, {
+              // 团队赛，则判断是否为参赛人员
+              if (competitionType) {
+                this.$post(this.api.isParticipant, {
                   competitionId: id,
-                  number: item.curStage.number,
                   stageId: item.curStage.stageId,
                   teamId: item.teamId,
                 }).then(res => {
-                  this.toSub()
+                  this.getAllow(item)
                 }).catch(res => {})
               } else {
-                this.toSub()
+                this.getAllow(item)
               }
             } else if (status == 2) { // 报名
               // 团队赛报名
diff --git a/src/setting.js b/src/setting.js
index 7084e6e..e8171ee 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -44,7 +44,7 @@ const Setting = {
     apiBaseURL: host, // 接口请求地址
     uploadURL, // 阿里云oss域名
     systemPath, // 子系统地址前缀
-    autoLogoutTime: 3600000, // 长时间未操作，自动退出登录时间
+    autoLogoutTime: 3600000000, // 长时间未操作，自动退出登录时间
     modalDuration: 3, // 接口请求返回错误时，弹窗的持续时间，单位：秒
     errorModalType: "Message", // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice
     cookiesExpires: 1, // Cookies 默认保存时间，单位：天
diff --git a/src/store/modules/match.js b/src/store/modules/match.js
index d51749f..c0ce517 100644
--- a/src/store/modules/match.js
+++ b/src/store/modules/match.js
@@ -5,7 +5,7 @@ export default {
     namespaced: true,
     state: {
       toMatch: '',
-      eventType: 1 // 赛事类型
+      eventType: 2 // 赛事类型
     },
     mutations: {
       SET_SOURCE: (state, id) => {