diff --git a/src/App.vue b/src/App.vue
index 6cee9c74..fde508a7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -79,7 +79,7 @@ export default defineComponent({
         store.commit("SET_MEMBER_INFO", JSON.parse(list));
         return;
       }
-      const memberInitInfo = await api1.getMemberInfo({keyWord: '', pageNo: 1, pageSize: 10});
+      const memberInitInfo = await api1.getMemberInfo({keyWord: '', pageNo: 1, pageSize: 10}).then(res=>res.data.data.rows);
       store.commit("SET_MEMBER_INFO", memberInitInfo);
       localStorage.setItem('memberInitInfo', JSON.stringify(memberInitInfo));
     }
diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue
index 71dc0444..05e28a23 100644
--- a/src/components/drawers/ProjCheckPower.vue
+++ b/src/components/drawers/ProjCheckPower.vue
@@ -1,29 +1,29 @@
 <!-- 项目的查看权 -->
 <template>
   <a-drawer
-    :visible="ProjCheckvisible"
-    class="drawerStyle ProjCheckship"
-    placement="right"
-    width="85%"
-    @after-visible-change="afterVisibleChange"
+      :visible="ProjCheckvisible"
+      class="drawerStyle ProjCheckship"
+      placement="right"
+      width="85%"
+      @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain" id="ProjCheckship">
       <div class="header">
         <div class="headerTitle">
           {{
             authClassify === 1
-              ? "查看权"
-              : authClassify === 2
-              ? "管理权"
-              : authClassify === 3
-              ? "添加学员"
-              : ""
+                ? "查看权"
+                : authClassify === 2
+                    ? "管理权"
+                    : authClassify === 3
+                        ? "添加学员"
+                        : ""
           }}
         </div>
         <img
-          style="width: 29px; height: 29px; cursor: pointer"
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="../../assets/images/basicinfo/close.png"
+            @click="closeDrawer"
         />
       </div>
       <div class="main">
@@ -32,23 +32,23 @@
             <a-tabs v-model:activeKey="activeKey">
               <a-tab-pane key="1" tab="快速选人">
                 <div
-                  :style="{ height: screenHeight - 235 + 'px' }"
-                  style="overflow-y: auto"
+                    :style="{ height: screenHeight - 235 + 'px' }"
+                    style="overflow-y: auto"
                 >
                   <div class="tab1">
                     <div class="nameinp">
                       <div class="namee">姓名：</div>
                       <a-input
-                        v-model:value="nameSearch"
-                        style="width: 270px; height: 40px; border-radius: 8px"
-                        placeholder="请输入姓名"
+                          v-model:value="nameSearch"
+                          style="width: 270px; height: 40px; border-radius: 8px"
+                          placeholder="请输入姓名"
                       />
                     </div>
                     <div class="btns">
                       <div class="btn1" @click="handleSearchStu">
                         <div class="img1">
                           <img
-                            src="../../assets/images/courseManage/search0.png"
+                              src="../../assets/images/courseManage/search0.png"
                           />
                         </div>
                         <div class="wz">搜索</div>
@@ -56,7 +56,7 @@
                       <div class="btn2" @click="resetStu">
                         <div class="img2">
                           <img
-                            src="../../assets/images/courseManage/reset1.png"
+                              src="../../assets/images/courseManage/reset1.png"
                           />
                         </div>
                         <div class="wz">重置</div>
@@ -81,40 +81,39 @@
                       <div class="boeTreeTitle">BOE组织树</div>
 
                       <a-tree
-                        v-model:value="valueSelectboe"
-                        class="treeMain"
-                        :style="{ height: screenHeight - 400 + 'px' }"
-                        dropdownClassName="changetreedropdownboe"
-                        :dropdown-style="{
+                          v-model:value="valueSelectboe"
+                          class="treeMain"
+                          :style="{ height: screenHeight - 400 + 'px' }"
+                          dropdownClassName="changetreedropdownboe"
+                          :dropdown-style="{
                           maxHeight: '600px',
                         }"
-                        placeholder="BOE组织树"
-                        allow-clear
-                        tree-default-expand-all
-                        :tree-data="treeData"
-                        @select="departmentSelect"
-                        v-model:selectedKeys="selectedKeys"
-                        :fieldNames="{
+                          placeholder="BOE组织树"
+                          allow-clear
+                          tree-default-expand-all
+                          :tree-data="treeData"
+                          @select="departmentSelect"
+                          v-model:selectedKeys="selectedKeys"
+                          :fieldNames="{
                           children: 'treeChildList',
                           key: 'id',
                           title: 'name',
                           value: 'name',
                         }"
-                        v-model:expandedKeys="expandedKeys"
+                          v-model:expandedKeys="expandedKeys"
                       >
                         <template #suffixIcon></template>
                       </a-tree>
                     </div>
                     <div class="tableBox tabb" style="margin-top: 16px">
                       <a-table
-                        style="border: 1px solid #f2f6fe"
-                        :columns="tablecolumns"
-                        :data-source="tabledata"
-                        :loading="tableDataTotal === -1 ? true : false"
-                        expandRowByClick="true"
-                        @expand="expandTable"
-                        :pagination="false"
-                        :row-selection="{
+                          style="border: 1px solid #f2f6fe"
+                          :columns="tablecolumns"
+                          :data-source="tabledata"
+                          :loading="loading"
+                          :pagination="false"
+                          rowKey="id"
+                          :row-selection="{
                           columnWidth: 20,
                           selectedRowKeys: selectedRowKeys,
                           onChange: onSelectChange,
@@ -123,16 +122,16 @@
                       />
                       <div class="pa">
                         <a-pagination
-                          showSizeChanger="true"
-                          showQuickJumper="true"
-                          hideOnSinglePage="true"
-                          :pageSize="pageSize"
-                          v-model:current="currentPage"
-                          :total="tableDataTotal"
-                          :pagination="false"
-                          class="pagination"
-                          v-if="tableDataTotal > 10"
-                          @change="changePagination"
+                            showSizeChanger="true"
+                            showQuickJumper="true"
+                            hideOnSinglePage="true"
+                            :pageSize="pageSize"
+                            v-model:current="currentPage"
+                            :total="tableDataTotal"
+                            :pagination="false"
+                            class="pagination"
+                            v-if="tableDataTotal > 10"
+                            @change="changePagination"
                         />
                       </div>
                     </div>
@@ -141,23 +140,23 @@
               </a-tab-pane>
               <a-tab-pane key="2" tab="添加组织" force-render>
                 <div
-                  :style="{ height: screenHeight - 235 + 'px' }"
-                  style="overflow-y: auto"
+                    :style="{ height: screenHeight - 235 + 'px' }"
+                    style="overflow-y: auto"
                 >
                   <div class="tab2">
                     <div class="nameinp">
                       <div class="namee">组织：</div>
                       <a-input
-                        v-model:value="searchOrgName"
-                        style="width: 230px; height: 40px; border-radius: 8px"
-                        placeholder="请输入组织"
+                          v-model:value="searchOrgName"
+                          style="width: 230px; height: 40px; border-radius: 8px"
+                          placeholder="请输入组织"
                       />
                     </div>
                     <div class="btns">
                       <div class="btn1" @click="searchOrg()">
                         <div class="img1">
                           <img
-                            src="../../assets/images/courseManage/search0.png"
+                              src="../../assets/images/courseManage/search0.png"
                           />
                         </div>
                         <div class="wz">搜索</div>
@@ -165,7 +164,7 @@
                       <div class="btn2" @click="resetOrg">
                         <div class="img2">
                           <img
-                            src="../../assets/images/courseManage/reset1.png"
+                              src="../../assets/images/courseManage/reset1.png"
                           />
                         </div>
                         <div class="wz">重置</div>
@@ -183,60 +182,60 @@
                   <div class="boeTree">
                     <div class="boeTreeTitle">BOE组织树</div>
                     <a-tree
-                      v-if="!isSearchOrg"
-                      class="treeMain treeMain2"
-                      :style="{ height: screenHeight - 430 + 'px' }"
-                      dropdownClassName="changetreedropdownboe"
-                      :dropdown-style="{
+                        v-if="!isSearchOrg"
+                        class="treeMain treeMain2"
+                        :style="{ height: screenHeight - 430 + 'px' }"
+                        dropdownClassName="changetreedropdownboe"
+                        :dropdown-style="{
                         maxHeight: '600px',
                       }"
-                      placeholder="BOE组织树"
-                      allow-clear
-                      tree-default-expand-all
-                      :tree-data="isSearchOrg ? treeData2 : treeData"
-                      @select="departmentSelect1"
-                      multiple
-                      v-model:selectedKeys="selectedKeys1"
-                      :fieldNames="{
+                        placeholder="BOE组织树"
+                        allow-clear
+                        tree-default-expand-all
+                        :tree-data="isSearchOrg ? treeData2 : treeData"
+                        @select="departmentSelect1"
+                        multiple
+                        v-model:selectedKeys="selectedKeys1"
+                        :fieldNames="{
                         children: 'treeChildList',
                         key: 'id',
                         title: 'name',
                         value: 'name',
                       }"
-                      v-model:expandedKeys="expandedKeys"
+                        v-model:expandedKeys="expandedKeys"
                     >
                       <template #suffixIcon></template>
                     </a-tree>
 
                     <a-tree
-                      v-else-if="isSearchOrg"
-                      class="treeMain treeMain2"
-                      :style="{ height: screenHeight - 430 + 'px' }"
-                      dropdownClassName="changetreedropdownboe"
-                      :dropdown-style="{
+                        v-else-if="isSearchOrg"
+                        class="treeMain treeMain2"
+                        :style="{ height: screenHeight - 430 + 'px' }"
+                        dropdownClassName="changetreedropdownboe"
+                        :dropdown-style="{
                         maxHeight: '600px',
                       }"
-                      placeholder="BOE组织树"
-                      allow-clear
-                      tree-default-expand-all
-                      :tree-data="isSearchOrg ? treeData2 : treeData"
-                      @select="departmentSelect1"
-                      multiple
-                      v-model:selectedKeys="selectedKeys1"
-                      :fieldNames="{
+                        placeholder="BOE组织树"
+                        allow-clear
+                        tree-default-expand-all
+                        :tree-data="isSearchOrg ? treeData2 : treeData"
+                        @select="departmentSelect1"
+                        multiple
+                        v-model:selectedKeys="selectedKeys1"
+                        :fieldNames="{
                         children: 'treeChildList',
                         key: 'id',
                         title: 'name',
                         value: 'name',
                       }"
-                      v-model:expandedKeys="expandedKeys"
+                        v-model:expandedKeys="expandedKeys"
                     >
                       <template #suffixIcon></template>
                     </a-tree>
                     <div
-                      class="boeTreeTitle"
-                      style="margin-top: 8px; cursor: pointer"
-                      @click="addOrgModal"
+                        class="boeTreeTitle"
+                        style="margin-top: 8px; cursor: pointer"
+                        @click="addOrgModal"
                     >
                       确认添加
                     </div>
@@ -245,8 +244,8 @@
               </a-tab-pane>
               <a-tab-pane key="3" tab="受众关联">
                 <div
-                  :style="{ height: screenHeight - 235 + 'px' }"
-                  style="overflow-y: auto"
+                    :style="{ height: screenHeight - 235 + 'px' }"
+                    style="overflow-y: auto"
                 >
                   <div class="tab1">
                     <div class="t1">
@@ -265,16 +264,16 @@
                     <div class="t1" style="margin-top: 10px">
                       <div class="organize">受众名称：</div>
                       <a-input
-                        v-model:value="audienceName"
-                        style="width: 260px; height: 40px; border-radius: 8px"
-                        placeholder="请输入受众名称"
+                          v-model:value="audienceName"
+                          style="width: 260px; height: 40px; border-radius: 8px"
+                          placeholder="请输入受众名称"
                       />
                     </div>
                     <div class="btns">
                       <div class="btn1" @click="searchAudienceInfo">
                         <div class="img1">
                           <img
-                            src="../../assets/images/courseManage/search0.png"
+                              src="../../assets/images/courseManage/search0.png"
                           />
                         </div>
                         <div class="wz">搜索</div>
@@ -282,7 +281,7 @@
                       <div class="btn2" @click="resetAudienceInfo">
                         <div class="img2">
                           <img
-                            src="../../assets/images/courseManage/reset1.png"
+                              src="../../assets/images/courseManage/reset1.png"
                           />
                         </div>
                         <div class="wz">重置</div>
@@ -305,15 +304,15 @@
                 </div> -->
                   <div class="tableBox tabb" style="margin-top: 16px">
                     <a-table
-                      style="border: 1px solid #f2f6fe"
-                      :columns="tablecolumns2"
-                      :data-source="tabledata2"
-                      :loading="tableDataTotal === -1 ? true : false"
-                      expandRowByClick="true"
-                      :scroll="{ x: 500 }"
-                      @expand="expandTable"
-                      :pagination="false"
-                      :row-selection="{
+                        style="border: 1px solid #f2f6fe"
+                        :columns="tablecolumns2"
+                        :data-source="tabledata2"
+                        :loading="tableDataTotal === -1 ? true : false"
+                        expandRowByClick="true"
+                        :scroll="{ x: 500 }"
+                        @expand="expandTable"
+                        :pagination="false"
+                        :row-selection="{
                         columnWidth: 30,
                         selectedRowKeys: selectedRowKeys2,
                         onChange: onSelectChange2,
@@ -322,15 +321,15 @@
                     />
                     <div class="pa" style="margin-top: 20px">
                       <a-pagination
