From fe993cb7246780cc72e8f959a10225b15a8f7341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= <lixg@dongwu-inc.com>
Date: Sat, 22 Oct 2022 18:31:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/navtop/download.png | Bin 0 -> 469 bytes
 src/assets/images/navtop/signout.png  | Bin 1033 -> 733 bytes
 src/components/NavTop.vue             |  52 +++++++++++++++----
 src/components/drawers/DownLoad.vue   |  71 ++++++++++++++++++++++++++
 4 files changed, 114 insertions(+), 9 deletions(-)
 create mode 100644 src/assets/images/navtop/download.png
 create mode 100644 src/components/drawers/DownLoad.vue

diff --git a/src/assets/images/navtop/download.png b/src/assets/images/navtop/download.png
new file mode 100644
index 0000000000000000000000000000000000000000..b57da3794d32cd7a3495b55702ee66840b2e20dd
GIT binary patch
literal 469
zcmV;`0V@89P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px$k4Z#9R7gwhl)p>EP!PxOnzX*Ph@eYbXkMhFL)`=g(V?@OgMWw4`gb_EId@P5
z1vecWi^(grT@*yR#`dKr7m|{cR$dC-%#vSspM3NE9*3}^16RZaW3ZI+nML@%zh@%G
z80<I>F;FRG)MHe{z<=;Gr=_isQnupM+p(t`0B|}QjjjiS!7vT3R4V0CsdNSaH%h55
zuAl9nhUYj=5T`Eq?7HsxWHPw~fVUtB4uufk{5%MPbs@w90PGYBg$vK~u3{mX{xmo<
zPPJNX)3U55MBHXLgJNHzYa)6N!*IXX>wV6fnuTC4u2!pCwrxMg@aV$;fDF}IAN2eE
zk0gZI4E_Yqfx|p#ZpDcjR$eR?@A-Z_9v`KZF0I&PFD$Lt1isMYdcCd@(E<RWl=?A&
zrEFN^NhG4M+wIy>!pTc1<qHutiKvZ;uX(`Shlnli^L>9e19n}v8HV8<B9`+&lUgDg
zT9$R}d0r$cvo;%z#+KIlgotv%5pihS_HC!rna;KGKF<3WD+B)mC12hb>aT+800000
LNkvXXu0mjfVBpmc

literal 0
HcmV?d00001

diff --git a/src/assets/images/navtop/signout.png b/src/assets/images/navtop/signout.png
index c1ab86ecfe971bae974e442c54b51950008d3a44..4c0db17fbf0b14150de3828bf2c7d98cfce60ca6 100644
GIT binary patch
delta 722
zcmV;@0xkWC2;Bvc7k?WF1^@s6jnwp200001b5ch_0Itp)=>Px%mq|oHR7gwhl}%_<
zK@i9P^U@@3@KQvjmb8Y<i`YsFqM&%JieI4K1ic9LAd09UA{9R_;!QnxQPD#|5d=k)
zf~_8_AVmyXN_RH&AVNXB1o4CTMix?uHOb41P%kdL%bT73&42v&zq^D59JGKeGz;?p
z1W^l(4D)^ejH;gUJa66f^z>8|U}P9GKLD^>RrgqHAO43q1!~I3%;($$5xGz)RV^92
zy1LpEiG-8&n25ZtCT~?(E|(h!g5arhTo433g+js1B{TCdfc-?Y*%&ic@&7CUSC}c4
zN_{gkGhgQetAE0n`4xb*0ER^5Vr5b~onD?yCO3-6eE?b!i<k5I0h|z#%b_r4UISnP
zz=u+)l&w}_EeHC(ze80Y1DFz#RgJ(-190736OkiPtPQ|p=8pi{0i;FbeP#Y1GBWcG
z0D}Myipb4~Ffj8tfDNiTV6A;#7v}r^T~*!dK5Om0CVyZf0Jaj*PGiiIy0C0EdzFZe
z0yr)rSDJvm1JL8T6Oor;ogGlsTL2!3$gU_bW?tfq<y@LdrP}lP{O7u`OeV7|7K^!!
zb+%q5BDPUr`64(EU_?Z=hq}>CVCL)2AVf53jM)a@M;I`Z$@F=i_kxI0K@e;z6bjE8
zf^~OycYn0Bv`i3D2Y}&3A~85QIr+U7kePek`68kf0Pcv$zJ{->a(C+ii~?Ass(H`z
zhKw=JX}`Mc?Cf0J*4B0yz)3d`z<9A(+%h{m``cd4f$P3!xm>P42m*I4aXH}=fVTj?
z0a&W4tBEL9j@<@uNJLz$>Ii*2nK|heDIfISc}uH&0WhYjm#nq!FxMTSu*z(=m+^Rf
zrK)<WT5N4?eN%5Q8!|{(h0Vqzb=EATA%pzw;{Q~}pG#m0D~5^qM*si-07*qoM6N<$
Ef-AsFGXMYp

delta 1024
zcmV+b1poWp1&Iid7k?TE1^@s6Mu;cy00001b5ch_0Itp)=>Px&!%0LzR7gv;R$XWu
zRTTct%w)^9SrWttm9}8rQe1R1nLBMN77TrA71Wm$#7cdtNKGn&i&E1y8dNHXZAJ90
zpyE&ZV1;V&q2wW8lkS~tvLy{#E7qd;V2oB9-R{hhyL)Fdu78<km(=?-_uTKC@1CDK
z=MY+4FTH+v7c(6t;{Jor?*F6}b!r8yutSHA%mUa1(D{6>Khui-vSdPtHYw$`(CE;i
zBdotG`P@KTC~w3qb%|Iq*R}5r0vsU14kCO|C=?&lo`qz{=LV|!u4})?j7OPqiils4
za%!w8GTXL0Eq@DdFynCm;bl0L>P(D|j#eU`RmpmLd#x*1=F3qm5sp<Vc&1n^&PPfA
z<=K`k+1q{JI0@j+2*@YGaG_9qG0ro`vGYV21Yj=e@vLd`{Sy<@--WU|Sx--PZKYy-
z1z>G>$jl!RSuaQ_zg;3{^)RY4A;cYk|1y9_A{V`ES%1Mj<Kxqpm8?ppk_!Z90CqI+
zDiQ4|6ef>1#y+k<LY(7t?INOM0FpHsd8t%Kk4k|i>wXU4SG7W!IoRoW)2Ek8@?z;@
zHlG`ahPw`Toa}ZY;|l-@P58W&ldn-GlW9*T6F&gx)aa+BEFO+~Kl)L>1JINCT>r;$
zI3eu)0Ds=p=kp5-<#psZU3-b>T`fGnVZ+9|M@B~cI3vx<`}+FKix<Bsg~i5<z2rFd
z2_ih$j91MPg}4Uqj*}4GmjGU;0L(_0=Xuku8jZudZuTx_LwTpxB@)6`4^sbj%r#QV
zt2c^F2(cRQ|J3%bDYCx+tf~pjPATPYH;OEsPJgfJ=xA5=)%shJeGg!LZSQBLEQM~b
znA3H$o0tvNCF)`P6u?8ZJq<`Xd341r+JNhJJ*9e|-k$j1N*{nBgne$Y^!W)ALUaJW
zdeo_^Z^ZqD!qi(U_0DnZeMAWD{0^Aw!+vyt8N-_3y1%PtE}?oMGrk0{x`yXLDW`_3
zWPh1VCXq}g&H(7v##FiPma?ew+0qiiei*>}0M=;5$%TdT)|r`^a$}1b2XLDPvFgx4
zU<`SlcVRh3$8pkte~^fFM;hsmhEdsi_Ut*8rg|r?+OlnXqiN!E0O^SFfQU{q^C@Oy
ztgWs5b254JFLQHqH(8c-3sJC*h;}gZ19_?_B6=5?jh)ep{$~bJV}WVn?S>|}oMVmW
zAC}AhzEY|5YxE#?;Mu&n`#$DikeRkOMj(cniTE@?YJ?bF3bX7er*c6QsHAUGwFKZ+
u0PO(&0Pqul831FZ$)8P3OnrU55c~uG?RDW$Mpw1~0000<MNUMnLSTX*)Ax)3

diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index b8e05d2a..d1c19f19 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -33,23 +33,37 @@
           />
           <div>李玉冰</div>
         </div>
-        <img
-          style="
-            width: 27px;
-            height: 26px;
-            margin: 27px 29px 0px 31px;
-            cursor: pointer;
-          "
-          src="../assets/images/navtop/signout.png"
-        />
+        <div
+          class="signOutMain"
+          style="margin: 0px 33px 0px 35px"
+          @click="showDrawer"
+        >
+          <img
+            style="width: 22px; height: 22px"
+            src="../assets/images/navtop/download.png"
+          />
+          <span class="signOut">下载</span>
+        </div>
+        <div class="signOutMain">
+          <img
+            style="width: 27px; height: 27px"
+            src="../assets/images/navtop/signout.png"
+          />
+          <span class="signOut">退出</span>
+        </div>
       </div>
     </div>
   </div>
+  <down-load v-model:downloadVisible="visible" />
 </template>
 <script>
 import { reactive, toRefs } from "vue";
+import DownLoad from "../components/drawers/DownLoad";
 export default {
   name: "NavTop",
+  components: {
+    DownLoad,
+  },
   setup() {
     const state = reactive({
       selectRole: "管理员",
@@ -63,6 +77,8 @@ export default {
           name: "学员",
         },
       ],
+
+      visible: false,
     });
     const changeRole = (value) => {
       state.roleList.map((item) => {
@@ -71,9 +87,14 @@ export default {
         }
       });
     };
+    const showDrawer = () => {
+      state.visible = true;
+      console.log("点击下载", state.visible);
+    };
     return {
       ...toRefs(state),
       changeRole,
+      showDrawer,
     };
   },
 };
