From fd2c55bffbfbcbe860ab4bdd790224fcdece6394 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Sun, 11 Dec 2022 10:40:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B3=A8=E9=87=8A=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NavLeft.vue                   | 11 ++-
 src/components/NavTop.vue                    | 89 +++++++++++---------
 src/views/courselibrary/CoursewareManage.vue | 44 +++++-----
 src/views/learningpath/LearningPath.vue      | 13 ++-
 src/views/learningpath/LevelAdd.vue          | 11 ++-
 src/views/projectcenter/TaskPage.vue         | 10 ++-
 6 files changed, 101 insertions(+), 77 deletions(-)

diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index fc63f253..3fcf9960 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -163,8 +163,7 @@
           </div>
           <span>考试中心</span>
         </a-menu-item> -->
-        <!-- 2022-12-10注释 后面放开 -->
-        <!-- <a-menu-item key="sub5" @titleClick="titleClick">
+        <a-menu-item key="sub5" @titleClick="titleClick">
           <div class="imgBox">
             <img
               style="width: 16px; height: 16px"
@@ -172,7 +171,7 @@
             />
           </div>
           <router-link to="/researchmanage">评估管理</router-link>
-        </a-menu-item> -->
+        </a-menu-item>
         <!-- 2022-12-10注释 后面放开 -->
         <!-- <a-menu-item key="sub6" @titleClick="titleClick">
           <div class="imgBox">
@@ -245,13 +244,13 @@
         <!-- 2022-12-10注释 后面放开 -->
         <!-- <a-menu-item key="sub4" @titleClick="titleClick">
           <span>考试</span>
-        </a-menu-item>
+        </a-menu-item> -->
 
         <a-menu-item key="sub5" @titleClick="titleClick">
           <span>评估</span>
         </a-menu-item>
-
-        <a-menu-item key="sub6" @titleClick="titleClick">
+        <!-- 2022-12-10注释 后面放开 -->
+        <!-- <a-menu-item key="sub6" @titleClick="titleClick">
           <span>报表</span>
         </a-menu-item>
 
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index a8fc96fd..306d7b78 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -2,8 +2,8 @@
   <div class="navTop">
     <div class="navTopMain">
       <img
-          style="width: 205px; height: 29px; margin-left: 37px; margin-top: 22px"
-          src="../assets/images/navtop/logo.png"
+        style="width: 205px; height: 29px; margin-left: 37px; margin-top: 22px"
+        src="../assets/images/navtop/logo.png"
       />
       <div class="navTopRight">
         <div class="role">
@@ -11,10 +11,10 @@
           <div class="roleArrow"></div>
           <div class="roleItems">
             <div
-                v-for="(value, index) in roleList"
-                :key="index"
-                class="roleItem"
-                @click="changeRole(value)"
+              v-for="(value, index) in roleList"
+              :key="index"
+              class="roleItem"
+              @click="changeRole(value)"
             >
               {{ value.name }}
             </div>
@@ -22,14 +22,14 @@
         </div>
         <div class="user">
           <img
-              style="
+            style="
               width: 40px;
               height: 40px;
               margin-left: 8px;
               border-radius: 15px;
               margin-right: 10px;
             "
-              :src="avatar"
+            :src="avatar"
           />
           <div style="margin-right: 20px">{{ username }}</div>
         </div>
@@ -47,18 +47,18 @@
         </div> -->
         <div class="signOutMain" @click="logOut">
           <img
-              style="width: 27px; height: 27px"
-              src="../assets/images/navtop/signout.png"
+            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"/>
+  <down-load v-model:downloadVisible="visible" />
 </template>
 <script>
-import {reactive, toRefs} from "vue";
+import { reactive, toRefs } from "vue";
 import DownLoad from "../components/drawers/DownLoad";
 import * as api from "../api/index1";
 