-                        showSizeChanger="true"
-                        showQuickJumper="true"
-                        hideOnSinglePage="true"
-                        :pageSize="pageSize2"
-                        :current="currentPage2"
-                        :total="tableDataTotal2"
-                        class="pagination"
-                        v-if="tableDataTotal2 > 10"
-                        @change="changePagination1"
+                          showSizeChanger="true"
+                          showQuickJumper="true"
+                          hideOnSinglePage="true"
+                          :pageSize="pageSize2"
+                          :current="currentPage2"
+                          :total="tableDataTotal2"
+                          class="pagination"
+                          v-if="tableDataTotal2 > 10"
+                          @change="changePagination1"
                       />
                     </div>
                   </div>
@@ -358,14 +357,14 @@
               <div class="selecteds" id="selecteds">
                 <!-- 遍历生成 -->
                 <div class="chose" v-for="item in choosepeople" :key="item.key">
-                  <div>{{ item.name }}</div>
+                  <div>{{ item.name || item.realName }}</div>
                   <div class="ch" @click="deleteChoosePeople(item)"></div>
                 </div>
               </div>
             </div>
             <div
-              class="chose"
-              style="
+                class="chose"
+                style="
                 display: flex;
                 justify-content: flex-end;
                 margin-right: 20px;
@@ -374,20 +373,20 @@
                 color: #409eff;
                 line-height: 22px;
               "
-              v-if="showMore"
-              @click="morePeopleShow"
+                v-if="showMore"
+                @click="morePeopleShow"
             >
               <div>
                 查看更多
                 <img
-                  style="width: 10px; height: 12px; margin-top: -2px"
-                  src="../../assets/images/projectadd/go.png"
+                    style="width: 10px; height: 12px; margin-top: -2px"
+                    src="../../assets/images/projectadd/go.png"
                 />
               </div>
             </div>
             <div
-              class="chose"
-              style="
+                class="chose"
+                style="
                 display: flex;
                 justify-content: flex-end;
                 margin-right: 20px;
@@ -396,14 +395,14 @@
                 color: #409eff;
                 line-height: 22px;
               "
-              v-if="showHidden"
-              @click="morePeopleHidden"
+                v-if="showHidden"
+                @click="morePeopleHidden"
             >
               <div>
                 收起
                 <img
-                  style="width: 10px; height: 12px; margin-top: -2px"
-                  src="../../assets/images/projectadd/pickUp.png"
+                    style="width: 10px; height: 12px; margin-top: -2px"
+                    src="../../assets/images/projectadd/pickUp.png"
                 />
               </div>
             </div>
@@ -412,16 +411,16 @@
           <div class="tit">添加组织</div>
           <div style="position: relative; min-height: 180px">
             <div
-              style="position: relative; height: 160px"
-              class="selectedsBox"
-              id="selectedsBox1"
+                style="position: relative; height: 160px"
+                class="selectedsBox"
+                id="selectedsBox1"
             >
               <div class="selecteds" id="selecteds1">
                 <!-- 遍历生成 -->
                 <div
-                  class="chose"
-                  v-for="item in chooseorganization1"
-                  :key="item.key"
+                    class="chose"
+                    v-for="item in chooseorganization1"
+                    :key="item.key"
                 >
                   <div>{{ item.name }}</div>
                   <div class="ch" @click="deleteChoosePeople1(item)"></div>
@@ -429,8 +428,8 @@
               </div>
             </div>
             <div
-              class="chose"
-              style="
+                class="chose"
+                style="
                 display: flex;
                 justify-content: flex-end;
                 margin-right: 20px;
@@ -439,20 +438,20 @@
                 color: #409eff;
                 line-height: 22px;
               "
-              v-if="showMore1"
-              @click="morePeopleShow1"
+                v-if="showMore1"
+                @click="morePeopleShow1"
             >
               <div>
                 查看更多
                 <img
-                  style="width: 10px; height: 12px; margin-top: -2px"
-                  src="../../assets/images/projectadd/go.png"
+                    style="width: 10px; height: 12px; margin-top: -2px"
+                    src="../../assets/images/projectadd/go.png"
                 />
               </div>
             </div>
             <div
-              class="chose"
-              style="
+                class="chose"
+                style="
                 display: flex;
                 justify-content: flex-end;
                 margin-right: 20px;
@@ -461,14 +460,14 @@
                 color: #409eff;
                 line-height: 22px;
               "
-              v-if="showHidden1"
-              @click="morePeopleHidden1"
+                v-if="showHidden1"
+                @click="morePeopleHidden1"
             >
               <div>
                 收起
                 <img
-                  style="width: 10px; height: 12px; margin-top: -2px"
-                  src="../../assets/images/projectadd/pickUp.png"
+                    style="width: 10px; height: 12px; margin-top: -2px"
+                    src="../../assets/images/projectadd/pickUp.png"
                 />
               </div>
             </div>
@@ -476,15 +475,15 @@
           <div class="line"></div>
           <div class="tit">受众关联</div>
           <div
-            style="position: relative; min-height: 180px; padding-bottom: 40px"
+              style="position: relative; min-height: 180px; padding-bottom: 40px"
           >
             <div style="height: 160px" class="selectedsBox" id="selectedsBox2">
               <div class="selecteds" id="selecteds2">
                 <!-- 遍历生成 -->
                 <div
-                  class="chose"
-                  v-for="item in relationpeople"
-                  :key="item.key"
+                    class="chose"
+                    v-for="item in relationpeople"
+                    :key="item.key"
                 >
                   <div>{{ item.name }}</div>
                   <div class="ch" @click="deleteChoosePeople2(item)"></div>
@@ -492,8 +491,8 @@
               </div>
             </div>
             <div
-              class="chose"
-              style="
+                class="chose"
+                style="
                 display: flex;
                 justify-content: flex-end;
                 margin-right: 20px;
@@ -502,20 +501,20 @@
                 color: #409eff;
                 line-height: 22px;
               "
-              v-if="showMore2"
-              @click="morePeopleShow2"
+                v-if="showMore2"
+                @click="morePeopleShow2"
             >
               <div>
                 查看更多
                 <img
-                  style="width: 10px; height: 12px; margin-top: -2px"
-                  src="../../assets/images/projectadd/go.png"
+                    style="width: 10px; height: 12px; margin-top: -2px"
+                    src="../../assets/images/projectadd/go.png"
                 />
               </div>
             </div>
             <div
-              class="chose"
-              style="
+                class="chose"
+                style="
                 display: flex;
                 justify-content: flex-end;
                 margin-right: 20px;
@@ -524,14 +523,14 @@
                 color: #409eff;
                 line-height: 22px;
               "
-              v-if="showHidden2"
-              @click="morePeopleHidden2"
+                v-if="showHidden2"
+                @click="morePeopleHidden2"
             >
               <div>
                 收起
                 <img
-                  style="width: 10px; height: 12px; margin-top: -2px"
-                  src="../../assets/images/projectadd/pickUp.png"
+                    style="width: 10px; height: 12px; margin-top: -2px"
+                    src="../../assets/images/projectadd/pickUp.png"
                 />
               </div>
             </div>
@@ -546,10 +545,10 @@
 
     <!-- 确认添加部门弹窗 -->
     <a-modal
-      v-model:visible="showOrgModal"
-      :footer="null"
-      wrapClassName="confirmAddOrg"
-      centered="true"
+        v-model:visible="showOrgModal"
+        :footer="null"
+        wrapClassName="confirmAddOrg"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -578,17 +577,18 @@
 </template>
 
 <script>
-import { reactive, toRefs, onMounted, onUnmounted, computed } from "vue";
+import {reactive, toRefs, onMounted, onUnmounted, computed} from "vue";
 import elementResizeDetectorMaker from "element-resize-detector";
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
 // import { toDate } from "../../api/method";
-import { useStore } from "vuex";
+import {useStore} from "vuex";
 import {
   traverseArr,
   // deepClone,
   // batchLoadList,
 } from "../../utils/utils";
 import * as api from "../../api/index1";
