From b77ddca1455f48406fcffcf8b5d4fa30564ff1bc Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 4 Dec 2022 18:00:49 +0800
Subject: [PATCH 1/5] =?UTF-8?q?--=E9=A1=B9=E7=9B=AE=20=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskAdd.vue | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 538b960c..d4bda014 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -872,11 +872,11 @@
             <span>您确定要取消阶段吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="closeCancel">取消</div>
+            <div class="del_btn btn1" @click="closeCancel">
+              <div class="btnText" >取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="showModal">确定</div>
+            <div class="del_btn btn2" @click="showModal">
+              <div class="btnText" >确定</div>
             </div>
           </div>
         </div>
@@ -902,11 +902,11 @@
             <span>您确定要删除此任务吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+            <div class="del_btn btn1" @click="closeDelete">
+              <div class="btnText">取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="showModal1">确定</div>
+            <div class="del_btn btn2" @click="showModal1">
+              <div class="btnText" >确定</div>
             </div>
           </div>
         </div>
@@ -931,11 +931,11 @@
             <span>您确定要批量删除任务吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="closeDeAll">取消</div>
+            <div class="del_btn btn1" @click="closeDeAll">
+              <div class="btnText">取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="deleteTaskAll">确定</div>
+            <div class="del_btn btn2" @click="deleteTaskAll">
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>

From ef0927c80a1b0aab63f36b6e523751ef1f033918 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 4 Dec 2022 19:45:05 +0800
Subject: [PATCH 2/5] =?UTF-8?q?--=E9=A1=B9=E7=9B=AE=20=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ProjCheckPower.vue | 828 ++++++++++++----------
 1 file changed, 467 insertions(+), 361 deletions(-)

diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue
index 74775826..c2cd635c 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>
@@ -80,39 +80,39 @@
                     <div class="boeTree">
                       <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="loading"
-                        :pagination="false"
-                        rowKey="id"
-                        :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,
@@ -121,16 +121,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>
@@ -139,23 +139,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>
@@ -163,7 +163,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>
@@ -181,69 +181,69 @@
                   <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"
-                    >
-                      确认添加
-                    </div>
+                    <!--                    <div-->
+                    <!--                      class="boeTreeTitle"-->
+                    <!--                      style="margin-top: 8px; cursor: pointer"-->
+                    <!--                      @click="addOrgModal"-->
+                    <!--                    >-->
+                    <!--                      确认添加-->
+                    <!--                    </div>-->
                   </div>
                 </div>
               </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">
@@ -262,16 +262,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>
@@ -279,7 +279,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>
@@ -301,15 +301,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,
@@ -318,15 +318,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>
@@ -353,15 +353,15 @@
             <div style="height: 160px" class="selectedsBox" id="selectedsBox">
               <div class="selecteds" id="selecteds">
                 <!-- 遍历生成 -->
-                <div class="chose" v-for="item in choosepeople" :key="item.key">
-                  <div>{{ item.name || item.realName }}</div>
+                <div class="chose" v-for="(item,index) in choosepeople" :key="index">
+                  <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;
@@ -370,20 +370,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;
@@ -392,14 +392,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>
@@ -408,16 +408,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>
@@ -425,8 +425,8 @@
               </div>
             </div>
             <div
-              class="chose"
-              style="
+                class="chose"
+                style="
                 display: flex;
                 justify-content: flex-end;
                 margin-right: 20px;
@@ -435,20 +435,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;
@@ -457,14 +457,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>
@@ -472,15 +472,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>
@@ -488,8 +488,8 @@
               </div>
             </div>
             <div
-              class="chose"
-              style="
+                class="chose"
+                style="
                 display: flex;
                 justify-content: flex-end;
                 margin-right: 20px;
@@ -498,20 +498,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;
@@ -520,14 +520,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>
@@ -541,10 +541,10 @@
     </div>
     <!-- 确认添加部门弹窗 -->
     <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>
@@ -572,17 +572,18 @@
   </a-drawer>
 </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: {
@@ -710,13 +711,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>
             );
           },
         },
@@ -845,16 +846,16 @@ export default {
       //   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;
-        });
+          .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;
+          });
     };
     // state.tabledata = traverseArr(item1, {
     //   key: "id",
@@ -894,8 +895,14 @@ export default {
     //快速选人 选中的数组
     const onSelectChange = (selectedRowKeys, item) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys, item);
+      console.log("choosepeople : ", state.choosepeople);
       state.selectedRowKeys = selectedRowKeys;
-      state.choosepeople = item.reverse();
+      const se = state.studentList.map(e => e.id).join(',') || ''
+      const addItem = item.filter(e => (e && !se.includes(e.id + ',')))
+      addItem.forEach(e => {
+        e.name = e.realName
+      })
+      state.choosepeople = [...addItem.reverse(), ...state.studentList];
       selectedsHeight();
       // if (selectedRowKeys.length > 0 && item.length > 0) {
       //   state.selectedRowKeys.push(selectedRowKeys[selectedRowKeys.length - 1]);