@@ -71,7 +71,7 @@ export default {
     const state = reactive({
       selectRole: "管理员",
       username: "",
-      avatar: null,
+      avatar: require("../assets/images/avatar.png"),
       roleList: [
         {
           id: 1,
@@ -101,32 +101,32 @@ export default {
     };
     const getUser = () => {
       api
-          .getUser()
-          .then((res) => {
-            console.log("获取登录信息成功", res);
-            if (res.data.code === 200) {
-              state.username = res.data.data.realName;
-              // state.avatar = res.data.data.avatar
-              //   ? res.data.data.avatar
-              //   : require("../assets/images/avatar.png");
-              state.avatar = require("../assets/images/avatar.png");
-            }
-          })
-          .catch((err) => {
-            console.log("获取登录信息失败", err);
-          });
+        .getUser()
+        .then((res) => {
+          console.log("获取登录信息成功", res);
+          if (res.data.code === 200) {
+            state.username = res.data.data.realName;
+            // state.avatar = res.data.data.avatar
+            //   ? res.data.data.avatar
+            //   : require("../assets/images/avatar.png");
+            state.avatar = require("../assets/images/avatar.png");
+          }
+        })
+        .catch((err) => {
+          console.log("获取登录信息失败", err);
+        });
     };
     getUser();
 
     const logOut = () => {
-      localStorage.removeItem('faceclassPic');
-      localStorage.removeItem('faceclassClass');
-      localStorage.removeItem('faceclassScene');
-      localStorage.removeItem('projectLevel');
-      localStorage.removeItem('projectSys');
-      localStorage.removeItem('pathmapPic');
-      localStorage.removeItem('projectClass');
-      localStorage.removeItem('projectPic');
+      localStorage.removeItem("faceclassPic");
+      localStorage.removeItem("faceclassClass");
+      localStorage.removeItem("faceclassScene");
+      localStorage.removeItem("projectLevel");
+      localStorage.removeItem("projectSys");
+      localStorage.removeItem("pathmapPic");
+      localStorage.removeItem("projectClass");
+      localStorage.removeItem("projectPic");
       window.open("https://u-pre.boe.com/web/", "_self");
     };
     return {
@@ -144,6 +144,7 @@ export default {
   height: 80px;
   // display: flex;
   background-color: rgba(255, 255, 255, 1);
+
   // box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
   .navTopMain {
     width: 100%;
@@ -151,7 +152,7 @@ export default {
     display: flex;
     justify-content: space-between;
     background-color: rgba(255, 255, 255, 1);
-
+    // background-color: #0078fc;
     .navTopRight {
       display: flex;
     }
@@ -161,7 +162,8 @@ export default {
       align-items: center;
       font-size: 16px;
       font-weight: 400;
-      color: #333330;
+      font-family: "Menlo", "苹方-简" !important;
+      color: #000;
       line-height: 36px;
       cursor: pointer;
       position: relative;
@@ -204,9 +206,9 @@ export default {
       display: block;
     }
 
-    .role:hover .roleArrow {
-      background-image: url(../assets/images/navtop/up.png);
-    }
+    // .role:hover .roleArrow {
+    //   background-image: url(../assets/images/navtop/up.png);
+    // }
 
     .user {
       margin-left: 37px;
@@ -214,8 +216,10 @@ export default {
       align-items: center;
       font-size: 14px;
       font-weight: 400;
-      color: #b3bdc4;
+      // color: #b3bdc4;
+      color: #000;
       line-height: 36px;
+      font-family: "Menlo", "苹方-简" !important;
     }
 
     .signOutMain {
@@ -228,9 +232,10 @@ export default {
     .signOut {
       font-size: 16px;
       font-weight: 400;
-      color: #242424;
+      color: #000;
       line-height: 22px;
       margin-left: 5px;
+      font-family: "Menlo", "苹方-简" !important;
     }
   }
 }
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 61419f20..b0f843b4 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -52,10 +52,13 @@
           <div class="select fitems">
             <a-range-picker
               v-model:value="projectTime"
-              style="width:420px;"
+              style="width: 420px"
               valueFormat="X"
               separator="至"
-              :placeholder="['        开始时间（创建时间）', '        结束时间（创建时间）']"
+              :placeholder="[
+                '        开始时间（创建时间）',
+                '        结束时间（创建时间）',
+              ]"
             />
           </div>
         </div>
@@ -737,7 +740,7 @@
             "
           >
             <span
-              style="margin-right: 24px;"
+              style="margin-right: 24px"
               :class="[
                 String(record.courseform) === '1'
                   ? 'disabled table-operation'
@@ -836,7 +839,7 @@
             "
           >
             <span
-              style="margin-right: 24px;"
+              style="margin-right: 24px"
               :class="[
                 String(record.courseform) === '1'
                   ? 'disabled table-operation'
@@ -927,7 +930,7 @@
             "
           >
             <span
-              style="margin-right: 24px;"
+              style="margin-right: 24px"
               :class="[
                 String(record.courseform) === '1'
                   ? 'disabled table-operation'
@@ -1057,7 +1060,7 @@
             "
           >
             <span
-              style="margin-right: 24px;"
+              style="margin-right: 24px"
               :class="[
                 String(record.courseform) === '1'
                   ? 'disabled table-operation'
@@ -1194,7 +1197,7 @@
             "
           >
             <span
-              style="margin-right: 24px;"
+              style="margin-right: 24px"
               :class="[
                 String(record.courseform) === '1'
                   ? 'disabled table-operation'
@@ -1652,7 +1655,8 @@
                 <template #bodyCell="{ record, column }">
                   <template v-if="column.key === 'operation'">
                     <span class="table-operation">
-                      <a
+                      <!-- 2022-12-10注释 后面放开 -->
+                      <!-- <a
                         @click="
                           () => {
                             //QR_hs = true;
@@ -1669,7 +1673,7 @@
                         "
                       >
                         签到
-                      </a>
+                      </a> -->
                       <a
                         @click="
                           () => {
@@ -1709,7 +1713,8 @@
                             >
                               删除
                             </a-menu-item>
-                            <a-menu-item
+                            <!-- 2022-12-10注释 后面放开 -->
+                            <!-- <a-menu-item
                               @click="
                                 () => {
                                   //QR_hs = true;
@@ -1726,7 +1731,7 @@
                               "
                             >
                               二维码
-                            </a-menu-item>
+                            </a-menu-item> -->
                           </a-menu>
                         </template>
                         <a>
@@ -1816,7 +1821,7 @@
                 style="width: 440px; height: 40px; border-radius: 8px"
                 placeholder="请输入详细地点"
               />
-              <div class="inp_num" style="right:164px;">
+              <div class="inp_num" style="right: 164px">
                 <span style="color: #c7cbd2">{{ xjkkinputV2.length }}/50</span>
               </div>
             </div>
@@ -4289,9 +4294,9 @@ export default defineComponent({
     };
     // 弹框提示敬请期待
     const expectOnline = () => {
-      message.destroy()
-      message.success("功能正在开发中，敬请期待。")
-    }
+      message.destroy();
+      message.success("功能正在开发中，敬请期待。");
+    };
     //新建面授课
     const createft = () => {
       if (!state.xzinputV1) {
@@ -5634,17 +5639,16 @@ export default defineComponent({
         }
       }
     }
-
   }
 
   .tableBox {
     margin: 20px 38px 30px;
 
     th {
-        background-color: #eff4fc !important;
-        text-align: center !important;
-      }
-    
+      background-color: #eff4fc !important;
+      text-align: center !important;
+    }
+
     .ant-table-tbody
       > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
       > td {
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index f1b4b733..0495ef85 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -11,7 +11,13 @@
             placeholder="请输入路径名称"
           />
         </div>
-
+        <div class="pathnameInp">
+          <a-input
+            v-model:value="createUser"
+            style="width: 270px; height: 40px; border-radius: 8px"
+            placeholder="请输入创建人"
+          />
+        </div>
         <div class="select">
           <a-select
             v-model:value="statusValue"
@@ -23,6 +29,7 @@
             showSearch
           ></a-select>
         </div>
+
         <div class="select addTimeBox">
           <!-- <a-date-picker
             v-model="selectTime"
@@ -811,6 +818,8 @@ export default {
       selectPathId: null, //选择授权的路径id
       addAuthList: null, //确定授权列表
       authClassify: null, //显示的是管理权还是查看权
+
+      createUser: null, //创建人搜索
     });
 
     //归属组织
@@ -1512,6 +1521,8 @@ export default {
         status: state.statusClassify,
         beginTime: state.startTime,
         endTime: state.endTime,
+        //添加创建人搜素 createUser
+        createName: state.createUser,
       };
       api
         .getLearnPath(obj)
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 0408fd13..781c0e9f 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -10,11 +10,12 @@
         <div class="fort">创建时间：{{ cretime }}</div>
       </div>
       <div class="right">
-        <img
+        <!-- 2022-12-10注释 后面放开 -->
+        <!-- <img
           class="img1"
           src="../../assets/images/leveladd/ma.png"
           @click="showCodeModel2()"
-        />
+        /> -->
         <div v-if="action == 1 || action == 0" class="line"></div>
         <img
           v-if="action == 1 || action == 0"
@@ -490,6 +491,7 @@
                       </div>
                     </div>
                     <div class="operations">
+                      <!-- 2022-12-2注释 后面放开 -->
                       <!-- <div
                         class="operation"
                         style="cursor: pointer"
@@ -513,13 +515,14 @@
                       >
                         考勤
                       </div> -->
-                      <div
+                      <!-- 2022-12-10注释 后面放开 -->
+                      <!-- <div
                         class="operation"
                         style="cursor: pointer"
                         @click="showCodeModel(item)"
                       >
                         二维码
-                      </div>
+                      </div> -->
                       <!-- <div
                         class="operation"
                         style="cursor: pointer; margin-right: 35px"
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index d9252df5..20303e6f 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -11,11 +11,12 @@
         <div class="fort">起止时间：{{ startTime }}至{{ endTime }}</div>
       </div>
       <div class="right">
-        <img
+        <!-- 2022-12-10注释 后面放开 -->
+        <!-- <img
           class="img1"
           src="../../assets/images/leveladd/ma.png"
           @click="showCodeModel2()"
-        />
+        /> -->
         <div
           class="line"
           v-if="
@@ -592,13 +593,14 @@
                         >
                           考勤
                         </div> -->
-                        <div
+                        <!-- 2022-12-10注释 后面放开 -->
+                        <!-- <div
                           class="operation"
                           style="cursor: pointer"
                           @click="showCodeModel(item)"
                         >
                           二维码
-                        </div>
+                        </div> -->
                         <!-- 2022-11-30注释 后面放开 -->
                         <!-- <div
                           class="operation"