diff --git a/src/App.vue b/src/App.vue
index f6028c22..a66681d8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="container">
+  <div id="container" v-if="!isLogin">
     <nav-top />
     <div style="display: flex">
       <nav-left />
@@ -14,9 +14,12 @@
       </div>
     </div>
   </div>
+  <div id="container" v-if="isLogin">
+    <router-view/>
+  </div>
 </template>
 <script>
-import { computed, defineComponent } from "vue";
+import {computed, defineComponent, ref, watch} from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { useStore } from "vuex";
 import NavLeft from "@/components/NavLeft";
@@ -36,61 +39,44 @@ export default defineComponent({
     const router = useRouter();
     const route = useRoute();
     const store = useStore();
+    const isLogin = ref(false)
     // console.log("router", router.getRoutes(), route);
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
 
+    watch(() => route.path, () => {
+      route.path === '/login' && (isLogin.value = true)
+    })
+
     const currentRouteName = computed(() => route.name);
 
     //获取组织树
-    const orgTree = () => {
+    const getOrgTree = () => {
       let obj = {
-        id: 0,
         keyWord: "",
-        pageNo: 0,
+        id: -1,
+        pageNo: 1,
         pageSize: 20,
       };
       api
         .getOrgInfo(obj)
         .then((res) => {
-          if (res.status === 200) {
-            // console.log("获取组织树成功", res.data.data);
-            // state.orgtreeList = res.data.data;
-            if (res.status === 200) {
-              let arr = res.data.data.rows;
-              for (let i = 0; i < arr.length; i++) {
-                let object = {
-                  keyWord: "",
-                  id: arr[i].id,
-                  pageNo: 1,
-                  pageSize: 20,
-                };
-                api
-                  .getOrgInfo(object)
-                  .then((res) => {
-                    // console.log("获取子元素", res);
-                    if (res.status === 200) {
-                      arr[i].treeChildList = res.data.data.rows;
-                      if (i === arr.length - 1) {
-                        store.commit("getOrgtreeList", arr);
-                      }
-                    }
-                  })
-                  .catch((err) => {
-                    console.log("获取子元素失败", err);
-                  });
-              }
-            }
+          console.log("组织树获取成功", res);
+          if (res.data.code === 200) {
+            // state.treeData = res.data.data;
+            store.commit("getOrgtreeList", res.data.data);
           }
         })
         .catch((err) => {
-          console.log("获取组织树失败", err);
+          console.log("组织树获取失败", err);
         });
     };
-    orgTree();
+
+    getOrgTree();
 
     return {
+      isLogin,
       routes,
       name: currentRouteName,
       zhCN,
diff --git a/src/api/config.js b/src/api/config.js
index 1db87212..959a3582 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-27 16:55:32
+ * @LastEditTime: 2022-11-28 14:25:01
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
diff --git a/src/api/index.js b/src/api/index.js
index c62e1b47..489a97a8 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -75,3 +75,5 @@ export const getTemplateDetail = (obj) => http.get('/admin/project/template/deta
 //获取项目统计
 export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', { params: { projectId: projectId } })
 
+export const login = (obj) => http.post('/admin/CheckUser/userLogin', obj)
+
diff --git a/src/api/index1.js b/src/api/index1.js
index 953a30b6..afa2b171 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-04 22:45:31
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-26 14:57:17
+ * @LastEditTime: 2022-11-28 19:59:10
  * @FilePath: /fe-manage/src/api/index1.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -102,8 +102,11 @@ export const getOrgInfo = (obj) => http.post('/admin/orgStruct/getOrgInfo', obj)
 export const getMemberInfo = (obj) => http.post('/admin/orgStruct/getMemberInfo', obj)
 //获取受众（修改版）
 export const getAudienceInfo = (obj) => http.post('/admin/orgStruct/getAudienceInfo', obj)
-//获取授权（修改版）
+//获取、添加授权（修改版）
 export const optionAuthPerm = (obj) => http.post('/admin/AuthPerm/optionAuthPerm', obj)
+
+
+
 //获取用户登录
 export const getUser = () => http.post('/admin/CheckUser/login', { withCredentials: true })
 
diff --git a/src/api/method.js b/src/api/method.js
index cee18bff..78a6113b 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -169,7 +169,7 @@ const setCookie = (name, value, perpetual) => {
   console.log('存储token到cookie')
   let exdate = new Date()
   exdate.setDate(perpetual * 24 * 60 * 60 * 1000)  //exdate.setDate(exdate.getDate() + 365)
-  document.cookie = name + '=' + value + ';expires=' + exdate.toGMTString()
+  document.cookie = `${name}=${value};expires=${exdate.toGMTString()};path=/`
   //永久有效
   //document.cookie = name + '=' + value + ';expires=' + 'Fri, 31 Dec 9999 23:59:59 GMT'    
 }
@@ -196,7 +196,21 @@ function getCookie(name) {
   }
   return "";
 }
-//最后通
+
+
+//滚动加载信息
+const scrollLoad = (e) => {
+  // console.log("滚动", e, b);
+  const { target } = e;
+  const scrllHeight = target.scrollHeight - target.scrollTop;
+  const clientHeight = target.clientHeight;
+  // console.log("scrllHeight", scrllHeight, clientHeight);
+  if (scrllHeight === 0 && clientHeight === 0) {
+    return 1
+  } else if (scrllHeight - clientHeight == 0) {
+    return 2
+  }
+};
 
 
 //新建延迟
@@ -414,6 +428,7 @@ export {
   formatNumber,
   setCookie,
   getCookie,
+  scrollLoad,
   commonData,
   organizationalTree,
   iframeUrl,
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index dca09764..6f9da3bb 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -29,7 +29,7 @@
               border-radius: 15px;
               margin-right: 10px;
             "
-            src="../assets/images/avatar.png"
+            :src="avatar"
           />
           <div>{{ username }}</div>
         </div>
@@ -69,6 +69,7 @@ export default {
     const state = reactive({
       selectRole: "管理员",
       username: "",
+      avatar: null,
       roleList: [
         {
           id: 1,
@@ -103,6 +104,9 @@ export default {
           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");
           }
         })
         .catch((err) => {
diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue
index db4e9b53..8c0e27d3 100644
--- a/src/components/drawers/ProjCheckPower.vue
+++ b/src/components/drawers/ProjCheckPower.vue
@@ -9,7 +9,11 @@
   >
     <div class="drawerMain" id="ProjCheckship">
       <div class="header">
-        <div class="headerTitle">查看权</div>
+        <div class="headerTitle">
+          {{
+            authClassify === 1 ? "查看权" : authClassify === 2 ? "管理权" : ""
+          }}
+        </div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -29,13 +33,13 @@
                     <div class="nameinp">
                       <div class="namee">姓名：</div>
                       <a-input
-                        v-model:value="name"
+                        v-model:value="nameSearch"
                         style="width: 270px; height: 40px; border-radius: 8px"
                         placeholder="请输入姓名"
                       />
                     </div>
                     <div class="btns">
-                      <div class="btn1">
+                      <div class="btn1" @click="handleSearchStu">
                         <div class="img1">
                           <img
                             src="../../assets/images/courseManage/search0.png"
@@ -43,7 +47,7 @@
                         </div>
                         <div class="wz">搜索</div>
                       </div>
-                      <div class="btn2">
+                      <div class="btn2" @click="resetStu">
                         <div class="img2">
                           <img
                             src="../../assets/images/courseManage/reset1.png"
@@ -75,7 +79,6 @@
                         class="treeMain"
                         :style="{ height: screenHeight - 400 + 'px' }"
                         dropdownClassName="changetreedropdownboe"
-                        defaultExpandAll
                         :dropdown-style="{
                           maxHeight: '600px',
                         }"
@@ -85,6 +88,12 @@
                         :tree-data="treeData"
                         @select="departmentSelect"
                         v-model:selectedKeys="selectedKeys"
+                        :fieldNames="{
+                          children: 'treeChildList',
+                          key: 'id',
+                          title: 'name',
+                          value: 'name',
+                        }"
                       >
                         <template #suffixIcon></template>
                       </a-tree>
@@ -131,13 +140,13 @@
                     <div class="nameinp">
                       <div class="namee">组织：</div>
                       <a-input
-                        v-model:value="com"
+                        v-model:value="searchOrgName"
                         style="width: 230px; height: 40px; border-radius: 8px"
                         placeholder="请输入组织"
                       />
                     </div>
                     <div class="btns">
-                      <div class="btn1" @click="searchOrg">
+                      <div class="btn1" @click="searchOrg()">
                         <div class="img1">
                           <img
                             src="../../assets/images/courseManage/search0.png"
@@ -145,7 +154,7 @@
                         </div>
                         <div class="wz">搜索</div>
                       </div>
-                      <div class="btn2">
+                      <div class="btn2" @click="resetOrg">
                         <div class="img2">
                           <img
                             src="../../assets/images/courseManage/reset1.png"
@@ -170,17 +179,22 @@
                       class="treeMain treeMain2"
                       :style="{ height: screenHeight - 430 + 'px' }"
                       dropdownClassName="changetreedropdownboe"
-                      defaultExpandAll
                       :dropdown-style="{
                         maxHeight: '600px',
                       }"
                       placeholder="BOE组织树"
                       allow-clear
                       tree-default-expand-all
-                      :tree-data="treeData"
+                      :tree-data="isSearchOrg ? treeData2 : treeData"
                       @select="departmentSelect1"
                       multiple
                       v-model:selectedKeys="selectedKeys1"
+                      :fieldNames="{
+                        children: 'treeChildList',
+                        key: 'id',
+                        title: 'name',
+                        value: 'name',
+                      }"
                     >
                       <template #suffixIcon></template>
                     </a-tree>
@@ -216,13 +230,13 @@
                     <div class="t1" style="margin-top: 10px">
                       <div class="organize">受众名称：</div>
                       <a-input
-                        v-model:value="nameaddd"
+                        v-model:value="audienceName"
                         style="width: 260px; height: 40px; border-radius: 8px"
                         placeholder="请输入受众名称"
                       />
                     </div>
                     <div class="btns">
-                      <div class="btn1">
+                      <div class="btn1" @click="searchAudienceInfo">
                         <div class="img1">
                           <img
                             src="../../assets/images/courseManage/search0.png"
@@ -230,7 +244,7 @@
                         </div>
                         <div class="wz">搜索</div>
                       </div>
-                      <div class="btn2">
+                      <div class="btn2" @click="resetAudienceInfo">
                         <div class="img2">
                           <img
                             src="../../assets/images/courseManage/reset1.png"
@@ -279,7 +293,8 @@
                         :current="currentPage2"
                         :total="tableDataTotal2"
                         class="pagination"
-                        v-if="tabledata2 > 10"
+                        v-if="tableDataTotal2 > 10"
+                        @change="changePagination1"
                       />
                     </div>
                   </div>
@@ -372,7 +387,7 @@
                   v-for="item in chooseorganization1"
                   :key="item.key"
                 >
-                  <div>{{ item.value }}</div>
+                  <div>{{ item.name }}</div>
                   <div class="ch" @click="deleteChoosePeople1(item)"></div>
                 </div>
               </div>
@@ -436,7 +451,7 @@
                   :key="item.key"
                 >
                   <div>{{ item.name }}</div>
-                  <div class="ch" @click="deleteRelationPeople(item)"></div>
+                  <div class="ch" @click="deleteChoosePeople2(item)"></div>
                 </div>
               </div>
             </div>
@@ -488,8 +503,8 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="submitAuth">确定</button>
       </div>
     </div>
 
@@ -530,8 +545,14 @@
 import { reactive, toRefs, onMounted, onUnmounted, computed } from "vue";
 import elementResizeDetectorMaker from "element-resize-detector";
 import { message } from "ant-design-vue";
-import { toDate } from "../../api/method";
+// import { toDate } from "../../api/method";
 import { useStore } from "vuex";
+import {
+  traverseArr,
+  // deepClone,
+  // batchLoadList,
+} from "../../utils/utils";
+import * as api from "../../api/index1";
 export default {
   name: "ProjCheckShip",
   props: {
@@ -539,20 +560,30 @@ export default {
       type: Boolean,
       default: false,
     },
+    authClassify: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const store = useStore();
     const state = reactive({
       screenHeight: document.body.clientHeight, // 屏幕高度
+      //快速选人
       pageSize: 10,
       currentPage: 1,
-      tableDataTotal: 50,
-      pageSize1: 10,
-      currentPage1: 1,
-      tableDataTotal1: 50,
+      tableDataTotal: 0,
+      nameSearch: "", //搜索名称
+
+      //受众
       pageSize2: 10,
       currentPage2: 1,
-      tableDataTotal2: 50,
+      tableDataTotal2: 0,
+      audienceName: "",
+
+      pageSize1: 10,
+      currentPage1: 1,
+      tableDataTotal1: 0,
 
       selectedRowKeys1: [],
 
@@ -562,404 +593,70 @@ export default {
       valueSelect: null, //树形选择
 
       valueSelectboe2: null, //boe树形选择
-      name: "",
+
       nameadd: "",
-      nameaddd: "",
-      com: "",
+
+      searchOrgName: "", //搜索组织
       //组织树
-      treeData: [
-        {
-          title: "京东方",
-          value: "京东方",
-          children: [
-            {
-              title: "产研部",
-              value: "产研部",
-              children: [
-                {
-                  title: "产品部",
-                  value: "产品部",
-                },
-                {
-                  title: "研究部",
-                  value: "研究部",
-                },
-                {
-                  title: "研究部2",
-                  value: "研究部2",
-                },
-                {
-                  title: "研究3",
-                  value: "研究3",
-                },
-                {
-                  title: "研究4",
-                  value: "研究4",
-                },
-                {
-                  title: "研究部5",
-                  value: "研究部5",
-                },
-                {
-                  title: "研究部6",
-                  value: "研究部6",
-                },
-                {
-                  title: "研究部7",
-                  value: "研究部7",
-                },
-                {
-                  title: "研究部8",
-                  value: "研究部8",
-                },
-                {
-                  title: "研究部9",
-                  value: "研究部9",
-                },
-              ],
-            },
-            {
-              title: "二级标题",
-              value: "二级标题",
-              children: [
-                {
-                  title: "三级标题",
-                  value: "三级标题",
-                  children: [
-                    {
-                      title: "四级标题",
-                      value: "四级标题",
-                      children: [
-                        {
-                          title: "五级标题",
-                          value: "五级标题",
-                          children: [
-                            {
-                              title: "六级标题",
-                              value: "六级标题",
-                              children: [
-                                {
-                                  title: "七级标题",
-                                  value: "七级标题",
-                                  children: [
-                                    {
-                                      title: "八级标题",
-                                      value: "八级标题",
-                                      children: [
-                                        {
-                                          title: "九级标题",
-                                          value: "九级标题",
-                                          children: [
-                                            {
-                                              title: "十级标题",
-                                              value: "十级标题",
-                                              children: [
-                                                {
-                                                  title: "十一级标题",
-                                                  value: "十一级标题",
-                                                  children: [
-                                                    {
-                                                      title: "十二级标题",
-                                                      value: "十二级标题",
-                                                      children: [
-                                                        {
-                                                          title:
-                                                            "十三级标题十三级标题十三级标题十三级标题",
-                                                          value: "十三级标题",
-                                                          children: [
-                                                            {
-                                                              title:
-                                                                "十四级标题",
-                                                              value:
-                                                                "十四级标题",
-                                                              children: [
-                                                                {
-                                                                  title:
-                                                                    "十五级标题",
-                                                                  value:
-                                                                    "十五级标题",
-                                                                  children: [
-                                                                    {
-                                                                      title:
-                                                                        "十六级标题",
-                                                                      value:
-                                                                        "十六级标题",
-                                                                      children:
-                                                                        [
-                                                                          {
-                                                                            title:
-                                                                              "十七级标题",
-                                                                            value:
-                                                                              "十七级标题",
-                                                                            children:
-                                                                              [
-                                                                                {
-                                                                                  title:
-                                                                                    "十八级标题",
-                                                                                  value:
-                                                                                    "十八级标题",
-                                                                                  children:
-                                                                                    [
-                                                                                      {
-                                                                                        title:
-                                                                                          "十九级标题",
-                                                                                        value:
-                                                                                          "十九级标题",
-                                                                                        children:
-                                                                                          [
-                                                                                            {
-                                                                                              title:
-                                                                                                "二十级标题二十级标题",
-                                                                                              value:
-                                                                                                "二十级标题二十级标题",
-                                                                                            },
-                                                                                          ],
-                                                                                      },
-                                                                                    ],
-                                                                                },
-                                                                              ],
-                                                                          },
-                                                                        ],
-                                                                    },
-                                                                  ],
-                                                                },
-                                                              ],
-                                                            },
-                                                          ],
-                                                        },
-                                                      ],
-                                                    },
-                                                  ],
-                                                },
-                                              ],
-                                            },
-                                          ],
-                                        },
-                                      ],
-                                    },
-                                  ],
-                                },
-                              ],
-                            },
-                          ],
-                        },
-                      ],
-                    },
-                  ],
-                },
-              ],
-            },
-            {
-              title: "人力资源部",
-              value: "人力资源部",
-              children: [
-                {
-                  title: "人事部",
-                  value: "人事部",
-                },
-                {
-                  title: "行政部",
-                  value: "行政部",
-                },
-              ],
-            },
-          ],
-        },
-      ],
+      treeData: [],
       //快速选人的table
       tabledata: [
-        {
-          key: 1,
-          name: "小李小李小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "产品部",
-        },
-        {
-          key: 2,
-          name: "小刘小刘小刘",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "产品部",
-        },
-        {
-          key: 3,
-          name: "小李小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "产品部",
-        },
-        {
-          key: 4,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "产品部",
-        },
-        {
-          key: 5,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "产品部",
-        },
-        {
-          key: 6,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "产品部",
-        },
-        {
-          key: 7,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "产品部",
-        },
-        {
-          key: 8,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "产品部",
-        },
-        {
-          key: 9,
-          name: "小小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "产品部",
-        },
-        {
-          key: 10,
-          name: "小小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "产品部",
-        },
-        {
-          key: 11,
-          name: "小小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "产品部",
-        },
-        {
-          key: 12,
-          name: "小小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "产品部",
-        },
+        // {
+        //   key: 1,
+        //   name: "小李小李小李",
+        //   bum: "产研部",
+        //   numb: "000000",
+        //   guishu: "产品部",
+        // },
       ],
       tablecolumns: [
         {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          // width: 30,
-          align: "left",
+          width: 80,
+          align: "center",
           className: "h",
+          ellipsis: true,
         },
         {
           title: "工号",
           dataIndex: "numb",
           key: "numb",
-          // width: 30,
+          width: 80,
           align: "center",
           className: "h",
+          ellipsis: true,
         },
         {
           title: "归属组织",
           dataIndex: "guishu",
           key: "guishu",
-          // width: 30,
+          width: 80,
           align: "center",
           className: "h",
+          ellipsis: true,
         },
         {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          // width: 30,
+          width: 80,
           align: "center",
           className: "h",
+          ellipsis: true,
         },
       ],
 
       //受众关联table数据
       tabledata2: [
-        {
-          key: 1,
-          name: "学习受众",
-          time: "1668410969",
-          number: "20",
-          type: "普通受众",
-        },
-        {
-          key: 2,
-          name: "案例受众",
-          time: "1668324569",
-          number: "10",
-          type: "普通受众",
-        },
-        {
-          key: 3,
-          name: "学习受众",
-          time: "1668238169",
-          number: "20",
-          type: "普通受众",
-        },
-        {
-          key: 4,
-          name: "显示受众",
-          time: "1668133769",
-          number: "30",
-          type: "普通受众2",
-        },
-        {
-          key: 5,
-          name: "惯例受众",
-          time: "1668047369",
-          number: "50",
-          type: "普通受众",
-        },
-        {
-          key: 6,
-          name: "管理受众",
-          time: "1667960969",
-          number: "20",
-          type: "普通受众",
-        },
-        {
-          key: 7,
-          name: "学习小组受众",
-          time: "1667874569",
-          number: "20",
-          type: "普通受众",
-        },
-        {
-          key: 8,
-          name: "学习受众",
-          time: "1667701769",
-          number: "10",
-          type: "普通受众",
-        },
-        {
-          key: 9,
-          name: "案例受众",
-          time: "1667442569",
-          number: "5",
-          type: "普通受众",
-        },
-        {
-          key: 10,
-          name: "项目受众",
-          time: "1667262569",
-          number: "25",
-          type: "普通受众",
-        },
+        // {
+        //   key: 1,
+        //   name: "学习受众",
+        //   time: "1668410969",
+        //   number: "20",
+        //   type: "普通受众",
+        // },
       ],
       tablecolumns2: [
         {
@@ -969,16 +666,17 @@ export default {
           width: 30,
           align: "left",
           className: "h",
+          ellipsis: true,
         },
         {
           title: "创建时间",
-          dataIndex: "time",
-          key: "time",
+          dataIndex: "createTime",
+          key: "createTime",
           width: 35,
           align: "center",
           className: "h",
           sorter: {
-            compare: (a, b) => a.time - b.time,
+            compare: (a, b) => new Date(a.createTime) - new Date(b.createTime),
             multiple: 3,
           },
           scopedSlots: { customRender: "action" }, //引入的插槽
@@ -986,23 +684,23 @@ export default {
             // console.log(text.record.checked1);
             return (
               <div class="racona">
-                <span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
+                <span>{text.record.createTime} </span>
               </div>
             );
           },
         },
         {
           title: "人数",
-          dataIndex: "number",
-          key: "number",
+          dataIndex: "countNum",
+          key: "countNum",
           width: 30,
           align: "center",
           className: "h",
         },
         {
           title: "类型",
-          dataIndex: "type",
-          key: "type",
+          dataIndex: "typeName",
+          key: "typeName",
           width: 40,
           align: "center",
           className: "h",
@@ -1025,6 +723,8 @@ export default {
       showMore: false, //是否显示快速选人的查看更多
       showHidden: false, //是否显示收回
       selectedRowKeys: [], //表格选中的key
+      selectOrgId: null, //选中的组织id
+      selectOrgName: null, //选中的组织名称
       //快速选人-------------------------------------
       //添加组织-------------------------------------
 
@@ -1035,6 +735,9 @@ export default {
       showHidden1: false, //是否显示添加组织的收回
 
       showOrgModal: false, //确认弹窗
+
+      isSearchOrg: false,
+      treeData2: [],
       //添加组织-------------------------------------
 
       //受众关联-------------------------------------
@@ -1043,18 +746,22 @@ export default {
       showHidden2: false, //是否显示收回
       selectedRowKeys2: [], //表格选中的key
       //受众关联-------------------------------------
+
+      selectAllArr: null, //所有选中
     });
-    //获取组织树
-    state.treeData = computed(() => {
-      return store.state.orgtreeList ? store.state.orgtreeList : [];
-    });
+
     const closeDrawer = () => {
       state.activeKey = "1";
       ctx.emit("update:ProjCheckvisible", false);
+      deleteAll();
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
+    //获取组织树
+    state.treeData = computed(() => {
+      return store.state.orgtreeList ? store.state.orgtreeList : [];
+    });
 
     const getClientHeight = () => {
       state.screenHeight = document.body.clientHeight;
@@ -1080,13 +787,70 @@ export default {
     //选中部门
     const departmentSelect = (e, k) => {
       console.log("选中的部门", e, k);
+      state.currentPage = 1;
       state.selectedKeys = [k.node.key];
+      state.selectOrgId = k.selectedNodes[0].id; //选中的组织id
+      state.selectOrgName = k.selectedNodes[0].name; //选中的组织名称
+      getMember(k.selectedNodes[0].id);
+    };
+    //获取学员
+    const getMember = async (org) => {
+      if (!state.nameSearch && !org) {
+        return false;
+      }
+      console.log("org", org);
+      const item1 = await api
+        .getMemberInfo({
+          pageNo: state.currentPage,
+          pageSize: state.pageSize,
+          keyWord: state.nameSearch,
+          org: state.nameSearch ? null : org,
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            console.log("获取学员", res.data);
+            state.tableDataTotal = res.data.data.total;
+            return res.data.data.rows;
+          }
+        });
+
+      state.tabledata = traverseArr(item1, {
+        key: "id",
+        name: "realName",
+        bum: "depName",
+        numb: "id",
+        guishu: "orgName",
+      });
+    };
+    //分页获取学员
+    const changePagination = (page) => {
+      state.currentPage = page;
+      getMember(state.selectOrgId);
+    };
+    //搜索学员
+    const handleSearchStu = () => {
+      deleteDepSelect();
+      state.currentPage2 = 1;
+      getMember();
+    };
+    //重置
+    const resetStu = () => {
+      state.nameSearch = "";
+      state.currentPage = 1;
+      state.tableDataTotal = 0;
+      state.tabledata = [];
+    };
+    //清空选择部门信息
+    const deleteDepSelect = () => {
+      state.selectedKeys = null;
+      state.selectOrgId = null;
+      state.selectOrgName = null;
     };
     //快速选人 选中的数组
     const onSelectChange = (selectedRowKeys, item) => {
       // console.log("selectedRowKeys changed: ", selectedRowKeys,item);
-      state.selectedRowKeys = selectedRowKeys;
-      state.choosepeople = item.reverse();
+      state.selectedRowKeys.push(selectedRowKeys[selectedRowKeys.length - 1]);
+      state.choosepeople.unshift(item[item.length - 1]);
       selectedsHeight();
     };
     //单个删除选中的人
@@ -1159,9 +923,73 @@ export default {
     // 结束 快速选人------------------------------------------------------------------
 
     // 开始 添加组织------------------------------------------------------------------
+    //搜索组织
+    const searchOrg = (id) => {
+      let obj = {
+        keyWord: state.searchOrgName,
+        id: id ? id : 0,
+        pageNo: 1,
+        pageSize: 99999,
+      };
+      console.log("obj", obj);
+      api
+        .getOrgInfo(obj)
+        .then((res) => {
+          if (res.data.code === 200) {
+            state.isSearchOrg = true;
+            // res.data.data.rows.forEach((element) => {
+            //   // console.log("element", element);
+            //   element.treeChildList = [];
+            // });
+            // console.log("组织树搜索成功", res.data.data.rows);
+            state.treeData2 = res.data.data.rows;
+          }
+        })
+        .catch((err) => {
+          console.log("组织树获取失败", err);
+        });
+    };
+    //重置组织
+    const resetOrg = () => {
+      state.isSearchOrg = false;
+      state.treeData2 = [];
+      state.searchOrgName = "";
+      state.treeData = computed(() => {
+        return store.state.orgtreeList ? store.state.orgtreeList : [];
+      });
+    };
+
+    //  //搜索组织
+    //     const searchOrg = () => {
+    //       let treeTitle = document
+    //         .getElementById("ProjCheckship")
+    //         .querySelector(".treeMain2")
+    //         .querySelectorAll(".ant-tree-title");
+    //       if (state.searchOrgName) {
+    //         for (let i = 0; i < treeTitle.length; i++) {
+    //           if (state.searchOrgName === treeTitle[i].innerHTML) {
+    //             document
+    //               .getElementById("ProjCheckship")
+    //               .querySelector(".treeMain2")
+    //               .scrollTo(0, treeTitle[i].offsetTop + 28 * i);
+    //             return;
+    //           } else if (i == treeTitle.length - 1) {
+    //             message.destroy();
+    //             message.warning("未找到该部门");
+    //           }
+    //         }
+    //       } else {
+    //         message.destroy();
+    //         message.warning("请输入组织名称");
+    //       }
+    //     };
+
     //选中部门
     const departmentSelect1 = (e, k) => {
       console.log("选中的部门", e, k);
+      // if (state.isSearchOrg) {
+      //   searchOrg(e[0]);
+      // }
       if (!k.node.children) {
         state.selectedKeys1 = e.reverse();
         if (k.selected) {
@@ -1189,7 +1017,7 @@ export default {
     //确定添加
     const addOrg = () => {
       console.log("chooseorganization", state.chooseorganization);
-      state.chooseorganization1 = state.chooseorganization;
+      state.chooseorganization1 = Object.assign([], state.chooseorganization); //需要浅拷贝
       selectedsHeight1();
       state.showOrgModal = false;
     };
@@ -1266,39 +1094,61 @@ export default {
         .getElementById("ProjCheckship")
         .querySelector("#selectedsBox1").style.height = "160px";
     };
-    //搜索组织
-    const searchOrg = () => {
-      let treeTitle = document
-        .getElementById("ProjCheckship")
-        .querySelector(".treeMain2")
-        .querySelectorAll(".ant-tree-title");
-      if (state.com) {
-        for (let i = 0; i < treeTitle.length; i++) {
-          if (state.com === treeTitle[i].innerHTML) {
-            document
-              .getElementById("ProjCheckship")
-              .querySelector(".treeMain2")
-              .scrollTo(0, treeTitle[i].offsetTop + 28 * i);
-            return;
-          } else if (i == treeTitle.length - 1) {
-            message.destroy();
-            message.warning("未找到该部门");
-          }
-        }
-      } else {
-        message.destroy();
-        message.warning("请输入组织名称");
-      }
-    };
+
     // 结束 添加组织------------------------------------------------------------------
 
     // 开始 受众关联------------------------------------------------------------------
 
+    //获取受众
+    const getAudienceInfo = async () => {
+      const item1 = await api
+        .getAudienceInfo({
+          keyWord: state.audienceName,
+          id: 0,
+          pageNo: state.currentPage2,
+          pageSize: state.pageSize2,
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            console.log("获取学员", res.data);
+            state.tableDataTotal2 = res.data.data.total;
+            return res.data.data.rows;
+          }
+        });
+
+      state.tabledata2 = traverseArr(item1, {
+        key: "id",
+        name: "audienceName",
+        createTime: "createTime",
+        countNum: "countNum",
+        typeName: "typeName",
+      });
+    };
+    getAudienceInfo();
+    //分页获取受众
+    const changePagination1 = (page) => {
+      //  console.log(page);
+      state.currentPage2 = page;
+      getAudienceInfo();
+    };
+    //搜索受众
+    const searchAudienceInfo = () => {
+      state.currentPage2 = 1;
+      getAudienceInfo();
+    };
+    //重置受众
+    const resetAudienceInfo = () => {
+      state.currentPage2 = 1;
+      state.audienceName = "";
+      getAudienceInfo();
+    };
+
     //受众关联 选中的数组
     const onSelectChange2 = (selectedRowKeys, item) => {
-      // console.log("selectedRowKeys changed: ", selectedRowKeys,item);
-      state.selectedRowKeys2 = selectedRowKeys;
-      state.relationpeople = item.reverse();
+      // console.log("selectedRowKeys changed: ", selectedRowKeys, item);
+      state.selectedRowKeys2.push(selectedRowKeys[selectedRowKeys.length - 1]);
+      state.relationpeople.unshift(item[item.length - 1]);
+
       selectedsHeight2();
     };
     //单个删除选中的人
@@ -1317,7 +1167,6 @@ export default {
         }
       }
       state.selectedRowKeys2 = array;
-      console.log("");
     };
     //根据右侧快速选人高度，判断是否显示更多
     const selectedsHeight2 = () => {
@@ -1378,6 +1227,8 @@ export default {
       state.showMore = false; //是否显示快速选人的查看更多
       state.showHidden = false; //是否显示收回
       state.selectedRowKeys = []; //表格选中的key
+      state.selectOrgId = null; //选中的组织id
+      state.selectOrgName = null; //选中的组织名称
       //快速选人-------------------------------------
       //添加组织-------------------------------------
 
@@ -1396,6 +1247,42 @@ export default {
       state.showHidden2 = false; //是否显示收回
       state.selectedRowKeys2 = []; //表格选中的key
       //受众关联-------------------------------------
+
+      state.selectAllArr = null; //所有选中
+    };
+
+    //确定添加授权
+    const submitAuth = () => {
+      let choosepeople = [];
+      state.choosepeople.map((value) => {
+        let obj = {
+          id: value.key,
+          name: value.name,
+        };
+        choosepeople.push(obj);
+      });
+
+      let chooseorganization1 = [];
+      state.chooseorganization1.map((value) => {
+        let obj = {
+          id: value.key,
+          name: value.name,
+        };
+        chooseorganization1.push(obj);
+      });
+
+      let relationpeople = [];
+      state.relationpeople.map((value) => {
+        let obj = {
+          id: value.key,
+          name: value.name,
+        };
+        relationpeople.push(obj);
+      });
+      console.log("state", choosepeople, chooseorganization1, relationpeople);
+      state.selectAllArr = [choosepeople, chooseorganization1, relationpeople];
+      ctx.emit("update:addAuthList", state.selectAllArr);
+      closeDrawer();
     };
 
     return {
@@ -1428,6 +1315,18 @@ export default {
       deleteAll,
 
       searchOrg,
+      changePagination,
+      handleSearchStu,
+      resetStu,
+
+      getAudienceInfo,
+      changePagination1,
+      searchAudienceInfo,
+      resetAudienceInfo,
+
+      resetOrg,
+
+      submitAuth,
     };
   },
 };
diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue
index 018c52ca..74265598 100644
--- a/src/components/drawers/ProjPowerList.vue
+++ b/src/components/drawers/ProjPowerList.vue
@@ -124,8 +124,8 @@
 
     <div class="botm"></div>
     <div class="btnn">
-      <button class="btn1" @click="closeCancelModal">取消</button>
-      <button class="btn2" @click="closeCancelModal">确定</button>
+      <button class="btn1" @click="closeDrawer">取消</button>
+      <button class="btn2" @click="closeDrawer">确定</button>
     </div>
   </a-drawer>
 </template>
@@ -167,11 +167,12 @@ export default {
         //   state: "管理权",
         // },
       ],
-      cancelAuthId: null, //取消授权id
+      cancelAuthInfo: null, //取消授权id
     });
 
     const closeDrawer = () => {
       ctx.emit("update:ProjPvisible", false);
+      state.currentPage = 1;
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool, props);
@@ -183,9 +184,14 @@ export default {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;
     };
-    const showCancelModal = (id) => {
+    const showCancelModal = (item) => {
+      console.log("item", item);
       state.cancelModal = true;
-      state.cancelAuthId = id;
+      let obj = {
+        id: item.number,
+        name: item.name,
+      };
+      state.cancelAuthInfo = obj;
     };
     const closeCancelModal = () => {
       state.cancelModal = false;
@@ -259,7 +265,8 @@ export default {
               <div
                 class="opa"
                 onClick={() => {
-                  showCancelModal(text.record.id);
+                  console.log("text.record.id", text.record.id);
+                  showCancelModal(text.record);
                 }}
               >
                 取消授权
@@ -299,9 +306,9 @@ export default {
                 name: value.memberName ? value.memberName : "-",
 
                 com: value.orgName ? value.orgName : "-",
-                gang: "产品经理",
-                number: "20201234",
-                state: "管理权",
+                gang: "-",
+                number: value.memberNo ? value.memberNo : "-",
+                state: "-",
               };
               array.push(obj);
             });
@@ -338,18 +345,22 @@ export default {
         type: 2,
         tag: 1,
         opt: 4,
-        refId: state.cancelAuthId,
+        refId: props.selectProjectId,
         pageNo: 1,
         pageSize: 20,
+        deptList: [],
+        groupList: [],
+        studentList: [state.cancelAuthInfo],
       };
-      console.log("获取权限名单obj", obj);
+      console.log("取消权限名单obj", obj);
       api
         .optionAuthPerm(obj)
         .then((res) => {
-          // console.log("获取权限名单成功", res);
+          console.log("取消权限名单", res);
           if (res.data.code === 200) {
-            console.log("取消授权成功", res.data.data);
+            // console.log("取消授权成功", res.data.data);
             optionAuthPerm();
+            closeCancelModal();
           }
         })
         .catch((err) => {
diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue
index 3a3c76c7..13f0ec30 100644
--- a/src/components/drawers/ProjectOwn.vue
+++ b/src/components/drawers/ProjectOwn.vue
@@ -607,8 +607,8 @@ export default {
         tag: 1, //归属权
         opt: 1, //查询
         type: 2, //项目
-        // refId: props.selectProjectId, //项目id
-        refId: 64,
+        refId: props.selectProjectId, //项目id
+        // refId: 64,
         pageNo: 1,
         pageSize: 10,
         studentList: [],
@@ -630,12 +630,14 @@ export default {
         tag: 2, //归属权
         opt: 3, //修改
         type: 2, //项目
-        // refId: props.selectProjectId, //项目id
-        refId: 64,
+        refId: props.selectProjectId, //项目id
+        // refId: 64,
         pageNo: 1,
         pageSize: 10,
         // studentList: state.selectPeopleArr,
-        studentList: [{ id: "966733333637632000", name: "何丹" }],
+        deptList: [],
+        groupList: [],
+        studentList: state.selectPeopleArr,
       };
       console.log("修改归属权obj", obj);
       api
diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue
index 10455da0..674e4cc1 100644
--- a/src/components/drawers/StuAdd.vue
+++ b/src/components/drawers/StuAdd.vue
@@ -541,6 +541,7 @@ import {
   onMounted,
   onUnmounted,
   // watch
+  computed,
 } from "vue";
 import elementResizeDetectorMaker from "element-resize-detector";
 import { message } from "ant-design-vue";
@@ -556,7 +557,7 @@ import {
   // deepClone,
   batchLoadList,
 } from "../../utils/utils";
-
+import { useStore } from "vuex";
 export default {
   name: "StuAdd",
   props: {
@@ -566,6 +567,7 @@ export default {
     },
   },
   setup(props, ctx) {
+    const store = useStore();
     const state = reactive({
       screenHeight: document.body.clientHeight, // 屏幕高度
       pageSize: 10,
@@ -1171,24 +1173,27 @@ export default {
     //   state.copyTreeData = deepClone(arr);
     // };
     //获取组织树
-    const getTree = () => {
-      let obj = {
-        keyWord: "",
-        id: -1,
-        pageNo: 1,
-        pageSize: 20,
-      };
-      getOrgInfoApi(obj)
-        .then((res) => {
-          console.log("组织树获取成功", res);
-          if (res.data.code === 200) {
-            state.treeData = res.data.data;
-          }
-        })
-        .catch((err) => {
-          console.log("组织树获取失败", err);
-        });
-    };
+    // const getTree = () => {
+    //   let obj = {
+    //     keyWord: "",
+    //     id: -1,
+    //     pageNo: 1,
+    //     pageSize: 20,
+    //   };
+    //   getOrgInfoApi(obj)
+    //     .then((res) => {
+    //       console.log("组织树获取成功", res);
+    //       if (res.data.code === 200) {
+    //         state.treeData = res.data.data;
+    //       }
+    //     })
+    //     .catch((err) => {
+    //       console.log("组织树获取失败", err);
+    //     });
+    // };
+    state.treeData = computed(() => {
+      return store.state.orgtreeList ? store.state.orgtreeList : [];
+    });
     //获取学员
     const getMember = async (org) => {
       if (!state.nameSearch && !org) {
@@ -1270,7 +1275,7 @@ export default {
       console.log("state", bool);
       if (bool) {
         // getComOnce();
-        getTree();
+        // getTree();
       }
     };
     const getClientHeight = () => {
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 5c3b02d0..d3be222a 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -864,13 +864,13 @@
 
     <div class="footbtn">
       <div class="btnbox">
-        <div class="btn btn2">
+        <div class="btn btn2" @click="temporaryStorage">
           <div class="btnText">暂存</div>
         </div>
-        <div class="btn btn2">
+        <div class="btn btn2" @click="submitStorage">
           <div class="btnText">确定</div>
         </div>
-        <div class="btn btn1">
+        <div class="btn btn1" @click="cancelStorage">
           <div class="btnText">取消</div>
         </div>
       </div>
@@ -1051,7 +1051,7 @@ import draggable from "vuedraggable";
 import { editTask } from "../../api/indexTaskadd";
 
 // import { RouterEditTask } from "@/api/indexTask";
-
+import { useRouter } from "vue-router";
 import { toDate } from "../../api/method";
 import UnlockMode from "../../components/drawers/UnlockMode.vue";
 export default {
@@ -1076,6 +1076,7 @@ export default {
     AddProject,
   },
   setup() {
+    const router = useRouter();
     const state = reactive({
       routerId: storage.get("routerId")
         ? JSON.parse(storage.get("routerId"))
@@ -1884,6 +1885,23 @@ export default {
     const showModeVisible = () => {
       state.unlockModeVisible = true;
     };
+
+    //暂存
+    const temporaryStorage = () => {
+      message.success("暂存成功");
+    };
+    //确定
+    const submitStorage = () => {
+      router.push({
+        path: "/leveladd",
+      });
+    };
+    //取消
+    const cancelStorage = () => {
+      router.push({
+        path: "/leveladd",
+      });
+    };
     return {
       ...toRefs(state),
       // tableDataFunc,
@@ -1935,6 +1953,10 @@ export default {
 
       showModeVisible,
       showAddface,
+
+      temporaryStorage,
+      submitStorage,
+      cancelStorage,
     };
   },
 };
diff --git a/src/views/login.vue b/src/views/login.vue
new file mode 100644
index 00000000..13882d6b
--- /dev/null
+++ b/src/views/login.vue
@@ -0,0 +1,51 @@
+<template>
+  <div :style="{
+       margin: 'auto',
+  background: 'url(http://img.gz2c.com/FoTcLY8ww-ISCFlwyCoYuLim1BMt) no-repeat',
+  backgroundSize: '100% 100%',
+  width: '100%',
+  height: '100vh',
+  display:'flex'
+  }">
+    <div
+        :style="{width:'300px', height: '300px', margin:'10% auto',padding:'20px 30px',textAlign:'center', borderRadius:'10px', background:'#e0e0e0',boxShadow:'20px 20px 60px #bebebe,-20px -20px 60px #ffffff'}">
+      <div :style="{fontSize:'24px',paddingBottom:'30px'}">用户登录</div>
+      <div>
+        <a-input placeholder='用户名' v-model:value="form.account"/>
+        <a-input placeholder='密码' v-model:value="form.password" :style="{marginTop: '30px'}" type='password'/>
+        <a-button :style="{marginTop:'30px'}" @click="loginUser">登录</a-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {reactive, toRefs} from "vue";
+import * as api from "@/api";
+import {setCookie} from "@/api/method";
+import {useRouter} from "vue-router";
+
+export default {
+  name: "loginPage",
+  setup() {
+    const router = useRouter()
+    const state = reactive({
+      form: {
+        account: '10181461',
+        password: '1234567890Aa'
+      }
+    })
+
+    async function loginUser() {
+      const {data: {data: token}} = await api.login(state.form)
+      setCookie("token", token, 10)
+      await router.push({path: '/learningpath'})
+      location.reload()
+    }
+
+    return {
+      ...toRefs(state),
+      loginUser
+    }
+  }
+}
+</script>
diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue
index 57526254..36ff6937 100644
--- a/src/views/projectcenter/ClassAdd.vue
+++ b/src/views/projectcenter/ClassAdd.vue
@@ -62,13 +62,17 @@
                 }
               "
               v-model:value="classifySelect"
-              placeholder="四个养成"
+              placeholder="请选择分类"
               style="width: 100%"
               :options="classifyList"
               @change="classificationChange"
               allowClear
               showSearch
               :disabled="viewDetail ? true : false"
+              :fieldNames="{
+                label: 'dictName',
+                value: 'dictCode',
+              }"
             >
             </a-select>
           </div>
@@ -169,6 +173,7 @@
               allowClear
               showSearch
               :disabled="viewDetail ? true : false"
+              @popupScroll="memberScroll"
             >
             </a-select>
           </div>
@@ -183,18 +188,26 @@
           </div>
 
           <div class="in select">
-            <a-select
+            <a-tree-select
               :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
                 }
               "
               v-model:value="classifySelect2"
+              style="width: 100%"
+              :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
               placeholder="自动带出 可修改"
               :options="classifyList2"
               @change="classificationChange2"
               :disabled="viewDetail ? true : false"
-            />
+              :tree-data="classifyList2"
+              :fieldNames="{
+                children: 'treeChildList',
+                label: 'name',
+                value: 'id',
+              }"
+            ></a-tree-select>
           </div>
         </div>
         <div class="name name2">
@@ -252,6 +265,10 @@
               @change="classificationChange3"
               placeholder="集团级/组织级/现地级/部门级"
               :disabled="viewDetail ? true : false"
+              :fieldNames="{
+                label: 'dictName',
+                value: 'dictCode',
+              }"
             />
           </div>
         </div>
@@ -275,6 +292,10 @@
               @change="classificationChange4"
               placeholder="集团级/组织级/现地级/部门级"
               :disabled="viewDetail ? true : false"
+              :fieldNames="{
+                label: 'dictName',
+                value: 'dictCode',
+              }"
             />
           </div>
         </div>
@@ -355,6 +376,7 @@
               style="width: 100%"
               :options="classifyList5"
               @change="classificationChange5"
+              @popupScroll="templateScroll"
             >
             </a-select>
           </div>
@@ -372,16 +394,18 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, toRefs, ref, computed } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
 import dayjs from "dayjs";
 import * as api from "../../api/index";
-import { toDate } from "../../api/method";
-
+import * as api1 from "../../api/index1";
+import { toDate, scrollLoad } from "../../api/method";
+import { useStore } from "vuex";
 export default {
   name: "projectAdd",
   setup() {
+    const store = useStore();
     // 编辑页面跳转过来时候，自动填充表格
     const routers = useRoute();
     const router = useRouter();
@@ -398,12 +422,20 @@ export default {
       valueE1: null,
       valueE2: null,
       classifySelect1: [],
-      classifySelect2: [],
-      classifySelect3: [],
-      classifySelect4: [],
+      classifySelect2: null, //选中的资源归属信息
+      classifySelect3: null, //选中的项目级别信息
+      classifySelect4: null, //选中的培训分类信息
       rangevalue: [],
       projectAscription: "",
       viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
+
+      currentPage: 1, //当前页
+      tableDataTotal: -1, //模版列表总数
+      pageSize: 10, //每页10条数据
+      totalPages: 0, //总页数
+
+      currentPage1: 1, //项目经理
+      pageSize1: 10, //项目经理
     });
 
     if (routers.query.name == undefined) {
@@ -489,9 +521,7 @@ export default {
     const projectName = ref("");
 
     const classifyList = ref([
-      { value: 1, label: "管理者" },
-      { value: 2, label: "领军者" },
-      { value: 3, label: "产业人" },
+      // { value: 1, label: "管理者" },
     ]);
 
     let projectType = "";
@@ -615,10 +645,48 @@ export default {
 
     // 项目经理 后续接口调用
     const classifyList1 = ref([
-      { value: 1, label: "李俊国" },
-      { value: 2, label: "将小米" },
-      { value: 3, label: "刘孟君" },
+      // { value: 1, label: "李俊国" },
     ]);
+    //获取学员
+    const getMember = () => {
+      api1
+        .getMemberInfo({
+          pageNo: state.currentPage1,
+          pageSize: state.pageSize1,
+          keyWord: "",
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            let arr = res.data.data.rows;
+            let array = classifyList1.value;
+            arr.map((value) => {
+              let obj = {
+                value: value.id,
+                label: value.realName,
+              };
+              array.push(obj);
+            });
+            classifyList1.value = array;
+            console.log("获取学员", res.data);
+            // classifyList1.value = res.data.data.rows;
+            // state.tableDataTotal = res.data.data.total;
+            // return res.data.data.rows;
+          }
+        });
+    };
+    getMember();
+    //学员滚动加载信息
+    const memberScroll = (e) => {
+      // console.log("滚动", e, b);
+      let num = scrollLoad(e);
+      if (num === 1) {
+        state.currentPage1 = 1;
+      } else if (num === 2) {
+        // 如果滑到底部，则加载下一页
+        state.currentPage1++;
+        getMember();
+      }
+    };
 
     let manager = "";
     let managerId = "";
@@ -649,11 +717,9 @@ export default {
     };
 
     // 资源归属 sourceBelongId 后续给接口
-    const classifyList2 = ref([
-      { value: 1, label: "项目一" },
-      { value: 2, label: "项目二" },
-      { value: 3, label: "项目三" },
-    ]);
+    const classifyList2 = computed(() => {
+      return store.state.orgtreeList ? store.state.orgtreeList : ref([]);
+    });
 
     let sourceBelongIdC = "";
     const classificationChange2 = (key) => {
@@ -663,10 +729,7 @@ export default {
 
     // 项目级别
     const classifyList3 = ref([
-      { value: 1, label: "集团级" },
-      { value: 2, label: "组织级" },
-      { value: 3, label: "现地级" },
-      { value: 4, label: "部门级" },
+      // { value: 1, label: "集团级" },
     ]);
 
     let levels = "";
@@ -677,10 +740,7 @@ export default {
 
     // 培训分类
     const classifyList4 = ref([
-      { value: 1, label: "集团级" },
-      { value: 2, label: "组织级" },
-      { value: 3, label: "现地级" },
-      { value: 4, label: "部门级" },
+      // { value: 1, label: "集团级" },
     ]);
 
     let systemid = "";
@@ -688,17 +748,94 @@ export default {
       console.log(`selected ${key}`, classifyList4);
       systemid = key;
     };
+    //获取分类、封面图、项目级别、培训分类-----------字典配置-------------------------------
+    const getDictList = (param) => {
+      let obj = {
+        pageNo: 1,
+        pageSize: 20,
+        setCode: param,
+      };
+      api1
+        .getDict(obj)
+        .then((res) => {
+          console.log("获取字典成功", res);
+          if (res.status === 200) {
+            if (param === "projectClass") {
+              classifyList.value = res.data.data.rows;
+            }
+            if (param === "projectPic") {
+              if (res.data.data.rows.length > 0) {
+                imageUrl.value = res.data.data.rows[0].dictValue;
+                picUrl = res.data.data.rows[0].dictValue;
+              }
+            }
+            if (param === "projectLevel") {
+              classifyList3.value = res.data.data.rows;
+            }
+            if (param === "projectSys") {
+              classifyList4.value = res.data.data.rows;
+            }
+          }
+        })
+        .catch((err) => {
+          console.log("获取字典失败", err);
+        });
+    };
+    getDictList("projectClass");
+    getDictList("projectPic");
+    getDictList("projectLevel");
+    getDictList("projectSys");
+    //获取分类、封面图、项目级别、培训分类---------------字典配置---------------------------
 
     // 模版
     const classifyList5 = ref([
-      { value: 1, label: "模版一" },
-      { value: 2, label: "模版二" },
-      { value: 3, label: "模版三" },
-      { value: 4, label: "模版四" },
+      // { value: 1, label: "模版一" },
     ]);
     const classificationChange5 = (key) => {
       console.log(`selected ${key}`, classifyList5);
     };
+    //获取模版列表
+    const getTemplate = () => {
+      let obj = {
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+        // projectId:id?id:''
+      };
+      api
+        .getTemplate(obj)
+        .then((res) => {
+          console.log("获取模版列表", res);
+          state.totalPages = Number(res.data.data.pages);
+          if (res.status === 200) {
+            let arr = res.data.data.rows;
+            let array = classifyList5.value;
+            arr.map((value) => {
+              let obj = {
+                value: value.projectTemplateId,
+                label: value.name,
+              };
+              array.push(obj);
+            });
+            classifyList5.value = array;
+          }
+        })
+        .catch((err) => {
+          console.log("获取模版列表失败", err);
+        });
+    };
+    getTemplate();
+    //模版滚动加载模板信息
+    const templateScroll = (e) => {
+      // console.log("滚动", e, b);
+      let num = scrollLoad(e);
+      if (num === 1) {
+        state.currentPage = 1;
+      } else if (num === 2) {
+        // 如果滑到底部，则加载下一页
+        state.currentPage++;
+        getTemplate();
+      }
+    };
 
     // 项目说明
     const remark = ref("");
@@ -906,6 +1043,9 @@ export default {
       isEdit,
       backPage,
       dateFormatList,
+
+      templateScroll,
+      memberScroll,
     };
   },
 };
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index fa3dfd24..17fd68c6 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -167,6 +167,7 @@
               allowClear
               showSearch
               :disabled="viewDetail ? true : false"
+              @popupScroll="memberScroll"
             >
             </a-select>
           </div>
@@ -192,7 +193,6 @@
               :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
               placeholder="自动带出 可修改"
               allow-clear
-              tree-default-expand-all
               :tree-data="classifyList2"
               :fieldNames="{
                 children: 'treeChildList',
@@ -416,7 +416,7 @@ import dayjs from "dayjs";
 import * as api from "../../api/index";
 import * as api1 from "../../api/index1";
 import { storage } from "../../api/storage";
-import { toDate } from "../../api/method";
+import { toDate, scrollLoad } from "../../api/method";
 import { useStore } from "vuex";
 export default {
   name: "projectAdd",
@@ -441,6 +441,9 @@ export default {
       pageSize: 10, //每页10条数据
       totalPages: 0, //总页数
       viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
+
+      currentPage1: 1, //项目经理
+      pageSize1: 10, //项目经理
     });
     //分类列表
     const classifyList = ref([]);
@@ -764,12 +767,47 @@ export default {
       endTime = new Date(dateString[1]).getTime() / 1000;
     };
     // 项目经理 后续接口调用
-    const classifyList1 = ref([
-      { value: 1, label: "李俊国" },
-      { value: 2, label: "将小米" },
-      { value: 3, label: "刘孟君" },
-    ]);
-    //获取
+    const classifyList1 = ref([]);
+    //获取学员
+    const getMember = () => {
+      api1
+        .getMemberInfo({
+          pageNo: state.currentPage1,
+          pageSize: state.pageSize1,
+          keyWord: "",
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            let arr = res.data.data.rows;
+            let array = classifyList1.value;
+            arr.map((value) => {
+              let obj = {
+                value: value.id,
+                label: value.realName,
+              };
+              array.push(obj);
+            });
+            classifyList1.value = array;
+            console.log("获取学员", res.data);
+            // classifyList1.value = res.data.data.rows;
+            // state.tableDataTotal = res.data.data.total;
+            // return res.data.data.rows;
+          }
+        });
+    };
+    getMember();
+    //学员滚动加载信息
+    const memberScroll = (e) => {
+      // console.log("滚动", e, b);
+      let num = scrollLoad(e);
+      if (num === 1) {
+        state.currentPage1 = 1;
+      } else if (num === 2) {
+        // 如果滑到底部，则加载下一页
+        state.currentPage1++;
+        getMember();
+      }
+    };
 
     //选择处理项目经理
     let manager = "";
@@ -929,19 +967,13 @@ export default {
     //模版滚动加载模板信息
     const templateScroll = (e) => {
       // console.log("滚动", e, b);
-      const { target } = e;
-      const scrllHeight = target.scrollHeight - target.scrollTop;
-      const clientHeight = target.clientHeight;
-      // console.log("scrllHeight", scrllHeight, clientHeight);
-      if (scrllHeight === 0 && clientHeight === 0) {
+      let num = scrollLoad(e);
+      if (num === 1) {
         state.currentPage = 1;
-      } else if (scrllHeight - clientHeight == 0) {
-        // 下拉到底部时
-        if (state.currentPage < state.totalPages) {
-          // 如果滑到底部，则加载下一页
-          state.currentPage++;
-          getTemplate();
-        }
+      } else if (num === 2) {
+        // 如果滑到底部，则加载下一页
+        state.currentPage++;
+        getTemplate();
       }
     };
 
@@ -1159,6 +1191,7 @@ export default {
       dateFormatList,
 
       templateScroll,
+      memberScroll,
     };
   },
 };
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index e773f934..ec9e8a3b 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -376,10 +376,14 @@
             <div class="in select">
               <a-select
                 v-model:value="value2"
-                placeholder="四个养成"
+                placeholder="请选择分类"
                 :options="classifyList"
                 @change="classificationChange"
                 style="border-radius: 8px; height: 40px"
+                :fieldNames="{
+                  label: 'dictName',
+                  value: 'dictCode',
+                }"
               />
             </div>
           </div>
@@ -399,6 +403,7 @@
                 :options="classifyList1"
                 @change="classificationChange1"
                 style="border-radius: 8px; height: 40px"
+                @popupScroll="memberScroll"
               />
             </div>
           </div>
@@ -411,13 +416,20 @@
             </div>
             <div class="inname">资源归属:</div>
             <div class="in select">
-              <a-select
+              <a-tree-select
                 v-model:value="value5"
                 placeholder="请选择资源归属"
                 :options="classifyList5"
+                :tree-data="classifyList5"
                 @change="classificationChange5"
                 style="border-radius: 8px; height: 40px"
-              />
+                :fieldNames="{
+                  children: 'treeChildList',
+                  label: 'name',
+                  value: 'id',
+                }"
+              >
+              </a-tree-select>
             </div>
           </div>
           <div class="pubtn">
@@ -498,10 +510,14 @@
             <div class="in select">
               <a-select
                 v-model:value="edvalue2"
-                placeholder="四个养成"
+                placeholder="请选择分类"
                 :options="classifyList"
                 @change="edclassificationChange"
                 style="border-radius: 8px; height: 40px"
+                :fieldNames="{
+                  label: 'dictName',
+                  value: 'dictCode',
+                }"
               />
             </div>
           </div>
@@ -521,6 +537,7 @@
                 :options="classifyList1"
                 @change="edclassificationChange1"
                 style="border-radius: 8px; height: 40px"
+                @popupScroll="memberScroll"
               />
             </div>
           </div>
@@ -533,13 +550,20 @@
             </div>
             <div class="inname">资源归属:</div>
             <div class="in select">
-              <a-select
+              <a-tree-select
                 v-model:value="edvalue5"
                 placeholder="请选择资源归属"
                 :options="classifyList5"
+                :tree-data="classifyList5"
                 @change="edclassificationChange5"
                 style="border-radius: 8px; height: 40px"
-              />
+                :fieldNames="{
+                  children: 'treeChildList',
+                  label: 'name',
+                  value: 'id',
+                }"
+              >
+              </a-tree-select>
             </div>
           </div>
           <div class="pubtn">
@@ -620,8 +644,12 @@
                 v-model:value="value7"
                 @change="classificationChange2"
                 :options="classifyList2"
-                placeholder="四个养成"
+                placeholder="请选择分类"
                 style="border-radius: 8px; height: 40px"
+                :fieldNames="{
+                  label: 'dictName',
+                  value: 'dictCode',
+                }"
               />
             </div>
           </div>
@@ -641,6 +669,7 @@
                 :options="classifyList3"
                 placeholder="自动带出 可编辑"
                 style="border-radius: 8px; height: 40px"
+                @popupScroll="memberScroll"
               />
             </div>
           </div>
@@ -653,13 +682,20 @@
             </div>
             <div class="inname">资源归属:</div>
             <div class="in select">
-              <a-select
+              <a-tree-select
                 v-model:value="value9"
-                @change="classificationChange4"
-                :options="classifyList4"
                 placeholder="请选择资源归属"
+                :options="classifyList4"
+                :tree-data="classifyList4"
+                @change="classificationChange4"
                 style="border-radius: 8px; height: 40px"
-              />
+                :fieldNames="{
+                  children: 'treeChildList',
+                  label: 'name',
+                  value: 'id',
+                }"
+              >
+              </a-tree-select>
             </div>
           </div>
           <div class="pubtn">
@@ -746,8 +782,12 @@
                 v-model:value="edvalue7"
                 @change="edclassificationChange2"
                 :options="classifyList2"
-                placeholder="四个养成"
+                placeholder="请选择分类"
                 style="border-radius: 8px; height: 40px"
+                :fieldNames="{
+                  label: 'dictName',
+                  value: 'dictCode',
+                }"
               />
             </div>
           </div>
@@ -767,6 +807,7 @@
                 :options="classifyList3"
                 placeholder="自动带出 可编辑"
                 style="border-radius: 8px; height: 40px"
+                @popupScroll="memberScroll"
               />
             </div>
           </div>
@@ -779,13 +820,20 @@
             </div>
             <div class="inname">资源归属:</div>
             <div class="in select">
-              <a-select
+              <a-tree-select
                 v-model:value="edvalue9"
-                @change="edclassificationChange4"
-                :options="classifyList4"
                 placeholder="请选择资源归属"
+                :options="classifyList4"
+                :tree-data="classifyList4"
+                @change="edclassificationChange4"
                 style="border-radius: 8px; height: 40px"
-              />
+                :fieldNames="{
+                  children: 'treeChildList',
+                  label: 'name',
+                  value: 'id',
+                }"
+              >
+              </a-tree-select>
             </div>
           </div>
           <div class="pubtn">
@@ -1128,30 +1176,48 @@
       v-model:ProjPvisible="ProjPvisible"
       :selectProjectId="selectProjectId"
     />
+
     <!-- 查看权抽屉 -->
     <proj-check-ship
       v-model:ProjCheckvisible="ProjCheckvisible"
       :selectProjectId="selectProjectId"
+      classify="checkship"
+      v-model:addAuthList="addAuthList"
+      :authClassify="authClassify"
     />
     <!-- 管理权抽屉 -->
-    <proj-manage-ship v-model:ProjManagevisible="ProjManagevisible" />
+    <proj-check-ship
+      v-model:ProjCheckvisible="ProjCheckvisible"
+      :selectProjectId="selectProjectId"
+      classify="checkship"
+      v-model:addAuthList="addAuthList"
+      :authClassify="authClassify"
+    />
   </div>
 </template>
 <script>
-import { reactive, toRefs, onMounted, ref } from "vue";
+import { reactive, toRefs, onMounted, ref, watch, computed } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter } from "vue-router";
 import ProjOwnerShip from "../../components/drawers/ProjectOwn";
 import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
-import ProjManageShip from "../../components/drawers/ProjManagePower";
+// import ProjManageShip from "../../components/drawers/ProjManagePower";
 import * as api from "../../api/index";
-import { toDate } from "../../api/method";
+import * as api1 from "../../api/index1";
+import { toDate, scrollLoad } from "../../api/method";
 import { storage } from "../../api/storage";
+import { useStore } from "vuex";
 export default {
   name: "projectManage",
-  components: { ProjOwnerShip, ProjPowerList, ProjCheckShip, ProjManageShip },
+  components: {
+    ProjOwnerShip,
+    ProjPowerList,
+    ProjCheckShip,
+    // ProjManageShip
+  },
   setup() {
+    const store = useStore();
     const state = reactive({
       projectName: null,
       selectTime: null,
@@ -1205,6 +1271,12 @@ export default {
       copyProjectId: null, //复制项目id
 
       selectProjectId: null, //选择的授权id
+
+      addAuthList: null, //确定授权列表
+      authClassify: null, //显示的是管理权还是查看权
+
+      currentPage1: 1, //项目经理分页
+      pageSize1: 10,
     });
     // 数据接入 - start -
     const router = useRouter();
@@ -1309,9 +1381,7 @@ export default {
 
     // 项目分类
     const classifyList = ref([
-      { value: 1, label: "管理者" },
-      { value: 2, label: "领军者" },
-      { value: 3, label: "产业人" },
+      // { value: 1, label: "管理者" },
     ]);
 
     const classifyList1 = ref([
@@ -1324,7 +1394,7 @@ export default {
     const value2 = ref([]);
     const value3 = ref([]);
     const value4 = ref("");
-    const value5 = ref([]);
+    const value5 = ref(null);
 
     const edvalue1 = ref("");
     const edvalue2 = ref([]);
@@ -1378,12 +1448,13 @@ export default {
       edsource = key;
     };
 
-    const classifyList5 = ref([
-      { value: 1, label: "项目一" },
-      { value: 2, label: "项目二" },
-      { value: 3, label: "项目三" },
-    ]);
-
+    // const classifyList5 = ref([
+    //   // { value: 1, label: "项目一" },
+    // ]);
+    // 资源归属 sourceBelongId 后续给接口
+    const classifyList5 = computed(() => {
+      return store.state.orgtreeList ? store.state.orgtreeList : ref([]);
+    });
     let sourceBelongId = 0;
     const classificationChange5 = (key) => {
       console.log(`selected ${key}`);
@@ -1393,7 +1464,7 @@ export default {
     let type = "";
     const classificationChange = (key) => {
       console.log(`selected ${key}`);
-      console.log(classifyList.value[key - 1].label);
+      // console.log(classifyList.value[key - 1].label);
       type = key;
     };
 
@@ -1500,7 +1571,7 @@ export default {
       value2.value = [];
       value3.value = [];
       value4.value = "";
-      value5.value = [];
+      value5.value = "";
       state.doublepro = false;
     };
     console.log(edmanage, edmanageid);
@@ -1604,9 +1675,7 @@ export default {
     const value9 = ref([]);
 
     const classifyList2 = ref([
-      { value: 1, label: "管理者" },
-      { value: 2, label: "领军者" },
-      { value: 3, label: "产业人" },
+      // { value: 1, label: "管理者" },
     ]);
 
     let categoryT = "";
@@ -1616,9 +1685,7 @@ export default {
     };
 
     const classifyList3 = ref([
-      { value: 1, label: "李俊国" },
-      { value: 2, label: "将小米" },
-      { value: 3, label: "刘孟君" },
+      // { value: 1, label: "李俊国" },
     ]);
 
     let managerT = "";
@@ -1641,12 +1708,10 @@ export default {
       managerT = mstr;
       managerIdT = midstr;
     };
-
-    const classifyList4 = ref([
-      { value: 1, label: "项目一" },
-      { value: 2, label: "项目二" },
-      { value: 3, label: "项目三" },
-    ]);
+    // 资源归属 sourceBelongId 后续给接口
+    const classifyList4 = computed(() => {
+      return store.state.orgtreeList ? store.state.orgtreeList : ref([]);
+    });
 
     let sourceBelongIdT = "";
     const classificationChange4 = (key) => {
@@ -1871,6 +1936,75 @@ export default {
       state.eddoublesonpro = false;
     };
 
+    //获取分类、封面图、项目级别、培训分类-----------字典配置-------------------------------
+    const getDictList = (param) => {
+      let obj = {
+        pageNo: 1,
+        pageSize: 20,
+        setCode: param,
+      };
+      api1
+        .getDict(obj)
+        .then((res) => {
+          console.log("获取字典成功", res);
+          if (res.status === 200) {
+            if (param === "projectClass") {
+              classifyList.value = res.data.data.rows;
+              classifyList2.value = res.data.data.rows;
+            }
+          }
+        })
+        .catch((err) => {
+          console.log("获取字典失败", err);
+        });
+    };
+    getDictList("projectClass");
+    // getDictList("projectLevel");
+    // getDictList("projectSys");
+    //获取分类、封面图、项目级别、培训分类---------------字典配置---------------------------
+
+    //获取学员
+    const getMember = () => {
+      api1
+        .getMemberInfo({
+          pageNo: state.currentPage1,
+          pageSize: state.pageSize1,
+          keyWord: "",
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            let arr = res.data.data.rows;
+            let array = classifyList1.value;
+            arr.map((value) => {
+              let obj = {
+                value: value.id,
+                label: value.realName,
+              };
+              array.push(obj);
+            });
+            classifyList1.value = array;
+            classifyList3.value = array;
+            console.log("获取学员", res.data);
+            // classifyList1.value = res.data.data.rows;
+            // state.tableDataTotal = res.data.data.total;
+            // return res.data.data.rows;
+          }
+        });
+    };
+    getMember();
+    //学员滚动加载信息
+    const memberScroll = (e) => {
+      // console.log("滚动", e, b);
+      let num = scrollLoad(e);
+      if (num === 1) {
+        state.currentPage1 = 1;
+      } else if (num === 2) {
+        // 如果滑到底部，则加载下一页
+        state.currentPage1++;
+        getMember();
+      }
+    };
+
     //打开发布弹窗
     const showProjectPub = (object) => {
       state.projectPub = true;
@@ -2081,7 +2215,10 @@ export default {
       state.reviewModal = true;
     };
     //确认提交审核
-    const reviewProject = () => {};
+    const reviewProject = () => {
+      state.reviewModal = false;
+      message.success("提交成功");
+    };
     //关闭提交审核弹窗
     const closeReviewModal = () => {
       state.reviewModal = false;
@@ -2092,7 +2229,10 @@ export default {
       state.recallReviewModal = true;
     };
     //确认提交审核
-    const recallReviewProject = () => {};
+    const recallReviewProject = () => {
+      state.recallReviewModal = false;
+      message.success("撤回成功");
+    };
     //关闭提交审核弹窗
     const closeRecallReviewModal = () => {
       state.recallReviewModal = false;
@@ -2285,7 +2425,7 @@ export default {
                     <a-select-option value="管理权" label="管理权">
                       <div
                         onClick={() => {
-                          showProjManage();
+                          showProjManage(value.record.projectId);
                         }}
                       >
                         管理权
@@ -2368,7 +2508,7 @@ export default {
                       <div
                         onClick={() => {
                           console.log("点击了111");
-                          showProjOwner();
+                          showProjOwner(value.record.projectId);
                         }}
                       >
                         归属权
@@ -2387,7 +2527,7 @@ export default {
                     <a-select-option value="管理权" label="管理权">
                       <div
                         onClick={() => {
-                          showProjManage();
+                          showProjManage(value.record.projectId);
                         }}
                       >
                         管理权
@@ -2457,7 +2597,7 @@ export default {
                       <div
                         onClick={() => {
                           console.log("点击了111");
-                          showProjOwner();
+                          showProjOwner(value.record.projectId);
                         }}
                       >
                         归属权
@@ -2476,7 +2616,7 @@ export default {
                     <a-select-option value="管理权" label="管理权">
                       <div
                         onClick={() => {
-                          showProjManage();
+                          showProjManage(value.record.projectId);
                         }}
                       >
                         管理权
@@ -2578,7 +2718,7 @@ export default {
                       <div
                         onClick={() => {
                           console.log("点击了111");
-                          showProjOwner();
+                          showProjOwner(value.record.projectId);
                         }}
                       >
                         归属权
@@ -2597,7 +2737,7 @@ export default {
                     <a-select-option value="管理权" label="管理权">
                       <div
                         onClick={() => {
-                          showProjManage();
+                          showProjManage(value.record.projectId);
                         }}
                       >
                         管理权
@@ -2672,7 +2812,7 @@ export default {
                       <div
                         onClick={() => {
                           console.log("点击了111");
-                          showProjOwner();
+                          showProjOwner(value.record.projectId);
                         }}
                       >
                         归属权
@@ -2691,7 +2831,7 @@ export default {
                     <a-select-option value="管理权" label="管理权">
                       <div
                         onClick={() => {
-                          showProjManage();
+                          showProjManage(value.record.projectId);
                         }}
                       >
                         管理权
@@ -2745,7 +2885,7 @@ export default {
                       <div
                         onClick={() => {
                           console.log("点击了111");
-                          showProjOwner();
+                          showProjOwner(value.record.projectId);
                         }}
                       >
                         归属权
@@ -2764,7 +2904,7 @@ export default {
                     <a-select-option value="管理权" label="管理权">
                       <div
                         onClick={() => {
-                          showProjManage();
+                          showProjManage(value.record.projectId);
                         }}
                       >
                         管理权
@@ -2919,7 +3059,7 @@ export default {
                     <div
                       onClick={() => {
                         console.log("点击了111");
-                        showProjOwner();
+                        showProjOwner(value.record.projectId);
                       }}
                     >
                       归属权
@@ -2938,7 +3078,7 @@ export default {
                   <a-select-option value="管理权" label="管理权">
                     <div
                       onClick={() => {
-                        showProjManage();
+                        showProjManage(value.record.projectId);
                       }}
                     >
                       管理权
@@ -3265,11 +3405,15 @@ export default {
       state.ProjPvisible = true;
     };
     const showProjCheck = (id) => {
+      state.authClassify = 1;
       state.selectProjectId = id;
       state.ProjCheckvisible = true;
     };
-    const showProjManage = () => {
-      state.ProjManagevisible = true;
+    const showProjManage = (id) => {
+      state.authClassify = 2;
+      state.selectProjectId = id;
+      // state.ProjManagevisible = true;
+      state.ProjCheckvisible = true;
     };
 
     const closeReminderModal = () => {
@@ -3279,6 +3423,36 @@ export default {
       state.reminderModal = false;
       state.estabish = true;
     };
+
+    //添加权限
+    watch(
+      () => state.addAuthList,
+      (res) => {
+        console.log("res", res, state.addAuthList);
+        let obj = {
+          type: 2,
+          tag:
+            state.authClassify === 1 ? 3 : state.authClassify === 2 ? 4 : null,
+          opt: 3,
+          deptList: res[1],
+          groupList: res[2],
+          refId: state.selectProjectId,
+          pageNo: 20,
+          pageSize: 1,
+          studentList: res[0],
+        };
+        console.log("obj", obj);
+        api1
+          .optionAuthPerm(obj)
+          .then((res) => {
+            console.log("添加授权成功", res);
+            message.success("添加授权成功");
+          })
+          .catch((err) => {
+            console.log("添加授权失败", err);
+          });
+      }
+    );
     return {
       ...toRefs(state),
       selectProjectName,
@@ -3388,6 +3562,7 @@ export default {
       copyProject,
       closeReminderModal,
       okReminderModal,
+      memberScroll,
     };
   },
 };
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index d09e7be9..0dfa4326 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -62,13 +62,17 @@
                 }
               "
               v-model:value="classifySelect"
-              placeholder="四个养成"
+              placeholder="请选择分类"
               style="width: 100%"
               :options="classifyList"
               @change="classificationChange"
               allowClear
               showSearch
               :disabled="viewDetail ? true : false"
+              :fieldNames="{
+                label: 'dictName',
+                value: 'dictCode',
+              }"
             >
             </a-select>
           </div>
@@ -169,6 +173,7 @@
               allowClear
               showSearch
               :disabled="viewDetail ? true : false"
+              @popupScroll="memberScroll"
             >
             </a-select>
           </div>
@@ -183,18 +188,26 @@
           </div>
 
           <div class="in select">
-            <a-select
+            <a-tree-select
               :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
                 }
               "
               v-model:value="classifySelect2"
+              style="width: 100%"
+              :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
               placeholder="自动带出 可修改"
               :options="classifyList2"
               @change="classificationChange2"
               :disabled="viewDetail ? true : false"
-            />
+              :tree-data="classifyList2"
+              :fieldNames="{
+                children: 'treeChildList',
+                label: 'name',
+                value: 'id',
+              }"
+            ></a-tree-select>
           </div>
         </div>
         <div class="name name2">
@@ -252,6 +265,10 @@
               @change="classificationChange3"
               placeholder="集团级/组织级/现地级/部门级"
               :disabled="viewDetail ? true : false"
+              :fieldNames="{
+                label: 'dictName',
+                value: 'dictCode',
+              }"
             />
           </div>
         </div>
@@ -275,6 +292,10 @@
               @change="classificationChange4"
               placeholder="集团级/组织级/现地级/部门级"
               :disabled="viewDetail ? true : false"
+              :fieldNames="{
+                label: 'dictName',
+                value: 'dictCode',
+              }"
             />
           </div>
         </div>
@@ -355,6 +376,7 @@
               style="width: 100%"
               :options="classifyList5"
               @change="classificationChange5"
+              @popupScroll="templateScroll"
             >
             </a-select>
           </div>
@@ -372,16 +394,18 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, toRefs, ref, computed } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
 import dayjs from "dayjs";
 import * as api from "../../api/index";
-import { toDate } from "../../api/method";
-
+import * as api1 from "../../api/index1";
+import { toDate, scrollLoad } from "../../api/method";
+import { useStore } from "vuex";
 export default {
   name: "projectAdd",
   setup() {
+    const store = useStore();
     // 编辑页面跳转过来时候，自动填充表格
     const routers = useRoute();
     const router = useRouter();
@@ -398,12 +422,20 @@ export default {
       valueE1: null,
       valueE2: null,
       classifySelect1: [],
-      classifySelect2: [],
-      classifySelect3: [],
-      classifySelect4: [],
+      classifySelect2: null, //选中的资源归属信息
+      classifySelect3: null, //选中的项目级别信息
+      classifySelect4: null, //选中的培训分类信息
       rangevalue: [],
       projectAscription: "",
       viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
+
+      currentPage: 1, //当前页
+      tableDataTotal: -1, //模版列表总数
+      pageSize: 10, //每页10条数据
+      totalPages: 0, //总页数
+
+      currentPage1: 1, //项目经理
+      pageSize1: 10, //项目经理
     });
 
     if (routers.query.name == undefined) {
@@ -489,9 +521,7 @@ export default {
     const projectName = ref("");
 
     const classifyList = ref([
-      { value: 1, label: "管理者" },
-      { value: 2, label: "领军者" },
-      { value: 3, label: "产业人" },
+      // { value: 1, label: "管理者" },
     ]);
 
     let projectType = "";
@@ -615,11 +645,49 @@ export default {
 
     // 项目经理 后续接口调用
     const classifyList1 = ref([
-      { value: 1, label: "李俊国" },
-      { value: 2, label: "将小米" },
-      { value: 3, label: "刘孟君" },
+      // { value: 1, label: "李俊国" },
     ]);
-
+    //获取学员
+    const getMember = () => {
+      api1
+        .getMemberInfo({
+          pageNo: state.currentPage1,
+          pageSize: state.pageSize1,
+          keyWord: "",
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            let arr = res.data.data.rows;
+            let array = classifyList1.value;
+            arr.map((value) => {
+              let obj = {
+                value: value.id,
+                label: value.realName,
+              };
+              array.push(obj);
+            });
+            classifyList1.value = array;
+            console.log("获取学员", res.data);
+            // classifyList1.value = res.data.data.rows;
+            // state.tableDataTotal = res.data.data.total;
+            // return res.data.data.rows;
+          }
+        });
+    };
+    getMember();
+    //学员滚动加载信息
+    const memberScroll = (e) => {
+      // console.log("滚动", e, b);
+      let num = scrollLoad(e);
+      if (num === 1) {
+        state.currentPage1 = 1;
+      } else if (num === 2) {
+        // 如果滑到底部，则加载下一页
+        state.currentPage1++;
+        getMember();
+      }
+    };
+    //选择处理项目经理
     let manager = "";
     let managerId = "";
     const classificationChange1 = (key, options) => {
@@ -649,11 +717,9 @@ export default {
     };
 
     // 资源归属 sourceBelongId 后续给接口
-    const classifyList2 = ref([
-      { value: 1, label: "项目一" },
-      { value: 2, label: "项目二" },
-      { value: 3, label: "项目三" },
-    ]);
+    const classifyList2 = computed(() => {
+      return store.state.orgtreeList ? store.state.orgtreeList : ref([]);
+    });
 
     let sourceBelongIdC = "";
     const classificationChange2 = (key) => {
@@ -663,10 +729,7 @@ export default {
 
     // 项目级别
     const classifyList3 = ref([
-      { value: 1, label: "集团级" },
-      { value: 2, label: "组织级" },
-      { value: 3, label: "现地级" },
-      { value: 4, label: "部门级" },
+      // { value: 1, label: "集团级" },
     ]);
 
     let levels = "";
@@ -677,10 +740,7 @@ export default {
 
     // 培训分类
     const classifyList4 = ref([
-      { value: 1, label: "集团级" },
-      { value: 2, label: "组织级" },
-      { value: 3, label: "现地级" },
-      { value: 4, label: "部门级" },
+      // { value: 1, label: "集团级" },
     ]);
 
     let systemid = "";
@@ -688,17 +748,94 @@ export default {
       console.log(`selected ${key}`, classifyList4);
       systemid = key;
     };
+    //获取分类、封面图、项目级别、培训分类-----------字典配置-------------------------------
+    const getDictList = (param) => {
+      let obj = {
+        pageNo: 1,
+        pageSize: 20,
+        setCode: param,
+      };
+      api1
+        .getDict(obj)
+        .then((res) => {
+          console.log("获取字典成功", res);
+          if (res.status === 200) {
+            if (param === "projectClass") {
+              classifyList.value = res.data.data.rows;
+            }
+            if (param === "projectPic") {
+              if (res.data.data.rows.length > 0) {
+                imageUrl.value = res.data.data.rows[0].dictValue;
+                picUrl = res.data.data.rows[0].dictValue;
+              }
+            }
+            if (param === "projectLevel") {
+              classifyList3.value = res.data.data.rows;
+            }
+            if (param === "projectSys") {
+              classifyList4.value = res.data.data.rows;
+            }
+          }
+        })
+        .catch((err) => {
+          console.log("获取字典失败", err);
+        });
+    };
+    getDictList("projectClass");
+    getDictList("projectPic");
+    getDictList("projectLevel");
+    getDictList("projectSys");
+    //获取分类、封面图、项目级别、培训分类---------------字典配置---------------------------
 
     // 模版
     const classifyList5 = ref([
-      { value: 1, label: "模版一" },
-      { value: 2, label: "模版二" },
-      { value: 3, label: "模版三" },
-      { value: 4, label: "模版四" },
+      // { value: 1, label: "模版一" },
     ]);
     const classificationChange5 = (key) => {
       console.log(`selected ${key}`, classifyList5);
     };
+    //获取模版列表
+    const getTemplate = () => {
+      let obj = {
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+        // projectId:id?id:''
+      };
+      api
+        .getTemplate(obj)
+        .then((res) => {
+          console.log("获取模版列表", res);
+          state.totalPages = Number(res.data.data.pages);
+          if (res.status === 200) {
+            let arr = res.data.data.rows;
+            let array = classifyList5.value;
+            arr.map((value) => {
+              let obj = {
+                value: value.projectTemplateId,
+                label: value.name,
+              };
+              array.push(obj);
+            });
+            classifyList5.value = array;
+          }
+        })
+        .catch((err) => {
+          console.log("获取模版列表失败", err);
+        });
+    };
+    getTemplate();
+    //模版滚动加载模板信息
+    const templateScroll = (e) => {
+      // console.log("滚动", e, b);
+      let num = scrollLoad(e);
+      if (num === 1) {
+        state.currentPage = 1;
+      } else if (num === 2) {
+        // 如果滑到底部，则加载下一页
+        state.currentPage++;
+        getTemplate();
+      }
+    };
 
     // 项目说明
     const remark = ref("");
@@ -906,6 +1043,9 @@ export default {
       isEdit,
       backPage,
       dateFormatList,
+
+      templateScroll,
+      memberScroll,
     };
   },
 };
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index c9087527..cb126a5f 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -15,7 +15,6 @@
             <div class="btnText">添加阶段</div>
           </div>
           <div class="maincon" style="background-color: #fff">
-
             <draggable
               v-model="level"
               chosenClass="chosen"
@@ -690,13 +689,13 @@
 
     <div class="footbtn">
       <div class="btnbox">
-        <div class="btn btn2">
+        <div class="btn btn2" @click="temporaryStorage">
           <div class="btnText">暂存</div>
         </div>
-        <div class="btn btn2">
+        <div class="btn btn2" @click="submitStorage">
           <div class="btnText">确定</div>
         </div>
-        <div class="btn btn1">
+        <div class="btn btn1" @click="cancelStorage">
           <div class="btnText">取消</div>
         </div>
       </div>
@@ -1039,7 +1038,7 @@ import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
 import UnlockMode from "../../components/drawers/UnlockMode.vue";
 // import * as api1 from "../../api/index1";
-
+import { useRouter } from "vue-router";
 export default {
   name: "TaskAdd",
   components: {
@@ -1059,6 +1058,7 @@ export default {
     UnlockMode,
   },
   setup() {
+    const router = useRouter();
     const state = reactive({
       projectId: storage.get("projectId")
         ? JSON.parse(storage.get("projectId"))
@@ -1683,7 +1683,6 @@ export default {
       state.addactivevisible = true;
       state.EditActiveId = id;
       state.projectTaskId = eleId;
-   
     };
     const showDrawerAddEval = (id, eleId) => {
       state.addevalvisible = true;
@@ -1861,6 +1860,23 @@ export default {
     const showModeVisible = () => {
       state.unlockModeVisible = true;
     };
+
+    //暂存
+    const temporaryStorage = () => {
+      message.success("暂存成功");
+    };
+    //确定
+    const submitStorage = () => {
+      router.push({
+        path: "/leveladd",
+      });
+    };
+    //取消
+    const cancelStorage = () => {
+      router.push({
+        path: "/leveladd",
+      });
+    };
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1914,6 +1930,10 @@ export default {
       deleteStage,
 
       showModeVisible,
+
+      temporaryStorage,
+      submitStorage,
+      cancelStorage,
     };
   },
 };
diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue
index ac52a68b..942d2c85 100644
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -704,13 +704,13 @@
 
     <div class="footbtn">
       <div class="btnbox">
-        <div class="btn btn2">
+        <div class="btn btn2"  @click="temporaryStorage">
           <div class="btnText">暂存</div>
         </div>
-        <div class="btn btn2">
+        <div class="btn btn2" @click="submitStorage">
           <div class="btnText">确定</div>
         </div>
-        <div class="btn btn1">
+        <div class="btn btn1" @click="cancelStorage">
           <div class="btnText">取消</div>
         </div>
       </div>
@@ -1052,7 +1052,7 @@ import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
 import UnlockMode from "../../components/drawers/UnlockMode.vue";
 // import * as api1 from "../../api/index1";
-
+import { useRouter } from "vue-router";
 const drawercolumns = [
   {
     title: "项目名称",
@@ -1111,6 +1111,7 @@ export default {
     UnlockMode,
   },
   setup() {
+    const router = useRouter();
     const state = reactive({
       projectTemplateId: storage.get("projectTemplateId")
         ? JSON.parse(storage.get("projectTemplateId"))
@@ -2005,6 +2006,24 @@ export default {
     const showModeVisible = () => {
       state.unlockModeVisible = true;
     };
+
+
+    //暂存
+    const temporaryStorage = () => {
+      message.success("暂存成功");
+    };
+    //确定
+    const submitStorage = () => {
+      router.push({
+        path: "/leveladd",
+      });
+    };
+    //取消
+    const cancelStorage = () => {
+      router.push({
+        path: "/leveladd",
+      });
+    };
     return {
       ...toRefs(state),
       selectProjectName,
@@ -2061,6 +2080,11 @@ export default {
       deleteStage,
 
       showModeVisible,
+
+
+       temporaryStorage,
+      submitStorage,
+      cancelStorage,
     };
   },
 };