From 40cf3a8bff0a97a5160fa42f464b63bf779f6c1c Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 21 Dec 2022 16:12:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=98=B6=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico                   | Bin 4286 -> 25974 bytes
 src/views/project/ProjectDetails.vue | 198 ++++++++++++++-------------
 2 files changed, 103 insertions(+), 95 deletions(-)

diff --git a/public/favicon.ico b/public/favicon.ico
index df36fcfb72584e00488330b560ebcf34a41c64c2..87c93eb8f756f8c3d4bb0bdc539395a01c2f46f7 100644
GIT binary patch
literal 25974
zcmeI2K~md55Jku3g?E7!RoMhpWs{{(5Of241Z9yuH^8aNo*TqR;0S^fa0ELih?guV
zCjXn6FtmDPNkFiRcB)ZN&!6t;r;!X*ac+cvr>71-3s-%2?#Ma!1%{CO1!J6_pWikY
z`(Xr(fDtePM!*Od0V7}pjDQg^0!F|H7y%<-1dM<YFak!v2p9n)U<3vcIQsaxg!xyn
za?pnMXpylSezT0-v)C2jH-7~yhVRN&8UZ8l9tnhZIe(AnV$+vqgt}8$1xw$F91p66
zb%(Gny>!tWw)KlTLw@)AgLMn;u`PFQ4(r$-SuJ60^*K*nYY%B1Xvw54XP>#&{$8L?
z-Ltm}db01+1NF0%QO<{MpV*PX4Q%V#fMx;f!%S)yIc71A{BOywM*W;ETY7Kp3+on{
zwT$yDPT4=NVVu=RPTCb~B|DzkdZ2Cgq}5>zIelt5U5rD^cNKfpo;&sIL3;*!QU_!9
zQ^dU5mGeO-*Pdy5#-J}@slLu>pBoo-eAj%+9=YFAu1AdhOU|ulRLQYGj+6)U6;j7B
z;yceS?DIzS)Hn~AmwjJqJ#UL4&!woP@`q+$*eyjrvy=hm_<YOrqCVH@I?WHc((_Bd
zkqfb%XNNs%@33jwH#9R?%I+ea@9QJig~<2hUNIl$-;7<T&H6d3FjvD;CiIt*1!8ld
zd%{-gw~di&D)P<c8q9Ow>E3QaEZ2_~@3c=*C#~7n*Umtl=9hgA8K?Q+*D?oUl3m|E
zsBh$zbvPD#8B&L9D&~?O?jgzFIG0l2Wt`+wd&K-cv76_57VLaZ*C)Q??08mkmVVFi
zzDFyy{xQEuG}Inyx~?&<7x^0BJ(!p0j(e_qS|hKvN3oZ!XCv&5@88IcSM~jXxcn}z
zv^{i<Azvlxp2@YCm+aKN$#p}<VlP|Su?E%@avjEvGo|RB)d%v)dsfJvq1kD6fuHQ7
zlzn7$jkBVylQA%nXIQ-td%}+Ik@UGOWxpIlGZQ+ln`+uzjCxqtdOLmY(8mIna--jP
zW+MyC)k04WvpC;&r4A;!W&b9I_RZL#_PoU|Ft>zBZtC+BnLvLCll?QtC9I6P^vZac
zm$g{G?LJ9%)VKANn^X5C_9*u@WZb2W_T0r<<XR`Dai*5>*5@7bl3lFP_c~8GX+CQ8
z%_;SjmRF0R7SCTjuqM}K&s(eq%|5VWFRf=F_9L%YSHYGr-@&M>WRBbz+W*OJj(UBJ
zeHXdC_lYA9zXvX0ybtj?<&|T`XMOTfi!}wTPd_<r*|)aojerp_0!F|H7y%<-1dM<Y
zFak!v2p9n)U<8bS5ikNqzz7%tBVYuKfDtePM!*Odf&C@m<LBPF==%5Lubn&gq2Dh4
z1ELl_YfxMt<G&hzaBl4m{CpgJIHTx~m?3CJcO!TH;Cpv_usWG=KWl%rKDj*({%U=G
z_s?IQ-yKBF%HIdyjp#e~m32qIy^sDl@h6Ete$@MoA9DV9%;~R_y4T5me%v0f!#>^k
oc5-#%+$Yu@-#PZO@h9j4J#PHKVdJ0p)xksj9iF$X=cfykzYGaftpET3

literal 4286
zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj
zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56
zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy
zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei
z@g6Xq-pDoPl=MANPiR7%172VA%r)kev<ISBgE$F{SFy+(=9Z)f)De0Se}ZDZW}Z3B
zElCeVrw;K0Fdl_Cg=gZOFXXc3pL)Q05CAuT+XucQ<8g~3dteP~|7s7c6QYP;fy;mF
zMN;>tV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX
zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm
zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp=
zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8
zx!=3<4seY*%=OlbCbcae?<QnEgvj4i?s}Yk=qA2z`-^*<eK3c)MS4JOdbsTQEOa0)
z0NWqlna2rzs>5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO
z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3
z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD
zsW0Ab)ZK@0cIW%W7<X*Er!BfRbvU93$DH%#v6dRt^6HBxz1xBNHx=$&_Gv<&J}Ljk
zJN<Fzx(`Oe@KgQ0F$<14=XV#WK`o#6Ku>z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6
z={Xwx{T<?%b6i9IjI)Ls)S{-*mq<@~R{?$}ZKjf;^k75i_}(2MXt}^SEBVg7AI@28
zo_uPg2V)_e-`2Ois=PYoe%9u*n9({PFR)OnHJPi{dNx>Kx<YG`4QQ>D#iCLfl2<BD
h7L=-;Q>vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S

diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 2b10205..e48bcb2 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -12,114 +12,122 @@
     <div class="detailinfo">
       <div class="detailL">
         <div v-for="(i, k) in data.stageProcessList" :key="k">
-          <div class="title">
-            <div class="titleL">{{ i.stageName }}</div>
-            <div class="titleR" :style="{ display: 'flex' }">
-              <img src="../../assets/image/pathdetails/circle.png" />
-              <div class="titleRT">进行中</div>
-            </div>
-            <div
-              class="titleR"
-              :style="{ display: i.status === 2 ? 'flex' : 'none' }"
-            >
-              <img src="../../assets/image/pathdetails/circle2.png" />
-              <div class="titleRT" style="color: rgba(102, 102, 102, 1)">
-                未开始
-              </div>
-            </div>
-          </div>
-          <div
-            class="course"
-            v-for="(value, index) in i.taskProcessList.filter(
-              (e) => !whiteTypes(e.type)
-            )"
-            :key="index"
-          >
-            <div style="width: 70%">
-              <div class="coursename">{{ value.name }}</div>
-              <div class="coursetag">
-                <div class="tag1" style="margin-right: 11px; margin-top: 16px">
-                  必修
-                </div>
-                <div class="tag3" style="margin-right: 11px; margin-top: 16px">
-                  {{ types.typeName[value.type] || "" }}
-                </div>
-
-                <!--                                <div-->
-                <!--                                    v-for="(item, key) in value.flag"-->
-                <!--                                    :key="key"-->
-                <!--                                    :class="{1:'tag1',2:'tag2',3:'tag3',4:'tag4'}[item.type]"-->
-                <!--                                    style="margin-right: 11px; margin-top: 16px"-->
-                <!--                                >-->
-                <!--                                  {{ item.name }}-->
-                <!--                                </div>-->
+          <div v-if="i.stageId !== '0'">
+            <div class="title">
+              <div class="titleL">{{ i.stageName }}</div>
+              <div class="titleR" :style="{ display: 'flex' }">
+                <img src="../../assets/image/pathdetails/circle.png" />
+                <div class="titleRT">进行中</div>
               </div>
               <div
-                class="progressBox"
-                :style="{ display: value.status === 1 ? 'block' : 'none' }"
+                class="titleR"
+                :style="{ display: i.status === 2 ? 'flex' : 'none' }"
               >