@@ -911,14 +918,15 @@ export default {
     const deleteChoosePeople = (item) => {
       let arr = state.choosepeople;
       for (let i = 0; i < arr.length; i++) {
-        if (arr[i].key === item.key) {
+        if (arr[i].id == item.id) {
           arr.splice(i, 1);
         }
       }
       state.choosepeople = arr;
+      state.studentList = state.studentList.filter(e => e.id != item.id)
       let array = state.selectedRowKeys;
       for (let i = 0; i < array.length; i++) {
-        if (array[i] === item.key) {
+        if (array[i] === item.id) {
           array.splice(i, 1);
         }
       }
@@ -929,49 +937,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";
     };
     // 结束 快速选人------------------------------------------------------------------
     // 开始 添加组织------------------------------------------------------------------
@@ -985,22 +993,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 = () => {
@@ -1098,69 +1106,69 @@ 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";
     };
     // 结束 添加组织------------------------------------------------------------------
     // 开始 受众关联------------------------------------------------------------------
     //获取受众
     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, {
@@ -1220,49 +1228,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";
     };
     // 结束 受众关联------------------------------------------------------------------
     //全部清除
@@ -1298,7 +1306,7 @@ export default {
       state.choosepeople.map((value) => {
         let obj = {
           id: value.id,
-          name: value.realName,
+          name: value.name,
         };
         choosepeople.push(obj);
       });
@@ -1328,13 +1336,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,
@@ -1346,47 +1354,42 @@ 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]);
+          .optionAuthPerm(obj)
+          .then((res) => {
+            // console.log("获取权限名单成功", res);
+            if (res.data.code === 200) {
+              let studentArr = res.data.data.studentList;
+              state.studentList = res.data.data.studentList;
+              state.choosepeople = res.data.data.studentList;
+              //快速选人
+              state.selectedRowKeys = studentArr.map(e => e.id);
+              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]);
+              }
+              //受众
+              state.selectedRowKeys2 = selectedRowKeys2;
+              state.relationpeople = relationpeople;
+              console.log("获取权限名单成功", res);
             }
-            //快速选人
-            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 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);
-          }
-        })
-        .catch((err) => {
-          console.log("获取权限名单失败", err);
-        });
+          })
+          .catch((err) => {
+            console.log("获取权限名单失败", err);
+          });
     };
     return {
       ...toRefs(state),
@@ -1433,6 +1436,7 @@ export default {
   .ant-drawer-content-wrapper {
     max-width: 1300px !important;
   }
+
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
@@ -1440,6 +1444,7 @@ export default {
     display: flex;
     flex-direction: column;
     overflow-x: auto;
+
     .header {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;
@@ -1449,6 +1454,7 @@ export default {
       align-items: center;
       // background-color: red;
       margin-bottom: 20px;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -1457,6 +1463,7 @@ export default {
         // margin-left: 24px;
       }
     }
+
     .main {
       display: flex;
       //  min-width: 1200px;
@@ -1470,31 +1477,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;
@@ -1508,10 +1522,12 @@ export default {
                 border-radius: 8px;
                 border: 1px solid #409eff;
                 cursor: pointer;
+
                 .wz {
                   margin-left: 10px;
                 }
               }
+
               .btn2 {
                 width: 100px;
                 height: 40px;
@@ -1524,15 +1540,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;
@@ -1546,10 +1565,12 @@ export default {
               border-radius: 8px;
               border: 1px solid #409eff;
               cursor: pointer;
+
               .wz {
                 margin-left: 10px;
               }
             }
+
             .btn2 {
               width: 100px;
               height: 40px;
@@ -1562,11 +1583,13 @@ export default {
               border-radius: 8px;
               cursor: pointer;
               border: 1px solid #409eff;
+
               .wz {
                 margin-left: 10px;
               }
             }
           }
+
           .line {
             width: 100%;
             height: 40px;
@@ -1576,6 +1599,7 @@ export default {
             align-items: center;
             margin-top: 20px;
             border: 1px solid #c3e6fc;
+
             .inline {
               width: 95%;
               height: 100%;
@@ -1586,25 +1610,30 @@ export default {
                 height: 100%;
                 display: flex;
                 align-items: center;
+
                 .img {
                   width: 14px;
                   height: 15px;
                   background-image: url(../../assets/images/leveladd/gan.png);
                   background-size: 100% 100%;
                 }
+
                 .text {
                   color: #999ba3;
                 }
+
                 .text2 {
                   color: #4ea6ff;
                   margin-left: 5px;
                   margin-right: 5px;
                 }
+
                 .text3 {
                   color: #999ba3;
                   margin-left: 20px;
                 }
               }
+
               .right1 {
                 font-size: 14px;
                 font-weight: 400;
@@ -1616,9 +1645,11 @@ export default {
               }
             }
           }
+
           .chooseLeft {
             display: flex;
             justify-content: space-between;
+
             .boeTree {
               margin-right: 20px;
               // margin-top: 20px;
@@ -1651,6 +1682,7 @@ export default {
                 margin-bottom: 8px;
                 margin-top: 20px;
               }
+
               .treeMain {
                 width: 280px;
                 border-radius: 4px;
@@ -1660,45 +1692,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;
               // }
@@ -1725,26 +1768,31 @@ export default {
               }
             }
           }
+
           .tab2 {
             display: flex;
             align-items: center;
             // 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;
               }
             }
+
             .t1 {
               display: flex;
               align-items: center;
               margin-bottom: 5px;
             }
+
             .btns {
               display: flex;
               // margin-top: -10px;
@@ -1761,10 +1809,12 @@ export default {
                 border-radius: 8px;
                 border: 1px solid #409eff;
                 cursor: pointer;
+
                 .wz {
                   margin-left: 10px;
                 }
               }
+
               .btn2 {
                 width: 100px;
                 height: 40px;
@@ -1777,35 +1827,43 @@ 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;
               white-space: nowrap;
             }
+
             .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;
@@ -1822,6 +1880,7 @@ export default {
               margin-bottom: 8px;
               margin-top: 20px;
             }
+
             .treeMain {
               width: 280px;
               border-radius: 4px;
@@ -1831,21 +1890,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;
             //               }
@@ -1858,19 +1922,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;
@@ -1879,17 +1947,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;
@@ -1900,6 +1971,7 @@ export default {
             height: 32px;
             border-radius: 4px;
             background: #409eff;
+
             .colose {
               width: 16px;
               height: 16px;
@@ -1910,12 +1982,14 @@ export default {
               background-size: 100%;
               margin-right: 4px;
             }
+
             .allclear {
               color: rgba(255, 255, 255, 1);
               font-size: 14px;
             }
           }
         }
+
         .line {
           width: 90%;
           height: 1px;
@@ -1923,17 +1997,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;
@@ -1945,6 +2022,7 @@ export default {
           // height: 170px;
           // overflow: hidden;
           flex-shrink: 0;
+
           .chose {
             // width: 64px;
             padding-left: 10px;
@@ -1961,6 +2039,7 @@ export default {
             font-size: 12px;
             position: relative;
             flex-shrink: 0;
+
             .ch {
               position: absolute;
               width: 18px;
@@ -1973,6 +2052,7 @@ export default {
         }
       }
     }
+
     .btnn {
       height: 72px;
       width: 100%;
@@ -1984,6 +2064,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;
@@ -1993,6 +2074,7 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
+
       .btn2 {
         cursor: pointer;
         width: 100px;
@@ -2006,43 +2088,55 @@ 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;
   }
 }
+
 .changetreedropdownboe {
   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;
@@ -2059,19 +2153,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;
@@ -2079,6 +2176,7 @@ export default {
                 background-image: url(@/assets/images/taskpage/gan.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -2089,6 +2187,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -2098,6 +2197,7 @@ export default {
               flex-direction: column;
               // background-color: red;
               position: relative;
+
               .back {
                 position: absolute;
                 top: 30px;
@@ -2106,10 +2206,12 @@ export default {
                 color: #666666;
               }
             }
+
             .del_btnbox {
               display: flex;
               margin: 30px auto;
               justify-content: center;
+
               .del_btn {
                 width: 100px;
                 height: 40px;
@@ -2120,17 +2222,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;
@@ -2140,6 +2245,7 @@ export default {
         }
       }
     }
+
     .ant-modal-close-x {
       display: none;
     }

From 3649771664f98138ac4de2b3d2410ca56a7b7144 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Sun, 4 Dec 2022 20:04:55 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E7=9B=B4=E6=92=AD500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddLive.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 2bf40040..217e3c94 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -649,7 +649,7 @@ export default {
         liveName: state.inputV1,
         livePlayback: state.switchC1 ? "1" : "0",
         livePlaybackLink: state.switchC1 ? state.inputV5 : "",
-        liveTeacherId: Number(state.memberValue.value),
+        liveTeacherId: state.memberValue.value,
         liveTeacherName: state.memberValue.label,
         otherSettings: state.switchC2 ? "1" : "0", //1或0
         signOutTime: state.inputV8, 
@@ -664,8 +664,9 @@ export default {
               console.log(res)
               message.destroy();
               message.success("提交成功");
-              await updateTask(res);
               closeDrawer();
+              await updateTask(res);
+              
             })
             .catch((err) => {
               console.log(err)

From 2c4e6c08ff67a3af9797d5681381dd3134ee3e59 Mon Sep 17 00:00:00 2001
From: kclf <1195754634@qq.com>
Date: Sun, 4 Dec 2022 20:06:18 +0800
Subject: [PATCH 4/5] t

---
 package-lock.json                   |   21 +-
 src/api/config.js                   |   15 +-
 src/views/projectcenter/TaskAdd.vue | 1026 ++++++++++++++-------------
 3 files changed, 541 insertions(+), 521 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 362d4de6..b2df0a1d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3591,6 +3591,8 @@
 			"resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz",
 			"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
 			"dev": true,
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
 				"json-schema-traverse": "^1.0.0",
@@ -3602,7 +3604,9 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
 			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true
+			"dev": true,
+			"optional": true,
+			"peer": true
 		},
 		"node_modules/ajv-keywords": {
 			"version": "3.5.2",
@@ -13767,7 +13771,6 @@
 			"integrity": "sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg==",
 			"dev": true,
 			"requires": {
-				"@babel/core": "^7.12.16",
 				"@babel/helper-compilation-targets": "^7.12.16",
 				"@babel/helper-module-imports": "^7.12.13",
 				"@babel/plugin-proposal-class-properties": "^7.12.13",
@@ -13780,7 +13783,6 @@
 				"@vue/babel-plugin-jsx": "^1.0.3",
 				"@vue/babel-preset-jsx": "^1.1.2",
 				"babel-plugin-dynamic-import-node": "^2.3.3",
-				"core-js": "^3.8.3",
 				"core-js-compat": "^3.8.3",
 				"semver": "^7.3.4"
 			},
@@ -14627,15 +14629,14 @@
 			"resolved": "https://registry.npmmirror.com/ajv-formats/-/ajv-formats-2.1.1.tgz",
 			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
 			"dev": true,
-			"requires": {
-				"ajv": "^8.0.0"
-			},
+			"requires": {},
 			"dependencies": {
 				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz",
+					"version": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz",
 					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
 					"dev": true,
+					"optional": true,
+					"peer": true,
 					"requires": {
 						"fast-deep-equal": "^3.1.1",
 						"json-schema-traverse": "^1.0.0",
@@ -14647,7 +14648,9 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
 					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
+					"dev": true,
+					"optional": true,
+					"peer": true
 				}
 			}
 		},
diff --git a/src/api/config.js b/src/api/config.js
index e8171905..e1b4874a 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -24,18 +24,19 @@ const http = axios.create({
 
 http.interceptors.request.use(
   (config) => {
-    // console.log('config', config)
+    console.log("config", config);
     // const token = localStorage.getItem("token");
     // // const token = getCookie('token')
     // // console.log('token', token)
     // if (token) {
     //   config.headers.token = token; //测试1111
     // } else {
-    //   console.log("当前请求页面无token,请执行操作！！！");
+    // console.log("当前请求页面无token,请执行操作！！！");
 
-    //   // 此处测试默认配置token
-    //   config.headers.token = "123456";
-    // }
+    // // 此处测试默认配置token
+    // config.headers.token =
+    //   "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzAxNTMxMDMsImV4cCI6MTY3MDE2MDMwMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.c937b2d3a59cbab2136fdde55fd38f06bdff041212aab0fa6741bc4be41e28a7";
+    // // }
     return config;
   },
   (err) => {
@@ -64,8 +65,8 @@ http.interceptors.response.use(
   },
   function (error) {
     if (error.message == "timeout of 1ms exceeded") {
-      message.destroy()
-      message.error("请求超时")
+      message.destroy();
+      message.error("请求超时");
     }
     console.log("api error %o", error);
     return Promise.reject(error);
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 538b960c..a3312555 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -8,7 +8,7 @@
               src="../../assets/images/projectadd/right.png"
               style="margin-left: 10px; cursor: pointer"
               @click="showCancel"
-          />
+            />
           </div>
           <div class="btn btn3" @click="showModal()" style="margin-left: 19px">
             <div class="search"></div>
@@ -16,18 +16,18 @@
           </div>
           <div class="maincon" style="background-color: #fff">
             <draggable
-                v-model="level"
-                chosenClass="chosen"
-                ghostClass="ghost"
-                forceFallback="true"
-                group="stage"
-                animation="500"
+              v-model="level"
+              chosenClass="chosen"
+              ghostClass="ghost"
+              forceFallback="true"
+              group="stage"
+              animation="500"
             >
               <template #item="{ element }">
                 <div
-                    class="items"
-                    :class="chooseStageId == element.id ? 'active' : ''"
-                    @click="changebgc(element.id)"
+                  class="items"
+                  :class="chooseStageId == element.id ? 'active' : ''"
+                  @click="changebgc(element.id)"
                 >
                   <div class="items1">
                     <div class="boxs_left">
@@ -42,7 +42,7 @@
                         </template>
                         <div class="script">
                           <span style="font-size: 12px; color: #ffffff"
-                          >说明</span
+                            >说明</span
                           >
                         </div>
                       </a-popover>
@@ -51,15 +51,15 @@
                     </div>
                     <div class="boxs_right">
                       <div
-                          class="imgIcon"
-                          @click="showDeleteStage(element.id)"
+                        class="imgIcon"
+                        @click="showDeleteStage(element.id)"
                       ></div>
                     </div>
                   </div>
                   <div class="items2">
                     <a-popover
-                        placement="topLeft"
-                        v-if="element.tit?.length > 10"
+                      placement="topLeft"
+                      v-if="element.tit?.length > 10"
                     >
                       <template #content>
                         <div style="width: 130px">
@@ -115,7 +115,7 @@
           <div class="filt">
             <div class="le">
               <div class="leftimg">
-                <img class="img" :src="picUrl"/>
+                <img class="img" :src="picUrl" />
               </div>
               <div class="imgfor">
                 <div class="forz" style="font-weight: 700">
@@ -142,8 +142,8 @@
               <router-link to="/taskpage">
                 <div style="display: flex">
                   <img
-                      class="img2"
-                      src="../../assets/images/leveladd/back.png"
+                    class="img2"
+                    src="../../assets/images/leveladd/back.png"
                   />
                   <div class="return">返回</div>
                 </div>
@@ -155,21 +155,21 @@
           <div class="item" @click="showDrawerOnline">
             <div class="itcon">
               <div class="img">
-                <img src="../../assets/images/leveladd/zai.png"/>
+                <img src="../../assets/images/leveladd/zai.png" />
               </div>
               <div class="text">在线</div>
             </div>
             <!-- 添加在线侧弹窗 -->
             <div>
               <add-online
-                  v-model:addonlineVisible="addonlinevisible"
-                  @changeData="updateTableData"
-                  :isLevel="isLevel"
-                  v-model:edit="edit"
-                  v-model:projectId="projectId"
-                  v-model:chooseStageId="chooseStageId"
-                  v-model:projectTaskId="projectTaskId"
-                  v-model:EditOnlineId="EditOnlineId"
+                v-model:addonlineVisible="addonlinevisible"
+                @changeData="updateTableData"
+                :isLevel="isLevel"
+                v-model:edit="edit"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:EditOnlineId="EditOnlineId"
               />
             </div>
             <!-- 添加在线侧弹窗 -->
@@ -178,21 +178,21 @@
           <div class="item" @click="showDrawerFaceteach">
             <div class="itcon">
               <div class="img">
-                <img src="../../assets/images/leveladd/mian.png"/>
+                <img src="../../assets/images/leveladd/mian.png" />
               </div>
               <div class="text">面授</div>
             </div>
             <!-- 添加面授侧弹窗 -->
             <div>
               <add-faceteach
-                  v-model:addfaceteachVisible="addfaceteachvisible"
-                  v-model:EditFaceId="EditFaceId"
-                  v-model:edit="edit"
-                  :isLevel="isLevel"
-                  v-model:projectId="projectId"
-                  v-model:chooseStageId="chooseStageId"
-                  @changeData="updateTableData"
-                  v-model:projectTaskId="projectTaskId"
+                v-model:addfaceteachVisible="addfaceteachvisible"
+                v-model:EditFaceId="EditFaceId"
+                v-model:edit="edit"
+                :isLevel="isLevel"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                @changeData="updateTableData"
+                v-model:projectTaskId="projectTaskId"
               />
             </div>
             <!-- 添加面授侧弹窗 -->
@@ -201,21 +201,21 @@
           <div class="item" @click="showDrawerAddCase">
             <div class="itcon">
               <div class="img">
-                <img src="../../assets/images/leveladd/an.png"/>
+                <img src="../../assets/images/leveladd/an.png" />
               </div>
               <div class="text">案例</div>
             </div>
             <!-- 添加案例侧弹窗 -->
             <div>
               <add-case
-                  v-model:addcaseVisible="addcasevisible"
-                  @changeData="updateTableData"
-                  :isLevel="isLevel"
-                  v-model:edit="edit"
-                  v-model:projectId="projectId"
-                  v-model:chooseStageId="chooseStageId"
-                  v-model:projectTaskId="projectTaskId"
-                  v-model:EditCaseId="EditCaseId"
+                v-model:addcaseVisible="addcasevisible"
+                @changeData="updateTableData"
+                :isLevel="isLevel"
+                v-model:edit="edit"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:EditCaseId="EditCaseId"
               />
             </div>
             <!-- 添加案例侧弹窗 -->
@@ -224,21 +224,21 @@
           <div class="item">
             <div class="itcon">
               <div class="img" @click="showDrawerAddHomework">
-                <img src="../../assets/images/leveladd/zuo.png"/>
+                <img src="../../assets/images/leveladd/zuo.png" />
               </div>
               <div class="text">作业</div>
             </div>
             <!-- 添加作业侧弹窗 -->
             <div>
               <add-homework
-                  v-model:addhomeworkVisible="addhomeworkvisible"
-                  @changeData="updateTableData"
-                  v-model:isLevel="isLevel"
-                  v-model:edit="edit"
-                  v-model:projectId="projectId"
-                  v-model:chooseStageId="chooseStageId"
-                  v-model:EditWorkId="EditWorkId"
-                  v-model:projectTaskId="projectTaskId"
+                v-model:addhomeworkVisible="addhomeworkvisible"
+                @changeData="updateTableData"
+                v-model:isLevel="isLevel"
+                v-model:edit="edit"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:EditWorkId="EditWorkId"
+                v-model:projectTaskId="projectTaskId"
               />
             </div>
             <!-- 添加作业侧弹窗 -->
@@ -247,21 +247,21 @@
           <div class="item" @click="showDrawerAddTest">
             <div class="itcon">
               <div class="img">
-                <img src="../../assets/images/leveladd/kao.png"/>
+                <img src="../../assets/images/leveladd/kao.png" />
               </div>
               <div class="text">考试</div>
             </div>
             <!-- 添加考试侧弹窗 -->
             <div>
               <add-test
-                  v-model:addtestVisible="addtestvisible"
-                  @changeData="updateTableData"
-                  :isLevel="isLevel"
-                  v-model:edit="edit"
-                  v-model:projectId="projectId"
-                  v-model:chooseStageId="chooseStageId"
-                  v-model:EditTestId="EditTestId"
-                  v-model:projectTaskId="projectTaskId"
+                v-model:addtestVisible="addtestvisible"
+                @changeData="updateTableData"
+                :isLevel="isLevel"
+                v-model:edit="edit"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:EditTestId="EditTestId"
+                v-model:projectTaskId="projectTaskId"
               />
             </div>
             <!-- 添加考试侧弹窗 -->
@@ -270,21 +270,21 @@
           <div class="item" @click="showDrawerAddLive">
             <div class="itcon">
               <div class="img">
-                <img src="../../assets/images/leveladd/zhi.png"/>
+                <img src="../../assets/images/leveladd/zhi.png" />
               </div>
               <div class="text">直播</div>
             </div>
             <!-- 添加直播侧弹窗 -->
             <div>
               <add-live
-                  v-model:addliveVisible="addlivevisible"
-                  :isLevel="isLevel"
-                  @changeData="updateTableData"
-                  v-model:projectId="projectId"
-                  v-model:chooseStageId="chooseStageId"
-                  v-model:edit="edit"
-                  v-model:EditLiveId="EditLiveId"
-                  v-model:projectTaskId="projectTaskId"
+                v-model:addliveVisible="addlivevisible"
+                :isLevel="isLevel"
+                @changeData="updateTableData"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:edit="edit"
+                v-model:EditLiveId="EditLiveId"
+                v-model:projectTaskId="projectTaskId"
               />
             </div>
             <!-- 添加直播侧弹窗 -->
@@ -293,21 +293,21 @@
           <div class="item" @click="showDrawerAddRef">
             <div class="itcon">
               <div class="img">
-                <img src="../../assets/images/leveladd/wai.png"/>
+                <img src="../../assets/images/leveladd/wai.png" />
               </div>
               <div class="text">外链</div>
             </div>
             <!-- 添加外链侧弹窗 -->
             <div>
               <add-ref
-                  v-model:addrefVisible="addrefvisible"
-                  :isLevel="isLevel"
-                  @changeData="updateTableData"
-                  v-model:projectId="projectId"
-                  v-model:chooseStageId="chooseStageId"
-                  v-model:edit="edit"
-                  v-model:EditRefId="EditRefId"
-                  v-model:projectTaskId="projectTaskId"
+                v-model:addrefVisible="addrefvisible"
+                :isLevel="isLevel"
+                @changeData="updateTableData"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:edit="edit"
+                v-model:EditRefId="EditRefId"
+                v-model:projectTaskId="projectTaskId"
               />
             </div>
             <!-- 添加外链侧弹窗 -->
@@ -316,21 +316,21 @@
           <div class="item" @click="showDrawerAddDiscuss">
             <div class="itcon">
               <div class="img">
-                <img src="../../assets/images/leveladd/tao.png"/>
+                <img src="../../assets/images/leveladd/tao.png" />
               </div>
               <div class="text">讨论</div>
             </div>
             <!-- 添加讨论侧弹窗 -->
             <div>
               <add-discuss
-                  v-model:adddiscussVisible="adddiscussvisible"
-                  v-model:edit="edit"
-                  :isLevel="isLevel"
-                  v-model:projectId="projectId"
-                  v-model:chooseStageId="chooseStageId"
-                  v-model:EditDiscussId="EditDiscussId"
-                  v-model:projectTaskId="projectTaskId"
-                  @changeData="updateTableData"
+                v-model:adddiscussVisible="adddiscussvisible"
+                v-model:edit="edit"
+                :isLevel="isLevel"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:EditDiscussId="EditDiscussId"
+                v-model:projectTaskId="projectTaskId"
+                @changeData="updateTableData"
               />
             </div>
             <!-- 添加讨论侧弹窗 -->
@@ -339,21 +339,21 @@
           <div class="item" @click="showDrawerAddActive">
             <div class="itcon">
               <div class="img">
-                <img src="../../assets/images/leveladd/huo.png"/>
+                <img src="../../assets/images/leveladd/huo.png" />
               </div>
               <div class="text">活动</div>
             </div>
             <!-- 添加活动侧弹窗 -->
             <div>
               <add-active
-                  v-model:addactiveVisible="addactivevisible"
-                  v-model:projectId="projectId"
-                  v-model:EditActiveId="EditActiveId"
-                  v-model:projectTaskId="projectTaskId"
-                  v-model:edit="edit"
-                  :isLevel="isLevel"
-                  v-model:chooseStageId="chooseStageId"
-                  @changeData="updateTableData"
+                v-model:addactiveVisible="addactivevisible"
+                v-model:projectId="projectId"
+                v-model:EditActiveId="EditActiveId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:edit="edit"
+                :isLevel="isLevel"
+                v-model:chooseStageId="chooseStageId"
+                @changeData="updateTableData"
               />
             </div>
             <!-- 添加活动侧弹窗 -->
@@ -362,21 +362,21 @@
           <div class="item" @click="showDrawerAddEval">
             <div class="itcon">
               <div class="img">
-                <img src="../../assets/images/leveladd/ce.png"/>
+                <img src="../../assets/images/leveladd/ce.png" />
               </div>
               <div class="text">测评</div>
             </div>
             <!-- 添加测评侧弹窗 -->
             <div>
               <add-eval
-                  v-model:addevalVisible="addevalvisible"
-                  @changeData="updateTableData"
-                  v-model:edit="edit"
-                  :isLevel="isLevel"
-                  v-model:projectId="projectId"
-                  v-model:chooseStageId="chooseStageId"
-                  v-model:projectTaskId="projectTaskId"
-                  v-model:EditEvalId="EditEvalId"
+                v-model:addevalVisible="addevalvisible"
+                @changeData="updateTableData"
+                v-model:edit="edit"
+                :isLevel="isLevel"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:EditEvalId="EditEvalId"
               />
             </div>
             <!-- 添加测评侧弹窗 -->
@@ -385,21 +385,21 @@
           <div class="item" @click="showDrawerAddInvist">
             <div class="itcon">
               <div class="img">
-                <img src="../../assets/images/leveladd/diao.png"/>
+                <img src="../../assets/images/leveladd/diao.png" />
               </div>
               <div class="text">评估</div>
             </div>
             <!-- 添加评估侧弹窗 -->
             <div>
               <add-invist
-                  v-model:addinvistVisible="addinvistvisible"
-                  @changeData="updateTableData"
-                  v-model:edit="edit"
-                  :isLevel="isLevel"
-                  v-model:projectId="projectId"
-                  v-model:chooseStageId="chooseStageId"
-                  v-model:projectTaskId="projectTaskId"
-                  v-model:EditInvistId="EditInvistId"
+                v-model:addinvistVisible="addinvistvisible"
+                @changeData="updateTableData"
+                v-model:edit="edit"
+                :isLevel="isLevel"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:EditInvistId="EditInvistId"
               />
             </div>
             <!-- 添加评估侧弹窗 -->
@@ -408,23 +408,23 @@
           <div class="item" @click="showDrawerAddVote">
             <div class="itcon">
               <div class="img">
-                <img src="../../assets/images/leveladd/tou.png"/>
+                <img src="../../assets/images/leveladd/tou.png" />
               </div>
               <div class="text">投票</div>
               <!-- 添加投票侧弹窗 -->
               <div>
                 <add-vote
-                    v-model:addvoteVisible="addvotevisible"
-                    @changeData="updateTableData"
-                    @getData="changeVData"
-                    v-model:edit="edit"
-                    :isLevel="isLevel"
-                    v-model:projectId="projectId"
-                    v-model:chooseStageId="chooseStageId"
-                    v-model:projectTaskId="projectTaskId"
-                    v-model:EditVoteId="EditVoteId"
-                    v-model:voteId="voteId"
-                    v-model:ballotId="ballotId"
+                  v-model:addvoteVisible="addvotevisible"
+                  @changeData="updateTableData"
+                  @getData="changeVData"
+                  v-model:edit="edit"
+                  :isLevel="isLevel"
+                  v-model:projectId="projectId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:projectTaskId="projectTaskId"
+                  v-model:EditVoteId="EditVoteId"
+                  v-model:voteId="voteId"
+                  v-model:ballotId="ballotId"
                 />
               </div>
               <!-- 添加投票侧弹窗 -->
@@ -440,8 +440,8 @@
               </button>
               <div class="edit" @click="showdeAll">
                 <img
-                    class="editimg"
-                    src="../../assets/images/projectadd/delete.png"
+                  class="editimg"
+                  src="../../assets/images/projectadd/delete.png"
                 />
                 <span class="editext">批量删除</span>
               </div>
@@ -478,7 +478,7 @@
             </div> -->
               <div class="tableBox" style="border: 1px solid #f2f6fc">
                 <div
-                    style="
+                  style="
                     height: 50px;
                     display: flex;
                     justify-content: space-between;
@@ -492,7 +492,7 @@
                   "
                 >
                   <div
-                      style="
+                    style="
                       width: 87px;
                       text-align: center;
                       display: flex;
@@ -500,20 +500,20 @@
                     "
                   >
                     <img
-                        style="
+                      style="
                         width: 16px;
                         height: 16px;
                         cursor: pointer;
                         margin-top: 12px;
                       "
-                        :src="
+                      :src="
                         selectAll === 0
                           ? require('../../assets/images/notSelect.png')
                           : selectAll === 1
                           ? require('../../assets/images/selectAll.png')
                           : require('../../assets/images/select.png')
                       "
-                        @click="selectRowAll"
+                      @click="selectRowAll"
                     />
                     <!-- <a-checkbox
                     v-model:checked="selectAll"
@@ -526,24 +526,24 @@
                   <div style="width: 120px; text-align: center">必修/选修</div>
                   <div style="width: 87px; text-align: center">时长</div>
                   <div
-                      style="width: 120px; text-align: center; margin-right: 20px"
+                    style="width: 120px; text-align: center; margin-right: 20px"
                   >
                     操作
                   </div>
                 </div>
                 <draggable
-                    v-model="tableData"
-                    chosenClass="chosen"
-                    ghostClass="ghost"
-                    forceFallback="true"
-                    group="task"
-                    animation="500"
-                    @start="onStart"
-                    @end="onEnd"
+                  v-model="tableData"
+                  chosenClass="chosen"
+                  ghostClass="ghost"
+                  forceFallback="true"
+                  group="task"
+                  animation="500"
+                  @start="onStart"
+                  @end="onEnd"
                 >
                   <template #item="{ element }">
                     <div
-                        style="
+                      style="
                         height: 50px;
                         display: flex;
                         justify-content: space-between;
@@ -554,10 +554,10 @@
                         color: #4f5156;
                         line-height: 36px;
                       "
-                        class="tableRow"
+                      class="tableRow"
                     >
                       <div
-                          style="
+                        style="
                           width: 87px;
                           text-align: center;
                           margin-left: 46px;
@@ -566,8 +566,8 @@
                       >
                         <div class="racona">
                           <div
-                              class="img"
-                              style="
+                            class="img"
+                            style="
                               cursor: pointer;
                               margin-top: 2px;
                               margin-right: 9px;
@@ -576,9 +576,9 @@
                             "
                           ></div>
                           <a-checkbox
-                              :id="element.id"
-                              v-model:checked="element.checked"
-                              @change="changeRow"
+                            :id="element.id"
+                            v-model:checked="element.checked"
+                            @change="changeRow"
                           >
                           </a-checkbox>
                           <div style="margin-top: 2px; margin-left: 8px">
@@ -587,7 +587,7 @@
                         </div>
                       </div>
                       <div
-                          style="
+                        style="
                           width: 120px;
                           text-align: center;
                           text-align: center;
@@ -595,7 +595,7 @@
                           text-overflow: ellipsis;
                           white-space: nowrap;
                         "
-                          :title="element.creater"
+                        :title="element.creater"
                       >
                         {{ element.creater }}
                       </div>
@@ -603,16 +603,16 @@
                         <div class="opat">
                           <div class="opacationt clearfix">
                             <a-switch
-                                style="margin-left: -50px; margin-top: 3px"
-                                v-model:checked="element.checked1"
-                                size="small"
-                                active-color="red"
-                                @click="changeCourseType(element)"
+                              style="margin-left: -50px; margin-top: 3px"
+                              v-model:checked="element.checked1"
+                              size="small"
+                              active-color="red"
+                              @click="changeCourseType(element)"
                             />
                             <div class="showt clearfix">
                               <div
-                                  class="bi"
-                                  :style="{
+                                class="bi"
+                                :style="{
                                   'z-index': element.checked1 ? 999 : 998,
                                 }"
                               >
@@ -627,7 +627,7 @@
                         {{ element.cretime }}分钟
                       </div>
                       <div
-                          style="
+                        style="
                           width: 120px;
                           text-align: center;
                           margin-right: 20px;
@@ -636,12 +636,12 @@
                         <div class="opa">
                           <div class="opacation">
                             <span
-                                style="
+                              style="
                                 color: #4ea6ff;
                                 margin-right: 25px;
                                 cursor: pointer;
                               "
-                                @click="
+                              @click="
                                 decideType(
                                   element.lei,
                                   element.courseId,
@@ -652,8 +652,8 @@
                               编辑
                             </span>
                             <span
-                                style="color: #4ea6ff; cursor: pointer"
-                                @click="showDelete(element.id)"
+                              style="color: #4ea6ff; cursor: pointer"
+                              @click="showDelete(element.id)"
                             >
                               删除
                             </span>
@@ -713,20 +713,20 @@
     <!-- 添加阶段弹窗 -->
     <div>
       <a-modal
-          v-model:visible="stage"
-          :title="null"
-          @ok="closeModal"
-          :footer="null"
-          :closable="false"
-          wrapClassName="addstage"
-          width="624px"
-          height="388px"
-          centered="true"
-          @cancel="closeModal"
+        v-model:visible="stage"
+        :title="null"
+        @ok="closeModal"
+        :footer="null"
+        :closable="false"
+        wrapClassName="addstage"
+        width="624px"
+        height="388px"
+        centered="true"
+        @cancel="closeModal"
       >
         <div
-            class="modalHeader"
-            style="
+          class="modalHeader"
+          style="
             width: 100%;
             height: 68px;
             display: flex;
@@ -736,13 +736,13 @@
         >
           <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="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>
@@ -751,18 +751,18 @@
             <div class="namebox">
               <div>
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
                 />
               </div>
               <div class="inname">阶段名称：</div>
             </div>
             <div class="in">
               <a-input
-                  v-model:value="valuesname"
-                  show-count
-                  :maxlength="20"
-                  placeholder="请输入阶段名称"
+                v-model:value="valuesname"
+                show-count
+                :maxlength="20"
+                placeholder="请输入阶段名称"
               />
             </div>
           </div>
@@ -772,16 +772,16 @@
             </div>
             <div class="intext" style="margin-left: 14px">
               <a-textarea
-                  v-model:value="valuesnotice"
-                  style="height: 88px"
-                  show-count
-                  :maxlength="100"
-                  placeholder="请输入阶段说明"
+                v-model:value="valuesnotice"
+                style="height: 88px"
+                show-count
+                :maxlength="100"
+                placeholder="请输入阶段说明"
               />
             </div>
           </div>
           <div
-              style="
+            style="
               display: flex;
               width: 100%;
               justify-content: center;
@@ -789,8 +789,8 @@
             "
           >
             <button
-                @click="closeModal"
-                style="
+              @click="closeModal"
+              style="
                 cursor: pointer;
                 height: 40px;
                 width: 100px;
@@ -803,8 +803,8 @@
               取消
             </button>
             <button
-                @click="editStage"
-                style="
+              @click="editStage"
+              style="
                 cursor: pointer;
                 margin-left: 16px;
                 margin-bottom: 40px;
@@ -824,11 +824,11 @@
     </div>
     <!-- 确认添加阶段弹窗 -->
     <a-modal
-        v-model:visible="confirmModal"
-        :footer="null"
-        :closable="cC"
-        wrapClassName="ConfirmModal"
-        centered="true"
+      v-model:visible="confirmModal"
+      :footer="null"
+      :closable="cC"
+      wrapClassName="ConfirmModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -854,11 +854,11 @@
     </a-modal>
     <!-- 确认取消阶段弹窗 -->
     <a-modal
-        v-model:visible="cancelModal"
-        :footer="null"
-        :closable="cC"
-        wrapClassName="ConfirmModal"
-        centered="true"
+      v-model:visible="cancelModal"
+      :footer="null"
+      :closable="cC"
+      wrapClassName="ConfirmModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -884,11 +884,11 @@
     </a-modal>
     <!-- 确认删除任务弹窗 -->
     <a-modal
-        v-model:visible="deleteModal"
-        :footer="null"
-        :closable="cC"
-        wrapClassName="ConfirmModal"
-        centered="true"
+      v-model:visible="deleteModal"
+      :footer="null"
+      :closable="cC"
+      wrapClassName="ConfirmModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -913,11 +913,11 @@
       </div>
     </a-modal>
     <a-modal
-        v-model:visible="deAll"
-        :footer="null"
-        :closable="cC"
-        wrapClassName="ConfirmModal"
-        centered="true"
+      v-model:visible="deAll"
+      :footer="null"
+      :closable="cC"
+      wrapClassName="ConfirmModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -943,12 +943,12 @@
     </a-modal>
     <!-- 移动任务到阶段 -->
     <a-modal
-        style="padding: 0"
-        :closable="sh"
-        v-model:visible="visiblene"
-        :footer="null"
-        centered="true"
-        wrapClassName="moveModal"
+      style="padding: 0"
+      :closable="sh"
+      v-model:visible="visiblene"
+      :footer="null"
+      centered="true"
+      wrapClassName="moveModal"
     >
       <div class="con">
         <div class="header">
@@ -962,27 +962,27 @@
             <div class="cur">已选中{{ selectRow.length }}个任务</div>
             <div class="select">
               <a-select
-                  v-model:value="curLevel"
-                  style="width: 100%"
-                  placeholder="请选择阶段"
-                  :options="level"
-                  @change="handleChangeStage"
-                  allowClear
-                  showSearch
+                v-model:value="curLevel"
+                style="width: 100%"
+                placeholder="请选择阶段"
+                :options="level"
+                @change="handleChangeStage"
+                allowClear
+                showSearch
               ></a-select>
             </div>
             <div class="btn">
               <button
-                  style="cursor: pointer"
-                  class="sameb btn1"
-                  @click="closeChangeModal"
+                style="cursor: pointer"
+                class="sameb btn1"
+                @click="closeChangeModal"
               >
                 取消
               </button>
               <button
-                  style="cursor: pointer"
-                  class="sameb btn2"
-                  @click="moveTask"
+                style="cursor: pointer"
+                class="sameb btn2"
+                @click="moveTask"
               >
                 确定
               </button>
@@ -990,16 +990,15 @@
           </div>
         </div>
       </div>
-    </a-modal
-    >
+    </a-modal>
 
     <!-- 是否删除阶段弹窗 -->
     <a-modal
-        v-model:visible="deleteStageModal"
-        :footer="null"
-        :closable="cC"
-        wrapClassName="ConfirmModal"
-        centered="true"
+      v-model:visible="deleteStageModal"
+      :footer="null"
+      :closable="cC"
+      wrapClassName="ConfirmModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1027,7 +1026,14 @@
 </template>
 
 <script>
-import {reactive, toRefs, onMounted, onUnmounted, onUpdated, watch} from "vue";
+import {
+  reactive,
+  toRefs,
+  onMounted,
+  onUnmounted,
+  onUpdated,
+  watch,
+} from "vue";
 import AddOnline from "../../components/drawers/AddOnline.vue";
 import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
 import AddCase from "../../components/drawers/AddCase.vue";
@@ -1040,15 +1046,15 @@ import AddActive from "../../components/drawers/AddActive.vue";
 import AddEval from "../../components/drawers/AddEval.vue";
 import AddInvist from "../../components/drawers/AddInvist.vue";
 import AddVote from "../../components/vote/AddVote.vue";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
 import * as api from "../../api/indexTaskadd";
 import * as apistage from "../../api/indexStage";
 import * as apimove from "../../api/indexMovetask";
 import draggable from "vuedraggable";
-import {storage} from "../../api/storage";
+// import { storage } from "../../api/storage";
 // import UnlockMode from "../../components/drawers/UnlockMode.vue";
 // import * as api1 from "../../api/index1";
-import {useRoute, useRouter} from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 
 export default {
   name: "TaskAdd",
@@ -1160,8 +1166,8 @@ export default {
     };
 
     watch(route, () => {
-      console.log(route)
-    })
+      console.log(route);
+    });
 
     // 把数据放到state里
     const getTableData = (tableData) => {
@@ -1173,31 +1179,31 @@ export default {
           id: value.projectTaskId,
           key: value.projectTaskId,
           lei:
-              value.type == 1
-                  ? "在线"
-                  : value.type == 2
-                      ? "面授"
-                      : value.type == 3
-                          ? "案例"
-                          : value.type == 4
-                              ? "作业"
-                              : value.type == 5
-                                  ? "考试"
-                                  : value.type == 6
-                                      ? "直播"
-                                      : value.type == 7
-                                          ? "外链"
-                                          : value.type == 8
-                                              ? "讨论"
-                                              : value.type == 9
-                                                  ? "活动"
-                                                  : value.type == 10
-                                                      ? "测评"
-                                                      : value.type == 11
-                                                          ? "评估"
-                                                          : value.type == 12
-                                                              ? "投票"
-                                                              : "-",
+            value.type == 1
+              ? "在线"
+              : value.type == 2
+              ? "面授"
+              : value.type == 3
+              ? "案例"
+              : value.type == 4
+              ? "作业"
+              : value.type == 5
+              ? "考试"
+              : value.type == 6
+              ? "直播"
+              : value.type == 7
+              ? "外链"
+              : value.type == 8
+              ? "讨论"
+              : value.type == 9
+              ? "活动"
+              : value.type == 10
+              ? "测评"
+              : value.type == 11
+              ? "评估"
+              : value.type == 12
+              ? "投票"
+              : "-",
           creater: value.name,
           cretime: value.duration ? value.duration : "-",
           checked1: value.flag ? true : false,
@@ -1243,27 +1249,27 @@ export default {
           width: 60,
           align: "left",
           className: "classify",
-          scopedSlots: {customRender: "action"},
+          scopedSlots: { customRender: "action" },
           customRender: (text) => {
             // console.log(text.record.checked1);
             return (
-                <div class="racona">
-                  <div
-                      class="img"
-                      style={{cursor: "pointer"}}
-                      onClick={() => {
-                        console.log("点击了");
-                      }}
-                  ></div>
-                  <span> {text.record.lei}</span>
+              <div class="racona">
+                <div
+                  class="img"
+                  style={{ cursor: "pointer" }}
+                  onClick={() => {
+                    console.log("点击了");
+                  }}
+                ></div>
+                <span> {text.record.lei}</span>
 
-                  {/**
+                {/**
                    <div class="img"></div>
                    <a-checkbox class="ch" checked={text.record.checkedd}>
                    {text.record.lei}
                    </a-checkbox>
                    */}
-                </div>
+              </div>
             );
           },
         },
@@ -1283,35 +1289,35 @@ export default {
           // width: 100,
           align: "center",
           className: "h",
-          scopedSlots: {customRender: "action"},
+          scopedSlots: { customRender: "action" },
           customRender: (text) => {
             // console.log(text.record.checked1);
             return (
-                <div class="opat">
-                  <div class="opacationt clearfix">
-                    <a-switch
-                        style="margin-left:-50px;margin-top:3px"
-                        checked={text.record.checked1}
-                        size="small"
-                        active-color="red"
-                        onClick={() => {
-                          console.log("点击了");
-                          text.record.checked1 = !text.record.checked1;
-                        }}
-                    />
-                    <div class="showt clearfix">
-                      <div
-                          class="bi"
-                          style={
-                            text.record.checked1 ? "z-index:999" : "z-index:998"
-                          }
-                      >
-                        必修
-                      </div>
-                      <div class="xuan">选修</div>
+              <div class="opat">
+                <div class="opacationt clearfix">
+                  <a-switch
+                    style="margin-left:-50px;margin-top:3px"
+                    checked={text.record.checked1}
+                    size="small"
+                    active-color="red"
+                    onClick={() => {
+                      console.log("点击了");
+                      text.record.checked1 = !text.record.checked1;
+                    }}
+                  />
+                  <div class="showt clearfix">
+                    <div
+                      class="bi"
+                      style={
+                        text.record.checked1 ? "z-index:999" : "z-index:998"
+                      }
+                    >
+                      必修
                     </div>
+                    <div class="xuan">选修</div>
                   </div>
                 </div>
+              </div>
             );
           },
         },
@@ -1330,30 +1336,30 @@ export default {
           key: "opacation",
           // width: 100,
           align: "center",
-          scopedSlots: {customRender: "action"},
+          scopedSlots: { customRender: "action" },
           customRender: (text) => {
             return (
-                <div class="opa">
-                  <div class="opacation">
+              <div class="opa">
+                <div class="opacation">
                   <span
-                      onClick={() => {
-                        console.log(text, "编辑text");
-                      }}
-                      style="color:#4EA6FF;margin-right:25px;cursor:pointer"
+                    onClick={() => {
+                      console.log(text, "编辑text");
+                    }}
+                    style="color:#4EA6FF;margin-right:25px;cursor:pointer"
                   >
                     编辑
                   </span>
-                    <span
-                        style="color:#4EA6FF;cursor:pointer"
-                        onClick={() => {
-                          showDelete();
-                          state.deleteID = text.record.id;
-                        }}
-                    >
+                  <span
+                    style="color:#4EA6FF;cursor:pointer"
+                    onClick={() => {
+                      showDelete();
+                      state.deleteID = text.record.id;
+                    }}
+                  >
                     删除
                   </span>
-                  </div>
                 </div>
+              </div>
             );
           },
         },
@@ -1366,83 +1372,81 @@ export default {
       let obj = {
         projectId: state.projectId,
       };
-      await api
-          .getTask(obj)
-          .then((res) => {
-            console.log("22222", res.data.data.stageList);
-            state.projectTitle = res.data.data.projectInfo.name;
-            state.picUrl = res.data.data.projectInfo.picUrl;
-            state.stageList = res.data.data.stageList;
-            getStageData(res.data.data.stageList);
-            updateStageChoosd()
-            // let leng = res.data.data.stageList.length;
-            // if (leng > 0) {
-            //   let stage = localStorage.getItem("stageId") ? localStorage.getItem("stageId") : null;
-            //
-            //   // console.log("stage",Object.prototype.toString.call(stage))
-            //   if (stage != null) {
-            //     console.log(stage);
-            //     let stageList = res.data.data.stageList; //阶段数组
-            //
-            //
-            //
-            //     let result = stageList.find((item) => item.stageId == stage);
-            //     console.log("又找到了", result);
-            //     if (result != null) {
-            //       getTableData(result.taskList);
-            //     } else {
-            //       //没有选中的阶段时，获取全部的任务
-            //       console.log(stage);
-            //       let stageList = res.data.data.stageList; //阶段数组
-            //       if (stageList != null) {
-            //         let taskListAll;
-            //         stageList.forEach((item) => {
-            //           taskListAll = [...item.taskList];
-            //         });
-            //         console.log("taskListAll", taskListAll);
-            //         getTableData(taskListAll);
-            //       }
-            //     }
-            //   } else {
-            //     console.log(stage);
-            //     let stageList = res.data.data.stageList; //阶段数组
-            //     if (stageList != null) {
-            //       let taskListAll;
-            //       stageList.forEach((item) => {
-            //         taskListAll = [...item.taskList];
-            //       });
-            //       console.log("taskListAll", taskListAll);
-            //       getTableData(taskListAll);
-            //     }
-            //   }
-            //   // 每次都获取了第一条taskList
-            //   // let arr = res.data.data.stageList[0].taskList;
-            //   // console.log("任务列表", stage, arr);
-            //   // getTableData(arr);
-            // }
-            // // //获取阶段列表
-            // let stagearr = res.data.data.stageList;
-            // // let arrlist = state.curLevel;
-            // console.log(stagearr, 111111);
-            // if (stagearr.length > 0) {
-            //   getStageData(stagearr);
-            //   // stagearr.map((value) => {
-            //   //   console.log(value);
-            //   //   // arrlist.push(value);
-            //   // });
-            // }
-            // //给阶段id赋初始值
-            // let stageid = localStorage.getItem("stageId")
-            //     ? localStorage.getItem("stageId")
-            //     : null;
-            // if (stageid !== "null") {
-            //   state.chooseStageId = stageid;
-            // } else {
-            //   state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
-            // }
-            // let final = state.level.find((item) => item.id == state.chooseStageId);
-            // getTableData(final.taskList);
-          })
+      await api.getTask(obj).then((res) => {
+        console.log("22222", res.data.data.stageList);
+        state.projectTitle = res.data.data.projectInfo.name;
+        state.picUrl = res.data.data.projectInfo.picUrl;
+        state.stageList = res.data.data.stageList;
+        getStageData(res.data.data.stageList);
+        updateStageChoosd();
+        // let leng = res.data.data.stageList.length;
+        // if (leng > 0) {
+        //   let stage = localStorage.getItem("stageId") ? localStorage.getItem("stageId") : null;
+        //
+        //   // console.log("stage",Object.prototype.toString.call(stage))
+        //   if (stage != null) {
+        //     console.log(stage);
+        //     let stageList = res.data.data.stageList; //阶段数组
+        //
+        //
+        //
+        //     let result = stageList.find((item) => item.stageId == stage);
+        //     console.log("又找到了", result);
+        //     if (result != null) {
+        //       getTableData(result.taskList);
+        //     } else {
+        //       //没有选中的阶段时，获取全部的任务
+        //       console.log(stage);
+        //       let stageList = res.data.data.stageList; //阶段数组
+        //       if (stageList != null) {
+        //         let taskListAll;
+        //         stageList.forEach((item) => {
+        //           taskListAll = [...item.taskList];
+        //         });
+        //         console.log("taskListAll", taskListAll);
+        //         getTableData(taskListAll);
+        //       }
+        //     }
+        //   } else {
+        //     console.log(stage);
+        //     let stageList = res.data.data.stageList; //阶段数组
+        //     if (stageList != null) {
+        //       let taskListAll;
+        //       stageList.forEach((item) => {
+        //         taskListAll = [...item.taskList];
+        //       });
+        //       console.log("taskListAll", taskListAll);
+        //       getTableData(taskListAll);
+        //     }
+        //   }
+        //   // 每次都获取了第一条taskList
+        //   // let arr = res.data.data.stageList[0].taskList;
+        //   // console.log("任务列表", stage, arr);
+        //   // getTableData(arr);
+        // }
+        // // //获取阶段列表
+        // let stagearr = res.data.data.stageList;
+        // // let arrlist = state.curLevel;
+        // console.log(stagearr, 111111);
+        // if (stagearr.length > 0) {
+        //   getStageData(stagearr);
+        //   // stagearr.map((value) => {
+        //   //   console.log(value);
+        //   //   // arrlist.push(value);
+        //   // });
+        // }
+        // //给阶段id赋初始值
+        // let stageid = localStorage.getItem("stageId")
+        //     ? localStorage.getItem("stageId")
+        //     : null;
+        // if (stageid !== "null") {
+        //   state.chooseStageId = stageid;
+        // } else {
+        //   state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
+        // }
+        // let final = state.level.find((item) => item.id == state.chooseStageId);
+        // getTableData(final.taskList);
+      });
     };
 
     //获取修改、删除id（投票)
@@ -1459,25 +1463,33 @@ export default {
 
     //删除任务
     const deleteTask = async () => {
-      await api.deleteTask({projectTaskIds: state.deleteID})
+      await api.deleteTask({ projectTaskIds: state.deleteID });
       //删除后更新索引
     };
 
     function updateStageChoosd() {
-      console.log('updateStageChoosd')
-      console.log(state.chooseStageId)
-      if (state.chooseStageId && state.stageList.find(e => e.stageId == state.chooseStageId)) {
-        getTableData(state.stageList.find(e => e.stageId == state.chooseStageId)?.taskList);
-        return
+      console.log("updateStageChoosd");
+      console.log(state.chooseStageId);
+      if (
+        state.chooseStageId &&
+        state.stageList.find((e) => e.stageId == state.chooseStageId)
+      ) {
+        getTableData(
+          state.stageList.find((e) => e.stageId == state.chooseStageId)
+            ?.taskList
+        );
+        return;
       }
-      state.chooseStageId = ''
-      const arr = state.stageList.filter(e => e.name);
+      state.chooseStageId = "";
+      const arr = state.stageList.filter((e) => e.name);
       arr && arr.length && (state.chooseStageId = arr[0].stageId);
       if (!state.chooseStageId) {
-        getTableData(state.stageList[0].taskList)
-        return
+        getTableData(state.stageList[0].taskList);
+        return;
       }
-      getTableData(state.stageList.find(e => e.stageId == state.chooseStageId)?.taskList);
+      getTableData(
+        state.stageList.find((e) => e.stageId == state.chooseStageId)?.taskList
+      );
     }
 
     const showChangeModal = () => {
@@ -1506,21 +1518,21 @@ export default {
             projectTaskId: state.selectRow,
           };
           apimove
-              .moveTask(obj)
-              .then((res) => {
-                console.log("移动成功", res);
-                message.destroy();
-                message.success("移动成功");
-                state.selectRow = []; //选择行
-                state.selectAll = 0; //0：未选择，1：全选，2：部分选择
-                console.log(state.removeStageId);
-                getTask();
+            .moveTask(obj)
+            .then((res) => {
+              console.log("移动成功", res);
+              message.destroy();
+              message.success("移动成功");
+              state.selectRow = []; //选择行
+              state.selectAll = 0; //0：未选择，1：全选，2：部分选择
+              console.log(state.removeStageId);
+              getTask();
 
-                localStorage.setItem("stageId", state.chooseStageId);
-              })
-              .catch((err) => {
-                console.log("移动失败", err);
-              });
+              localStorage.setItem("stageId", state.chooseStageId);
+            })
+            .catch((err) => {
+              console.log("移动失败", err);
+            });
           state.visiblene = false;
         }
       }
@@ -1534,18 +1546,18 @@ export default {
           projectTaskIds: value,
         };
         api
-            .deleteTask(obj)
-            .then((res) => {
-              console.log(res);
-              message.destroy();
-              message.success("批量删除成功");
-              getTask();
-            })
-            .catch((err) => {
-              console.log(err);
-              message.destroy();
-              message.warning("批量删除失败");
-            });
+          .deleteTask(obj)
+          .then((res) => {
+            console.log(res);
+            message.destroy();
+            message.success("批量删除成功");
+            getTask();
+          })
+          .catch((err) => {
+            console.log(err);
+            message.destroy();
+            message.warning("批量删除失败");
+          });
       });
       state.deAll = false;
     };
@@ -1602,23 +1614,25 @@ export default {
           stageId: state.updateStageID,
         };
         await apistage
-            .editStage(obj)
-            .then(async (res) => {
-              console.log("修改阶段成功", res);
-              state.valuesname = "";
-              state.valuesnotice = "";
-              closeModal();
-              state.updateStageID = null;
-              message.destroy();
-              message.success("修改阶段成功");
-              await getTask();
-              state.chooseStageId = res.data.data.stageId;
-              let final = state.level.find((item) => item.id == state.chooseStageId);
-              getTableData(final.taskList);
-            })
-            .catch((err) => {
-              console.log("添加阶段失败", err);
-            });
+          .editStage(obj)
+          .then(async (res) => {
+            console.log("修改阶段成功", res);
+            state.valuesname = "";
+            state.valuesnotice = "";
+            closeModal();
+            state.updateStageID = null;
+            message.destroy();
+            message.success("修改阶段成功");
+            await getTask();
+            state.chooseStageId = res.data.data.stageId;
+            let final = state.level.find(
+              (item) => item.id == state.chooseStageId
+            );
+            getTableData(final.taskList);
+          })
+          .catch((err) => {
+            console.log("添加阶段失败", err);
+          });
       } else {
         let obj = {
           name: state.valuesname,
@@ -1626,22 +1640,24 @@ export default {
           remark: state.valuesnotice,
         };
         await apistage
-            .editStage(obj)
-            .then(async (res) => {
-              console.log("添加阶段成功", res);
-              state.valuesname = "";
-              state.valuesnotice = "";
-              closeModal();
-              message.destroy();
-              message.success("添加阶段成功");
-              await getTask();
-              state.chooseStageId = res.data.data.stageId;
-              let final = state.level.find((item) => item.id == state.chooseStageId);
-              getTableData(final.taskList);
-            })
-            .catch((err) => {
-              console.log("添加阶段失败", err);
-            });
+          .editStage(obj)
+          .then(async (res) => {
+            console.log("添加阶段成功", res);
+            state.valuesname = "";
+            state.valuesnotice = "";
+            closeModal();
+            message.destroy();
+            message.success("添加阶段成功");
+            await getTask();
+            state.chooseStageId = res.data.data.stageId;
+            let final = state.level.find(
+              (item) => item.id == state.chooseStageId
+            );
+            getTableData(final.taskList);
+          })
+          .catch((err) => {
+            console.log("添加阶段失败", err);
+          });
       }
     };
 
@@ -1662,21 +1678,21 @@ export default {
         stageId: state.deleteStageId,
       };
       apistage
-          .deleteStage(obj)
-          .then((res) => {
-            console.log("删除阶段成功", res);
-            message.success("删除阶段成功");
-            closeDeleteStage();
-            localStorage.setItem("stageId", "");
-            getTask();
-          })
-          .catch((err) => {
-            console.log("删除阶段失败", err);
-          });
+        .deleteStage(obj)
+        .then((res) => {
+          console.log("删除阶段成功", res);
+          message.success("删除阶段成功");
+          closeDeleteStage();
+          localStorage.setItem("stageId", "");
+          getTask();
+        })
+        .catch((err) => {
+          console.log("删除阶段失败", err);
+        });
     };
     onMounted(() => {
       document.getElementsByTagName("main")[0].style.background =
-          "rgb(245, 247, 250,1)";
+        "rgb(245, 247, 250,1)";
       document.getElementsByTagName("main")[0].style.boxShadow = "none";
       getTask();
     });
@@ -1689,7 +1705,7 @@ export default {
     onUnmounted(() => {
       document.getElementsByTagName("main")[0].style.background = "#ffffff";
       document.getElementsByTagName("main")[0].style.boxShadow =
-          "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
+        "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
     });
     const showDrawerOnline = (id, eleId) => {
       console.log("id, eleId", id, eleId);
@@ -1852,17 +1868,17 @@ export default {
         type: ele.type,
       };
       api
-          .addTask(obj)
-          .then((res) => {
-            console.log(`修改状态成功${res.data}`);
-            message.destroy();
-            message.success("修改成功");
-          })
-          .catch((err) => {
-            console.log(`修改状态失败${err.data}`);
-            message.destroy();
-            message.warning("修改失败");
-          });
+        .addTask(obj)
+        .then((res) => {
+          console.log(`修改状态成功${res.data}`);
+          message.destroy();
+          message.success("修改成功");
+        })
+        .catch((err) => {
+          console.log(`修改状态失败${err.data}`);
+          message.destroy();
+          message.warning("修改失败");
+        });
     };
     //编辑的按钮
     const decideType = (type, id, eleId) => {
@@ -2021,8 +2037,8 @@ export default {
             width: calc(100%);
             height: 40px;
             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%
             );
           }
 
@@ -2123,9 +2139,9 @@ export default {
 
       .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%
         );
       }
 
@@ -2242,8 +2258,8 @@ export default {
             justify-content: center;
 
             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%
             );
 
             .inhe {
@@ -2927,8 +2943,8 @@ export default {
             }
 
             .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: #f6f9fd;
             }
 

From 5f9c997189df474be5d3b0bcbaa56a766715d7f5 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 4 Dec 2022 20:06:23 +0800
Subject: [PATCH 5/5] =?UTF-8?q?--=E9=A1=B9=E7=9B=AE=20=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ProjCheckPower.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue
index c2cd635c..4d93ac8e 100644
--- a/src/components/drawers/ProjCheckPower.vue
+++ b/src/components/drawers/ProjCheckPower.vue
@@ -898,10 +898,14 @@ export default {
       console.log("choosepeople : ", state.choosepeople);
       state.selectedRowKeys = selectedRowKeys;
       const se = state.studentList.map(e => e.id).join(',') || ''
-      const addItem = item.filter(e => (e && !se.includes(e.id + ',')))
+      const addItem = item.filter(e => (e && !se.includes(e.id + '')))
       addItem.forEach(e => {
         e.name = e.realName
       })
+      const selectStr = selectedRowKeys.join(',')
+      console.log(selectStr)
+      state.studentList = state.studentList.filter(e => selectStr.includes(e.id + ''))
+      console.log(state.studentList)
       state.choosepeople = [...addItem.reverse(), ...state.studentList];
       selectedsHeight();
       // if (selectedRowKeys.length > 0 && item.length > 0) {