+
 export default {
   name: "ProjCheckShip",
   props: {
@@ -616,9 +616,9 @@ export default {
       //快速选人
       pageSize: 10,
       currentPage: 1,
-      tableDataTotal: 0,
+      tableDataTotal: 100,
       nameSearch: "", //搜索名称
-
+      loading: false,
       //受众
       pageSize2: 10,
       currentPage2: 1,
@@ -656,8 +656,8 @@ export default {
       tablecolumns: [
         {
           title: "姓名",
-          dataIndex: "name",
-          key: "name",
+          dataIndex: "realName",
+          key: "realName",
           width: 80,
           align: "center",
           className: "h",
@@ -665,8 +665,8 @@ export default {
         },
         {
           title: "工号",
-          dataIndex: "numb",
-          key: "numb",
+          dataIndex: "userNo",
+          key: "userNo",
           width: 80,
           align: "center",
           className: "h",
@@ -674,8 +674,8 @@ export default {
         },
         {
           title: "归属组织",
-          dataIndex: "guishu",
-          key: "guishu",
+          dataIndex: "orgName",
+          key: "orgName",
           width: 80,
           align: "center",
           className: "h",
@@ -683,8 +683,8 @@ export default {
         },
         {
           title: "部门",
-          dataIndex: "bum",
-          key: "bum",
+          dataIndex: "departName",
+          key: "departName",
           width: 80,
           align: "center",
           className: "h",
@@ -723,13 +723,13 @@ export default {
             compare: (a, b) => new Date(a.createTime) - new Date(b.createTime),
             multiple: 3,
           },
-          scopedSlots: { customRender: "action" }, //引入的插槽
+          scopedSlots: {customRender: "action"}, //引入的插槽
           customRender: (text) => {
             // console.log(text.record.checked1);
             return (
-              <div class="racona">
-                <span>{text.record.createTime} </span>
-              </div>
+                <div class="racona">
+                  <span>{text.record.createTime} </span>
+                </div>
             );
           },
         },
@@ -847,14 +847,11 @@ export default {
 
     //     };
     onMounted(() => {
-      // console.log("11111", 1);
       window.addEventListener("resize", getClientHeight, false);
-      //  window.addEventListener("resize", getClientHeightSelecteds, false);
-      // judgeUrl();
+      state.tabledata = store.state.memberInitInfo
     });
     onUnmounted(() => {
       window.removeEventListener("resize", getClientHeight, false);
-      //  window.removeEventListener("resize", getClientHeightSelecteds, false);
     });
 
     // 开始 快速选人------------------------------------------------------------------
@@ -872,33 +869,30 @@ export default {
     };
     //获取学员
     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);
+      // if (!state.nameSearch && !org) {
+      //   return false;
+      // }
+      await api
+          .getMemberInfo({
+            pageNo: state.currentPage,
+            pageSize: state.pageSize,
+            keyWord: state.nameSearch,
+            org: state.nameSearch ? null : org,
+          })
+          .then((res) => {
+            state.tabledata = res.data.data.rows
             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",
-      });
-    };
+    // state.tabledata = traverseArr(item1, {
+    //   key: "id",
+    //   name: "realName",
+    //   bum: "depName",
+    //   numb: "id",
+    //   guishu: "orgName",
+    // });
+    // };
     //分页获取学员
     const changePagination = (page) => {
       state.currentPage = page;
@@ -965,49 +959,49 @@ export default {
     const selectedsHeight = () => {
       let resize = elementResizeDetectorMaker();
       resize.listenTo(
-        document.getElementById("ProjCheckship").querySelector("#selecteds"),
-        function (ele) {
-          console.log("ele", ele.clientHeight, ele.offsetHeight);
-          if (ele.offsetHeight > 160 && !state.showHidden) {
-            state.showMore = true;
-            document
-              .getElementById("ProjCheckship")
-              .querySelector("#selectedsBox").style.overflow = "hidden";
-            document
-              .getElementById("ProjCheckship")
-              .querySelector("#selectedsBox").style.height = "160px";
-          } else if (ele.offsetHeight < 160) {
-            state.showMore = false;
-            state.showHidden = false;
-            document
-              .getElementById("ProjCheckship")
-              .querySelector("#selectedsBox").style.overflow = "hidden";
-            document
-              .getElementById("ProjCheckship")
-              .querySelector("#selectedsBox").style.height = "160px";
+          document.getElementById("ProjCheckship").querySelector("#selecteds"),
+          function (ele) {
+            console.log("ele", ele.clientHeight, ele.offsetHeight);
+            if (ele.offsetHeight > 160 && !state.showHidden) {
+              state.showMore = true;
+              document
+                  .getElementById("ProjCheckship")
+                  .querySelector("#selectedsBox").style.overflow = "hidden";
+              document
+                  .getElementById("ProjCheckship")
+                  .querySelector("#selectedsBox").style.height = "160px";
+            } else if (ele.offsetHeight < 160) {
+              state.showMore = false;
+              state.showHidden = false;
+              document
+                  .getElementById("ProjCheckship")
+                  .querySelector("#selectedsBox").style.overflow = "hidden";
+              document
+                  .getElementById("ProjCheckship")
+                  .querySelector("#selectedsBox").style.height = "160px";
+            }
           }
-        }
       );
     };
     const morePeopleShow = () => {
       state.showMore = false;
       state.showHidden = true;
       document
-        .getElementById("ProjCheckship")
-        .querySelector("#selectedsBox").style.overflow = "";
+          .getElementById("ProjCheckship")
+          .querySelector("#selectedsBox").style.overflow = "";
       document
-        .getElementById("ProjCheckship")
-        .querySelector("#selectedsBox").style.height = "";
+          .getElementById("ProjCheckship")
+          .querySelector("#selectedsBox").style.height = "";
     };
     const morePeopleHidden = () => {
       state.showMore = true;
       state.showHidden = false;
       document
-        .getElementById("ProjCheckship")
-        .querySelector("#selectedsBox").style.overflow = "hidden";
+          .getElementById("ProjCheckship")
+          .querySelector("#selectedsBox").style.overflow = "hidden";
       document
-        .getElementById("ProjCheckship")
-        .querySelector("#selectedsBox").style.height = "160px";
+          .getElementById("ProjCheckship")
+          .querySelector("#selectedsBox").style.height = "160px";
     };
 
     // 结束 快速选人------------------------------------------------------------------
@@ -1023,22 +1017,22 @@ export default {
       };
       console.log("obj", obj);
       api
-        .getOrgInfo(obj)
-        .then((res) => {
-          if (res.data.code === 200) {
-            console.log("搜索组织", res);
-            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;
-          }
-        })
-        .catch((err) => {
-          console.log("组织树获取失败", err);
-        });
+          .getOrgInfo(obj)
+          .then((res) => {
+            if (res.data.code === 200) {
+              console.log("搜索组织", res);
+              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;
+            }
+          })
+          .catch((err) => {
+            console.log("组织树获取失败", err);
+          });
     };
     //重置组织
     const resetOrg = () => {
@@ -1141,49 +1135,49 @@ export default {
     const selectedsHeight1 = () => {
       let resize = elementResizeDetectorMaker();
       resize.listenTo(
-        document.getElementById("ProjCheckship").querySelector("#selecteds1"),
-        function (ele) {
-          console.log("ele", ele.offsetHeight);
-          if (ele.offsetHeight > 160 && !state.showHidden1) {
-            state.showMore1 = true;
-            document
-              .getElementById("ProjCheckship")
-              .querySelector("#selectedsBox1").style.overflow = "hidden";
-            document
-              .getElementById("ProjCheckship")
-              .querySelector("#selectedsBox1").style.height = "160px";
-          } else if (ele.offsetHeight < 160) {
-            state.showMore1 = false;
-            state.showHidden1 = false;
-            document
-              .getElementById("ProjCheckship")
-              .querySelector("#selectedsBox1").style.overflow = "hidden";
-            document
-              .getElementById("ProjCheckship")
-              .querySelector("#selectedsBox1").style.height = "160px";
+          document.getElementById("ProjCheckship").querySelector("#selecteds1"),
+          function (ele) {
+            console.log("ele", ele.offsetHeight);
+            if (ele.offsetHeight > 160 && !state.showHidden1) {
+              state.showMore1 = true;
+              document
+                  .getElementById("ProjCheckship")
+                  .querySelector("#selectedsBox1").style.overflow = "hidden";
+              document
+                  .getElementById("ProjCheckship")
+                  .querySelector("#selectedsBox1").style.height = "160px";
+            } else if (ele.offsetHeight < 160) {
+              state.showMore1 = false;
+              state.showHidden1 = false;
+              document
+                  .getElementById("ProjCheckship")
+                  .querySelector("#selectedsBox1").style.overflow = "hidden";
+              document
+                  .getElementById("ProjCheckship")
+                  .querySelector("#selectedsBox1").style.height = "160px";
+            }
           }
-        }
       );
     };
     const morePeopleShow1 = () => {
       state.showMore1 = false;
       state.showHidden1 = true;
       document
-        .getElementById("ProjCheckship")
-        .querySelector("#selectedsBox1").style.overflow = "";
+          .getElementById("ProjCheckship")
+          .querySelector("#selectedsBox1").style.overflow = "";
       document
-        .getElementById("ProjCheckship")
-        .querySelector("#selectedsBox1").style.height = "";
+          .getElementById("ProjCheckship")
+          .querySelector("#selectedsBox1").style.height = "";
     };
     const morePeopleHidden1 = () => {
       state.showMore1 = true;
       state.showHidden1 = false;
       document
-        .getElementById("ProjCheckship")
-        .querySelector("#selectedsBox1").style.overflow = "hidden";
+          .getElementById("ProjCheckship")
+          .querySelector("#selectedsBox1").style.overflow = "hidden";
       document
-        .getElementById("ProjCheckship")
-        .querySelector("#selectedsBox1").style.height = "160px";
+          .getElementById("ProjCheckship")
+          .querySelector("#selectedsBox1").style.height = "160px";
     };
 
     // 结束 添加组织------------------------------------------------------------------
@@ -1193,20 +1187,20 @@ export default {
     //获取受众
     const getAudienceInfo = async () => {
       const item1 = await api
-        .getAudienceInfo({
-          keyWord: state.audienceName,
-          id: 0,
-          pageNo: state.currentPage2,
-          pageSize: state.pageSize2,
-        })
-        .then((res) => {
-          // console.log("获取受众", res);
-          if (res.data.code === 200) {
-            // console.log("获取学员", res.data);
-            state.tableDataTotal2 = res.data.data.total;
-            return res.data.data.rows;
-          }
-        });
+          .getAudienceInfo({
+            keyWord: state.audienceName,
+            id: 0,
+            pageNo: state.currentPage2,
+            pageSize: state.pageSize2,
+          })
+          .then((res) => {
+            // console.log("获取受众", res);
+            if (res.data.code === 200) {
+              // console.log("获取学员", res.data);
+              state.tableDataTotal2 = res.data.data.total;
+              return res.data.data.rows;
+            }
+          });
       // console.log("item1", item1);
       if (item1) {
         state.tabledata2 = traverseArr(item1, {
@@ -1268,49 +1262,49 @@ export default {
     const selectedsHeight2 = () => {
       let resize = elementResizeDetectorMaker();
       resize.listenTo(
-        document.getElementById("ProjCheckship").querySelector("#selecteds2"),
-        function (ele) {
-          console.log("ele", ele.offsetHeight);
-          if (ele.offsetHeight > 160 && !state.showHidden2) {
-            state.showMore2 = true;
-            document
-              .getElementById("ProjCheckship")
-              .querySelector("#selectedsBox2").style.overflow = "hidden";
-            document
-              .getElementById("ProjCheckship")
-              .querySelector("#selectedsBox2").style.height = "160px";
-          } else if (ele.offsetHeight < 160) {
-            state.showMore2 = false;
-            state.showHidden2 = false;
-            document
-              .getElementById("ProjCheckship")
-              .querySelector("#selectedsBox2").style.overflow = "hidden";
-            document
-              .getElementById("ProjCheckship")
-              .querySelector("#selectedsBox2").style.height = "160px";
+          document.getElementById("ProjCheckship").querySelector("#selecteds2"),
+          function (ele) {
+            console.log("ele", ele.offsetHeight);
+            if (ele.offsetHeight > 160 && !state.showHidden2) {
+              state.showMore2 = true;
+              document
+                  .getElementById("ProjCheckship")
+                  .querySelector("#selectedsBox2").style.overflow = "hidden";
+              document
+                  .getElementById("ProjCheckship")
+                  .querySelector("#selectedsBox2").style.height = "160px";
+            } else if (ele.offsetHeight < 160) {
+              state.showMore2 = false;
+              state.showHidden2 = false;
+              document
+                  .getElementById("ProjCheckship")
+                  .querySelector("#selectedsBox2").style.overflow = "hidden";
+              document
+                  .getElementById("ProjCheckship")
+                  .querySelector("#selectedsBox2").style.height = "160px";
+            }
           }
-        }
       );
     };
     const morePeopleShow2 = () => {
       state.showMore2 = false;
       state.showHidden2 = true;
       document
-        .getElementById("ProjCheckship")
-        .querySelector("#selectedsBox2").style.overflow = "";
+          .getElementById("ProjCheckship")
+          .querySelector("#selectedsBox2").style.overflow = "";
       document
-        .getElementById("ProjCheckship")
-        .querySelector("#selectedsBox2").style.height = "";
+          .getElementById("ProjCheckship")
+          .querySelector("#selectedsBox2").style.height = "";
     };
     const morePeopleHidden2 = () => {
       state.showMore2 = true;
       state.showHidden2 = false;
       document
-        .getElementById("ProjCheckship")
-        .querySelector("#selectedsBox2").style.overflow = "hidden";
+          .getElementById("ProjCheckship")
+          .querySelector("#selectedsBox2").style.overflow = "hidden";
       document
-        .getElementById("ProjCheckship")
-        .querySelector("#selectedsBox2").style.height = "160px";
+          .getElementById("ProjCheckship")
+          .querySelector("#selectedsBox2").style.height = "160px";
     };
 
     // 结束 受众关联------------------------------------------------------------------
@@ -1352,8 +1346,8 @@ export default {
       let choosepeople = [];
       state.choosepeople.map((value) => {
         let obj = {
-          id: value.key,
-          name: value.name,
+          id: value.id,
+          name: value.realName,
         };
         choosepeople.push(obj);
       });
@@ -1385,13 +1379,13 @@ export default {
       let obj = {
         keyWord: "",
         type:
-          props.classify === "learnPath"
-            ? 1
-            : props.classify === "project"
-            ? 2
-            : props.classify === "course"
-            ? 3
-            : null,
+            props.classify === "learnPath"
+                ? 1
+                : props.classify === "project"
+                    ? 2
+                    : props.classify === "course"
+                        ? 3
+                        : null,
         tag: props.authClassify === 1 ? 3 : props.authClassify === 2 ? 4 : "",
         opt: 1,
         refId: props.selectProjectId,
@@ -1403,49 +1397,49 @@ export default {
       };
       console.log("获取权限名单obj", obj);
       api
-        .optionAuthPerm(obj)
-        .then((res) => {
-          // console.log("获取权限名单成功", res);
-          if (res.data.code === 200) {
-            let studentArr = res.data.data.studentList;
-            let selectedRowKeys = [];
-            let choosepeople = [];
-            for (let i = 0; i < studentArr.length; i++) {
-              selectedRowKeys.push(studentArr[i].id);
-              choosepeople.push(studentArr[i]);
-            }
-            //快速选人
-            state.selectedRowKeys = selectedRowKeys;
-            state.choosepeople = choosepeople;
+          .optionAuthPerm(obj)
+          .then((res) => {
+            // console.log("获取权限名单成功", res);
+            if (res.data.code === 200) {
+              let studentArr = res.data.data.studentList;
+              let selectedRowKeys = [];
+              let choosepeople = [];
+              for (let i = 0; i < studentArr.length; i++) {
+                selectedRowKeys.push(studentArr[i].id);
+                choosepeople.push(studentArr[i]);
+              }
+              //快速选人
+              state.selectedRowKeys = selectedRowKeys;
+              state.choosepeople = choosepeople;
 
-            let deptArr = res.data.data.deptList;
-            let selectedKeys1 = [];
-            let chooseorganization = [];
-            for (let i = 0; i < deptArr.length; i++) {
-              selectedKeys1.push(deptArr[i].id);
-              chooseorganization.push(deptArr[i]);
-            }
-            //组织
-            state.selectedKeys1 = selectedKeys1;
-            state.chooseorganization = chooseorganization;
-            state.chooseorganization1 = chooseorganization;
+              let deptArr = res.data.data.deptList;
+              let selectedKeys1 = [];
+              let chooseorganization = [];
+              for (let i = 0; i < deptArr.length; i++) {
+                selectedKeys1.push(deptArr[i].id);
+                chooseorganization.push(deptArr[i]);
+              }
+              //组织
+              state.selectedKeys1 = selectedKeys1;
+              state.chooseorganization = chooseorganization;
+              state.chooseorganization1 = chooseorganization;
 
-            let groupArr = res.data.data.groupList;
-            let selectedRowKeys2 = [];
-            let relationpeople = [];
-            for (let i = 0; i < groupArr.length; i++) {
-              selectedRowKeys2.push(groupArr[i].id);
-              relationpeople.push(groupArr[i]);
+              let groupArr = res.data.data.groupList;
+              let selectedRowKeys2 = [];
+              let relationpeople = [];
+              for (let i = 0; i < groupArr.length; i++) {
+                selectedRowKeys2.push(groupArr[i].id);
+                relationpeople.push(groupArr[i]);
+              }
+              //受众
+              state.selectedRowKeys2 = selectedRowKeys2;
+              state.relationpeople = relationpeople;
+              console.log("获取权限名单成功", res);
             }
-            //受众
-            state.selectedRowKeys2 = selectedRowKeys2;
-            state.relationpeople = relationpeople;
-            console.log("获取权限名单成功", res);
-          }
-        })
-        .catch((err) => {
-          console.log("获取权限名单失败", err);
-        });
+          })
+          .catch((err) => {
+            console.log("获取权限名单失败", err);
+          });
     };
 
     return {
@@ -1501,6 +1495,7 @@ export default {
   .ant-drawer-content-wrapper {
     max-width: 1300px !important;
   }
+
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
@@ -1508,6 +1503,7 @@ export default {
     display: flex;
     flex-direction: column;
     overflow-x: auto;
+
     .header {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;
@@ -1517,6 +1513,7 @@ export default {
       align-items: center;
       // background-color: red;
       margin-bottom: 20px;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -1525,6 +1522,7 @@ export default {
         // margin-left: 24px;
       }
     }
+
     .main {
       display: flex;
       //  min-width: 1200px;
@@ -1538,31 +1536,38 @@ export default {
         flex-shrink: 0;
         // height: 100%;
         border-right: 1px solid rgba(233, 233, 233, 1);
+
         .tabs {
           margin-right: 33px;
+
           .tab1 {
             display: flex;
             flex-wrap: wrap;
             // justify-content: space-between;
             align-items: center;
+
             .t1 {
               display: flex;
               align-items: center;
               margin-bottom: 5px;
             }
+
             .nameinp {
               display: flex;
               align-items: center;
               margin-top: 10px;
+
               .namee {
                 color: rgba(0, 0, 0, 0.85);
                 font-size: 14px;
               }
             }
+
             .btns {
               display: flex;
               margin-top: 10px;
               margin-left: 34px;
+
               .btn1 {
                 width: 100px;
                 height: 40px;
@@ -1576,10 +1581,12 @@ export default {
                 border-radius: 8px;
                 border: 1px solid #409eff;
                 cursor: pointer;
+
                 .wz {
                   margin-left: 10px;
                 }
               }
+
               .btn2 {
                 width: 100px;
                 height: 40px;
@@ -1592,15 +1599,18 @@ export default {
                 border-radius: 8px;
                 cursor: pointer;
                 border: 1px solid #409eff;
+
                 .wz {
                   margin-left: 10px;
                 }
               }
             }
           }
+
           .btns {
             display: flex;
             margin-top: 10px;
+
             .btn1 {
               width: 100px;
               height: 40px;
@@ -1614,10 +1624,12 @@ export default {
               border-radius: 8px;
               border: 1px solid #409eff;
               cursor: pointer;
+
               .wz {
                 margin-left: 10px;
               }
             }
+
             .btn2 {
               width: 100px;
               height: 40px;
@@ -1630,11 +1642,13 @@ export default {
               border-radius: 8px;
               cursor: pointer;
               border: 1px solid #409eff;
+
               .wz {
                 margin-left: 10px;
               }
             }
           }
+
           .line {
             width: 100%;
             height: 40px;
@@ -1691,9 +1705,11 @@ export default {
               }
             }
           }
+
           .chooseLeft {
             display: flex;
             justify-content: space-between;
+
             .boeTree {
               margin-right: 20px;
               // margin-top: 20px;
@@ -1726,6 +1742,7 @@ export default {
                 margin-bottom: 8px;
                 margin-top: 20px;
               }
+
               .treeMain {
                 width: 280px;
                 border-radius: 4px;
@@ -1735,46 +1752,56 @@ export default {
                 padding-top: 10px;
                 padding-left: 5px;
               }
+
               .ant-tree .ant-tree-node-content-wrapper {
                 flex-shrink: 0;
               }
+
               .ant-tree-indent-unit {
                 width: 5px;
               }
+
               .ant-tree
-                .ant-tree-node-content-wrapper-normal.ant-tree-node-selected {
+              .ant-tree-node-content-wrapper-normal.ant-tree-node-selected {
                 background-color: rgba(255, 255, 255, 0);
                 color: #409eff;
               }
+
               .ant-tree .ant-tree-node-selected {
                 background-color: rgba(255, 255, 255, 0);
                 // color:#409EFF;
               }
+
               //               .ant-tree .ant-tree-title{
               // background-color: pink;
               //               }
             }
+
             .tabb {
               .ant-table-thead > tr > th {
                 background-color: rgba(240, 246, 252, 1);
                 color: rgba(0, 0, 0, 0.85);
               }
+
               .ant-table-tbody > tr > td {
                 border-bottom: 1px solid #f0f6fc;
                 color: rgba(0, 0, 0, 0.65);
               }
+
               th.h {
                 background-color: #eff4fc !important;
               }
 
               .ant-table-tbody
-                > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-                > td {
+              > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+              > td {
                 background: rgba(250, 250, 250, 1);
               }
+
               .ant-table-selection-column {
                 padding: 0 !important;
               }
+
               // table tr td.ant-table-selection-column {
               //   text-align: right;
               // }
@@ -1808,10 +1835,12 @@ export default {
             // margin-top: 10px;
             flex-wrap: wrap;
             justify-content: space-between;
+
             .nameinp {
               display: flex;
               align-items: center;
               margin-top: 10px;
+
               .namee {
                 color: rgba(0, 0, 0, 0.85);
                 font-size: 14px;
@@ -1823,6 +1852,7 @@ export default {
               align-items: center;
               margin-bottom: 5px;
             }
+
             .btns {
               display: flex;
               // margin-top: -10px;
@@ -1839,10 +1869,12 @@ export default {
                 border-radius: 8px;
                 border: 1px solid #409eff;
                 cursor: pointer;
+
                 .wz {
                   margin-left: 10px;
                 }
               }
+
               .btn2 {
                 width: 100px;
                 height: 40px;
@@ -1855,11 +1887,13 @@ export default {
                 border-radius: 8px;
                 cursor: pointer;
                 border: 1px solid #409eff;
+
                 .wz {
                   margin-left: 10px;
                 }
               }
             }
+
             .organize {
               color: rgba(0, 0, 0, 0.85);
               font-size: 14px;
@@ -1869,22 +1903,27 @@ export default {
             .ant-select-dropdown {
               min-width: 800px !important;
             }
+
             .ant-select {
               border-radius: 8px !important;
               // background-color: red;
             }
+
             .ant-cascader {
               width: 264px;
               height: 40px;
               border-radius: 8px !important;
+
               .ant-select-selector {
                 height: 100%;
               }
+
               .ant-select-selection-search-input {
                 height: 40px;
               }
             }
           }
+
           .boeTree {
             .boeTreeTitle {
               width: 280px;
@@ -1901,6 +1940,7 @@ export default {
               margin-bottom: 8px;
               margin-top: 20px;
             }
+
             .treeMain {
               width: 280px;
               border-radius: 4px;
@@ -1910,21 +1950,26 @@ export default {
               padding-top: 10px;
               padding-left: 5px;
             }
+
             .ant-tree .ant-tree-node-content-wrapper {
               flex-shrink: 0;
             }
+
             .ant-tree-indent-unit {
               width: 5px;
             }
+
             .ant-tree
-              .ant-tree-node-content-wrapper-normal.ant-tree-node-selected {
+            .ant-tree-node-content-wrapper-normal.ant-tree-node-selected {
               background-color: rgba(255, 255, 255, 0);
               color: #409eff;
             }
+
             .ant-tree .ant-tree-node-selected {
               background-color: rgba(255, 255, 255, 0);
               // color:#409EFF;
             }
+
             //               .ant-tree-switcher_open+ .ant-tree-checkbox{
             // display: none !important;
             //               }
@@ -1937,19 +1982,23 @@ export default {
           }
         }
       }
+
       .right {
         width: 320px;
         flex-shrink: 0;
         overflow-y: auto;
+
         .onerow {
           display: flex;
           justify-content: space-between;
           align-items: center;
           margin-right: 40px;
           flex-wrap: wrap;
+
           .onleft {
             display: flex;
             text-align: center;
+
             .already {
               color: rgba(51, 51, 51, 1);
               font-size: 16px;
@@ -1958,17 +2007,20 @@ export default {
               white-space: nowrap;
               // margin-bottom: 20px;
             }
+
             .count {
               color: #388be1;
               font-size: 16px;
               margin: 0 6px;
             }
+
             .peo {
               color: rgba(51, 51, 51, 1);
               font-size: 16px;
               font-weight: 500;
             }
           }
+
           .clbox {
             margin-left: 30px;
             display: flex;
@@ -1979,6 +2031,7 @@ export default {
             height: 32px;
             border-radius: 4px;
             background: #409eff;
+
             .colose {
               width: 16px;
               height: 16px;
@@ -1989,12 +2042,14 @@ export default {
               background-size: 100%;
               margin-right: 4px;
             }
+
             .allclear {
               color: rgba(255, 255, 255, 1);
               font-size: 14px;
             }
           }
         }
+
         .line {
           width: 90%;
           height: 1px;
@@ -2002,17 +2057,20 @@ export default {
           margin-left: 12px;
           margin-top: 20px;
         }
+
         .tit {
           font-size: 14px;
           font-weight: 500;
           margin-top: 12px;
           margin-left: 32px;
         }
+
         .selectedsBox {
           position: relative;
           // height: 160px;
           overflow: hidden;
         }
+
         .selecteds {
           display: flex;
           // flex-wrap:wrap;
@@ -2024,6 +2082,7 @@ export default {
           // height: 170px;
           // overflow: hidden;
           flex-shrink: 0;
+
           .chose {
             // width: 64px;
             padding-left: 10px;
@@ -2040,6 +2099,7 @@ export default {
             font-size: 12px;
             position: relative;
             flex-shrink: 0;
+
             .ch {
               position: absolute;
               width: 18px;
@@ -2052,6 +2112,7 @@ export default {
         }
       }
     }
+
     .btnn {
       height: 72px;
       width: 100%;
@@ -2063,6 +2124,7 @@ export default {
       align-items: center;
       justify-content: center;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
       .btn1 {
         width: 100px;
         height: 40px;
@@ -2072,6 +2134,7 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
+
       .btn2 {
         cursor: pointer;
         width: 100px;
@@ -2085,14 +2148,18 @@ export default {
     }
   }
 }
+
 .changetreedropdown {
   width: 500px !important;
+
   .ant-select-tree-list-scrollbar {
     width: 5px !important;
+
     .ant-select-tree-list-scrollbar-thumb {
       background-color: #4ea6ff !important;
     }
   }
+
   .ant-select-tree-indent-unit {
     width: 7px !important;
   }
@@ -2102,27 +2169,34 @@ export default {
   width: 240px !important;
   border-radius: 5px;
   min-height: 600px !important;
+
   .ant-select-tree-list-scrollbar {
     width: 5px !important;
+
     .ant-select-tree-list-scrollbar-thumb {
       background-color: #4ea6ff !important;
     }
   }
+
   .ant-select-tree-indent-unit {
     width: 7px !important;
   }
 }
+
 .confirmAddOrg {
   .ant-modal {
     width: 424px !important;
     height: 258px !important;
+
     .ant-modal-content {
       width: 424px !important;
       height: 258px !important;
+
       .ant-modal-body {
         width: 424px !important;
         height: 258px !important;
         padding: 0 !important;
+
         .delete {
           z-index: 999;
           width: 424px;
@@ -2139,19 +2213,22 @@ export default {
             width: calc(100%);
             height: 68px;
             background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
+                    rgba(78, 166, 255, 0.2) 0%,
+                    rgba(78, 166, 255, 0) 100%
             );
           }
+
           .del_main {
             width: 100%;
             position: relative;
+
             .header {
               display: flex;
               align-items: center;
               padding-top: 20px;
               padding-left: 26px;
               font-size: 16px;
+
               .icon {
                 width: 16px;
                 height: 16px;
@@ -2159,6 +2236,7 @@ export default {
                 background-image: url(@/assets/images/taskpage/gan.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -2169,6 +2247,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -2178,6 +2257,7 @@ export default {
               flex-direction: column;
               // background-color: red;
               position: relative;
+
               .back {
                 position: absolute;
                 top: 30px;
@@ -2186,10 +2266,12 @@ export default {
                 color: #666666;
               }
             }
+
             .del_btnbox {
               display: flex;
               margin: 30px auto;
               justify-content: center;
+
               .del_btn {
                 width: 100px;
                 height: 40px;
@@ -2201,17 +2283,20 @@ export default {
 
                 flex-shrink: 0;
                 cursor: pointer;
+
                 .btnText {
                   font-size: 14px;
                   font-weight: 400;
                   line-height: 40px;
                 }
               }
+
               .btn1 {
                 border: 1px solid rgba(64, 158, 255, 1);
                 color: #4ea6ff;
                 margin-right: 14px;
               }
+
               .btn2 {
                 background-color: #4ea6ff;
                 color: #ffffff;
@@ -2221,6 +2306,7 @@ export default {
         }
       }
     }
+
     .ant-modal-close-x {
       display: none;
     }
diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue
index 0f6616f1..40422f1f 100644
--- a/src/components/project/ProjectManagerNew.vue
+++ b/src/components/project/ProjectManagerNew.vue
@@ -61,12 +61,16 @@ watch(() => memberParam.value.pageNo, throttle(getPageMember, 500))
 
 onMounted(() => {
   console.log('onMounted')
+  const memberOptions = store.state.memberInitInfo.map(e => ({
+    label: e.realName,
+    value: e.id
+  }))
   if (props.value) {
     options.value = [...(props.value + '').split(',').map((value, i) => ({
       label: (props.name + '').split(',')[i],
       value
-    })), ...store.state.memberInitInfo]
-  } else options.value = store.state.memberInitInfo
+    })), ...memberOptions]
+  } else options.value = memberOptions
 })
 
 function getSearchMember() {
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index e0ff44a3..889990b4 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -6,53 +6,53 @@
       <div class="filterItems">
         <div class="select">
           <a-input
-            v-model:value="searchParam.name"
-            style="width: 270px; height: 40px; border-radius: 8px"
-            placeholder="请输入项目名称"
-            @change="sProjectNameChange"
-            allowClear
-            showSearch
+              v-model:value="searchParam.name"
+              style="width: 270px; height: 40px; border-radius: 8px"
+              placeholder="请输入项目名称"
+              @change="sProjectNameChange"
+              allowClear
+              showSearch
           >
           </a-input>
         </div>
         <div class="select">
           <a-input
-            v-model:value="searchParam.manager"
-            style="width: 270px; height: 40px; border-radius: 8px"
-            placeholder="请输入项目经理"
-            @change="sProjectOrderChange"
-            allowClear
-            showSearch
+              v-model:value="searchParam.manager"
+              style="width: 270px; height: 40px; border-radius: 8px"
+              placeholder="请输入项目经理"
+              @change="sProjectOrderChange"
+              allowClear
+              showSearch
           >
           </a-input>
         </div>
         <div class="select">
           <a-input
-            v-model:value="searchParam.createName"
-            style="width: 270px; height: 40px; border-radius: 8px"
-            placeholder="请输入项目创建人"
-            @change="sProjectCreateChange"
-            allowClear
-            showSearch
+              v-model:value="searchParam.createName"
+              style="width: 270px; height: 40px; border-radius: 8px"
+              placeholder="请输入项目创建人"
+              @change="sProjectCreateChange"
+              allowClear
+              showSearch
           >
           </a-input>
         </div>
         <div class="select">
           <a-select
-            v-model:value="searchParam.status"
-            style="width: 270px"
-            placeholder="请选择状态"
-            :options="sProjectStateList"
-            allowClear
-            showSearch
+              v-model:value="searchParam.status"
+              style="width: 270px"
+              placeholder="请选择状态"
+              :options="sProjectStateList"
+              allowClear
+              showSearch
           ></a-select>
         </div>
         <div class="select">
           <a-range-picker
-            v-model:value="searchParam.valueDate"
-            style="border-radius: 8px; height: 40px; margin-left: 5px"
-            :placeholder="['      开始时间', '        结束时间']"
-            valueFormat="X"
+              v-model:value="searchParam.valueDate"
+              style="border-radius: 8px; height: 40px; margin-left: 5px"
+              :placeholder="['      开始时间', '        结束时间']"
+              valueFormat="X"
           />
         </div>
         <div style="display: flex; margin-bottom: 20px">
@@ -77,26 +77,26 @@
     <!-- 表格 -->
     <div class="tableBox">
       <a-table
-        :columns="columns"
-        :data-source="tableData"
-        :loading="tableDataTotal === -1 ? true : false"
-        :scroll="{ x: 700 }"
-        @expand="expandTable"
-        :pagination="false"
+          :columns="columns"
+          :data-source="tableData"
+          :loading="tableDataTotal === -1 ? true : false"
+          :scroll="{ x: 700 }"
+          @expand="expandTable"
+          :pagination="false"
       >
       </a-table>
       <div class="tableBox">
         <div class="pa">
           <a-pagination
-            v-if="tableDataTotal > 10"
-            showSizeChanger="true"
-            showQuickJumper="true"
-            hideOnSinglePage="true"
-            :pageSize="pageSize"
-            v-model:current="searchParam.pageNo"
-            :total="tableDataTotal"
-            class="pagination"
-            @change="changePagination"
+              v-if="tableDataTotal > 10"
+              showSizeChanger="true"
+              showQuickJumper="true"
+              hideOnSinglePage="true"
+              :pageSize="pageSize"
+              v-model:current="searchParam.pageNo"
+              :total="tableDataTotal"
+              class="pagination"
+              @change="changePagination"
           />
         </div>
       </div>
@@ -105,18 +105,18 @@
     <!-- 无项目 -->
     <div class="tableBox" style="display: none">
       <div
-        class="taskbox"
-        @click="showModal1"
-        style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
+          class="taskbox"
+          @click="showModal1"
+          style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
       >
         <div class="leftt">
-          <img src="../../assets/images/taskpage/left2.png" />
+          <img src="../../assets/images/taskpage/left2.png"/>
         </div>
         <div class="photo">
-          <img src="../../assets/images/projectadd/nopro.png" />
+          <img src="../../assets/images/projectadd/nopro.png"/>
         </div>
         <div class="rightt">
-          <img src="../../assets/images/taskpage/right2.png" />
+          <img src="../../assets/images/taskpage/right2.png"/>
         </div>
         <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
           创建项目
@@ -127,18 +127,18 @@
     <!-- 创建多层项目弹窗 -->
     <div>
       <a-modal
-        v-model:visible="doublepro"
-        :title="null"
-        @ok="closeModal2"
-        :footer="null"
-        :closable="false"
-        wrapClassName="doublepro"
-        width="624px"
-        height="476px"
+          v-model:visible="doublepro"
+          :title="null"
+          @ok="closeModal2"
+          :footer="null"
+          :closable="false"
+          wrapClassName="doublepro"
+          width="624px"
+          height="476px"
       >
         <div
-          class="modalHeader"
-          style="
+            class="modalHeader"
+            style="
             width: 100%;
             height: 68px;
             display: flex;
@@ -148,49 +148,49 @@
         >
           <div class="headerLeft" style="margin-left: 32px">
             <span class="headerLeftText" style="font-size: 16px"
-              >{{ projectInfo.projectId ? "编辑" : "创建" }}多层项目</span
+            >{{ projectInfo.projectId ? "编辑" : "创建" }}多层项目</span
             >
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
             <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
+                style="width: 22px; height: 22px"
+                src="../../assets/images/basicinfo/close22.png"
             />
           </div>
         </div>
         <div class="modalMain">
           <div
-            style="margin-left: 40px; margin-top: 40px; width: 78%"
-            v-if="projectInfo.parentName"
+              style="margin-left: 40px; margin-top: 40px; width: 78%"
+              v-if="projectInfo.parentName"
           >
             <span style="color: #000000; font-size: 14px">项目归属：</span>
             <span style="color: #999999; font-size: 14px; margin-left: 10px">{{
-              projectInfo.parentName
-            }}</span>
+                projectInfo.parentName
+              }}</span>
           </div>
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
+                  style="width: 10px; height: 10px"
+                  src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">项目名称:</div>
             <div class="in">
               <a-input
-                v-model:value="projectInfo.name"
-                show-count
-                :maxlength="30"
-                placeholder="请输入项目名称"
-                style="border-radius: 8px"
+                  v-model:value="projectInfo.name"
+                  show-count
+                  :maxlength="30"
+                  placeholder="请输入项目名称"
+                  style="border-radius: 8px"
               />
             </div>
           </div>
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
+                  style="width: 10px; height: 10px"
+                  src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">分类:</div>
@@ -201,38 +201,38 @@
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
+                  style="width: 10px; height: 10px"
+                  src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">项目经理:</div>
             <div class="in">
               <ProjectManager
-                v-model:value="projectInfo.managerId"
-                v-model:name="projectInfo.manager"
-                mode="multiple"
+                  v-model:value="projectInfo.managerId"
+                  v-model:name="projectInfo.manager"
+                  mode="multiple"
               ></ProjectManager>
             </div>
           </div>
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
+                  style="width: 10px; height: 10px"
+                  src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">资源归属:</div>
             <div class="in select">
               <OrgClass
-                v-model:value="projectInfo.sourceBelongId"
-                v-model:name="projectInfo.sourceBelongName"
+                  v-model:value="projectInfo.sourceBelongId"
+                  v-model:name="projectInfo.sourceBelongName"
               ></OrgClass>
             </div>
           </div>
           <div class="pubtn">
             <a-button class="pubtn1" @click="closeModal2">取消</a-button>
             <a-button class="pubtn2" @click="createStoreyProject"
-              >确定
+            >确定
             </a-button>
           </div>
         </div>
@@ -241,18 +241,18 @@
     <!-- 创建多层项目弹窗 -->
     <div>
       <a-modal
-        v-model:visible="sonproject"
-        :title="null"
-        @ok="closeModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="sonproject"
-        width="764px"
-        height="356px"
+          v-model:visible="sonproject"
+          :title="null"
+          @ok="closeModal"
+          :footer="null"
+          :closable="false"
+          wrapClassName="sonproject"
+          width="764px"
+          height="356px"
       >
         <div
-          class="modalHeader"
-          style="
+            class="modalHeader"
+            style="
             width: 100%;
             height: 68px;
             display: flex;
@@ -262,53 +262,53 @@
         >
           <div class="headerLeft" style="margin-left: 32px">
             <span class="headerLeftText" style="font-size: 16px"
-              >请选择项目类别1</span
+            >请选择项目类别1</span
             >
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
             <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
+                style="width: 22px; height: 22px"
+                src="../../assets/images/basicinfo/close22.png"
             />
           </div>
         </div>
         <div class="modalMain">
           <div
-            @click="createChildProject"
-            class="taskbox"
-            style="
+              @click="createChildProject"
+              class="taskbox"
+              style="
               margin-right: 24px;
               background: linear-gradient(180deg, #ddeaff 0%, #f0f8fe 100%);
             "
           >
             <div class="leftt">
-              <img src="../../assets/images/taskpage/left2.png" />
+              <img src="../../assets/images/taskpage/left2.png"/>
             </div>
             <div class="photo">
-              <img src="../../assets/images/taskpage/picture4.png" />
+              <img src="../../assets/images/taskpage/picture4.png"/>
             </div>
             <div class="rightt">
-              <img src="../../assets/images/taskpage/right2.png" />
+              <img src="../../assets/images/taskpage/right2.png"/>
             </div>
             <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
               单层子项目
             </div>
           </div>
           <div
-            class="taskbox"
-            @click="showModal3"
-            style="
+              class="taskbox"
+              @click="showModal3"
+              style="
               background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%);
             "
           >
             <div class="leftt">
-              <img src="../../assets/images/taskpage/left1.png" />
+              <img src="../../assets/images/taskpage/left1.png"/>
             </div>
             <div class="photo">
-              <img src="../../assets/images/taskpage/picture5.png" />
+              <img src="../../assets/images/taskpage/picture5.png"/>
             </div>
             <div class="rightt">
-              <img src="../../assets/images/taskpage/right1.png" />
+              <img src="../../assets/images/taskpage/right1.png"/>
             </div>
             <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
               多层子项目
@@ -322,18 +322,18 @@
     <div>
       <div>
         <a-modal
-          v-model:visible="estabish"
-          :title="null"
-          @ok="closeModal1"
-          :footer="null"
-          :closable="false"
-          wrapClassName="estabish"
-          width="638px"
-          height="468px"
+            v-model:visible="estabish"
+            :title="null"
+            @ok="closeModal1"
+            :footer="null"
+            :closable="false"
+            wrapClassName="estabish"
+            width="638px"
+            height="468px"
         >
           <div
-            class="modalHeader"
-            style="
+              class="modalHeader"
+              style="
               width: 100%;
               height: 68px;
               display: flex;
@@ -343,39 +343,39 @@
           >
             <div class="headerLeft" style="margin-left: 32px">
               <span class="headerLeftText" style="font-size: 16px"
-                >请选择项目类别</span
+              >请选择项目类别</span
               >
             </div>
             <div
-              style="cursor: pointer; margin-right: 32px"
-              @click="closeModal1"
+                style="cursor: pointer; margin-right: 32px"
+                @click="closeModal1"
             >
               <img
-                style="width: 22px; height: 22px"
-                src="../../assets/images/basicinfo/close22.png"
+                  style="width: 22px; height: 22px"
+                  src="../../assets/images/basicinfo/close22.png"
               />
             </div>
           </div>
           <div class="modalMain">
             <router-link
-              :to="`/projectadd?parentId=${
+                :to="`/projectadd?parentId=${
                 projectInfo.parentId || ''
               }&parentName=${projectInfo.parentName || ''}`"
             >
               <div
-                class="taskbox"
-                style="
+                  class="taskbox"
+                  style="
                   background: linear-gradient(180deg, #ddeaff 0%, #f0f8fe 100%);
                 "
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left2.png" />
+                  <img src="../../assets/images/taskpage/left2.png"/>
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture6.png" />
+                  <img src="../../assets/images/taskpage/picture6.png"/>
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right2.png" />
+                  <img src="../../assets/images/taskpage/right2.png"/>
                 </div>
                 <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
                   单层项目
@@ -386,21 +386,21 @@
               </div>
             </router-link>
             <div
-              class="taskbox"
-              @click="showModal2"
-              style="
+                class="taskbox"
+                @click="showModal2"
+                style="
                 margin-bottom: 40px;
                 background: linear-gradient(180deg, #e5f6ec 0%, #eef9f3 100%);
               "
             >
               <div class="leftt">
-                <img src="../../assets/images/taskpage/left3.png" />
+                <img src="../../assets/images/taskpage/left3.png"/>
               </div>
               <div class="photo">
-                <img src="../../assets/images/taskpage/picture7.png" />
+                <img src="../../assets/images/taskpage/picture7.png"/>
               </div>
               <div class="rightt">
-                <img src="../../assets/images/taskpage/right3.png" />
+                <img src="../../assets/images/taskpage/right3.png"/>
               </div>
               <div class="centerbox1" style="color: rgba(93, 201, 136, 1)">
                 多层项目
@@ -417,11 +417,11 @@
     <!-- 编辑多层项目弹窗 - end -->
     <!-- 复制路径弹窗 -->
     <a-modal
-      v-model:visible="copyModal"
-      :footer="null"
-      :closable="closeCopy"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="copyModal"
+        :footer="null"
+        :closable="closeCopy"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -447,11 +447,11 @@
     </a-modal>
     <!-- 结束项目弹窗 -->
     <a-modal
-      v-model:visible="stopModal"
-      :footer="null"
-      :closable="closeStop"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="stopModal"
+        :footer="null"
+        :closable="closeStop"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -480,11 +480,11 @@
     </a-modal>
     <!-- 删除项目弹窗 -->
     <a-modal
-      v-model:visible="deleteModal"
-      :footer="null"
-      :closable="closeDelete"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="deleteModal"
+        :footer="null"
+        :closable="closeDelete"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -510,11 +510,11 @@
     </a-modal>
     <!-- 存为模版弹窗 -->
     <a-modal
-      v-model:visible="startModal"
-      :footer="null"
-      :closable="closeStart"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="startModal"
+        :footer="null"
+        :closable="closeStart"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -540,17 +540,17 @@
     </a-modal>
     <!-- 发布弹窗 -->
     <a-modal
-      v-model:visible="projectPub"
-      :title="null"
-      :footer="null"
-      :closable="false"
-      wrapClassName="projectPub"
-      width="679px"
-      height="437px"
+        v-model:visible="projectPub"
+        :title="null"
+        :footer="null"
+        :closable="false"
+        wrapClassName="projectPub"
+        width="679px"
+        height="437px"
     >
       <div
-        class="modalHeader"
-        style="
+          class="modalHeader"
+          style="
           width: 100%;
           height: 68px;
           display: flex;
@@ -560,21 +560,21 @@
       >
         <div class="headerLeft" style="margin-left: 32px">
           <span style="width: 15px; height: 15px"
-            ><img src="../../assets/images/taskpage/pub.png"
+          ><img src="../../assets/images/taskpage/pub.png"
           /></span>
           <span
-            class="headerLeftText"
-            style="font-size: 16px; margin-left: 10px"
-            >项目发布</span
+              class="headerLeftText"
+              style="font-size: 16px; margin-left: 10px"
+          >项目发布</span
           >
         </div>
         <div
-          style="cursor: pointer; margin-right: 32px"
-          @click="closeProjectPub"
+            style="cursor: pointer; margin-right: 32px"
+            @click="closeProjectPub"
         >
           <img
-            style="width: 22px; height: 22px"
-            src="../../assets/images/basicinfo/close22.png"
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
           />
         </div>
       </div>
@@ -616,11 +616,11 @@
     </a-modal>
     <!-- 撤回路径弹窗 -->
     <a-modal
-      v-model:visible="backModal"
-      :footer="null"
-      :closable="closeBack"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="backModal"
+        :footer="null"
+        :closable="closeBack"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -647,11 +647,11 @@
     </a-modal>
     <!-- 创建项目提示框 -->
     <a-modal
-      v-model:visible="reminderModal"
-      :footer="null"
-      :closable="closeBack"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="reminderModal"
+        :footer="null"
+        :closable="closeBack"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -676,11 +676,11 @@
     </a-modal>
     <!-- 项目提交审核弹窗 -->
     <a-modal
-      v-model:visible="reviewModal"
-      :footer="null"
-      :closable="false"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="reviewModal"
+        :footer="null"
+        :closable="false"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -707,11 +707,11 @@
     </a-modal>
     <!-- 项目撤回审核弹窗 -->
     <a-modal
-      v-model:visible="recallReviewModal"
-      :footer="null"
-      :closable="false"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="recallReviewModal"
+        :footer="null"
+        :closable="false"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -738,48 +738,48 @@
     </a-modal>
     <!-- 授权名单抽屉 -->
     <proj-power-list
-      v-model:ProjPvisible="ProjPvisible"
-      :selectProjectId="selectProjectId"
-      classify="project"
+        v-model:ProjPvisible="ProjPvisible"
+        :selectProjectId="selectProjectId"
+        classify="project"
     />
     <!-- 归属权抽屉 -->
     <proj-owner-ship
-      v-model:ProjOwnervisible="ProjOwnervisible"
-      :selectProjectId="selectProjectId"
-      classify="project"
+        v-model:ProjOwnervisible="ProjOwnervisible"
+        :selectProjectId="selectProjectId"
+        classify="project"
     />
     <!-- 查看权抽屉 -->
     <proj-check-ship
-      v-model:ProjCheckvisible="ProjCheckvisible"
-      :selectProjectId="selectProjectId"
-      v-model:addAuthList="addAuthList"
-      :authClassify="authClassify"
-      classify="project"
+        v-model:ProjCheckvisible="ProjCheckvisible"
+        :selectProjectId="selectProjectId"
+        v-model:addAuthList="addAuthList"
+        :authClassify="authClassify"
+        classify="project"
     />
     <!-- 管理权抽屉 -->
     <proj-check-ship
-      v-model:ProjCheckvisible="ProjCheckvisible"
-      :selectProjectId="selectProjectId"
-      v-model:addAuthList="addAuthList"
-      :authClassify="authClassify"
-      classify="project"
+        v-model:ProjCheckvisible="ProjCheckvisible"
+        :selectProjectId="selectProjectId"
+        v-model:addAuthList="addAuthList"
+        :authClassify="authClassify"
+        classify="project"
     />
   </div>
 </template>
 <script>
-import { reactive, toRefs, ref, watch } from "vue";
-import { message } from "ant-design-vue";
-import { useRouter } from "vue-router";
+import {reactive, toRefs, ref, watch} 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 * as api from "../../api/index";
 import * as api1 from "../../api/index1";
-import { toDate } from "../../api/method";
-import { storage } from "../../api/storage";
+import {storage} from "../../api/storage";
 import ProjectManager from "@/components/project/ProjectManager";
 import ProjectClass from "@/components/project/ProjectClass";
 import OrgClass from "@/components/project/OrgClass";
+
 export default {
   name: "projectManage",
   components: {
@@ -863,20 +863,21 @@ export default {
     // 数据接入 - start -
     const router = useRouter();
     const sProjectStateList = ref([
-      { value: 0, label: "草稿" },
-      { value: 1, label: "审核中" },
-      { value: 2, label: "审核通过" },
-      { value: 3, label: "已发布" },
-      { value: -2, label: "未通过" },
+      {value: 0, label: "草稿"},
+      {value: 1, label: "审核中"},
+      {value: 2, label: "审核通过"},
+      {value: 3, label: "已发布"},
+      {value: -2, label: "未通过"},
     ]);
     const searchReset = () => {
-      state.searchParam = { pageNo: 1, pageSize: 10 };
+      state.searchParam = {pageNo: 1, pageSize: 10};
       getTableDate();
     };
     const searchSubmit = () => {
       state.searchParam.pageNo = 1;
       getTableDate();
     };
+
     function timeChange(e) {
       console.log(e);
       if (e && e.length === 2) {
@@ -887,6 +888,7 @@ export default {
         state.searchParam.endTime = "";
       }
     }
+
     function validate(obj, errorMsgs) {
       for (let i in errorMsgs) {
         if (!obj[i]) {
@@ -897,6 +899,7 @@ export default {
       }
       return true;
     }
+
     // 创建多层项目
     const createStoreyProject = () => {
       // 接口需要传递的参数信息
@@ -961,18 +964,18 @@ export default {
       state.releaseProjectTime = object.time;
       console.log("object", object);
       api
-        .getProjectCount(object.projectId)
-        .then((res) => {
-          if (res.status === 200) {
-            console.log("获取关卡、任务、学员统计数据", res.data);
-            state.projectStudentsNum = res.data.students;
-            state.projectStages = res.data.stages;
-            state.projectTasks = res.data.tasks;
-          }
-        })
-        .catch((err) => {
-          console.log("err", err);
-        });
+          .getProjectCount(object.projectId)
+          .then((res) => {
+            if (res.status === 200) {
+              console.log("获取关卡、任务、学员统计数据", res.data);
+              state.projectStudentsNum = res.data.students;
+              state.projectStages = res.data.stages;
+              state.projectTasks = res.data.tasks;
+            }
+          })
+          .catch((err) => {
+            console.log("err", err);
+          });
       // //获取学员总数
       // let obj = {
       //   pageNo: 0,
@@ -1002,17 +1005,17 @@ export default {
         type: 4,
       };
       api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("发布成功", res);
-          message.destroy();
-          message.success("发布成功");
-          state.projectPub = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("发布失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("发布成功", res);
+            message.destroy();
+            message.success("发布成功");
+            state.projectPub = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("发布失败", err);
+          });
     };
     //关闭发布弹窗
     const closeProjectPub = () => {
@@ -1030,17 +1033,17 @@ export default {
         type: -4,
       };
       api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("撤回成功", res);
-          message.destroy();
-          message.success("撤回成功");
-          state.backModal = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("撤回失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("撤回成功", res);
+            message.destroy();
+            message.success("撤回成功");
+            state.backModal = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("撤回失败", err);
+          });
     };
     //关闭撤回弹窗
     const closeBackModal = () => {
@@ -1058,17 +1061,17 @@ export default {
         type: -1,
       };
       api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("结束成功", res);
-          message.destroy();
-          message.success("已结束");
-          state.stopModal = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("结束失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("结束成功", res);
+            message.destroy();
+            message.success("已结束");
+            state.stopModal = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("结束失败", err);
+          });
     };
     //关闭结束弹窗
     const closeStopModal = () => {
@@ -1086,17 +1089,17 @@ export default {
         type: -2,
       };
       api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("删除成功", res);
-          message.destroy();
-          message.success("删除成功");
-          state.deleteModal = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("删除失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("删除成功", res);
+            message.destroy();
+            message.success("删除成功");
+            state.deleteModal = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("删除失败", err);
+          });
     };
     //关闭删除弹窗
     const closeDeleteModal = () => {
@@ -1141,17 +1144,17 @@ export default {
         type: 2,
       };
       api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("复制成功", res);
-          message.destroy();
-          message.success("复制成功");
-          state.copyModal = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("复制失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("复制成功", res);
+            message.destroy();
+            message.success("复制成功");
+            state.copyModal = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("复制失败", err);
+          });
     };
     //打开提交审核弹窗
     const showReviewModal = (projectId) => {
@@ -1166,17 +1169,17 @@ export default {
       };
       console.log("提交审核obj", obj);
       api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("提交成功", res);
-          message.destroy();
-          message.success("提交成功");
-          state.reviewModal = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("提交失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("提交成功", res);
+            message.destroy();
+            message.success("提交成功");
+            state.reviewModal = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("提交失败", err);
+          });
     };
     //关闭提交审核弹窗
     const closeReviewModal = () => {
@@ -1195,17 +1198,17 @@ export default {
       };
       console.log("撤回成功obj", obj);
       api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("撤回成功", res);
-          message.destroy();
-          message.success("撤回成功");
-          state.recallReviewModal = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("撤回成功", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("撤回成功", res);
+            message.destroy();
+            message.success("撤回成功");
+            state.recallReviewModal = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("撤回成功", err);
+          });
     };
     //关闭提交审核弹窗
     const closeRecallReviewModal = () => {
@@ -1247,26 +1250,26 @@ export default {
         align: "center",
         customRender: (value) => {
           return (
-            <div>
-              {value.record.status == 0 ||
-              value.record.status == 1 ||
-              value.record.status == 2 ||
-              value.record.status == -2
-                ? "草稿"
-                : value.record.status == 3 &&
-                  Number(value.record.beginTime) <
+              <div>
+                {value.record.status == 0 ||
+                value.record.status == 1 ||
+                value.record.status == 2 ||
+                value.record.status == -2
+                    ? "草稿"
+                    : value.record.status == 3 &&
+                    Number(value.record.beginTime) <
                     Math.ceil(new Date().getTime() / 1000)
-                ? "进行中"
-                : value.record.status == 3 &&
-                  Number(value.record.beginTime) >
-                    Math.ceil(new Date().getTime() / 1000) &&
-                  value.record.type !== 1 &&
-                  value.record.type !== 2
-                ? "未开始"
-                : value.record.status == -1
-                ? "已结束"
-                : "-"}
-            </div>
+                        ? "进行中"
+                        : value.record.status == 3 &&
+                        Number(value.record.beginTime) >
+                        Math.ceil(new Date().getTime() / 1000) &&
+                        value.record.type !== 1 &&
+                        value.record.type !== 2
+                            ? "未开始"
+                            : value.record.status == -1
+                                ? "已结束"
+                                : "-"}
+              </div>
           );
         },
       },
@@ -1287,21 +1290,21 @@ export default {
         align: "center",
         customRender: (value) => {
           return (
-            <div>
-              {value.record.type !== 3
-                ? "-"
-                : value.record.status == 0
-                ? "未审核"
-                : value.record.status == 1
-                ? "审核中"
-                : value.record.status == 2 ||
-                  value.record.status == 3 ||
-                  value.record.status == -1
-                ? "已审核"
-                : value.record.status == -2
-                ? "未通过"
-                : "-"}
-            </div>
+              <div>
+                {value.record.type !== 3
+                    ? "-"
+                    : value.record.status == 0
+                        ? "未审核"
+                        : value.record.status == 1
+                            ? "审核中"
+                            : value.record.status == 2 ||
+                            value.record.status == 3 ||
+                            value.record.status == -1
+                                ? "已审核"
+                                : value.record.status == -2
+                                    ? "未通过"
+                                    : "-"}
+              </div>
           );
         },
       },
@@ -1322,256 +1325,249 @@ export default {
         customRender: (value) => {
           // console.log("value", value.record.type, value.record.status);
           return (
-            <div className="operation">
-              {value.record.status === 0 || value.record.status === -2 ? (
-                <span
-                  onClick={() => {
-                    if (value.record.type === 1 || value.record.type === 2) {
-                      state.doublepro = true;
-                      state.projectInfo = value.record;
-                    } else {
-                      console.log(value.record);
-                      router.push({
-                        path: "/projectadd",
-                        query: {
-                          projectId: value.record.projectId,
-                          parentId: value.record.parentId,
-                          parentName: value.record.parentName,
-                        },
-                      });
-                    }
-                  }}
-                  style="cursor:pointer;"
-                  className="operation1"
-                >
+              <div className="operation">
+                {value.record.status === 0 || value.record.status === -2 ? (
+                    <span
+                        onClick={() => {
+                          if (value.record.type === 1 || value.record.type === 2) {
+                            state.doublepro = true;
+                            state.projectInfo = value.record;
+                          } else {
+                            console.log(value.record);
+                            router.push({
+                              path: "/projectadd",
+                              query: {
+                                projectId: value.record.projectId,
+                                parentId: value.record.parentId,
+                                parentName: value.record.parentName,
+                              },
+                            });
+                          }
+                        }}
+                        style="cursor:pointer;"
+                        className="operation1"
+                    >
                   编辑
                 </span>
-              ) : (
-                ""
-              )}
-              {(value.record.status === 0 || value.record.status === -2) &&
-              value.record.type === 3 ? (
-                <span
-                  onClick={() => {
-                    showReviewModal(value.record.projectId);
-                  }}
-                  style="cursor:pointer"
-                  class="operation3"
-                >
+                ) : (
+                    ""
+                )}
+                {(value.record.status === 0 || value.record.status === -2) &&
+                value.record.type === 3 ? (
+                    <span
+                        onClick={() => {
+                          showReviewModal(value.record.projectId);
+                        }}
+                        style="cursor:pointer"
+                        class="operation3"
+                    >
                   提交审核
                 </span>
-              ) : (
-                ""
-              )}
-              {value.record.status === 1 && value.record.type !== 1 ? (
-                <span
-                  onClick={() => {
-                    showRecallReviewModal(value.record.projectId);
-                  }}
-                  style="cursor:pointer"
-                  class="operation3"
-                >
+                ) : (
+                    ""
+                )}
+                {value.record.status === 1 && value.record.type !== 1 ? (
+                    <span
+                        onClick={() => {
+                          showRecallReviewModal(value.record.projectId);
+                        }}
+                        style="cursor:pointer"
+                        class="operation3"
+                    >
                   撤回审核
                 </span>
-              ) : (
-                ""
-              )}
-              {value.record.status === 2 ? (
-                <span
-                  onClick={() => {
-                    console.log("value.record", value.record);
-                    let beginTime = value.record.beginTime
-                      ? toDate(value.record.beginTime, "Y/M/D")
-                      : "";
-                    let endTime = value.record.beginTime
-                      ? toDate(value.record.endTime, "Y/M/D")
-                      : "";
-                    let time =
-                      beginTime && endTime ? beginTime + "-" + endTime : "";
-                    let obj = {
-                      projectId: value.record.projectId,
-                      name: value.record.name,
-                      time: time,
-                    };
-                    showProjectPub(obj);
-                  }}
-                  style="cursor:pointer"
-                  class="operation3"
-                >
+                ) : (
+                    ""
+                )}
+                {value.record.status === 2 ? (
+                    <span
+                        onClick={() => {
+                          let time = value.record.beginTime + "-" + value.record.beginTime;
+                          let obj = {
+                            projectId: value.record.projectId,
+                            name: value.record.name,
+                            time: time,
+                          };
+                          showProjectPub(obj);
+                        }}
+                        style="cursor:pointer"
+                        class="operation3"
+                    >
                   发布
                 </span>
-              ) : (
-                ""
-              )}
-              <div className="tableSelect">
-                <a-select
-                  style="width: 50px"
-                  value="授权"
-                  // options={state.projectNameList}
-                  dropdownClassName="tabledropdown"
-                >
-                  <a-select-option value="权限名单" label="权限名单">
-                    <div
-                      onClick={() => {
-                        showProjPrower(value.record.projectId);
-                      }}
+                ) : (
+                    ""
+                )}
+                <div className="tableSelect">
+                  <a-select
+                      style="width: 50px"
+                      value="授权"
+                      // options={state.projectNameList}
+                      dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="权限名单" label="权限名单">
+                      <div
+                          onClick={() => {
+                            showProjPrower(value.record.projectId);
+                          }}
+                      >
+                        权限名单
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="归属权" label="归属权">
+                      <div
+                          onClick={() => {
+                            console.log("点击了111");
+                            showProjOwner(value.record.projectId);
+                          }}
+                      >
+                        归属权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="查看权" label="查看权">
+                      <div
+                          onClick={() => {
+                            console.log("点击了111");
+                            showProjCheck(value.record.projectId);
+                          }}
+                      >
+                        查看权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="管理权" label="管理权">
+                      <div
+                          onClick={() => {
+                            showProjManage(value.record.projectId);
+                          }}
+                      >
+                        管理权
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+                {value.record.type === 1 ? (
+                    <span
+                        className="operation3"
+                        style="cursor: pointer"
+                        onClick={() => {
+                          state.projectInfo = {
+                            parentName: value.record.name,
+                            parentId: value.record.projectId,
+                            type: 2,
+                          };
+                          state.reminderModal = true;
+                        }}
                     >
-                      权限名单
-                    </div>
-                  </a-select-option>
-                  <a-select-option value="归属权" label="归属权">
-                    <div
-                      onClick={() => {
-                        console.log("点击了111");
-                        showProjOwner(value.record.projectId);
-                      }}
-                    >
-                      归属权
-                    </div>
-                  </a-select-option>
-                  <a-select-option value="查看权" label="查看权">
-                    <div
-                      onClick={() => {
-                        console.log("点击了111");
-                        showProjCheck(value.record.projectId);
-                      }}
-                    >
-                      查看权
-                    </div>
-                  </a-select-option>
-                  <a-select-option value="管理权" label="管理权">
-                    <div
-                      onClick={() => {
-                        showProjManage(value.record.projectId);
-                      }}
-                    >
-                      管理权
-                    </div>
-                  </a-select-option>
-                </a-select>
-              </div>
-              {value.record.type === 1 ? (
-                <span
-                  className="operation3"
-                  style="cursor: pointer"
-                  onClick={() => {
-                    state.projectInfo = {
-                      parentName: value.record.name,
-                      parentId: value.record.projectId,
-                      type: 2,
-                    };
-                    state.reminderModal = true;
-                  }}
-                >
                   创建子项目
                 </span>
-              ) : (
-                ""
-              )}
-              {value.record.type === 2 ? (
-                <span
-                  className="operation3"
-                  style="cursor: pointer"
-                  onClick={() => {
-                    router.push({
-                      path: "/projectadd",
-                      query: {
-                        parentId: value.record.projectId,
-                        parentName: value.record.name,
-                      },
-                    });
-                  }}
-                >
-                  创建班级
-                </span>
-              ) : (
-                ""
-              )}
-              <div className="tableSelect">
-                <a-select
-                  style="width: 50px"
-                  value="更多"
-                  // options={state.projectNameList}
-                  dropdownClassName="tabledropdown"
-                >
-                  <a-select-option value="复制" label="复制">
-                    <div
-                      onClick={() => {
-                        showCopyModal(value.record.projectId);
-                      }}
-                    >
-                      复制
-                    </div>
-                  </a-select-option>
-                  <a-select-option value="删除" label="删除">
-                    <div
-                      onClick={() => {
-                        showDeleteModal(value.record.projectId);
-                      }}
-                    >
-                      删除
-                    </div>
-                  </a-select-option>
-                  {value.record.type === 3 ? (
-                    <a-select-option value="存为模版" label="存为模版">
-                      <div
-                        onClick={() => {
-                          showStartModal(value.record.projectId);
-                        }}
-                      >
-                        存为模版
-                      </div>
-                    </a-select-option>
-                  ) : (
+                ) : (
                     ""
-                  )}
-                  {value.record.type === 3 ? (
-                    <a-select-option value="基础信息" label="基础信息">
-                      <div
+                )}
+                {value.record.type === 2 ? (
+                    <span
+                        className="operation3"
+                        style="cursor: pointer"
                         onClick={() => {
                           router.push({
-                            path: "/taskpage",
+                            path: "/projectadd",
+                            query: {
+                              parentId: value.record.projectId,
+                              parentName: value.record.name,
+                            },
                           });
-                          storage.set("projectId", value.record.projectId);
                         }}
+                    >
+                  创建班级
+                </span>
+                ) : (
+                    ""
+                )}
+                <div className="tableSelect">
+                  <a-select
+                      style="width: 50px"
+                      value="更多"
+                      // options={state.projectNameList}
+                      dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="复制" label="复制">
+                      <div
+                          onClick={() => {
+                            showCopyModal(value.record.projectId);
+                          }}
                       >
-                        基础信息
+                        复制
                       </div>
                     </a-select-option>
-                  ) : (
-                    ""
-                  )}
-                </a-select>
+                    <a-select-option value="删除" label="删除">
+                      <div
+                          onClick={() => {
+                            showDeleteModal(value.record.projectId);
+                          }}
+                      >
+                        删除
+                      </div>
+                    </a-select-option>
+                    {value.record.type === 3 ? (
+                        <a-select-option value="存为模版" label="存为模版">
+                          <div
+                              onClick={() => {
+                                showStartModal(value.record.projectId);
+                              }}
+                          >
+                            存为模版
+                          </div>
+                        </a-select-option>
+                    ) : (
+                        ""
+                    )}
+                    {value.record.type === 3 ? (
+                        <a-select-option value="基础信息" label="基础信息">
+                          <div
+                              onClick={() => {
+                                router.push({
+                                  path: "/taskpage",
+                                });
+                                storage.set("projectId", value.record.projectId);
+                              }}
+                          >
+                            基础信息
+                          </div>
+                        </a-select-option>
+                    ) : (
+                        ""
+                    )}
+                  </a-select>
+                </div>
               </div>
-            </div>
           );
         },
       },
     ]);
     const getTableDate = () =>
-      api
-        .getProjectList({
-          ...state.searchParam,
-          beginTime:
-            state.searchParam.valueDate &&
-            state.searchParam.valueDate.length === 2
-              ? state.searchParam.valueDate[0]
-              : "",
-          endTime:
-            state.searchParam.valueDate &&
-            state.searchParam.valueDate.length === 2
-              ? state.searchParam.valueDate[1]
-              : "",
-        })
-        .then((res) => {
-          console.log(res);
-          state.tableDataTotal = Number(res.data.data.total);
-          const data = res.data.data.rows;
-          initDataSublist("", data);
-          console.log(data);
-          tableData.value = data;
-          console.log("tableData", tableData);
-        });
+        api
+            .getProjectList({
+              ...state.searchParam,
+              beginTime:
+                  state.searchParam.valueDate &&
+                  state.searchParam.valueDate.length === 2
+                      ? state.searchParam.valueDate[0]
+                      : "",
+              endTime:
+                  state.searchParam.valueDate &&
+                  state.searchParam.valueDate.length === 2
+                      ? state.searchParam.valueDate[1]
+                      : "",
+            })
+            .then((res) => {
+              console.log(res);
+              state.tableDataTotal = Number(res.data.data.total);
+              const data = res.data.data.rows;
+              initDataSublist("", data);
+              console.log(data);
+              tableData.value = data;
+              console.log("tableData", tableData);
+            });
+
     function initDataSublist(parentName, data) {
       if (data && data.length) {
         data.forEach((e) => {
@@ -1582,6 +1578,7 @@ export default {
         });
       }
     }
+
     getTableDate();
     // 翻页
     const changePagination = (page) => {
@@ -1637,33 +1634,33 @@ export default {
     };
     //添加权限
     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],
-          keyWord: "",
-        };
-        console.log("obj", obj);
-        api1
-          .optionAuthPerm(obj)
-          .then((res) => {
-            console.log("添加授权成功", res);
-            message.success("添加授权成功");
-          })
-          .catch((err) => {
-            console.log("添加授权失败", err);
-          });
-      }
+        () => 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],
+            keyWord: "",
+          };
+          console.log("obj", obj);
+          api1
+              .optionAuthPerm(obj)
+              .then((res) => {
+                console.log("添加授权成功", res);
+                message.success("添加授权成功");
+              })
+              .catch((err) => {
+                console.log("添加授权失败", err);
+              });
+        }
     );
     return {
       ...toRefs(state),
@@ -1728,6 +1725,7 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
+
   .filter {
     margin-left: 38px;
     margin-right: 38px;
@@ -1735,13 +1733,16 @@ export default {
     display: flex;
     justify-content: space-between;
     flex-wrap: wrap;
+
     .filterItems {
       display: flex;
       flex-wrap: wrap;
+
       .select {
         margin-right: 20px;
         margin-bottom: 20px;
       }
+
       .btn {
         padding: 0px 26px 0px 26px;
         height: 38px;
@@ -1754,9 +1755,11 @@ export default {
         margin-right: 14px;
         flex-shrink: 0;
         cursor: pointer;
+
         .search {
           background-size: 100%;
         }
+
         .btnText {
           font-size: 14px;
           font-weight: 400;
@@ -1765,6 +1768,7 @@ export default {
           margin-left: 5px;
         }
       }
+
       .btnn {
         padding: 0px 26px 0px 26px;
         height: 38px;
@@ -1777,9 +1781,11 @@ export default {
         margin-right: 14px;
         flex-shrink: 0;
         cursor: pointer;
+
         .search {
           background-size: 100%;
         }
+
         .btnText {
           font-size: 14px;
           font-weight: 400;
@@ -1788,6 +1794,7 @@ export default {
           margin-left: 5px;
         }
       }
+
       .btn1 {
         .search {
           width: 15px;
@@ -1795,6 +1802,7 @@ export default {
           background-image: url("../../assets/images/courseManage/search0.png");
         }
       }
+
       .btn2 {
         .search {
           width: 16px;
@@ -1802,25 +1810,32 @@ export default {
           background-image: url("../../assets/images/courseManage/reset1.png");
         }
       }
+
       .btn1:hover {
         background: rgba(64, 158, 255, 0.76);
+
         .search {
           background-image: url("../../assets/images/courseManage/search0.png");
         }
+
         .btnText {
           color: #ffffff;
         }
       }
+
       .btn1:active {
         background: #0982ff;
       }
+
       .btn2:hover {
         background: rgba(64, 158, 255, 0.1);
       }
+
       .btn2:active {
         background: rgba(64, 158, 255, 0.2);
       }
     }
+
     .btns {
       display: flex;
       // flex-wrap: wrap;
@@ -1836,9 +1851,11 @@ export default {
         justify-content: center;
         margin-right: 14px;
         flex-shrink: 0;
+
         .search {
           background-size: 100%;
         }
+
         .btnText {
           font-size: 14px;
           font-weight: 400;
@@ -1847,24 +1864,30 @@ export default {
           margin-left: 5px;
         }
       }
+
       .btn3 {
         margin-right: 0px;
+
         .search {
           width: 17px;
           height: 18px;
           background-image: url("../../assets/images/courseManage/add0.png");
         }
       }
+
       .btn3:hover {
         background: rgba(64, 158, 255, 0.76);
       }
+
       .btn3:active {
         background: #0982ff;
       }
     }
   }
+
   .tableBox {
     margin: 20px 38px 30px;
+
     .ant-table-thead > tr > th {
       font-size: 14px;
       font-weight: 400;
@@ -1874,8 +1897,10 @@ export default {
       background-color: #eff4fc;
     }
   }
+
   .tableBox {
     padding-bottom: 20px;
+
     .pa {
       // position: absolute;
       // bottom: 20px;
@@ -1890,6 +1915,7 @@ export default {
       // bottom: -40px;
     }
   }
+
   .operation {
     font-size: 14px;
     font-weight: 400;
@@ -1900,12 +1926,14 @@ export default {
       width: 28px;
       display: inline-block;
     }
+
     .operation3 {
       margin-left: 21px;
       width: 70px;
       display: inline-block;
       text-align: center;
     }
+
     .more {
       width: 50px;
       display: inline-block;
@@ -1922,6 +1950,7 @@ export default {
         margin: 2px;
         margin-left: 7px;
       }
+
       .moreItems {
         width: 80px;
         padding: 5px;
@@ -1937,30 +1966,36 @@ export default {
         text-align: center;
       }
     }
+
     .more:hover .moreArrow {
       background-image: url("../../assets/images/navtop/up.png");
     }
+
     .more:hover .moreItems {
       display: block;
     }
   }
 }
+
 .doublesonpro {
   .ant-modal {
     .ant-modal-body {
       .modalHeader {
         background: linear-gradient(
-          0deg,
-          rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
+                0deg,
+                rgba(78, 166, 255, 0) 0%,
+                rgba(78, 166, 255, 0.2) 100%
         );
       }
+
       padding: 0;
+
       .modalMain {
         display: flex;
         flex-direction: column;
         //align-items: center;
         margin-left: 60px;
+
         .name {
           //width: 90%;
           // background-color: lightcoral;
@@ -1975,20 +2010,24 @@ export default {
             font-size: 14px;
             margin-left: 7px;
           }
+
           .in {
             margin-left: 14px;
             width: 80%;
+
             .ant-input {
               border-radius: 5px;
               // height: 120%;
               width: 80%;
               height: 30px;
             }
+
             .ant-select {
               border-radius: 5px;
               // height: 120%;
               width: 80%;
               height: 40px;
+
               .ant-select-selector {
                 border-radius: 8px;
                 // height: 120%;
@@ -1998,6 +2037,7 @@ export default {
             }
           }
         }
+
         .pubtn {
           display: flex;
           justify-content: center;
@@ -2016,6 +2056,7 @@ export default {
             align-items: center;
             background: rgba(255, 255, 255, 1);
           }
+
           .pubtn2 {
             width: 100px;
             height: 40px;
@@ -2033,21 +2074,25 @@ export default {
     }
   }
 }
+
 .doublepro {
   .ant-modal {
     .ant-modal-body {
       .modalHeader {
         background: linear-gradient(
-          0deg,
-          rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
+                0deg,
+                rgba(78, 166, 255, 0) 0%,
+                rgba(78, 166, 255, 0.2) 100%
         );
       }
+
       padding: 0;
+
       .modalMain {
         display: flex;
         flex-direction: column;
         align-items: center;
+
         .name {
           width: 78%;
           // background-color: lightcoral;
@@ -2062,20 +2107,24 @@ export default {
             font-size: 14px;
             margin-left: 7px;
           }
+
           .in {
             margin-left: 14px;
             width: 81%;
+
             .ant-input {
               border-radius: 5px;
               // height: 120%;
               width: 100%;
               height: 30px;
             }
+
             .ant-select {
               border-radius: 5px;
               // height: 120%;
               width: 100%;
               height: 40px;
+
               .ant-select-selector {
                 border-radius: 8px;
                 // height: 120%;
@@ -2085,6 +2134,7 @@ export default {
             }
           }
         }
+
         .pubtn {
           display: flex;
           justify-content: center;
@@ -2103,6 +2153,7 @@ export default {
             align-items: center;
             background: rgba(255, 255, 255, 1);
           }
+
           .pubtn2 {
             width: 100px;
             height: 40px;
@@ -2120,17 +2171,20 @@ export default {
     }
   }
 }
+
 .sonproject {
   .ant-modal {
     .ant-modal-body {
       padding: 0 !important;
+
       .modalHeader {
         background: linear-gradient(
-          0deg,
-          rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
+                0deg,
+                rgba(78, 166, 255, 0) 0%,
+                rgba(78, 166, 255, 0.2) 100%
         );
       }
+
       .modalMain {
         display: flex;
         justify-content: center;
@@ -2143,21 +2197,25 @@ export default {
           position: relative;
           margin-bottom: 80px;
           cursor: pointer;
+
           .leftt {
             position: absolute;
             top: 18px;
             left: 0;
           }
+
           .photo {
             position: absolute;
             top: 44px;
             left: 40px;
           }
+
           .rightt {
             position: absolute;
             top: 69px;
             right: 26px;
           }
+
           .centerbox {
             position: absolute;
             top: 66px;
@@ -2166,6 +2224,7 @@ export default {
             font-weight: 700;
             //line-height: 36px;
           }
+
           .centermain {
             color: rgba(135, 139, 146, 1);
             font-size: 14px;
@@ -2178,17 +2237,20 @@ export default {
     }
   }
 }
+
 .estabish {
   .ant-modal {
     .ant-modal-body {
       padding: 0 !important;
+
       .modalHeader {
         background: linear-gradient(
-          0deg,
-          rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
+                0deg,
+                rgba(78, 166, 255, 0) 0%,
+                rgba(78, 166, 255, 0.2) 100%
         );
       }
+
       .modalMain {
         display: flex;
         flex-direction: column;
@@ -2202,21 +2264,25 @@ export default {
           position: relative;
           margin-bottom: 24px;
           cursor: pointer;
+
           .leftt {
             position: absolute;
             top: 18px;
             left: 0;
           }
+
           .photo {
             position: absolute;
             top: 44px;
             left: 40px;
           }
+
           .rightt {
             position: absolute;
             top: 69px;
             right: 26px;
           }
+
           .centerbox {
             position: absolute;
             top: 42px;
@@ -2225,6 +2291,7 @@ export default {
             font-weight: 500;
             //line-height: 36px;
           }
+
           .centerbox1 {
             position: absolute;
             top: 32px;
@@ -2233,6 +2300,7 @@ export default {
             font-weight: 500;
             //line-height: 36px;
           }
+
           .centermain {
             color: rgba(135, 139, 146, 1);
             font-size: 14px;
@@ -2242,6 +2310,7 @@ export default {
             left: 120px;
             top: 78px;
           }
+
           .centermain1 {
             color: rgba(135, 139, 146, 1);
             font-size: 14px;
@@ -2256,17 +2325,21 @@ export default {
     }
   }
 }
+
 .CopyModal {
   .ant-modal {
     width: 424px !important;
     height: 258px !important;
+
     .ant-modal-content {
       width: 424px !important;
       height: 258px !important;
+
       .ant-modal-body {
         width: 424px !important;
         height: 258px !important;
         padding: 0 !important;
+
         .delete {
           z-index: 999;
           width: 424px;
@@ -2283,19 +2356,22 @@ export default {
             width: calc(100%);
             height: 68px;
             background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
+                    rgba(78, 166, 255, 0.2) 0%,
+                    rgba(78, 166, 255, 0) 100%
             );
           }
+
           .del_main {
             width: 100%;
             position: relative;
+
             .header {
               display: flex;
               align-items: center;
               padding-top: 20px;
               padding-left: 26px;
               font-size: 16px;
+
               .icon {
                 width: 16px;
                 height: 16px;
@@ -2303,6 +2379,7 @@ export default {
                 background-image: url(@/assets/images/coursewareManage/QR.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -2313,6 +2390,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -2322,6 +2400,7 @@ export default {
               flex-direction: column;
               // background-color: red;
               position: relative;
+
               .back {
                 position: absolute;
                 top: 30px;
@@ -2330,10 +2409,12 @@ export default {
                 color: #666666;
               }
             }
+
             .del_btnbox {
               display: flex;
               margin: 30px auto;
               justify-content: center;
+
               .del_btn {
                 width: 100px;
                 height: 40px;
@@ -2344,17 +2425,20 @@ export default {
                 justify-content: center;
                 flex-shrink: 0;
                 cursor: pointer;
+
                 .btnText {
                   font-size: 14px;
                   font-weight: 400;
                   line-height: 40px;
                 }
               }
+
               .btn1 {
                 border: 1px solid rgba(64, 158, 255, 1);
                 color: #4ea6ff;
                 margin-right: 14px;
               }
+
               .btn2 {
                 background-color: #4ea6ff;
                 color: #ffffff;
@@ -2366,16 +2450,19 @@ export default {
     }
   }
 }
+
 .projectPub {
   .ant-modal {
     .ant-modal-body {
       padding: 0;
+
       .modalHeader {
         background: linear-gradient(
-          rgba(78, 166, 255, 0.2) 0%,
-          rgba(78, 166, 255, 0) 100%
+                rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0) 100%
         );
       }
+
       .modalMain {
         .projectname {
           color: rgba(79, 81, 86, 1);
@@ -2385,33 +2472,39 @@ export default {
           font-weight: 500;
           text-align: center;
         }
+
         .projecttime {
           margin-left: 221px;
+
           .timeti {
             color: rgba(153, 155, 163, 1);
             font-size: 14px;
             line-height: 36px;
           }
+
           .timeme {
             color: rgba(79, 81, 86, 1);
             font-size: 14px;
             line-height: 36px;
           }
         }
+
         .projectbox {
           margin-top: 26px;
           display: flex;
           justify-content: center;
+
           .promessage {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-              180deg,
-              rgba(254, 243, 221, 1),
-              rgba(255, 250, 240, 1)
+                    180deg,
+                    rgba(254, 243, 221, 1),
+                    rgba(255, 250, 240, 1)
             );
             border-radius: 10px;
             margin-right: 7px;
+
             .messageme {
               color: rgba(255, 182, 78, 1);
               font-size: 14px;
@@ -2419,21 +2512,24 @@ export default {
               margin-top: 17px;
               margin-left: 30px;
             }
+
             .messagege {
               color: rgba(153, 155, 163, 1);
               font-size: 14px;
               margin-left: 30px;
             }
           }
+
           .stumessage {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-              180deg,
-              rgba(221, 234, 255, 1),
-              rgba(240, 248, 254, 1)
+                    180deg,
+                    rgba(221, 234, 255, 1),
+                    rgba(240, 248, 254, 1)
             );
             border-radius: 10px;
+
             .messageme1 {
               color: rgba(78, 166, 255, 1);
               font-size: 14px;
@@ -2441,6 +2537,7 @@ export default {
               margin-top: 17px;
               margin-left: 30px;
             }
+
             .messagege1 {
               color: rgba(153, 155, 163, 1);
               font-size: 14px;
@@ -2448,26 +2545,32 @@ export default {
             }
           }
         }
+
         .send {
           margin-top: 30px;
           margin-left: 61px;
+
           .sendtext {
             margin-left: 11px;
             color: rgba(109, 117, 132, 1);
             font-size: 14px;
           }
         }
+
         .ckb {
           margin-top: 20px;
           margin-left: 62px;
+
           .sendpeo {
             color: rgba(109, 117, 132, 1);
             font-size: 14px;
           }
+
           .ant-checkbox-inner {
             border-radius: 4px;
           }
         }
+
         .pubtn {
           display: flex;
           justify-content: center;
@@ -2486,6 +2589,7 @@ export default {
             align-items: center;
             background: rgba(255, 255, 255, 1);
           }
+
           .pubtn2 {
             width: 100px;
             height: 40px;
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index b7c8d745..de5963c0 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -674,11 +674,11 @@
                       style="border: 1px solid #f2f6fe"
                       :columns="studentColumns()"
                       :data-source="tabledata"
-                      :loading="tableDataTotal === -1 ? true : false"
                       expandRowByClick="true"
                       :scroll="{ x: 1400 }"
                       @expand="expandTable"
                       :pagination="false"
+                      :loading="loading"
                       :row-selection="{
                       columnWidth: 30,
                       selectedRowKeys: selectedRowKeys,
@@ -1407,11 +1407,11 @@
               <span>您确定要删除此学员吗</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1">
-                <div class="btnText" @click="closeDeleteOne">取消</div>
+              <div class="del_btn btn1" @click="closeDeleteOne">
+                <div class="btnText">取消</div>
               </div>
-              <div class="del_btn btn2">
-                <div class="btnText" @click="closeDeleteOneConfirm">确定</div>
+              <div class="del_btn btn2" @click="closeDeleteOneConfirm">
+                <div class="btnText">确定</div>
               </div>
             </div>
           </div>
@@ -1475,11 +1475,11 @@
               <span>您确定批量删除吗？</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1">
-                <div class="btnText" @click="closeCancelDelete">取消</div>
+              <div class="del_btn btn1" @click="closeCancelDelete">
+                <div class="btnText">取消</div>
               </div>
-              <div class="del_btn btn2">
-                <div class="btnText" @click="closeAllDelete">确定</div>
+              <div class="del_btn btn2" @click="closeAllDelete">
+                <div class="btnText">确定</div>
               </div>
             </div>
           </div>
@@ -1744,6 +1744,7 @@ export default {
   setup() {
     const store = useStore();
     const state = reactive({
+      loading: false,
       projectId: storage.get("projectId")
           ? JSON.parse(storage.get("projectId"))
           : null,
@@ -3065,6 +3066,7 @@ export default {
     //点击确认删除单个学员
     const closeDeleteOneConfirm = () => {
       state.deleteOneStu = false;
+      state.loading = true
       deleteStu({
         projectId: state.projectId,
         studentIds: state.chooseDeleteOne,
@@ -3095,6 +3097,7 @@ export default {
     };
     //点击确定的批量删除弹窗
     const closeAllDelete = () => {
+      state.loading = true
       deleteStu({
         projectId: state.projectId,
         studentIds: state.selectedRows,
@@ -3254,6 +3257,7 @@ export default {
                 // studentData();
               }
             }
+            state.loading = false
           })
           .catch((err) => {
             console.log("获取学员列表失败", err);
@@ -3706,6 +3710,7 @@ export default {
             projectGroupId: 0,
           };
           console.log("obj", obj);
+          state.loading = true
           api
               .addStudentProject(obj)
               .then((res) => {