@@ -148,6 +169,19 @@ export default {
       color: #b3bdc4;
       line-height: 36px;
     }
+    .signOutMain {
+      cursor: pointer;
+      margin-right: 29px;
+      display: flex;
+      align-items: center;
+    }
+    .signOut {
+      font-size: 16px;
+      font-weight: 400;
+      color: #242424;
+      line-height: 22px;
+      margin-left: 5px;
+    }
   }
 }
 </style>
diff --git a/src/components/drawers/DownLoad.vue b/src/components/drawers/DownLoad.vue
new file mode 100644
index 00000000..96ad521b
--- /dev/null
+++ b/src/components/drawers/DownLoad.vue
@@ -0,0 +1,71 @@
+<template>
+  <a-drawer
+    :visible="downloadVisible"
+    class="drawerStyle downloadDrawer"
+    placement="right"
+    width="80%"
+    @after-visible-change="afterVisibleChange"
+  >
+    <div class="drawerMain">
+      <div class="header">
+        <div class="headerTitle">下载中心</div>
+        <img
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
+        />
+      </div>
+      <div class="main"></div>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+import { toRefs, reactive } from "vue";
+export default {
+  name: "DownLoad",
+  props: {
+    downloadVisible: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  setup(props, ctx) {
+    console.log("props", props.downloadVisible);
+    const state = reactive({});
+
+    const closeDrawer = () => {
+      ctx.emit("update:downloadVisible", false);
+    };
+
+    return {
+      ...toRefs(state),
+      closeDrawer,
+    };
+  },
+};
+</script>
+
+<style lang="scss">
+.downloadDrawer {
+  .drawerMain {
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        margin-left: 24px;
+      }
+    }
+    .contentMain {
+    }
+  }
+}
+</style>

From 378df7a0f136737f0ffe7732a580897ad4e5d3a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= <yuejx@dongwu-inc.com>
Date: Mon, 24 Oct 2022 09:36:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=BC=B9=E7=AA=97=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskPage.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index d6205076..4e699b48 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -372,7 +372,10 @@
                               ? 'flex'
                               : 'none',
                         }"
-                        @click="showCopyModal"
+                        
+                        @click="
+                          item.course === '面授' ? showCopyModal(item.course) : null
+                        "
                       >
                         二维码
                       </div>
@@ -1473,7 +1476,7 @@
       v-model:visible="copyModal"
       :footer="null"
       :closable="closeCopy"
-      wrapClassName="CopyModal"
+      wrapClassName="facemanageModal"
       centered="true"
     >
       <div class="delete">
@@ -2296,7 +2299,11 @@ export default {
             }}
           >
             <div class="studentopea1" onClick={() => {
-                      state.canclestu = true;
+              if(value.excellent === false){
+                state.canclestu = true;
+              }else if(value.excellent === true){
+                state.canclestu = false;
+              }
                     }}>
               {value.excellent ? "取消优秀" : "优秀学员"}
             </div>
@@ -2861,7 +2868,7 @@ export default {
   }
 }
 
-.CopyModal {
+.facemanageModal {
   .ant-modal {
     width: 532px !important;
     height: 428px !important;