diff --git a/src/api/index.js b/src/api/index.js
index 6177433..f60a4ab 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -156,7 +156,6 @@ export default {
   cCompetitionStageFileDel: `competition/cCompetitionStageFile/batchDeletion`,
   viewEventAllocationInformation: `competition/competitionAutomaticAllocationRecord/viewEventAllocationInformation`,
   checkTeamStatus: `competition/teamAbnormalInformation/checkTeamStatus`,
-  competitionTeamAutomaticAllocationRecordSave: `competition/competitionTeamAutomaticAllocationRecord/save`,
   teamAssignmentButtonDisplay: `competition/competitionTeamAutomaticAllocationRecord/teamAssignmentButtonDisplay`,
   assignedPlayer: `competition/competition/automaticAllocation/assignedPlayer`,
   competitionTeamAutomaticAllocationRecordSave: `competition/competitionTeamAutomaticAllocationRecord/saveOrUpdate`,
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index e6c6e80..075e618 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -98,7 +98,7 @@ export default {
     ])
   },
   mounted () {
-    if (this.token) {
+    if (util.local.get(Setting.tokenKey)) {
       this.getSystemDetail();
       this.getUserInfo();
       this.getNotice()
diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue
index aa5433e..e225141 100644
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@@ -260,8 +260,9 @@
                 <th>竞赛阶段：</th>
                 <td>
                   <div v-if="showButton" class="m-b-10 text-right">
-                    <el-button type="primary" :disabled="status > 3" @click="automaticAllocationMember">{{
-                      assignRecord.assignOrNot && status < 3 ? '取消' : '' }}自动分配阶段成员</el-button>
+                    <el-button type="primary" :disabled="status > 3" :loading="allocating"
+                      @click="automaticAllocationMember">{{
+                        assignRecord.assignOrNot && status < 3 ? '取消' : '' }}自动分配阶段成员</el-button>
                   </div>
                   <table class="table tc">
                     <tr>
@@ -654,6 +655,7 @@ export default {
       stageTips: [],
       showButton: false,
       assignRecord: {},
+      allocating: false,
     };
   },
   computed: {
@@ -1145,6 +1147,7 @@ export default {
       const res = await this.$post(`${this.api.teamAssignmentButtonDisplay}?competitionId=${this.id}&teamId=${this.info.teamId}`)
       this.showButton = res.showButton // 自动分配按钮是否展示
       this.assignRecord = res.teamRecord || {} // 展示成自动分配 or 取消分配
+      this.allocating = false
     },
     // 移除参赛人员
     async removePar (e, stage) {
@@ -1319,7 +1322,7 @@ export default {
     },
     // 队长创建团队后弹框
     afterCreateTeam () {
-      // 已分配
+      // 赛事自动分配状态为开启，则直接提示；否则弹框询问是否要启用团队自动分配
       if (this.allocated) {
         Util.successMsg('团队创建成功，系统将自动帮您分配阶段参赛成员，您也可以到参数信息进行指定')
       } else {
@@ -1331,9 +1334,7 @@ export default {
           closeOnClickModal: false,
         }).then(() => {
           this.automaticAllocation(1)
-        }).catch(() => {
-          this.automaticAllocation(0)
-        })
+        }).catch(() => { })
       }
     },
     // 团队创建成功后分配
@@ -1353,6 +1354,7 @@ export default {
         type: 'success',
         closeOnClickModal: false,
       }).then(async () => {
+        this.allocating = true
         // 报名结束之前则调修改接口，否则调自动分配接口
         if (this.status < 3) {
           await this.$post(this.api.competitionTeamAutomaticAllocationRecordSave, {
@@ -1571,7 +1573,7 @@ export default {
             type: 'success',
             closeOnClickModal: false
           }).then(() => {
-            this.$post(`${this.api.cancelRegistration}?competitionId = ${this.id} `).then(res => {
+            this.$post(`${this.api.cancelRegistration}?competitionId=${this.id}`).then(res => {
               this.status = 2
               this.$message.success('取消报名成功')
               this.getData()
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index 03c0636..1c2f762 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -3,22 +3,16 @@
     <div class="search">
       <h6>赛事竞技，精彩纷呈</h6>
       <div class="input">
-        <img src="@/assets/img/search.png"
-             alt="">
-        <input type="text"
-               placeholder="请输入关键词"
-               v-model="keyword">
+        <img src="@/assets/img/search.png" alt="">
+        <input type="text" placeholder="请输入关键词" v-model="keyword">
       </div>
     </div>
 
     <div class="main">
       <div class="center-wrap list-inner">
-        <ul v-if="token"
-            class="nav">
-          <li :class="{ active: form.eventType === item.id }"
-              v-for="(item, index) in typeList"
-              :key="index"
-              @click="changeType(item.id)">{{ item.name }}
+        <ul v-if="token" class="nav">
+          <li :class="{ active: form.eventType === item.id }" v-for="(item, index) in typeList" :key="index"
+            @click="changeType(item.id)">{{ item.name }}
           </li>
         </ul>
         <div class="list-wrap">
@@ -28,54 +22,37 @@
               <dl v-if="form.eventType !== 1">
                 <dt>比赛范围：</dt>
                 <template v-if="form.eventType === 2">
-                  <dd v-for="(item, i) in squareScopes"
-                      :key="i"
-                      :class="{active: form.competitionScope == item.id}"
-                      @click="changeScope(item.id)">{{ item.name }}</dd>
+                  <dd v-for="(item, i) in squareScopes" :key="i" :class="{ active: form.competitionScope == item.id }"
+                    @click="changeScope(item.id)">{{ item.name }}</dd>
                 </template>
                 <template v-if="form.eventType === 3">
-                  <dd v-for="(item, i) in scopes"
-                      :key="i"
-                      :class="{active: form.competitionScope == item.id}"
-                      @click="changeScope(item.id)">{{ item.name }}</dd>
+                  <dd v-for="(item, i) in scopes" :key="i" :class="{ active: form.competitionScope == item.id }"
+                    @click="changeScope(item.id)">{{ item.name }}</dd>
                 </template>
                 <template v-if="form.eventType !== 1 && form.competitionScope === 2">
                   <div class="select-wrap">
                     <span class="label">省份</span>
-                    <el-select size="small"
-                               v-model="form.provinceId"
-                               clearable
-                               @change="getCity">
-                      <el-option label="不限"
-                                 value=""></el-option>
-                      <el-option v-for="(item,index) in provinces"
-                                 :key="index"
-                                 :label="item.provinceName"
-                                 :value="item.provinceId"></el-option>
+                    <el-select size="small" v-model="form.provinceId" clearable @change="getCity">
+                      <el-option label="不限" value=""></el-option>
+                      <el-option v-for="(item, index) in provinces" :key="index" :label="item.provinceName"
+                        :value="item.provinceId"></el-option>
                     </el-select>
                   </div>
                   <div class="select-wrap">
                     <span class="label">城市</span>
-                    <el-select size="small"
-                               v-model="form.cityId"
-                               clearable
-                               @change="initData">
-                      <el-option label="不限"
-                                 value=""></el-option>
-                      <el-option v-for="(item,index) in cities"
-                                 :key="index"
-                                 :label="item.cityName"
-                                 :value="item.cityId"></el-option>
+                    <el-select size="small" v-model="form.cityId" clearable @change="initData">
+                      <el-option label="不限" value=""></el-option>
+                      <el-option v-for="(item, index) in cities" :key="index" :label="item.cityName"
+                        :value="item.cityId"></el-option>
                     </el-select>
                   </div>
                 </template>
               </dl>
               <dl>
                 <dt>筛选排序：</dt>
-                <dd v-for="(item, i) in sorts"
-                    :key="i"
-                    :class="{active: form.sequence == item.id}"
-                    @click="changeSort(item.id)">{{ item.name }}</dd>
+                <dd v-for="(item, i) in sorts" :key="i" :class="{ active: form.sequence == item.id }"
+                  @click="changeSort(item.id)">{{
+                  item.name }}</dd>
               </dl>
             </div>
           </div>
@@ -83,37 +60,39 @@
           <div class="list">
             <template v-if="listData.length">
               <ul>
-                <li v-for="(item,index) in listData"
-                    :key="index"
-                    @click="toDetail(item)">
+                <li v-for="(item, index) in listData" :key="index" @click="toDetail(item)">
                   <div class="left">
                     <el-button v-if="item.status === 1 || item.status === 2 || item.curStage"
-                               :class="['stage-label', {playing: item.curStage}]"
-                               type="primary">{{ item.status === 1 || item.status === 2 ? '报名中' : item.curStage ? '竞赛中' : '' }}</el-button>
+                      :class="['stage-label', { playing: item.curStage }]" type="primary">{{ item.status === 1 ||
+                        item.status === 2 ? '报名中' : item.curStage ? '竞赛中' : '' }}</el-button>
                     <div class="cover">
-                      <img :src="item.coverUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220623/png/1539857403162943488.png'"
-                           alt="">
+                      <img
+                        :src="item.coverUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220623/png/1539857403162943488.png'"
+                        alt="">
                     </div>
                     <div class="info">
                       <div class="title">{{ item.competitionName }}</div>
                       <div class="metas">
                         <template v-if="item.sponsor">
-                          <div :class="{'flex-top': item.sponsor.split(',').length > 1}">
+                          <div :class="{ 'flex-top': item.sponsor.split(',').length > 1 }">
                             <span class="label">主办方：&emsp;</span>
                             <span class="val">{{ item.sponsor }}</span>
                           </div>
                         </template>
                         <div>
-                          <span class="label">报名时间：</span><span class="val">{{ item.signUpStartTime}} ~ {{ item.signUpEndTime }}</span>
+                          <span class="label">报名时间：</span><span class="val">{{ item.signUpStartTime }} ~ {{
+                            item.signUpEndTime }}</span>
                         </div>
                         <div>
-                          <span class="label">比赛时间：</span><span class="val">{{ item.playStartTime}} ~ {{ item.playEndTime }}</span>
+                          <span class="label">比赛时间：</span><span class="val">{{ item.playStartTime }} ~ {{
+                            item.playEndTime }}</span>
                         </div>
                         <div :title="item.locations || item.range">
                           <span class="label">比赛范围：</span><span class="val">{{ item.locations || item.range }}</span>
                         </div>
                         <div>
-                          <span class="label">比赛类型：</span><span class="val">{{ item.competitionType ? '团体赛' : '个人赛' }}</span>
+                          <span class="label">比赛类型：</span><span class="val">{{ item.competitionType ? '团体赛' : '个人赛'
+                            }}</span>
                         </div>
                         <div v-if="item.curStage">
                           <span class="label">当前阶段：</span><span class="val">{{ item.curStage.stageName }}</span>
@@ -123,27 +102,25 @@
                   </div>
                   <div class="right">
                     <p v-if="item.status"
-                       :class="['sign-status', {signing: item.status == 2, signed: item.status == 1, playing: item.status == 4 && item.curStage}]">{{ item.whetherToSignUp === 0 ? '已报名' : '未报名' }}</p>
-                    <el-dropdown v-if="item.playingStages && item.playingStages.length > 1"
-                                 @click.stop="stageClick"
-                                 @command="e => chooseStage(e, item)">
-                      <el-button type="primary"
-                                 style="background-color: #f96d6d;border: 0;">
+                      :class="['sign-status', { signing: item.status == 2, signed: item.status == 1, playing: item.status == 4 && item.curStage }]">
+                      {{ item.whetherToSignUp === 0 ? '已报名' : '未报名' }}</p>
+                    <el-dropdown v-if="item.playingStages && item.playingStages.length > 1" @click.stop="stageClick"
+                      @command="e => chooseStage(e, item)">
+                      <el-button type="primary" style="background-color: #f96d6d;border: 0;">
                         选择竞赛<i class="el-icon-arrow-down el-icon--right"></i>
                       </el-button>
                       <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item v-for="(stage, i) in item.playingStages"
-                                          :key="i"
-                                          :command="stage">进入{{ stage.stageName }}</el-dropdown-item>
+                        <el-dropdown-item v-for="(stage, i) in item.playingStages" :key="i" :command="stage">进入{{
+                          stage.stageName
+                          }}</el-dropdown-item>
                       </el-dropdown-menu>
                     </el-dropdown>
-                    <p class="status"
-                       v-else-if="item.status != 4 || (item.status == 4 && item.curStage)"
-                       :class="{wait: item.status == 0,signing: item.status == 2,signed: item.status == 1,playing: item.status == 4 && item.curStage,finish: item.status == 3 || item.status == 5}"
-                       :title="item.status == 4 ? item.stageName : statusList[item.status]"
-                       @click.stop="signup(item)">{{ item.status == 4 ? item.stageName : statusList[item.status] }}</p>
-                    <p class="end-text"
-                       v-if="item.end">
+                    <p class="status" v-else-if="item.status != 4 || (item.status == 4 && item.curStage)"
+                      :class="{ wait: item.status == 0, signing: item.status == 2, signed: item.status == 1, playing: item.status == 4 && item.curStage, finish: item.status == 3 || item.status == 5 }"
+                      :title="item.status == 4 ? item.stageName : statusList[item.status]" @click.stop="signup(item)">{{
+                        item.status == 4
+                          ? item.stageName : statusList[item.status] }}</p>
+                    <p class="end-text" v-if="item.end">
                       距离{{ item.status == 4 ? item.endText : endList[item.status] }}还有
                       <em>{{ item.end }}</em>
                     </p>
@@ -151,19 +128,15 @@
                 </li>
               </ul>
               <div class="pagination">
-                <el-pagination background
-                               layout="total, prev, pager, next"
-                               :total="totals"
-                               @current-change="handleCurrentChange"
-                               :current-page="page">
+                <el-pagination background layout="total, prev, pager, next" :total="totals"
+                  @current-change="handleCurrentChange" :current-page="page">
                 </el-pagination>
               </div>
             </template>
             <template v-else>
               <div class="empty">
                 <div>
-                  <img src="@/assets/img/none.png"
-                       alt="">
+                  <img src="@/assets/img/none.png" alt="">
                   <p>暂无赛事</p>
                 </div>
               </div>
@@ -173,174 +146,108 @@
       </div>
     </div>
 
-    <el-dialog title="报名"
-               :visible.sync="peopleSignupVisible"
-               :close-on-click-modal="false"
-               width="300px">
+    <el-dialog title="报名" :visible.sync="peopleSignupVisible" :close-on-click-modal="false" width="300px">
       <el-form class="dia-form">
         <el-form-item>
-          <el-input placeholder="请输入4位数大赛邀请码"
-                    maxlength="4"
-                    v-model="peopleSignupForm.registrationInvitationCode"></el-input>
+          <el-input placeholder="请输入4位数大赛邀请码" maxlength="4"
+            v-model="peopleSignupForm.registrationInvitationCode"></el-input>
         </el-form-item>
       </el-form>
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button size="small"
-                   type="primary"
-                   @click="peopleSignupSubmit">报名</el-button>
-        <el-button size="small"
-                   @click="peopleSignupVisible = false">取消</el-button>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="peopleSignupSubmit">报名</el-button>
+        <el-button size="small" @click="peopleSignupVisible = false">取消</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="报名"
-               :visible.sync="enterVisible"
-               :close-on-click-modal="false"
-               width="300px">
+    <el-dialog title="报名" :visible.sync="enterVisible" :close-on-click-modal="false" width="300px">
       <el-form class="dia-form">
         <p style="margin-bottom: 5px">请选择要加入的团队</p>
         <el-form-item>
-          <el-select class="w-100"
-                     v-model="enterForm.teamId"
-                     filterable>
-            <el-option v-for="(item, i) in teams"
-                       :key="i"
-                       :label="item.teamName"
-                       :value="item.teamId"></el-option>
+          <el-select class="w-100" v-model="enterForm.teamId" filterable>
+            <el-option v-for="(item, i) in teams" :key="i" :label="item.teamName" :value="item.teamId"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-input placeholder="请输入6位数团队邀请码"
-                    maxlength="6"
-                    v-model="enterForm.invitationCode"></el-input>
+          <el-input placeholder="请输入6位数团队邀请码" maxlength="6" v-model="enterForm.invitationCode"></el-input>
         </el-form-item>
         <el-form-item v-if="curItem.isNeedCode">
-          <el-input placeholder="请输入4位数大赛邀请码"
-                    maxlength="4"
-                    v-model="enterForm.registrationInvitationCode"></el-input>
+          <el-input placeholder="请输入4位数大赛邀请码" maxlength="4" v-model="enterForm.registrationInvitationCode"></el-input>
         </el-form-item>
         <p class="tips">
-          查找不到团队？点击 <el-link :underline="false"
-                   type="primary"
-                   @click="toTeam">创建团队</el-link>
+          查找不到团队？点击 <el-link :underline="false" type="primary" @click="toTeam">创建团队</el-link>
         </p>
       </el-form>
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button size="small"
-                   type="primary"
-                   @click="enterSubmit">报名</el-button>
-        <el-button size="small"
-                   @click="enterVisible = false">取消</el-button>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="enterSubmit">报名</el-button>
+        <el-button size="small" @click="enterVisible = false">取消</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="创建团队"
-               :visible.sync="teamVisible"
-               :close-on-click-modal="false"
-               width="300px">
+    <el-dialog title="创建团队" :visible.sync="teamVisible" :close-on-click-modal="false" width="300px">
       <el-form class="dia-form">
         <el-form-item>
-          <el-input placeholder="请输入团队名称"
-                    maxlength="10"
-                    v-model="teamForm.teamName"></el-input>
+          <el-input placeholder="请输入团队名称" maxlength="10" v-model="teamForm.teamName"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input placeholder="请输入6位数团队邀请码"
-                    maxlength="6"
-                    v-model="teamForm.invitationCode"></el-input>
+          <el-input placeholder="请输入6位数团队邀请码" maxlength="6" v-model="teamForm.invitationCode"></el-input>
         </el-form-item>
         <el-form-item v-if="curItem.isNeedCode">
-          <el-input placeholder="请输入4位数大赛邀请码"
-                    maxlength="4"
-                    v-model="teamForm.registrationInvitationCode"></el-input>
+          <el-input placeholder="请输入4位数大赛邀请码" maxlength="4" v-model="teamForm.registrationInvitationCode"></el-input>
         </el-form-item>
       </el-form>
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button size="small"
-                   type="primary"
-                   @click="teamSubmit">创建并报名</el-button>
-        <el-button size="small"
-                   @click="teamVisible = false">取消</el-button>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="teamSubmit">创建并报名</el-button>
+        <el-button size="small" @click="teamVisible = false">取消</el-button>
       </span>
     </el-dialog>
 
-    <el-dialog :title="curStageItem.stageName"
-               :visible.sync="stageVisible"
-               :close-on-click-modal="false"
-               width="600px"
-               @close="stageClose">
+    <el-dialog :title="curStageItem.stageName" :visible.sync="stageVisible" :close-on-click-modal="false" width="600px"
+      @close="stageClose">
       <template v-if="curStageItem">
-        <div v-if="curStageItem.systemLink"
-             class="m-b-20">
+        <div v-if="curStageItem.systemLink" class="m-b-20">
           <span class="fs-14">进入比赛：</span>
-          <el-button type="danger"
-                     style="font-size: 13px"
-                     @click="toOffline">进入{{ curStageItem.stageName }}</el-button>
+          <el-button type="danger" style="font-size: 13px" @click="toOffline">进入{{ curStageItem.stageName }}</el-button>
         </div>
-        <div v-if="curStageItem.fileUrl"
-             class="flex m-b-20 fs-14">
+        <div v-if="curStageItem.fileUrl" class="flex m-b-20 fs-14">
           <span style="padding-top: 7px">文件下载：</span>
           <div>
-            <div v-for="file in curStageItem.fileList"
-                 :key="file">
+            <div v-for="file in curStageItem.fileList" :key="file">
               <span style="margin-right: 10px;color: #606266;">{{ file.name }}</span>
-              <el-button type="text"
-                         style="font-size: 14px"
-                         @click="download({fileName: file.name, filePath: file.url})">点击下载</el-button>
+              <el-button type="text" style="font-size: 14px"
+                @click="download({ fileName: file.name, filePath: file.url })">点击下载</el-button>
             </div>
           </div>
         </div>
 
         <div class="flex m-b-20">
           <span class="fs-14">文件上传：</span>
-          <el-upload class="file-upload flex-1"
-                     :disabled="uploading"
-                     :before-upload="beforeUpload"
-                     :on-remove="handleRemove"
-                     :on-error="uploadError"
-                     :before-remove="beforeRemove"
-                     :on-preview="handlePreview"
-                     :limit="1"
-                     action=""
-                     :on-exceed="handleExceed"
-                     :file-list="fileList"
-                     :http-request="handleRequest"
-                     name="file">
-            <el-button size="small"
-                       type="primary"
-                       :loading="uploading"
-                       :disabled="!!(fileList && fileList.length) || uploading">{{ uploading ? '正在上传' : fileList && fileList.length ? '已上传' : '上传文件' }}</el-button>
-            <div slot="tip"
-                 class="el-upload__tip relative">
-              <el-progress v-if="uploading"
-                           class="m-b-5"
-                           :stroke-width="3"
-                           :percentage="uploadProgress"></el-progress>
+          <el-upload class="file-upload flex-1" :disabled="uploading" :before-upload="beforeUpload"
+            :on-remove="handleRemove" :on-error="uploadError" :before-remove="beforeRemove" :on-preview="handlePreview"
+            :limit="1" action="" :on-exceed="handleExceed" :file-list="fileList" :http-request="handleRequest"
+            name="file">
+            <el-button size="small" type="primary" :loading="uploading"
+              :disabled="!!(fileList && fileList.length) || uploading">{{ uploading ? '正在上传' : fileList &&
+                fileList.length ? '已上传' : '上传文件' }}</el-button>
+            <div slot="tip" class="el-upload__tip relative">
+              <el-progress v-if="uploading" class="m-b-5" :stroke-width="3" :percentage="uploadProgress"></el-progress>
               <p>请上传大小1G以内的文件，支持常见文件格式。</p>
               <p>只允许上传一个文件，如有多个文件则需打包再上传。</p>
-              <div v-if="fileList.length"
-                   class="download"
-                   @click="downloadFile">下载</div>
+              <div v-if="fileList.length" class="download" @click="downloadFile">下载</div>
             </div>
           </el-upload>
         </div>
 
         <div class="fs-14">说明：{{ curStageItem.stageExplain }}</div>
       </template>
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button size="small"
-                   @click="stageVisible = false">关闭</el-button>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="stageVisible = false">关闭</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { mapState, mapMutations } from "vuex";
-import Setting from "@/setting"
-import Util from "@/libs/util"
+import { mapState, mapMutations } from 'vuex'
+import Setting from '@/setting'
+import Util from '@/libs/util'
 import Bus from '@/libs/bus'
 import OSS from 'ali-oss'
 import OssConfig from '@/components/upload/config.js'
@@ -733,7 +640,7 @@ export default {
         this.teams = teamList
       }).catch(res => { })
     },
-    // 团队提交
+    // 创建团队提交
     teamSubmit () {
       const form = this.teamForm
       if (!form.teamName) return Util.errorMsg('请输入团队名称')
@@ -745,8 +652,36 @@ export default {
         this.enterVisible = false
         this.getData()
         Util.successMsg('报名成功！')
+        this.afterCreateTeam(res.teamId)
       }).catch(res => { })
     },
+    // 队长创建团队后弹框
+    async afterCreateTeam (id) {
+      // 已分配
+      const res = await this.$post(`${this.api.viewEventAllocationInformation}?competitionId=${this.teamForm.competitionId}`)
+      // 赛事自动分配状态为开启，则直接提示；否则弹框询问是否要启用团队自动分配
+      if (res.data && res.data.assignOrNot) {
+        Util.successMsg('团队创建成功，系统将自动帮您分配阶段参赛成员，您也可以到参数信息进行指定')
+      } else {
+        // 未分配
+        this.$confirm('是否要启用自动分配成员参加阶段赛项', '提示', {
+          cancelButtonText: '否',
+          confirmButtonText: '是',
+          type: 'success',
+          closeOnClickModal: false,
+        }).then(() => {
+          this.automaticAllocation(id)
+        }).catch(() => { })
+      }
+    },
+    // 团队创建成功后分配
+    async automaticAllocation (teamId) {
+      await this.$post(this.api.competitionTeamAutomaticAllocationRecordSave, {
+        assignOrNot: 1,
+        competitionId: this.teamForm.competitionId,
+        teamId
+      })
+    },
     // 该阶段是否符合线下能进入比赛的条件
     offlineCanEntry (stage) {
       return stage.method === 2 && !!(stage.systemLink || stage.whetherToUploadFiles)
@@ -1055,321 +990,368 @@ export default {
 
 <style lang="scss" scoped>
 .search {
+  position: relative;
+  padding: 100px 0 130px;
+  text-align: center;
+  background: url(../../../assets/img/match-bg4.png) (27px 10px) / auto no-repeat,
+    url(../../../assets/img/match-bg5.png) (98% 20px) / auto no-repeat, url(../../../assets/img/match-bg3.png) 0 0/100% 100% no-repeat;
+
+  h6 {
+    margin-bottom: 25px;
+    font-size: 26px;
+    color: #fff;
+  }
+
+  .input {
     position: relative;
-    padding: 100px 0 130px;
-    text-align: center;
-    background: url(../../../assets/img/match-bg4.png) (27px 10px) / auto no-repeat,
-        url(../../../assets/img/match-bg5.png) (98% 20px) / auto no-repeat, url(../../../assets/img/match-bg3.png) 0 0/100% 100% no-repeat;
-    h6 {
-        margin-bottom: 25px;
-        font-size: 26px;
-        color: #fff;
-    }
-    .input {
-        position: relative;
-        width: 700px;
-        margin: 0 auto;
-    }
-    img {
-        position: absolute;
-        top: 19px;
-        left: 14px;
-    }
-    input {
-        width: 100%;
-        height: 62px;
-        line-height: 62px;
-        padding: 0 50px;
-        font-size: 18px;
-        color: #333;
-        border: 0;
-        outline: none;
-        border-radius: 4px;
-    }
+    width: 700px;
+    margin: 0 auto;
+  }
+
+  img {
+    position: absolute;
+    top: 19px;
+    left: 14px;
+  }
+
+  input {
+    width: 100%;
+    height: 62px;
+    line-height: 62px;
+    padding: 0 50px;
+    font-size: 18px;
+    color: #333;
+    border: 0;
+    outline: none;
+    border-radius: 4px;
+  }
 }
+
 .main {
-    background: url(../../../assets/img/match-bg1.png) (0px 95px) / auto auto no-repeat,
-        url(../../../assets/img/match-bg2.png) (98% bottom) / auto auto no-repeat;
-    .center-wrap {
-        width: 1078px;
-    }
+  background: url(../../../assets/img/match-bg1.png) (0px 95px) / auto auto no-repeat,
+    url(../../../assets/img/match-bg2.png) (98% bottom) / auto auto no-repeat;
+
+  .center-wrap {
+    width: 1078px;
+  }
 }
+
 .filter {
-    width: 100%;
-    padding: 0 20px;
-    margin-bottom: 20px;
-    background-color: #fff;
-    dl {
-        display: flex;
-        align-items: center;
-        margin: 20px 0;
-        dt {
-            color: #333;
-            font-size: 16px;
-            font-weight: 600;
-            white-space: nowrap;
-        }
-        dd {
-            padding: 5px 15px;
-            color: #6a6a6a;
-            font-size: 16px;
-            white-space: nowrap;
-            cursor: pointer;
-            border-radius: 4px;
-            &.active {
-                color: $main-color;
-                background-color: #e6f0ff;
-            }
-        }
-    }
-}
-.select-wrap {
-    display: inline-flex;
+  width: 100%;
+  padding: 0 20px;
+  margin-bottom: 20px;
+  background-color: #fff;
+
+  dl {
+    display: flex;
     align-items: center;
-    margin: 0 10px;
-    .label {
-        margin-right: 10px;
-        white-space: nowrap;
+    margin: 20px 0;
+
+    dt {
+      color: #333;
+      font-size: 16px;
+      font-weight: 600;
+      white-space: nowrap;
     }
-    .el-select {
-        width: 130px;
+
+    dd {
+      padding: 5px 15px;
+      color: #6a6a6a;
+      font-size: 16px;
+      white-space: nowrap;
+      cursor: pointer;
+      border-radius: 4px;
+
+      &.active {
+        color: $main-color;
+        background-color: #e6f0ff;
+      }
     }
+  }
 }
+
+.select-wrap {
+  display: inline-flex;
+  align-items: center;
+  margin: 0 10px;
+
+  .label {
+    margin-right: 10px;
+    white-space: nowrap;
+  }
+
+  .el-select {
+    width: 130px;
+  }
+}
+
 .list-inner {
-    display: flex;
-    justify-content: center;
-    align-items: flex-start;
+  display: flex;
+  justify-content: center;
+  align-items: flex-start;
 }
+
 .nav {
-    width: 156px;
-    text-align: right;
-    overflow: hidden;
-    background-color: #fff;
+  width: 156px;
+  text-align: right;
+  overflow: hidden;
+  background-color: #fff;
+
+  li {
+    padding: 0 24px;
+    font-size: 16px;
+    color: #666;
+    line-height: 48px;
+    border-bottom: 2px solid #f3f6fa;
+    border-right: 2px solid transparent;
+    cursor: pointer;
+
+    &:before {
+      content: '';
+      display: inline-block;
+      width: 3px;
+      height: 3px;
+      margin-right: 10px;
+      vertical-align: middle;
+      border-radius: 50%;
+      background-color: #666;
+    }
+
+    &.active {
+      color: $main-color;
+      border-right-color: $main-color;
+
+      &:before {
+        background-color: $main-color;
+      }
+    }
+  }
+}
+
+.list-wrap {
+  width: calc(100% - 180px);
+  margin-left: 24px;
+
+  .list {
     li {
-        padding: 0 24px;
-        font-size: 16px;
-        color: #666;
-        line-height: 48px;
-        border-bottom: 2px solid #f3f6fa;
-        border-right: 2px solid transparent;
-        cursor: pointer;
-        &:before {
-            content: '';
-            display: inline-block;
-            width: 3px;
-            height: 3px;
-            margin-right: 10px;
-            vertical-align: middle;
-            border-radius: 50%;
-            background-color: #666;
-        }
-        &.active {
+      display: flex;
+      justify-content: space-between;
+      padding: 16px;
+      margin-bottom: 12px;
+      transition: all 0.3s;
+      cursor: pointer;
+      border-radius: 6px;
+      background-color: #fff;
+
+      .right {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: flex-end;
+        flex: 1;
+
+        .sign-status {
+          margin-bottom: 10px;
+          font-size: 14px;
+          color: $main-color;
+
+          &.signing {
             color: $main-color;
-            border-right-color: $main-color;
-            &:before {
-                background-color: $main-color;
+          }
+
+          &.signed {
+            color: #52c41a;
+          }
+
+          &.playing {
+            color: #f96d6d;
+          }
+        }
+
+        .status {
+          max-width: 120px;
+          padding: 0 23px;
+          line-height: 34px;
+          font-size: 14px;
+          color: #fff;
+          white-space: nowrap;
+          background-color: #52c41a;
+          border-radius: 4px;
+          @include ellipsis();
+
+          &.wait {
+            background-color: #faad14;
+          }
+
+          &.signing {
+            background-color: $main-color;
+          }
+
+          &.signed {
+            background-color: #52c41a;
+          }
+
+          &.playing {
+            background-color: #f96d6d;
+          }
+
+          &.finish {
+            background-color: #ccc;
+          }
+        }
+
+        .btn {
+          padding: 12px 20px;
+          color: #fff;
+          background-color: #cb221c;
+          border-radius: 4px;
+          cursor: pointer;
+
+          &:hover {
+            opacity: 0.9;
+          }
+
+          &.disabled {
+            cursor: not-allowed;
+            background-color: #969696;
+          }
+        }
+
+        .end-text {
+          margin-top: 10px;
+          color: rgba(0, 0, 0, 0.65);
+          font-size: 12px;
+          white-space: nowrap;
+
+          em {
+            font-style: normal;
+            color: #f00;
+          }
+        }
+      }
+
+      &:hover {
+        .left {
+          .info {
+            .title {
+              color: $main-color;
             }
+          }
         }
+      }
     }
-}
-.list-wrap {
-    width: calc(100% - 180px);
-    margin-left: 24px;
-    .list {
-        li {
+
+    .left {
+      position: relative;
+      display: inline-flex;
+
+      .stage-label {
+        position: absolute;
+        top: -16px;
+        left: -16px;
+        border: 0;
+        background-color: rgb(101, 227, 181);
+
+        &.playing {
+          background-color: rgb(251, 174, 41);
+        }
+      }
+
+      .cover {
+        img {
+          width: 275px;
+          height: 175px;
+          border-radius: 6px;
+        }
+      }
+
+      .info {
+        margin-left: 16px;
+
+        .title {
+          margin-bottom: 10px;
+          font-size: 20px;
+          font-weight: 500;
+          color: #0b1d30;
+          line-height: 1;
+        }
+
+        .metas {
+          font-size: 14px;
+          color: #666;
+
+          div {
             display: flex;
-            justify-content: space-between;
-            padding: 16px;
-            margin-bottom: 12px;
-            transition: all 0.3s;
-            cursor: pointer;
-            border-radius: 6px;
-            background-color: #fff;
-            .right {
-                display: flex;
-                flex-direction: column;
-                justify-content: center;
-                align-items: flex-end;
-                flex: 1;
-                .sign-status {
-                    margin-bottom: 10px;
-                    font-size: 14px;
-                    color: $main-color;
-                    &.signing {
-                        color: $main-color;
-                    }
-                    &.signed {
-                        color: #52c41a;
-                    }
-                    &.playing {
-                        color: #f96d6d;
-                    }
-                }
-                .status {
-                    max-width: 120px;
-                    padding: 0 23px;
-                    line-height: 34px;
-                    font-size: 14px;
-                    color: #fff;
-                    white-space: nowrap;
-                    background-color: #52c41a;
-                    border-radius: 4px;
-                    @include ellipsis();
-                    &.wait {
-                        background-color: #faad14;
-                    }
-                    &.signing {
-                        background-color: $main-color;
-                    }
-                    &.signed {
-                        background-color: #52c41a;
-                    }
-                    &.playing {
-                        background-color: #f96d6d;
-                    }
-                    &.finish {
-                        background-color: #ccc;
-                    }
-                }
-
-                .btn {
-                    padding: 12px 20px;
-                    color: #fff;
-                    background-color: #cb221c;
-                    border-radius: 4px;
-                    cursor: pointer;
-
-                    &:hover {
-                        opacity: 0.9;
-                    }
-
-                    &.disabled {
-                        cursor: not-allowed;
-                        background-color: #969696;
-                    }
-                }
-
-                .end-text {
-                    margin-top: 10px;
-                    color: rgba(0, 0, 0, 0.65);
-                    font-size: 12px;
-                    white-space: nowrap;
-
-                    em {
-                        font-style: normal;
-                        color: #f00;
-                    }
-                }
-            }
+            align-items: center;
+            margin-bottom: 5px;
 
-            &:hover {
-                .left {
-                    .info {
-                        .title {
-                            color: $main-color;
-                        }
-                    }
-                }
+            &.flex-top {
+              align-items: flex-start;
             }
+          }
+
+          .label,
+          .val {
+            font-size: 14px;
+            color: #666;
+            white-space: nowrap;
+          }
+
+          .val {
+            max-width: 350px;
+            text-overflow: ellipsis;
+            overflow: hidden;
+          }
+
+          .a-line {
+            display: block;
+          }
         }
-        .left {
-            position: relative;
-            display: inline-flex;
-            .stage-label {
-                position: absolute;
-                top: -16px;
-                left: -16px;
-                border: 0;
-                background-color: rgb(101, 227, 181);
-                &.playing {
-                    background-color: rgb(251, 174, 41);
-                }
-            }
-            .cover {
-                img {
-                    width: 275px;
-                    height: 175px;
-                    border-radius: 6px;
-                }
-            }
 
-            .info {
-                margin-left: 16px;
-                .title {
-                    margin-bottom: 10px;
-                    font-size: 20px;
-                    font-weight: 500;
-                    color: #0b1d30;
-                    line-height: 1;
-                }
-                .metas {
-                    font-size: 14px;
-                    color: #666;
-                    div {
-                        display: flex;
-                        align-items: center;
-                        margin-bottom: 5px;
-
-                        &.flex-top {
-                            align-items: flex-start;
-                        }
-                    }
-
-                    .label,
-                    .val {
-                        font-size: 14px;
-                        color: #666;
-                        white-space: nowrap;
-                    }
-
-                    .val {
-                        max-width: 350px;
-                        text-overflow: ellipsis;
-                        overflow: hidden;
-                    }
-
-                    .a-line {
-                        display: block;
-                    }
-                }
-
-                .desc {
-                    font-size: 14px;
-                }
-            }
+        .desc {
+          font-size: 14px;
         }
+      }
     }
+  }
 }
+
 /deep/.dia-form {
-    .w-100 {
-        width: 100%;
-    }
-    .tips {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-    }
+  .w-100 {
+    width: 100%;
+  }
+
+  .tips {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 }
+
 /deep/.file-upload {
-    .el-upload__tip {
-        color: #727272;
-    }
-    .el-progress {
-        white-space: nowrap;
-    }
-    .download {
-        position: absolute;
-        bottom: -25px;
-        right: 0;
-        font-size: 12px;
-        color: #007eff;
-        cursor: pointer;
-    }
-    .el-upload-list__item {
-        width: 70%;
-        &:first-child {
-            margin-top: 5px;
-        }
+  .el-upload__tip {
+    color: #727272;
+  }
+
+  .el-progress {
+    white-space: nowrap;
+  }
+
+  .download {
+    position: absolute;
+    bottom: -25px;
+    right: 0;
+    font-size: 12px;
+    color: #007eff;
+    cursor: pointer;
+  }
+
+  .el-upload-list__item {
+    width: 70%;
+
+    &:first-child {
+      margin-top: 5px;
     }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue
index 71ba4d0..b9a9526 100644
--- a/src/pages/record/show/index.vue
+++ b/src/pages/record/show/index.vue
@@ -86,22 +86,22 @@
               </template>
             </el-table-column>
             <el-table-column prop="judgmentName" label="判分点" width="200" align="center"></el-table-column>
-            <el-table-column v-if="IsLc" prop="judgmentName" label="考核点" align="center" :key="2" width="150">
+            <el-table-column v-if="isLc" prop="judgmentName" label="考核点" align="center" :key="2" width="150">
               <template slot-scope="scope">
-                <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                  <span>
-                    <span>{{ index + 1 }}. </span>{{ item.name }}
-                  </span>
+                <div v-for="(item, i) in scope.row.lcRuleRecords" :key="i" class="rule-line">
+                  <span>{{ item.index }}. </span>{{ item.name }}
+                  <p v-if="item.ruleOperation === '或'" class="m-t-5 m-b-5">
+                    {{ item.ruleOperation === '或' ? '或' : '' }}</p>
                 </div>
               </template>
             </el-table-column>
             <el-table-column prop="ruleAnswer" label="参考答案" :key="3" style='word-wrap: break-word'>
               <template slot-scope="scope">
                 <div v-if="scope.row.lcRuleRecords">
-                  <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                    <span>
-                      <span>{{ index + 1 }}. </span>{{ item.ruleAnswer }}
-                    </span>
+                  <div v-for="(item, i) in scope.row.lcRuleRecords" :key="i" class="rule-line">
+                    <span>{{ item.index }}. </span>{{ item.ruleAnswer }}
+                    <p v-if="item.ruleOperation === '或'" class="p-l-10 m-t-5 m-b-5">
+                      {{ item.ruleOperation === '或' ? '或' : '' }}</p>
                   </div>
                 </div>
                 <div v-else v-html="scope.row.referenceAnswer"></div>
@@ -109,15 +109,15 @@
             </el-table-column>
             <el-table-column prop="userAnswer" :key="4" label="学生答案">
               <template slot-scope="scope">
-                <div v-if="scope.row.lcRuleRecords">
-                  <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                    {{ index + 1 }}. {{ item.userAnswer || '未填写' }}
+                <div v-if="scope.row.lcStudentAnswer">
+                  <div v-for="(item, i) in scope.row.lcStudentAnswer" :key="i" class="rule-line">
+                    {{ i + 1 }}. {{ item.userAnswer || '未填写' }}
                   </div>
                 </div>
                 <div v-else v-html="scope.row.answer" style="white-space: pre-wrap"></div>
               </template>
             </el-table-column>
-            <el-table-column v-if="!IsLc" prop="runResult" label="学生运行结果" :key="5" align="center">
+            <el-table-column v-if="!isLc" prop="runResult" label="学生运行结果" :key="5" align="center">
               <template slot-scope="scope">
                 <div class="m-b-20" v-html="scope.row.runResult" style="white-space: pre-wrap"></div>
                 <template v-if="scope.row.runThePictureList">
@@ -168,7 +168,7 @@ export default {
       editing: false,
       loadIns: null,
       loading: false,
-      IsLc: false,
+      isLc: false,
       userScores: [],
       quills: [],
       quillIndex1: 0,
@@ -254,13 +254,21 @@ export default {
     },
     // 处理实验数据
     handleList (list) {
-      this.IsLc = list.find(e => e.lcRuleRecords) // 流程系统才有lcRuleRecords
-      if (this.IsLc) {
+      this.isLc = list.find(e => e.lcRuleRecords) // 流程系统才有lcRuleRecords
+      if (this.isLc) {
         list.map(e => {
           e.assessmentPoint = ''
           e.referenceAnswer = ''
           e.answer = ''
+          let index = 1
           e.lcRuleRecords.map((n, i) => {
+            n.index = index
+
+            if (n.ruleOperation === '或') {
+              index = 1
+            } else {
+              index++
+            }
             e.assessmentPoint += `${i + 1}.${n.name}`
             e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
             if (!n.userAnswer) n.userAnswer = '未填写'
@@ -298,7 +306,7 @@ export default {
       //   if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
       // }
       form.purpose = form.purpose.replace(/<[^>]+>/g, '')
-      this.$post(this.IsLc ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
+      this.$post(this.isLc ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
         ...form,
         experimentalData: list
       }).then(res => {
@@ -351,7 +359,7 @@ export default {
     },
     editReport () { // 编辑实验报告
       if (this.editing) {
-        this.$post(`${this.api.updateReport}`, this.infoData).then(res => {
+        this.$post(this.api.updateReport, this.infoData).then(res => {
           this.editing = false;
           util.successMsg("修改成功");
         }).catch(err => { });
diff --git a/src/setting.js b/src/setting.js
index c53158e..1cac47b 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -16,17 +16,13 @@ let sandPath = `${location.origin}/sandbox` // 沙盘地址
 let host = `${location.origin}/`
 // let host = `https://izhixinyun.com/`
 let uploadURL = `${location.origin}/`
-// let uploadURL = `https://izhixinyun.com/`
 let title = isZxy ?
   '智信云' :
   (isHh || isCH) ?
     '学生端' :
     '职站'
 
-if (isPro) {
-  // 职站生产
-  uploadURL = `https://www.huorantech.cn/`
-} else if (isDev) {
+if (isDev) {
   // 本地
   systemPath = `http://${location.hostname}:8093`
   sandPath = `http://${location.hostname}:9520`