-                <div>当前进度</div>
-                <div class="progress">
-                  <div style="width: 291px">
-                    <el-progress
-                      :percentage="value.currentRatio"
-                      :show-text="false"
-                      :stroke-width="8"
-                      :color="
-                        {
+                <img src="../../assets/image/pathdetails/circle2.png" />
+                <div class="titleRT" style="color: rgba(102, 102, 102, 1)">
+                  未开始
+                </div>
+              </div>
+            </div>
+            <div
+              class="course"
+              v-for="(value, index) in i.taskProcessList.filter(
+                (e) => !whiteTypes(e.type)
+              )"
+              :key="index"
+            >
+              <div style="width: 70%">
+                <div class="coursename">{{ value.name }}</div>
+                <div class="coursetag">
+                  <div
+                    class="tag1"
+                    style="margin-right: 11px; margin-top: 16px"
+                  >
+                    必修
+                  </div>
+                  <div
+                    class="tag3"
+                    style="margin-right: 11px; margin-top: 16px"
+                  >
+                    {{ types.typeName[value.type] || "" }}
+                  </div>
+
+                  <!--                                <div-->
+                  <!--                                    v-for="(item, key) in value.flag"-->
+                  <!--                                    :key="key"-->
+                  <!--                                    :class="{1:'tag1',2:'tag2',3:'tag3',4:'tag4'}[item.type]"-->
+                  <!--                                    style="margin-right: 11px; margin-top: 16px"-->
+                  <!--                                >-->
+                  <!--                                  {{ item.name }}-->
+                  <!--                                </div>-->
+                </div>
+                <div
+                  class="progressBox"
+                  :style="{ display: value.status === 1 ? 'block' : 'none' }"
+                >
+                  <div>当前进度</div>
+                  <div class="progress">
+                    <div style="width: 291px">
+                      <el-progress
+                        :percentage="value.currentRatio"
+                        :show-text="false"
+                        :stroke-width="8"
+                        :color="
+                          {
+                            0: 'rgba(238, 112, 108, 1)',
+                            1: 'rgba(255, 151, 38, 1)',
+                            2: 'rgba(39, 122, 255, 1)',
+                            3: 'rgba(59, 94, 251, 1)',
+                            4: 'rgba(57, 219, 183, 1)',
+                            5: 'rgba(57, 219, 183, 1)',
+                          }[parseInt(value.currentRatio / 20)]
+                        "
+                      />
+                    </div>
+                    <div
+                      style="
+                        font-size: 14px;
+                        font-weight: 500;
+                        color: #277aff;
+                        margin-left: 10px;
+                      "
+                      :style="{
+                        color: {
                           0: 'rgba(238, 112, 108, 1)',
                           1: 'rgba(255, 151, 38, 1)',
                           2: 'rgba(39, 122, 255, 1)',
                           3: 'rgba(59, 94, 251, 1)',
                           4: 'rgba(57, 219, 183, 1)',
                           5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(value.currentRatio / 20)]
-                      "
-                    />
-                  </div>
-                  <div
-                    style="
-                      font-size: 14px;
-                      font-weight: 500;
-                      color: #277aff;
-                      margin-left: 10px;
-                    "
-                    :style="{
-                      color: {
-                        0: 'rgba(238, 112, 108, 1)',
-                        1: 'rgba(255, 151, 38, 1)',
-                        2: 'rgba(39, 122, 255, 1)',
-                        3: 'rgba(59, 94, 251, 1)',
-                        4: 'rgba(57, 219, 183, 1)',
-                        5: 'rgba(57, 219, 183, 1)',
-                      }[parseInt(value.currentRatio / 20)],
-                    }"
-                  >
-                    {{ value.currentRatio }}%
+                        }[parseInt(value.currentRatio / 20)],
+                      }"
+                    >
+                      {{ value.currentRatio }}%
+                    </div>
                   </div>
                 </div>
               </div>
+              <div class="goclass" @click="toFinish(value, i.name, i.stageId)">
+                {{
+                  value.status === 1
+                    ? "已完成"
+                    : types.path[value.type]
+                    ? types.toName[value.type]
+                    : "未开放"
+                }}
+              </div>
+              <!--            <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
+              <!--              <div-->
+              <!--                  class="goclass"-->
+              <!--                  :style="{ display: value.currentRatio === 0 ? 'none' : 'flex' }">去上课-->
+              <!--              </div>-->
+              <!--              <img-->
+              <!--                  style="width: 76px; height: 76px; margin-right: 61px"-->
+              <!--                  :style="{ display: value.currentRatio === 0 ? 'flex' : 'none' }"-->
+              <!--                  src="../../assets/image/pathdetails/notstarted.png"-->
+              <!--              />-->
+              <!--            </div>-->
             </div>
-            <div class="goclass" @click="toFinish(value, i.name, i.stageId)">
-              {{
-                value.status === 1
-                  ? "已完成"
-                  : types.path[value.type]
-                  ? types.toName[value.type]
-                  : "未开放"
-              }}
-            </div>
-            <!--            <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
-            <!--              <div-->
-            <!--                  class="goclass"-->
-            <!--                  :style="{ display: value.currentRatio === 0 ? 'none' : 'flex' }">去上课-->
-            <!--              </div>-->
-            <!--              <img-->
-            <!--                  style="width: 76px; height: 76px; margin-right: 61px"-->
-            <!--                  :style="{ display: value.currentRatio === 0 ? 'flex' : 'none' }"-->
-            <!--                  src="../../assets/image/pathdetails/notstarted.png"-->
-            <!--              />-->
-            <!--            </div>-->
           </div>
         </div>
         <!-- <div class="tag1">必修</div>