Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

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>

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>

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;