From 34d84486ea7cf626658cf9854176a3b1da58060a Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 25 Apr 2024 15:14:22 +0800
Subject: [PATCH] fix

---
 public/favicon.ico                     | Bin 4286 -> 0 bytes
 src/views/match/manage/matchInfo.vue   |   7 ++++---
 src/views/match/manage/matchRank.vue   |   2 +-
 src/views/match/manage/matchSignup.vue |   5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 public/favicon.ico

diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index 18d2a14b493ea0bfce3b78ca8c10fb6b3c18464c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4286
zcmbW*S!`5Q9LMo9GHElYR}mtR5I|!Xgvdov+OkykT@YloR4OVE1F{+r!48xifwE{p
z78ytv9F%H&Ha95A6*N&4B<c&Ly`ACCR?22lbN$|7?ww;Hgtp|v`JZ!s|Nogj%u9vv
z@UMG!VgE0x9v9+CAw*AbB!<8~PyKM${O9I-ONwtUT5<ukxblGP?0I^7u?jqmpHYXF
z%(!@C$>N(g7B9A1Axe)50Y411c+T}@3$0c%=~J&ST_kQSUF5&MY?0BbIV;|^t~=hR
zz8@!dXEn*H5b(or=h*l6n`7UlXEm-|U`cLJ|At?h`IUVfa@K5IIbVfnTs7a%ozd(*
z$=>d3KI=SZjZXI32k%&tpBh)qdy0AO(IG8Wlc|z&c8>`a0)7~fXMMx0j(5+R*M-~}
zC)==Qt|ig0efX9F_iJ)(_1l8q(L?5_l(TzGs1VoI%=NPxkY|M&*1qY5JIl_(2hGhE
z7g-G%dPDIX1#V9=Fh?ZU7kbD9rJUVkHhfg1vI_WNK%N!i-V1kDI_qQAoNRL48<s>*
zt}9gF_VBhyZYc1O2}(J;Cx(6y@WX&SE5zQ5%&a?EA7`4IEh(^)8G5p0wt`F#?>DR~
z@{kEiIlHGRvElU-iH)-cCrS!BCD+g1&sjpsgc2JIyon73nOP+Tf_on{Cl}u|(~{`a
zN_@-o?D*yxZ6M;CXNttO86M7qQcmuPkqcrVpJix#<E#_pZsBBN(=0FC_c;^rLBpLH
zTc%sQ=g{L@r$3B>*w$&QW80>6kL;cx>Pw~wGP|Ullh3SMr$^#jr<Kx^6W=mp64}M@
zBJ(~qdml8UdSlzCS`wYQEmow@evfT`Z6P`^yA!k5#<orUTguD5PF+JjfS!qxLP4MV
zK79f{XwHo2j>(opkM5k@mi=<+tcm)E=+0M*qPr%wV{VVw$5Xa(RwrfT8BTqPS!?L&
z7TYn|L%$$z^FecZ&C*GhM30tEYRi7PbmrXuW0p=lWA2_fjf}#)XPI3_E_{!y)6+!H
zAM`9lX9%)BXl~D*36`0mn|mj;WxrfHlke^NHoi6Yjvt@O?w*)y?s=u0vxfWhG;w#1
zo_yA9XioO(C*v%MPW_0vZ+xD)Z`@hxCh1Pj*>&U9PsfI?mW|0L?_>5TdQNeE>pnfj
z++{&?GLf>;mPC(~jZq+&-I>`7sV{QhBxU5hU7L~pqYp>+kLq)^Y^*}xWO`0>e)}Fh
z#hhh9bMC^QjkF{>wE_`2FbbnR%<URJFmg3#m!zEB<J4j9_k<6Qc#fWS^cS)}jV7tD
zm^urZdv<8J70%G96}aD-@ZsUYIF>KMheq_mI_@q@dAZlAYr=<zZ9z9aOM5IJe?Hw)
z%$fx)y|?N=A0pG)D{$YhKl-wOhqL8a5I!<AAEne0$i2<$gWNxK<%^dDpQS53tJ%*(
zHZ-L2Mlj!!=+p}S_kQHaP!DH8{EP1}mCrOReHLStXE=3;jJKXy>EEFZtB<Trb9;^t
zvWyI!T7mn%aeSbFhqIuRyGec0I5xN&22od`NxHXZhTw%XYY?*r`Jf^7Ze95ROQKUN
zaC_>?^F&>Fj)$|Ll(T!HP{I9x-UvgU6*4OFy!O5GW7qIOLn>QanQKY(+KM~{P7C=w
zQ6C)WArq8xc8>`aqP8Np2de>jR;aEr*9&)6DqETBW7XVjRgP7gp;Iexd+I84gi(>>
zsjccClyY{D36*mJKef^9K2%qg<Apn`_5|4z{e95fZ0JR+Hsc(17d#3@@)&gm<gCeF
zg@7Lh<ojy&Pe7hy*B$XaQrRnCzF<ijsn0>b2UE(~J@#IOxN@?epVfdoE5`muG@o^r
zvj!(y^VRcKE1C4E5b(o5%V(YHYt^)lNuLS<KMb^dR<(MordqXHAxe)50Y411c+TZ&
zwdC^Gef~rY(FYVy_w;5J%y@?N0_^h#ongQCmk<HIA9u?R1d<sd=?RD=e@sXcw)KVk
W*90${EMx~#0<0RO{s28(-ot-rN~DVb

diff --git a/src/views/match/manage/matchInfo.vue b/src/views/match/manage/matchInfo.vue
index 6c4043c..d3bb228 100644
--- a/src/views/match/manage/matchInfo.vue
+++ b/src/views/match/manage/matchInfo.vue
@@ -146,8 +146,8 @@
                   <td>
                     <span v-if="item.score >= 0"
                           class="m-r-10">分数{{item.score}}</span>
-                    <el-button type="text"
-                               :disabled="item.resultsDetails === 1 || (form.completeCompetitionSetup.competitionType && !item.reportId) || (form.completeCompetitionSetup.competitionType === 0 && !item.reportId)"
+                    <el-button v-if="form.completeCompetitionSetup.competitionType || (!form.completeCompetitionSetup.competitionType && item.resultsDetails === 0 && item.reportId)"
+                               type="text"
                                @click="show(item)">查看成绩详情</el-button>
                   </td>
                 </tr>
@@ -268,7 +268,8 @@
             <td>{{ item.timeSum }}min</td>
             <td>{{ item.score }}</td>
             <td>
-              <el-button type="text"
+              <el-button v-if="curRow.resultsDetails === 0 && item.reportId"
+                         type="text"
                          @click="toReport(item)">查看</el-button>
             </td>
           </tr>
diff --git a/src/views/match/manage/matchRank.vue b/src/views/match/manage/matchRank.vue
index a244510..447815c 100644
--- a/src/views/match/manage/matchRank.vue
+++ b/src/views/match/manage/matchRank.vue
@@ -407,7 +407,7 @@ export default {
             keyword: this.keyword
           }).then(({ page, publishStatus, total }) => {
             this.published = publishStatus
-            this.list = page
+            this.list = page || []
             this.total = total
             this.getPublishTime()
             this.loading = false
diff --git a/src/views/match/manage/matchSignup.vue b/src/views/match/manage/matchSignup.vue
index 4acd17b..c56701b 100644
--- a/src/views/match/manage/matchSignup.vue
+++ b/src/views/match/manage/matchSignup.vue
@@ -852,9 +852,10 @@ export default {
     // 批量删除
     async batchDel () {
       const list = this.multipleSelection
-      const tips = list.length ? (this.info.completeCompetitionSetup.competitionType && list.find(e => e.captain === '是') ? '删除队长后，该团队下所有成员都会同步移除报名，已有的成绩也会一并删除，成绩排名将会受影响，是否确认删除？' : '删除后该参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定要删除？') : '删除后参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定删除全部报名人员？'
+      const tips = list.length ? (this.info.completeCompetitionSetup.competitionType && list.find(e => e.captain === '是') ? '删除队长后，该团队下所有成员都会同步移除报名，已有的成绩也会一并删除，成绩排名将会受影响，是否确认删除？' : '删除后该参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定要删除？') : '删除后参赛人员已有的成绩会一并删除，成绩排名将会受影响，<span style="font-size: 15px;color: #f00">是否确定删除全部报名人员？</span>'
       this.$confirm(tips, "提示", {
-        type: "warning"
+        type: "warning",
+        dangerouslyUseHTMLString: true
       }).then(async () => {
         if (list.length) {
           await this.$post(this.api.batchDeleteApplicants, { registrationVOS: list })