From 02b22578a4ee1bccb04906f62aa876f543c35151 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 9 Sep 2024 15:17:11 +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/assets/css/main.css                |  2 +-
 src/views/match/add/step2.vue          | 10 ++++++----
 src/views/match/manage/matchInfo.vue   |  2 +-
 src/views/match/manage/matchSignup.vue | 16 +++++++++++++---
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 699a26f..dc9c1f1 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -464,7 +464,7 @@ li {
     }
 }
 .el-tooltip__popper {
-    max-width: 500px !important;
+    max-width: 100% !important;
 }
 .no-atTheMoment > .el-picker-panel__footer > .el-button--text:first-child {
     display: none;
diff --git a/src/views/match/add/step2.vue b/src/views/match/add/step2.vue
index 2204b8a..23e9794 100644
--- a/src/views/match/add/step2.vue
+++ b/src/views/match/add/step2.vue
@@ -104,7 +104,7 @@
                   （阶段）比赛结束后
                   <el-input v-model.number="item.resultAnnouncementTime" type="number" min="0"
                     style="width: 120px"></el-input>
-                  小时，公布（阶段）比赛成绩。
+                  小时，公布（阶段）比赛成绩。（为空则不公布成绩，为0则阶段比赛结束后立马公布成绩）
                 </div>
                 <div
                   v-if="item.resultAnnouncementTime !== '' && item.resultAnnouncementTime !== null && item.resultAnnouncementTime !== undefined"
@@ -136,13 +136,15 @@
                 </div>
               </div>
             </el-form-item>
-            <el-form-item prop="rule" label="成绩公布时间">
+            <el-form-item label="成绩公布时间">
               （阶段）比赛结束后
               <el-input v-model.number="form.competitionStageList[0].resultAnnouncementTime" type="number" min="0"
                 style="width: 120px"></el-input>
-              小时，公布（阶段）比赛成绩。
+              小时，公布（阶段）比赛成绩。（为空则不公布成绩，为0则阶段比赛结束后立马公布成绩）
             </el-form-item>
-            <el-form-item prop="resultsDetails" label="是否公布成绩详情">
+            <el-form-item
+              v-if="form.competitionStageList[0].resultAnnouncementTime !== '' && form.competitionStageList[0].resultAnnouncementTime !== null && form.competitionStageList[0].resultAnnouncementTime !== undefined"
+              prop="resultsDetails" label="是否公布成绩详情">
               <el-radio v-model="form.competitionStageList[0].resultsDetails" :label="0">是</el-radio>
               <el-radio v-model="form.competitionStageList[0].resultsDetails" :label="1">否</el-radio>
               <p class="tips">若选择“是”，则公布成绩详情，竞赛结束后参赛者可查看自己的比赛成绩得分详情；</p>
diff --git a/src/views/match/manage/matchInfo.vue b/src/views/match/manage/matchInfo.vue
index 8bcec0c..9f84dec 100644
--- a/src/views/match/manage/matchInfo.vue
+++ b/src/views/match/manage/matchInfo.vue
@@ -129,7 +129,7 @@
                 <td colspan="6">暂无数据</td>
               </tr>
             </table>
-            <el-alert v-if="form.completeCompetitionSetup.competitionType" style="margin-top: 10px;"
+            <el-alert v-if="form.completeCompetitionSetup.competitionType && form.rule !== 2" style="margin-top: 10px;"
               :title="'注：请团长（团队创建人）设置各阶段参赛成员，只有被选择的允许参赛成员可进入对应阶段比赛' + (info.teamLimit ? '，每个团队成员只能参加一个赛项阶段' : '') + '！'"
               type="warning" show-icon>
             </el-alert>
diff --git a/src/views/match/manage/matchSignup.vue b/src/views/match/manage/matchSignup.vue
index 715c847..6734510 100644
--- a/src/views/match/manage/matchSignup.vue
+++ b/src/views/match/manage/matchSignup.vue
@@ -17,9 +17,19 @@
         </li>
       </ul>
       <div>
-        <el-button v-show="loaded && info.completeCompetitionSetup.competitionType" type="primary" round
-          :disabled="hasReport" :loading="allocating" @click="autoAllocationConfirm">{{ !notBeginSign && allocated ?
-            '取消' : '' }}自动分配阶段成员</el-button>
+        <template v-if="loaded && info.completeCompetitionSetup.competitionType">
+          <el-button type="primary" round :disabled="hasReport" :loading="allocating" @click="autoAllocationConfirm">{{
+            !notBeginSign && allocated ?
+              '取消' : '' }}自动分配阶段成员</el-button>
+          <el-tooltip placement="top">
+            <div slot="content">
+              <p style="margin-bottom: 5px;">报名结束前，设置的自动分配将在报名结束时触发系统自动分配（取消则不触发）</p>
+              <p>报名结束后，也可以手动点击自动分配按钮来立即触发系统自动分配，并且点击一次就触发一次</p>
+            </div>
+            <i class="el-icon-question"
+              style="margin: 0 10px 0 5px;font-size: 16px;color: #8f8f8f;cursor: pointer;"></i>
+          </el-tooltip>
+        </template>
         <el-button type="primary" round @click="batchImport">导入</el-button>
         <el-button type="primary" round @click="add" v-auth="'/match:管理:报名人员:新增'">新增</el-button>
         <el-button type="primary" round :loading="exporting" @click="exportAll"