From d08bd5e10e114ce55a8be051a9ef5680b63ca9cf Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Sun, 13 Nov 2022 14:56:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feaet:=E6=8A=95=E7=A5=A8=E9=A2=98=E5=B9=B2?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=81=E9=80=89=E9=A1=B9=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/CreVote.vue | 35 ++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index cdcd309d..0158a5ed 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -36,7 +36,7 @@
           <button class="cjtpbtn" @click="addQue()">创建题干</button>
         </div>
         <div class="queBox" v-for="(q, index) in questions" :key="index">
-          <div class="delBtn" v-if="questions.length > 1">
+          <div class="delBtn" v-if="questions.length > 1" @click="delQue(questions,index)">
             <img src="@/assets/images/projectadd/delete.png" alt="" />
             <div class="btnText">删除题干</div>
           </div>
@@ -77,10 +77,18 @@
                     v-model:value="o.opvalue"
                     style="width: 424px; height: 32px"
                   />
-                  <button v-if="q.options.length > 2" class="delbtn" :key="index" @click="delOpt(q.options)">
+                  <button v-if="q.options.length > 2" class="delbtn" @click="delOpt(q.options,index)">
                     删除
                   </button>
                 </div>
+                <!-- <a-upload
+                  v-show="!item.imgVal"
+                  class="in uploadBtn"
+                  :show-upload-list="false"
+                  :before-upload="beforeUpload"
+                >
+                  <div class="addimg">+ 上传图片</div>
+                </a-upload> -->
                 <a-button type="link">+ 上传图片</a-button>
                 <!-- <input class="file-upload" type="file" accept="image/*" name="picture"/> -->
               </div>
@@ -154,7 +162,11 @@ export default {
           },
         ],
       });
-    };
+    }; 
+    const delQue = (value,index)=>{
+      console.log('gyd',value,index);
+      value.splice(value[index],1)
+    }
     const addOpt = (value) => {
       console.log(value);
       value.push({
@@ -163,10 +175,10 @@ export default {
         opvalue: "",
       });
     };
-    const delOpt = (value) => {
-      console.log('gys', value);
-      // delete value[0]
-      value.pop()
+    const delOpt = (value,index) => {
+      console.log('gys', value,index);
+      // delete value
+      value.splice(value[index],1)
     }
 
     const closeDrawer = () => {
@@ -186,10 +198,10 @@ export default {
       //   message.destroy();
       //   return message.info("请输入题干");
       // }
-      // if (!state.questions.optins.opvalue) {
-      //   message.destroy();
-      //   return message.info("请输入选项");
-      // }
+      if (!state.questions.optins.opvalue) {
+        message.destroy();
+        return message.info("请输入选项");
+      }
       console.log("111111", state.questions);
       // console.log('22222',state.questions.inputV);
       // console.log('333333',state.questions.options);
@@ -258,6 +270,7 @@ export default {
       afterVisibleChange,
       closeDrawer,
       addQue,
+      delQue,
       addOpt,
       delOpt,
       createQueTit,

From c2b68cf5aaec80041ed978b04b71409fed9b3686 Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Mon, 14 Nov 2022 09:42:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=E6=8A=95=E7=A5=A8=E9=A2=98=E5=B9=B2?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=92=8C=E9=80=89=E9=A1=B9=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?\=E5=88=9B=E5=BB=BA=E5=88=A0=E9=99=A4=E9=A2=98=E5=B9=B2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddVote.vue |  41 +++++-----
 src/components/drawers/CreVote.vue | 120 +++++++++++++++--------------
 vue.config.js                      |   1 +
 3 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
index 57195b43..01647cc1 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -66,7 +66,7 @@
               <div :style="{ display: creVote ? 'block' : 'none' }">
                 <div class="fileTigan">
                   <span style="color: #388be1">{{voteStemName}}</span>
-                  <div class="delBox" @click="delBox()"></div>
+                  <div class="delBox" @click="dleVoteStem()"></div>
                 </div>
               </div>
             </div>
@@ -74,7 +74,8 @@
             <div>
               <cre-vote
                 v-model:crevoteVisible="crevotevisible"
-                @getData="changeVData"
+                @getData="getStemId"
+                v-model:voteStemId="voteStemId"
               />
             </div>
             <!-- 创建投票侧弹窗 -->
@@ -195,7 +196,7 @@ export default {
       endTimes: "",
       startTimes: "",
       ascriptionId: "",
-      voteStemId: "",
+      voteStemId: null,
       voteId:"",
       voteStemName:"",
     });
@@ -209,6 +210,14 @@ export default {
     const showDrawerCreVote = () => {
       state.crevotevisible = true;
     };
+    const getStemId = (data) => {
+      state.voteStemName = data.voteStemName;
+      state.voteStemId = Number(data.voteStemId);
+      state.creVote = data.creVote;
+      console.log('state.voteStemId', state.voteStemId);
+      console.log('state.voteStemId', state.creVote);
+    }
+    //暂时没用 之前给子用传参来着
     const changeVData = (data) => {
       console.log("111", data);
       state.creVote = data.creVote;
@@ -220,25 +229,11 @@ export default {
     };
     const delBox = () => {
       state.creVote = false;
-      dleVoteStem()
     };
 
-    //获取题干信息
-    // const getStemText = () => {
-    //   let objstem = {
-    //     stemId: state.ascriptionId,
-    //     ascriptionId: state.voteStemId,
-    //   }
-    //   api
-    //     .queryStemByStemId(objstem)
-    //     .then((res) => {
-    //       console.log("获取成功", res);
-    //       message.success("获取成功");
-    //     })
-    //     .catch((err) => {
-    //       console.log(err);
-    //     });
-    // }
+    const updateTableData = (data) => {
+      console.log(data, 'data');
+    }
 
     //删除题干信息接口
     const dleVoteStem = () => {
@@ -249,6 +244,7 @@ export default {
         .then((res) => {
           console.log('删除题干信息成功', res)
           message.success('删除题干信息成功')
+          delBox()
       })
     }
     //创建投票信息
@@ -273,9 +269,6 @@ export default {
         );
       }
 
-      // if (state.crevotevisible = false) {
-      //   changeVData()
-      // };
 
       let obj = {
         ascriptionId: state.ascriptionId,
@@ -342,12 +335,14 @@ export default {
       showDrawerCreVote,
       afterVisibleChange,
       closeDrawer,
+      getStemId,
       changeVData,
       rowSelection,
       options1,
       dleVoteStem,
       createVoteText,
       delBox,
+      updateTableData,
     };
   },
 };
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index 826218f8..7ac4071e 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -111,7 +111,7 @@
     </div>
   </a-drawer>
 </template>
-  <script>
+<script>
 import { reactive, toRefs } from "vue";
 import * as api from "../../api/indexVote";
 import { message } from "ant-design-vue";
@@ -186,46 +186,69 @@ export default {
 
     //创建题干接口
     const createQueTit = () => {
-      if (state.inputV1 == "") {
+      if (!state.inputV1) {
         message.destroy();
         return message.info("请输入投票名称");
       }
-      // if (!state.questions.inputV) {
-      //   message.destroy();
-      //   return message.info("请输入题干");
-      // }
-      if (!state.questions.optins.opvalue) {
-        message.destroy();
-        return message.info("请输入选项");
+      for (let i = 0; i < state.questions.length; i++) {
+        if (!state.questions[i].inputV) {
+          message.destroy();
+          return message.info("请输入题干");
+        }
+      }
+      for (let i = 0; i < state.questions.length; i++) {
+        for (let k = 0; k < state.questions[i].options.length; k++) {
+          if (!state.questions[i].options[k].opvalue) {
+            message.destroy();
+            return message.info("请输入选项");
+          }
+        }
+      }
+      // for (let i = 0; i < state.questions.length; i++) {
+      //   for (let k = 0; k < state.questions[i].options.length; k++) {
+      //     // console.log('1111111111111111', state.questions);
+      //     // console.log('2222222222222222', state.questions[i].options);
+
+      //   }
+      // }
+      let obj = {
+        "ballotId": 0,
+        "ballotName": state.inputV1,
+        "createTime": "",
+        "createUser": 0,
+        "updateTime": "",
+        "updateUser": 0,
+        "voteStemDtoList": [
+          {
+            "ballotId": 0,
+            "createTime": "",
+            "createUser": 0,
+            "optionDetailList": [
+              {
+                "createTime": "",
+                "createUser": 0,
+                "optionFlag": "",
+                "optionId": 0,
+                // "optionName": state.questions[i].options[k].opvalue,
+                "optionName": "",
+                "optionOrderNum": "",
+                "optionPictureAddress": "",
+                "stem": "",
+                "updateTime": "",
+                "updateUser": 0,
+                "voteStemId": 0
+              }
+            ],
+            "orderNumber": "",
+            "updateTime": "",
+            "updateUser": 0,
+            "voteStemFlag": "",
+            "voteStemId": 0,
+            // "voteStemName": state.questions[i].inputV,
+            "voteStemName": "",
+          }
+        ]
       }
-      console.log("111111", state.questions);
-      // console.log('22222',state.questions.inputV);
-      // console.log('333333',state.questions.options);
-      let obj = [
-        {
-          ascriptionId: 0,
-          createUser: 0,
-          optionDetailList: [
-            {
-              createUser: 0,
-              optionId: 0,
-              optionName: state.questions[0].options[0].opvalue,
-              optionOrderNum: "",
-              optionPictureAddress: "",
-              stem: "",
-              updateTime: "",
-              updateUser: 0,
-              voteStemId: 0,
-            },
-          ],
-          orderNumber: "",
-          updateTime: "",
-          updateUser: 0,
-          voteStemFlag: "",
-          voteStemId: 0,
-          voteStemName: state.questions[0].inputV,
-        },
-      ];
       api
         .createOptionMessage(obj)
         .then((res) => {
@@ -234,27 +257,12 @@ export default {
           // console.log('res.data.data[0].voteStemId',res.data.data[0].voteStemId);
           // console.log('state.questions[0].inputV',state.questions[0].inputV);
           message.success("创建成功");
-          //获取题干信息
           let objstem = {
-            stemId: res.data.data[0].ascriptionId,
-            ascriptionId: res.data.data[0].voteStemId,
-          };
-          api
-            .queryStemByStemId(objstem)
-            .then((res) => {
-              console.log("获取成功", res);
-              message.success("获取成功");
-            })
-            .catch((err) => {
-              console.log(err);
-            });
-          let stemData = {
-            creVote: state.creVote,
-            ascriptionId: res.data.data[0].ascriptionId,
-            voteStemId: res.data.data[0].voteStemId,
             voteStemName: state.questions[0].inputV,
+            voteStemId: res.data.data.voteStemVoList[0].voteStemId,
+            creVote: true,
           };
-          ctx.emit("getData", stemData);
+          ctx.emit("getData", objstem);
           closeDrawer();
         })
         .catch((err) => {
@@ -274,7 +282,7 @@ export default {
   },
 };
 </script>
-  <style lang="scss">
+<style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
diff --git a/vue.config.js b/vue.config.js
index 00b489e9..83ff56c7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,6 +2,7 @@ const { defineConfig } = require("@vue/cli-service");
 module.exports = defineConfig({
   // transpileDependencies: true,
   devServer: {
+    port:8080,
     proxy: {
       "/api": {
         target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口

From 17e24ae408f806faff766086f7a4f9c19802b5da Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Mon, 14 Nov 2022 10:12:02 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=BD=92=E5=B1=9E?=
 =?UTF-8?q?=E6=9D=83=E5=8F=8A=E6=9F=A5=E7=9C=8B=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                           |   27 +
 package.json                                |    1 +
 src/assets/images/projectadd/go.png         |  Bin 0 -> 264 bytes
 src/assets/images/projectadd/pickUp.png     |  Bin 0 -> 275 bytes
 src/components/drawers/AddLevelAddStu.vue   |    6 +-
 src/components/drawers/CorPowerlist.vue     |   11 +-
 src/components/drawers/Ownership.vue        |   20 +-
 src/components/drawers/PowerList.vue        |    8 +-
 src/components/drawers/ProjPowerList.vue    |   16 +-
 src/components/drawers/ProjectOwn.vue       | 1337 +++++++++++--------
 src/components/drawers/StuAdd.vue           | 1305 ++++++++++++------
 src/views/certificate/CertificateCenter.vue |    6 +-
 src/views/learningpath/LevelAddDetail.vue   |   29 +-
 13 files changed, 1719 insertions(+), 1047 deletions(-)
 create mode 100644 src/assets/images/projectadd/go.png
 create mode 100644 src/assets/images/projectadd/pickUp.png

diff --git a/package-lock.json b/package-lock.json
index be3fa8d8..aeae90d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
 				"axios": "^1.1.3",
 				"core-js": "^3.8.3",
 				"element-plus": "^2.2.17",
+				"element-resize-detector": "^1.2.4",
 				"html2canvas": "^1.4.1",
 				"jquery": "^3.6.1",
 				"qrcode.vue": "^3.3.3",
@@ -3536,6 +3537,11 @@
 			"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
 			"dev": true
 		},
+		"node_modules/batch-processor": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmmirror.com/batch-processor/-/batch-processor-1.0.0.tgz",
+			"integrity": "sha512-xoLQD8gmmR32MeuBHgH0Tzd5PuSZx71ZsbhVxOCRbgktZEPe4SQy7s9Z50uPp0F/f7iw2XmkHN2xkgbMfckMDA=="
+		},
 		"node_modules/big.js": {
 			"version": "5.2.2",
 			"resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
@@ -4934,6 +4940,14 @@
 			"resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
 			"integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
 		},
+		"node_modules/element-resize-detector": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmmirror.com/element-resize-detector/-/element-resize-detector-1.2.4.tgz",
+			"integrity": "sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg==",
+			"dependencies": {
+				"batch-processor": "1.0.0"
+			}
+		},
 		"node_modules/emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -14162,6 +14176,11 @@
 			"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
 			"dev": true
 		},
+		"batch-processor": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmmirror.com/batch-processor/-/batch-processor-1.0.0.tgz",
+			"integrity": "sha512-xoLQD8gmmR32MeuBHgH0Tzd5PuSZx71ZsbhVxOCRbgktZEPe4SQy7s9Z50uPp0F/f7iw2XmkHN2xkgbMfckMDA=="
+		},
 		"big.js": {
 			"version": "5.2.2",
 			"resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
@@ -15332,6 +15351,14 @@
 				}
 			}
 		},
+		"element-resize-detector": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmmirror.com/element-resize-detector/-/element-resize-detector-1.2.4.tgz",
+			"integrity": "sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg==",
+			"requires": {
+				"batch-processor": "1.0.0"
+			}
+		},
 		"emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
diff --git a/package.json b/package.json
index faa48370..64e53703 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
 		"axios": "^1.1.3",
 		"core-js": "^3.8.3",
 		"element-plus": "^2.2.17",
+		"element-resize-detector": "^1.2.4",
 		"html2canvas": "^1.4.1",
 		"jquery": "^3.6.1",
 		"qrcode.vue": "^3.3.3",
diff --git a/src/assets/images/projectadd/go.png b/src/assets/images/projectadd/go.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1ca16c34d7781ac5bfb0133f4cb64e4a51dcc86
GIT binary patch
literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^AT|#N8<337)>#0g7>k44ofy`glX(f`9P)H=4ABVg
zy||Z;(NTo;LGhjmP74EW^twG%<k{*JBGu~D(Z|%e#y3Y<L`ZOvq1V>q6W<6n{fM;R
zKIdmz-n*Sg<{zD1Y$MCCC8yEx%5C=<$_5hyHoAU`|0p|8KPFzXb%ytf_gy*mkJKv;
zIxlt6k#tVaj@bRsyyCCrLV;|7MpK>n=NCPU`1qlNw{zv$#VkSZ*V?K&C%7gh@UEV?
zHr79rkz45O+C=3diS!jZNi#ZEyyMv||G3co7Wa!t=l|Ic_M25QCERo3?fp~;^b7-o
Mr>mdKI;Vst03bJJ<p2Nx

literal 0
HcmV?d00001

diff --git a/src/assets/images/projectadd/pickUp.png b/src/assets/images/projectadd/pickUp.png
new file mode 100644
index 0000000000000000000000000000000000000000..27a12c9df38f4876d3c427c7436a810d9a0d45f2
GIT binary patch
literal 275
zcmV+u0qp*XP)<h;3K|Lk000e1NJLTq000UA000aK1^@s6TWc(!00001b5ch_0Itp)
z=>Px#%}GQ-R47x8kTFjJK@@~%HsR-3Q?fKhLrf?zHjo^fi-7_=qp_f{fyPi!pUaP+
zpfP(E78Vrzp&N41BY0U1ublVg&CDat9G>FryZQj0a>t93iGnuMh{T(KyWDXd1zVXO
zNla<b4GBLg$3GX_Uau<fK%o;-ejUd;fYxgPp-+RWkZ@bi{sT(1D=a14ng%YzfV(*O
ztJ+L+5%&hT4vybZ>q=~Uy-0W_a1$Iqqh%_w<u#!&LxEnNa&z*J<-&R;1jb>==D%RQ
Z%pNXrJq<Z)7U2K@002ovPDHLkV1oDTZ1w;E

literal 0
HcmV?d00001

diff --git a/src/components/drawers/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue
index 87ef5560..935f71c2 100644
--- a/src/components/drawers/AddLevelAddStu.vue
+++ b/src/components/drawers/AddLevelAddStu.vue
@@ -1021,17 +1021,17 @@ export default {
       state.selectedRowKeys2 = selectedRowKeys;
     };
 
-    const getMousePosition = () => {
+    const getClientHeight = () => {
       state.screenHeight = document.body.clientHeight;
     };
 
     onMounted(() => {
       // console.log("11111", 1);
-      window.addEventListener("resize", getMousePosition, false);
+      window.addEventListener("resize", getClientHeight, false);
       // judgeUrl();
     });
     onUnmounted(() => {
-      window.removeEventListener("resize", getMousePosition, false);
+      window.removeEventListener("resize", getClientHeight, false);
     });
     return {
       ...toRefs(state),
diff --git a/src/components/drawers/CorPowerlist.vue b/src/components/drawers/CorPowerlist.vue
index d39314ef..e972af16 100644
--- a/src/components/drawers/CorPowerlist.vue
+++ b/src/components/drawers/CorPowerlist.vue
@@ -1,5 +1,5 @@
 <template>
-    <a-drawer
+     <a-drawer
       :visible="corpowerlistVisible"
       class="drawerStyle corpowerlistDrawer"
       width="80%"
@@ -80,7 +80,8 @@
         </div>
       </div>
     </a-drawer>
-  </template>
+</template>
+  
   <script>
   import { reactive, toRefs, ref } from "vue";
   const columns1 = [
@@ -205,9 +206,9 @@
   };
   </script>
   <style lang="scss">
-  .ant-table-striped :deep(.table-striped) td {
-    background-color: #fafafa !important;
-  }
+  // .ant-table-striped :deep(.table-striped) td {
+  //   background-color: #fafafa !important;
+  // }
   
   .corpowerlistDrawer {
     .drawerMain {
diff --git a/src/components/drawers/Ownership.vue b/src/components/drawers/Ownership.vue
index 2f8c229e..97baeeab 100644
--- a/src/components/drawers/Ownership.vue
+++ b/src/components/drawers/Ownership.vue
@@ -93,7 +93,7 @@
                   </div>
                 </div>
               </a-tab-pane>
-              <a-tab-pane key="2" tab="添加组织" force-render>
+              <!-- <a-tab-pane key="2" tab="添加组织" force-render>
                 <div class="tab2">
                   <div class="t1">
                     <div class="organize">选择组织：</div>
@@ -123,7 +123,7 @@
                     />
                   </div>
                 </div>
-                <!-- 选完后出现下面 -->
+               
                 <div class="searchdown">
                   <div class="btns">
                     <div class="btn1">
@@ -213,19 +213,7 @@
                     <div class="wz">重置</div>
                   </div>
                 </div>
-                <!-- <div class="line">
-                  <div class="inline">
-                    <div class="left1">
-                      <div class="img"></div>
-                      <div class="text" style="margin-left: 10px">已选择</div>
-                      <div class="text2">2</div>
-                      <div class="text">项</div>
-                      <div class="text3">列表选项总计：</div>
-                      <div class="text4">9条</div>
-                    </div>
-                    <div class="right1">清空</div>
-                  </div>
-                </div> -->
+               
                 <div class="tabb" style="margin-top: 16px">
                   <a-table
                     style="border: 1px solid #f2f6fe"
@@ -256,7 +244,7 @@
                     </div>
                   </div>
                 </div>
-              </a-tab-pane>
+              </a-tab-pane> -->
             </a-tabs>
           </div>
         </div>
diff --git a/src/components/drawers/PowerList.vue b/src/components/drawers/PowerList.vue
index db21a8f0..80466125 100644
--- a/src/components/drawers/PowerList.vue
+++ b/src/components/drawers/PowerList.vue
@@ -50,11 +50,7 @@
             @expand="expandTable"
             :scroll="{ x: 900 }"
             :pagination="false"
-            :row-selection="{
-              columnWidth: 30,
-              selectedRowKeys: selectedRowKeys,
-              onChange: onSelectChange,
-            }"
+           
           />
         </div>
 
@@ -562,7 +558,7 @@ export default {
         .classify {
           // margin-left: 11px !important;
           // padding-left: 9px !important;
-          padding-left: 0px !important;
+          padding-left: 20px !important;
         }
         .ant-checkbox-wrapper {
           align-items: center;
diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue
index 1bf31e58..8d823919 100644
--- a/src/components/drawers/ProjPowerList.vue
+++ b/src/components/drawers/ProjPowerList.vue
@@ -42,7 +42,7 @@
 
         <div class="tableBox" style="margin-top: 10px">
           <a-table
-            style="border: 1px solid #f2f6fe"
+            style="border: 1px solid #f2f6fe;"
             :columns="tableDataFunc()"
             :data-source="tableData"
             :loading="tableDataTotal === -1 ? true : false"
@@ -50,11 +50,7 @@
             @expand="expandTable"
             :scroll="{ x: 900 }"
             :pagination="false"
-            :row-selection="{
-              columnWidth: 30,
-              selectedRowKeys: selectedRowKeys,
-              onChange: onSelectChange,
-            }"
+           
           />
         </div>
         <div class="tableBox">
@@ -107,7 +103,7 @@
             <div class="close_exit" @click="closeCancelModal"></div>
           </div>
           <div class="body">
-            <span>是否取消当前用户对此数据的权限</span>
+            <span>您确定要取消该用户的授权吗</span>
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1">
@@ -255,13 +251,13 @@ export default {
           // width: "30%",
           key: "name",
           width: 70,
-          align: "left",
+          // align: "left",
           className: "classify",
           scopedSlots: { customRender: "action" }, //引入的插槽
           customRender: (text) => {
             // console.log(text.record.checked1);
             return (
-              <div class="racona">
+              <div class="racona" >
                 <span> {text.record.name}</span>
               </div>
             );
@@ -450,7 +446,7 @@ export default {
         .classify {
           // margin-left: 11px !important;
           // padding-left: 9px !important;
-          padding-left: 0px !important;
+          padding-left: 20px !important;
         }
         .ant-checkbox-wrapper {
           align-items: center;
diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue
index a294a2b6..8dca9dae 100644
--- a/src/components/drawers/ProjectOwn.vue
+++ b/src/components/drawers/ProjectOwn.vue
@@ -1,10 +1,9 @@
-<!-- 项目的归属权 -->
 <template>
   <a-drawer
     :visible="ProjOwnervisible"
     class="drawerStyle ProjOwnership"
     placement="right"
-    width="60%"
+    width="85%"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
@@ -21,35 +20,39 @@
           <div class="tabs">
             <a-tabs v-model:activeKey="activeKey">
               <a-tab-pane key="1" tab="快速选人">
-                <div class="tab1">
-                  <div class="nameinp">
-                    <div class="namee">姓名：</div>
-                    <a-input
-                      v-model:value="name"
-                      style="width: 270px; height: 40px; border-radius: 8px"
-                      placeholder="请输入姓名"
-                    />
-                  </div>
-                  <div class="btns">
-                    <div class="btn1">
-                      <div class="img1">
-                        <img
-                          src="../../assets/images/courseManage/search0.png"
-                        />
-                      </div>
-                      <div class="wz">搜索</div>
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <div class="tab1">
+                    <div class="nameinp">
+                      <div class="namee">姓名：</div>
+                      <a-input
+                        v-model:value="name"
+                        style="width: 270px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                      />
                     </div>
-                    <div class="btn2">
-                      <div class="img2">
-                        <img
-                          src="../../assets/images/courseManage/reset1.png"
-                        />
+                    <div class="btns">
+                      <div class="btn1">
+                        <div class="img1">
+                          <img
+                            src="../../assets/images/courseManage/search0.png"
+                          />
+                        </div>
+                        <div class="wz">搜索</div>
+                      </div>
+                      <div class="btn2">
+                        <div class="img2">
+                          <img
+                            src="../../assets/images/courseManage/reset1.png"
+                          />
+                        </div>
+                        <div class="wz">重置</div>
                       </div>
-                      <div class="wz">重置</div>
                     </div>
                   </div>
-                </div>
-                <!-- <div class="line">
+                  <!-- <div class="line">
                   <div class="inline">
                     <div class="left1">
                       <div class="img"></div>
@@ -62,242 +65,135 @@
                     <div class="right1">清空</div>
                   </div>
                 </div> -->
-                <div class="tabb" style="margin-top: 16px">
-                  <a-table
-                    style="border: 1px solid #f2f6fe"
-                    :columns="tablecolumns"
-                    :data-source="tabledata"
-                    :loading="tableDataTotal === -1 ? true : false"
-                    expandRowByClick="true"
-                    :scroll="{ x: 500, y: 560 }"
-                    @expand="expandTable"
-                    :pagination="false"
-                    :row-selection="{
-                      columnWidth: 30,
-                      selectedRowKeys: selectedRowKeys,
-                      onChange: onSelectChange,
-                    }"
-                  />
-                  <div class="tableBox">
-                    <div class="pa">
-                      <a-pagination
-                        showSizeChanger="true"
-                        showQuickJumper="true"
-                        hideOnSinglePage="true"
-                        :pageSize="pageSize"
-                        :current="currentPage"
-                        :total="tableDataTotal"
-                        class="pagination"
-                      />
-                    </div>
-                  </div>
-                </div>
-              </a-tab-pane>
-              <a-tab-pane key="2" tab="添加组织" force-render>
-                <div class="tab2">
-                  <div class="t1">
-                    <div class="organize">选择组织：</div>
-                    <div class="select">
-                      <a-tree-select
-                        v-model:value="valueSelect"
-                        style="width: 200px"
-                        dropdownClassName="changetreedropdown"
+                  <div class="chooseLeft">
+                    <div class="boeTree">
+                      <div class="boeTreeTitle">BOE组织树</div>
+
+                      <a-tree
+                        v-model:value="valueSelectboe"
+                        class="treeMain"
+                        :style="{ height: screenHeight - 400 + 'px' }"
+                        dropdownClassName="changetreedropdownboe"
+                        defaultExpandAll
                         :dropdown-style="{
-                          maxHeight: '400px',
-                          overflow: 'auto',
+                          maxHeight: '600px',
                         }"
-                        placeholder="请输入组织名称"
+                        placeholder="BOE组织树"
                         allow-clear
                         tree-default-expand-all
                         :tree-data="treeData"
+                        @select="departmentSelect"
+                        v-model:selectedKeys="selectedKeys"
                       >
-                      </a-tree-select>
+                        <template #suffixIcon></template>
+                      </a-tree>
                     </div>
-                  </div>
-                  <div class="t1">
-                    <div class="organize">姓名：</div>
-                    <a-input
-                      v-model:value="nameadd"
-                      style="width: 200px; height: 40px; border-radius: 8px"
-                      placeholder="请输入姓名"
-                    />
-                  </div>
-                </div>
-                <!-- 选完后出现下面 -->
-                <div class="searchdown">
-                  <div class="btns">
-                    <div class="btn1">
-                      <div class="img1">
-                        <img
-                          src="../../assets/images/courseManage/search0.png"
-                        />
-                      </div>
-                      <div class="wz">搜索</div>
-                    </div>
-                    <div class="btn2">
-                      <div class="img2">
-                        <img
-                          src="../../assets/images/courseManage/reset1.png"
-                        />
-                      </div>
-                      <div class="wz">重置</div>
-                    </div>
-                  </div>
-                  <div class="tabb" style="margin-top: 16px">
-                    <a-table
-                      style="border: 1px solid #f2f6fe"
-                      :columns="tablecolumns1"
-                      :data-source="tabledata1"
-                      :loading="tableDataTotal === -1 ? true : false"
-                      expandRowByClick="true"
-                      :scroll="{ x: 500, y: 560 }"
-                      @expand="expandTable"
-                      :pagination="false"
-                      :row-selection="{
-                        columnWidth: 30,
-                        selectedRowKeys: selectedRowKeys1,
-                        onChange: onSelectChange1,
-                      }"
-                    />
-                    <div class="tableBox">
+                    <div class="tableBox tabb" style="margin-top: 16px">
+                      <a-table
+                        style="border: 1px solid #f2f6fe"
+                        :columns="tablecolumns"
+                        :data-source="tabledata"
+                        :loading="tableDataTotal === -1 ? true : false"
+                        expandRowByClick="true"
+                        @expand="expandTable"
+                        :pagination="false"
+                        :row-selection="{
+                          columnWidth: 20,
+                          selectedRowKeys: selectedRowKeys,
+                          onChange: onSelectChange,
+                        }"
+                      />
                       <div class="pa">
                         <a-pagination
                           showSizeChanger="true"
                           showQuickJumper="true"
                           hideOnSinglePage="true"
-                          :pageSize="pageSize1"
-                          :current="currentPage1"
-                          :total="tableDataTotal1"
+                          :pageSize="pageSize"
+                          v-model:current="currentPage"
+                          :total="tableDataTotal"
+                          :pagination="false"
                           class="pagination"
+                          v-if="tableDataTotal > 10"
+                          @change="changePagination"
                         />
                       </div>
                     </div>
                   </div>
                 </div>
               </a-tab-pane>
-              <a-tab-pane key="3" tab="受众关联">
-                <div class="tab1">
-                  <div class="t1">
-                    <div class="nameinp">
-                      <div class="namee">选择受众：</div>
-                      <div class="select">
-                        <a-select
-                          v-model:value="choosevalue"
-                          style="width: 200px; border-radius: 8px"
-                          placeholder="请输入组织名称"
-                          :options="organizeList1"
-                        />
-                      </div>
-                    </div>
-                  </div>
-                  <div class="t1" style="margin-top: 10px">
-                    <div class="organize">姓名：</div>
-                    <a-input
-                      v-model:value="nameaddd"
-                      style="width: 200px; height: 40px; border-radius: 8px"
-                      placeholder="请输入姓名"
-                    />
-                  </div>
-                </div>
-                <div class="btns">
-                  <div class="btn1">
-                    <div class="img1">
-                      <img src="../../assets/images/courseManage/search0.png" />
-                    </div>
-                    <div class="wz">搜索</div>
-                  </div>
-                  <div class="btn2">
-                    <div class="img2">
-                      <img src="../../assets/images/courseManage/reset1.png" />
-                    </div>
-                    <div class="wz">重置</div>
-                  </div>
-                </div>
-                <!-- <div class="line">
-                  <div class="inline">
-                    <div class="left1">
-                      <div class="img"></div>
-                      <div class="text" style="margin-left: 10px">已选择</div>
-                      <div class="text2">2</div>
-                      <div class="text">项</div>
-                      <div class="text3">列表选项总计：</div>
-                      <div class="text4">9条</div>
-                    </div>
-                    <div class="right1">清空</div>
-                  </div>
-                </div> -->
-                <div class="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, y: 560 }"
-                    @expand="expandTable"
-                    :pagination="false"
-                    :row-selection="{
-                      columnWidth: 30,
-                      selectedRowKeys: selectedRowKeys2,
-                      onChange: onSelectChange2,
-                    }"
-                  />
-                  <div class="tableBox">
-                    <div class="pa">
-                      <a-pagination
-                        showSizeChanger="true"
-                        showQuickJumper="true"
-                        hideOnSinglePage="true"
-                        :pageSize="pageSize2"
-                        :current="currentPage2"
-                        :total="tableDataTotal2"
-                        class="pagination"
-                      />
-                    </div>
-                  </div>
-                </div>
-              </a-tab-pane>
+            
             </a-tabs>
           </div>
         </div>
-        <div class="right">
+        <div class="right" >
           <div class="onerow">
             <div class="onleft">
               <div class="already">已选</div>
-              <div class="count">6</div>
-              <div class="peo">人</div>
+              <!-- <div class="count">6</div>
+              <div class="peo">人</div> -->
             </div>
-            <div class="clbox">
+            <div class="clbox" @click="deleteAll">
               <div class="colose"></div>
               <span class="allclear">全部清除</span>
             </div>
           </div>
-          <div class="selecteds">
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李大明
-              <div class="ch"></div>
-            </div>
-            <div class="chose">
-              李二明
-              <div class="ch"></div>
+          <div class="line"></div>
+          <div class="tit">快速选人</div>
+         <div style="position: relative;min-height:180px ">
+           <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 }}</div>
+                <div class="ch" @click="deleteChoosePeople(item)"></div>
+              </div>
             </div>
+            
           </div>
+<div
+              class="chose"
+             style="
+                position: absolute;
+                right: 32px;
+                bottom: -9px;
+                font-size: 12px;
+                font-weight: 500;
+                color: #409eff;
+                line-height: 22px;
+              "
+              v-if="showMore"
+              @click="morePeopleShow"
+            >
+              <div>查看更多   <img
+                  style="width: 10px; height: 12px; margin-top: -2px"
+                  src="../../assets/images/projectadd/go.png"
+                /></div>
+            </div>
+            <div
+              class="chose"
+              style="
+                position: absolute;
+                right: 32px;
+                bottom: -9px;
+                font-size: 12px;
+                font-weight: 500;
+                color: #409eff;
+                line-height: 22px;
+              "
+              v-if="showHidden"
+              @click="morePeopleHidden"
+            >
+              <div>收起 <img
+                  style="width: 10px; height: 12px; margin-top: -2px"
+                  src="../../assets/images/projectadd/pickUp.png"
+                /></div>
+            </div>
+         </div>
+         
         </div>
       </div>
       <div class="btnn">
@@ -305,11 +201,44 @@
         <button class="btn2">确定</button>
       </div>
     </div>
+
+    <!-- 确认添加部门弹窗 -->
+    <a-modal
+      v-model:visible="showOrgModal"
+      :footer="null"
+      wrapClassName="confirmAddOrg"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeOrgModal"></div>
+          </div>
+          <div class="body">
+            <span>您确定要添加此组织吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1" @click="closeOrgModal">
+              <div class="btnText">取消</div>
+            </div>
+            <div class="del_btn btn2" @click="addOrg">
+              <div class="btnText">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+    <!-- 确认添加部门弹窗 -->
   </a-drawer>
 </template>
 
 <script>
-import { reactive, toRefs } from "vue";
+import { reactive, toRefs, onMounted, onUnmounted } from "vue";
+import elementResizeDetectorMaker from "element-resize-detector";
+// import { message } from "ant-design-vue";
 export default {
   name: "ProjOwnerShip",
   props: {
@@ -320,6 +249,7 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
+      screenHeight: document.body.clientHeight, // 屏幕高度
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 50,
@@ -329,16 +259,20 @@ export default {
       pageSize2: 10,
       currentPage2: 1,
       tableDataTotal2: 50,
-      selectedRowKeys: [],
+     
       selectedRowKeys1: [],
-      selectedRowKeys2: [],
+     
       activeKey: "1",
       value: [], //级联选择框
       choosevalue: null, //受众选择
       valueSelect: null, //树形选择
+
+      valueSelectboe2: null, //boe树形选择
       name: "",
       nameadd: "",
       nameaddd: "",
+      com: "",
+      //组织树
       treeData: [
         {
           title: "京东方",
@@ -356,6 +290,38 @@ export default {
                   title: "研究部",
                   value: "研究部",
                 },
+                {
+                  title: "研究部2",
+                  value: "研究部2",
+                },
+                {
+                  title: "研究3",
+                  value: "研究3",
+                },
+                {
+                  title: "研究4",
+                  value: "研究4",
+                },
+                {
+                  title: "研究部5",
+                  value: "研究部5",
+                },
+                {
+                  title: "研究部6",
+                  value: "研究部6",
+                },
+                 {
+                  title: "研究部7",
+                  value: "研究部7",
+                },
+                {
+                  title: "研究部8",
+                  value: "研究部8",
+                },
+                {
+                  title: "研究部9",
+                  value: "研究部9",
+                },
               ],
             },
             {
@@ -401,6 +367,73 @@ export default {
                                                     {
                                                       title: "十二级标题",
                                                       value: "十二级标题",
+                                                      children: [
+                                                        {
+                                                          title:
+                                                            "十三级标题十三级标题十三级标题十三级标题",
+                                                          value: "十三级标题",
+                                                          children: [
+                                                            {
+                                                              title:
+                                                                "十四级标题",
+                                                              value:
+                                                                "十四级标题",
+                                                              children: [
+                                                                {
+                                                                  title:
+                                                                    "十五级标题",
+                                                                  value:
+                                                                    "十五级标题",
+                                                                  children: [
+                                                                    {
+                                                                      title:
+                                                                        "十六级标题",
+                                                                      value:
+                                                                        "十六级标题",
+                                                                      children:
+                                                                        [
+                                                                          {
+                                                                            title:
+                                                                              "十七级标题",
+                                                                            value:
+                                                                              "十七级标题",
+                                                                            children:
+                                                                              [
+                                                                                {
+                                                                                  title:
+                                                                                    "十八级标题",
+                                                                                  value:
+                                                                                    "十八级标题",
+                                                                                  children:
+                                                                                    [
+                                                                                      {
+                                                                                        title:
+                                                                                          "十九级标题",
+                                                                                        value:
+                                                                                          "十九级标题",
+                                                                                        children:
+                                                                                          [
+                                                                                            {
+                                                                                              title:
+                                                                                                "二十级标题二十级标题",
+                                                                                              value:
+                                                                                                "二十级标题二十级标题",
+                                                                                            },
+                                                                                          ],
+                                                                                      },
+                                                                                    ],
+                                                                                },
+                                                                              ],
+                                                                          },
+                                                                        ],
+                                                                    },
+                                                                  ],
+                                                                },
+                                                              ],
+                                                            },
+                                                          ],
+                                                        },
+                                                      ],
                                                     },
                                                   ],
                                                 },
@@ -439,69 +472,91 @@ export default {
           ],
         },
       ],
+      //快速选人的table
       tabledata: [
         {
           key: 1,
-          name: "小李",
+          name: "小李小李小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 2,
-          name: "小刘",
+          name: "小刘小刘小刘",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 3,
-          name: "小李",
+          name: "小李小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 4,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 5,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 6,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 7,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 8,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 9,
-          name: "小李",
+          name: "小小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
+        },
+        {
+          key: 10,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+        {
+          key: 11,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+        {
+          key: 12,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
         },
       ],
       tablecolumns: [
@@ -509,7 +564,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 30,
+          // width: 30,
           align: "left",
           className: "h",
         },
@@ -517,7 +572,7 @@ export default {
           title: "工号",
           dataIndex: "numb",
           key: "numb",
-          width: 35,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -525,7 +580,7 @@ export default {
           title: "归属组织",
           dataIndex: "guishu",
           key: "guishu",
-          width: 30,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -533,219 +588,22 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          width: 40,
+          // width: 30,
           align: "center",
           className: "h",
         },
       ],
-      tabledata1: [
-        {
-          key: 1,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 2,
-          name: "小刘",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 3,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 4,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 5,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 6,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 7,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 8,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 9,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-      ],
-      tablecolumns1: [
-        {
-          title: "姓名",
-          dataIndex: "name",
-          key: "name",
-          width: 30,
-          align: "left",
-          className: "h",
-        },
-        {
-          title: "工号",
-          dataIndex: "numb",
-          key: "numb",
-          width: 35,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "归属组织",
-          dataIndex: "guishu",
-          key: "guishu",
-          width: 30,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "部门",
-          dataIndex: "bum",
-          key: "bum",
-          width: 40,
-          align: "center",
-          className: "h",
-        },
-      ],
-      tabledata2: [
-        {
-          key: 1,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 2,
-          name: "小刘",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 3,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 4,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 5,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 6,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 7,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 8,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 9,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-      ],
-      tablecolumns2: [
-        {
-          title: "姓名",
-          dataIndex: "name",
-          key: "name",
-          width: 30,
-          align: "left",
-          className: "h",
-        },
-        {
-          title: "工号",
-          dataIndex: "numb",
-          key: "numb",
-          width: 35,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "归属组织",
-          dataIndex: "guishu",
-          key: "guishu",
-          width: 30,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "部门",
-          dataIndex: "bum",
-          key: "bum",
-          width: 40,
-          align: "center",
-          className: "h",
-        },
-      ],
-      organizeList1: [
-        {
-          value: "产品受众群体",
-          label: "产品受众群体",
-        },
-        {
-          value: "人力资源hrbp",
-          label: "人力资源hrbp",
-        },
-      ],
+
+    
+      //快速选人-------------------------------------
+      valueSelectboe: null, //快速选人的选择组织
+      choosepeople: [], //总的数组
+      selectedKeys: [], //选中部门
+      showMore: false, //是否显示快速选人的查看更多
+      showHidden: false, //是否显示收回
+       selectedRowKeys: [],//表格选中的key
+      //快速选人-------------------------------------
+    
     });
     const closeDrawer = () => {
       state.activeKey = "1";
@@ -755,27 +613,116 @@ export default {
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
-    const onSelectChange = (selectedRowKeys) => {
-      console.log("selectedRowKeys changed: ", selectedRowKeys);
+
+    
+
+    const getClientHeight = () => {
+      state.screenHeight = document.body.clientHeight;
+    };
+    //     //监测快速选人的高度
+    // const getClientHeightSelecteds = () => {
+    //       state.selectedsHeight = document.getElementById('selecteds').offsetHeight
+    //       console.log('selectedsHeight',state.selectedsHeight)
+
+    //     };
+    onMounted(() => {
+      // console.log("11111", 1);
+      window.addEventListener("resize", getClientHeight, false);
+      //  window.addEventListener("resize", getClientHeightSelecteds, false);
+      // judgeUrl();
+    });
+    onUnmounted(() => {
+      window.removeEventListener("resize", getClientHeight, false);
+      //  window.removeEventListener("resize", getClientHeightSelecteds, false);
+    });
+
+    // 开始 快速选人------------------------------------------------------------------
+    //选中部门
+    const departmentSelect = (e, k) => {
+      console.log("选中的部门", e, k);
+      state.selectedKeys = [k.node.key];
+    };
+    //快速选人 选中的数组
+    const onSelectChange = (selectedRowKeys, item) => {
+      // console.log("selectedRowKeys changed: ", selectedRowKeys,item);
       state.selectedRowKeys = selectedRowKeys;
+      state.choosepeople = item.reverse();
+      selectedsHeight();
     };
-    const onSelectChange1 = (selectedRowKeys) => {
-      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys1 = selectedRowKeys;
+    //单个删除选中的人
+    const deleteChoosePeople = (item) => {
+      let arr = state.choosepeople;
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i].key === item.key) {
+          arr.splice(i, 1);
+        }
+      }
+      state.choosepeople = arr;
+      let array = state.selectedRowKeys;
+      for (let i = 0; i < array.length; i++) {
+        if (array[i] === item.key) {
+          array.splice(i, 1);
+        }
+      }
+      state.selectedRowKeys = array;
+      console.log("");
     };
-    const onSelectChange2 = (selectedRowKeys) => {
-      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys2 = selectedRowKeys;
+    //根据右侧快速选人高度，判断是否显示更多
+    const selectedsHeight = () => {
+      let resize = elementResizeDetectorMaker();
+      resize.listenTo(document.getElementById("selecteds"), function (ele) {
+        console.log("ele", ele.offsetHeight);
+        if (ele.offsetHeight > 160 && !state.showHidden) {
+          state.showMore = true;
+          document.getElementById("selectedsBox").style.overflow = "hidden";
+          document.getElementById("selectedsBox").style.height = "160px";
+        } else if (ele.offsetHeight < 160) {
+          state.showMore = false;
+          state.showHidden = false;
+          document.getElementById("selectedsBox").style.overflow = "hidden";
+          document.getElementById("selectedsBox").style.height = "160px";
+        }
+      });
+    };
+    const morePeopleShow = () => {
+      state.showMore = false;
+      state.showHidden = true;
+      document.getElementById("selectedsBox").style.overflow = "";
+      document.getElementById("selectedsBox").style.height = "";
+    };
+    const morePeopleHidden = () => {
+      state.showMore = true;
+      state.showHidden = false;
+      document.getElementById("selectedsBox").style.overflow = "hidden";
+      document.getElementById("selectedsBox").style.height = "160px";
     };
 
+    // 结束 快速选人------------------------------------------------------------------
+
+    //全部清除
+    const deleteAll=()=>{
+       //快速选人-------------------------------------
+      state.valueSelectboe=null //快速选人的选择组织
+     state.choosepeople=[] //总的数组
+     state.showMore=false //是否显示快速选人的查看更多
+     state.showHidden=false//是否显示收回
+     state.selectedRowKeys=[]//表格选中的key
+      //快速选人-------------------------------------
+      
+    }
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       onSelectChange,
-      onSelectChange1,
-      onSelectChange2,
       // change,
+      departmentSelect,
+      deleteChoosePeople,
+      selectedsHeight,
+      morePeopleShow,
+      morePeopleHidden,
+
+      deleteAll,
     };
   },
 };
@@ -783,13 +730,16 @@ export default {
 
 <style lang="scss">
 .ProjOwnership {
+  .ant-drawer-content-wrapper {
+    max-width: 1300px !important;
+  }
   .drawerMain {
-    min-width: 550px;
+    min-width: 600px;
     margin: 0px 32px 0px 32px;
     // overflow-y: auto;
     display: flex;
     flex-direction: column;
-
+    overflow-x: auto;
     .header {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;
@@ -809,11 +759,15 @@ export default {
     }
     .main {
       display: flex;
-      // height: 80%;
+      //  min-width: 1200px;
+      //height: 80%;
       margin-bottom: 72px;
       overflow-y: auto;
+      //  overflow-x: auto;
       .left {
-        width: 65%;
+        // overflow-y: auto;
+        width: 772px;
+        flex-shrink: 0;
         // height: 100%;
         border-right: 1px solid rgba(233, 233, 233, 1);
         .tabs {
@@ -821,7 +775,7 @@ export default {
           .tab1 {
             display: flex;
             flex-wrap: wrap;
-            justify-content: space-between;
+            // justify-content: space-between;
             align-items: center;
             .t1 {
               display: flex;
@@ -840,6 +794,7 @@ export default {
             .btns {
               display: flex;
               margin-top: 10px;
+              margin-left: 34px;
               .btn1 {
                 width: 100px;
                 height: 40px;
@@ -968,49 +923,113 @@ export default {
               }
             }
           }
-          .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;
+          .chooseLeft {
+            display: flex;
+            justify-content: space-between;
+            .boeTree {
+              margin-right: 20px;
+              // margin-top: 20px;
+              // width: 300px;
+              // overflow-y: auto;
+              // margin-right: 10px;
+              // .ant-select {
+              //   .ant-select-selector {
+              //     border-radius: 8px;
+              //     // height: 40px;
+              //     .ant-select-selection-placeholder {
+              //       color: #409eff;
+              //       margin-left: 72px !important;
+              //       margin-top: 4px !important;
+              //     }
+              //   }
+              // }
+              .boeTreeTitle {
+                width: 280px;
+                height: 40px;
+                border-radius: 4px;
+                border: 1px solid #c3c3c3;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 16px;
+                font-weight: 500;
+                color: #409eff;
+                line-height: 22px;
+                margin-bottom: 8px;
+                margin-top: 20px;
+              }
+              .treeMain {
+                width: 280px;
+                border-radius: 4px;
+                overflow-x: auto;
+                overflow-y: auto;
+                border: 1px solid #c3c3c3;
+                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 {
+                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 {
-              background: rgba(250, 250, 250, 1);
-            }
-            .ant-table-selection-column {
-              padding: 0 !important;
-            }
-            // table tr td.ant-table-selection-column {
-            //   text-align: right;
-            // }
-            // .ant-checkbox-wrapper {
-            //   align-items: center;
-            //   margin-top: -2px;
-            // }
-            .pa {
-              // left: 0;
-              margin-top: 15px;
-              width: 100%;
-              // height: 20px;
-              // background-color: red;
-              display: flex;
-              justify-content: center;
-              // position: absolute;
-              // bottom: 20px;
-              .ant-pagination-item,
-              .ant-pagination-prev,
-              .ant-pagination-next,
-              .ant-pagination-options {
-                margin-bottom: 10px;
+              .ant-table-tbody
+                > 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;
+              // }
+              // .ant-checkbox-wrapper {
+              //   align-items: center;
+              //   margin-top: -2px;
+              // }
+              .pa {
+                // left: 0;
+                margin-top: 15px;
+                width: 100%;
+                // height: 20px;
+                // background-color: red;
+                display: flex;
+                justify-content: center;
+                // position: absolute;
+                // bottom: 20px;
+                .ant-pagination-item,
+                .ant-pagination-prev,
+                .ant-pagination-next,
+                .ant-pagination-options {
+                  margin-bottom: 10px;
+                }
               }
             }
           }
@@ -1018,45 +1037,27 @@ export default {
           .tab2 {
             display: flex;
             align-items: center;
-            margin-top: 10px;
+            // 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;
             }
-            .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;
-              }
-            }
-          }
-
-          .searchdown {
             .btns {
               display: flex;
-              margin-top: 10px;
+              // margin-top: -10px;
               .btn1 {
                 width: 100px;
                 height: 40px;
@@ -1091,11 +1092,87 @@ export default {
                 }
               }
             }
+            .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;
+              height: 40px;
+              border-radius: 4px;
+              border: 1px solid #c3c3c3;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              font-size: 16px;
+              font-weight: 500;
+              color: #409eff;
+              line-height: 22px;
+              margin-bottom: 8px;
+              margin-top: 20px;
+            }
+            .treeMain {
+              width: 280px;
+              border-radius: 4px;
+              overflow-x: auto;
+              overflow-y: auto;
+              border: 1px solid #c3c3c3;
+              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 {
+              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;
+            //               }
+            //               .ant-tree-switcher_close+ .ant-tree-checkbox{
+            // display: none !important;
+            //               }
+            //               .ant-tree .ant-tree-title{
+            // background-color: pink;
+            //               }
           }
         }
       }
       .right {
-        width: 35%;
+        width: 320px;
+        flex-shrink: 0;
+        overflow-y:auto ;
         .onerow {
           display: flex;
           justify-content: space-between;
@@ -1150,12 +1227,37 @@ export default {
             }
           }
         }
+        .line {
+          width: 90%;
+          height: 1px;
+          background-color: #e8e8e8;
+          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;
           flex-wrap: wrap;
+          align-content: flex-start;
+          margin-right: 32px;
           margin-left: 32px;
+          min-height: 100px;
+          // overflow: hidden;
           .chose {
-            width: 64px;
+            // width: 64px;
+            padding-left: 10px;
+            padding-right: 10px;
             height: 24px;
             margin-top: 25px;
             margin-right: 25px;
@@ -1203,7 +1305,7 @@ export default {
         cursor: pointer;
         width: 100px;
         height: 40px;
-        background: #4ea6ff;
+        background: #409eff;
         border-radius: 8px;
         border: 0;
         margin-left: 15px;
@@ -1213,13 +1315,144 @@ export default {
   }
 }
 .changetreedropdown {
-  width: 550px !important;
+  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;
+  }
 }
 
-.ant-select-tree-list-scrollbar {
-  width: 5px !important;
-  .ant-select-tree-list-scrollbar-thumb {
-    background-color: #4ea6ff !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;
+          height: 258px;
+          background: #ffffff;
+          box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+          border-radius: 4px;
+          // position: absolute;
+          // left: 50%;
+          // top: 10%;
+          // transform: translate(-50%, -50%);
+          .del_header {
+            position: absolute;
+            width: calc(100%);
+            height: 68px;
+            background: linear-gradient(
+              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;
+                margin-right: 10px;
+                background-image: url(@/assets/images/taskpage/gan.png);
+                background-size: 100% 100%;
+              }
+              .close_exit {
+                position: absolute;
+                right: 42px;
+                cursor: pointer;
+                width: 20px;
+                height: 20px;
+                background-image: url(@/assets/images/coursewareManage/close.png);
+                background-size: 100% 100%;
+              }
+            }
+            .body {
+              width: 100%;
+              margin: 34px auto 56px auto;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              flex-direction: column;
+              // background-color: red;
+              position: relative;
+              .back {
+                position: absolute;
+                top: 30px;
+                font-size: 12px;
+                font-weight: 400;
+                color: #666666;
+              }
+            }
+            .del_btnbox {
+              display: flex;
+              margin: 30px auto;
+              justify-content: center;
+              .del_btn {
+                width: 100px;
+                height: 40px;
+                background: rgba(64, 158, 255, 0);
+                border-radius: 8px;
+                display: flex;
+                align-items: center;
+                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;
+              }
+            }
+          }
+        }
+      }
+    }
+    .ant-modal-close-x{
+      display: none;
+    }
   }
 }
 </style>
diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue
index 735d851f..89507bf4 100644
--- a/src/components/drawers/StuAdd.vue
+++ b/src/components/drawers/StuAdd.vue
@@ -3,7 +3,7 @@
     :visible="Stuvisible"
     class="drawerStyle stuadd"
     placement="right"
-    width="70%"
+    width="85%"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
@@ -67,23 +67,28 @@
                 </div> -->
                   <div class="chooseLeft">
                     <div class="boeTree">
-                      <a-tree-select
+                      <div class="boeTreeTitle">BOE组织树</div>
+
+                      <a-tree
                         v-model:value="valueSelectboe"
-                        style="width: 240px; border-radius: 4px"
+                        class="treeMain"
+                        :style="{ height: screenHeight - 400 + 'px' }"
                         dropdownClassName="changetreedropdownboe"
+                        defaultExpandAll
                         :dropdown-style="{
                           maxHeight: '600px',
-                          overflow: 'auto',
                         }"
                         placeholder="BOE组织树"
                         allow-clear
                         tree-default-expand-all
                         :tree-data="treeData"
+                        @select="departmentSelect"
+                        v-model:selectedKeys="selectedKeys"
                       >
                         <template #suffixIcon></template>
-                      </a-tree-select>
+                      </a-tree>
                     </div>
-                    <div class="tabb" style="margin-top: 16px">
+                    <div class="tableBox tabb" style="margin-top: 16px">
                       <a-table
                         style="border: 1px solid #f2f6fe"
                         :columns="tablecolumns"
@@ -104,9 +109,12 @@
                           showQuickJumper="true"
                           hideOnSinglePage="true"
                           :pageSize="pageSize"
-                          :current="currentPage"
+                          v-model:current="currentPage"
                           :total="tableDataTotal"
+                          :pagination="false"
                           class="pagination"
+                          v-if="tableDataTotal > 10"
+                          @change="changePagination"
                         />
                       </div>
                     </div>
@@ -155,53 +163,34 @@
                     </div> -->
                   </div>
                   <div class="boeTree">
-                    <a-tree-select
-                      v-model:value="valueSelectboe2"
-                      style="width: 240px; border-radius: 4px"
+                    <div class="boeTreeTitle">BOE组织树</div>
+
+                    <a-tree
+                      class="treeMain"
+                      :style="{ height: screenHeight - 430 + 'px' }"
                       dropdownClassName="changetreedropdownboe"
+                      defaultExpandAll
                       :dropdown-style="{
                         maxHeight: '600px',
-                        overflow: 'auto',
                       }"
                       placeholder="BOE组织树"
                       allow-clear
                       tree-default-expand-all
-                      :tree-data="treeData2"
+                      :tree-data="treeData"
+                      @select="departmentSelect1"
+                      multiple
+                      v-model:selectedKeys="selectedKeys1"
                     >
                       <template #suffixIcon></template>
-                    </a-tree-select>
-                  </div>
-                  <!-- 选完后出现下面 -->
-                  <!-- <div class="searchdown">
-                    <div class="tabb" style="margin-top: 16px">
-                      <a-table
-                        style="border: 1px solid #f2f6fe"
-                        :columns="tablecolumns1"
-                        :data-source="tabledata1"
-                        :loading="tableDataTotal === -1 ? true : false"
-                        expandRowByClick="true"
-                        :scroll="{ x: 500 }"
-                        @expand="expandTable"
-                        :pagination="false"
-                        :row-selection="{
-                          columnWidth: 30,
-                          selectedRowKeys: selectedRowKeys1,
-                          onChange: onSelectChange1,
-                        }"
-                      />
-                      <div class="pa">
-                        <a-pagination
-                          showSizeChanger="true"
-                          showQuickJumper="true"
-                          hideOnSinglePage="true"
-                          :pageSize="pageSize1"
-                          :current="currentPage1"
-                          :total="tableDataTotal1"
-                          class="pagination"
-                        />
-                      </div>
+                    </a-tree>
+                    <div
+                      class="boeTreeTitle"
+                      style="margin-top: 8px; cursor: pointer"
+                      @click="addOrgModal"
+                    >
+                      确认添加
                     </div>
-                  </div> -->
+                  </div>
                 </div>
               </a-tab-pane>
               <a-tab-pane key="3" tab="受众关联">
@@ -211,7 +200,7 @@
                 >
                   <div class="tab1">
                     <div class="t1">
-                      <div class="nameinp">
+                      <!-- <div class="nameinp">
                         <div class="namee">选择受众：</div>
                         <div class="select">
                           <a-select
@@ -221,35 +210,36 @@
                             :options="organizeList1"
                           />
                         </div>
-                      </div>
+                      </div> -->
                     </div>
                     <div class="t1" style="margin-top: 10px">
-                      <div class="organize">姓名：</div>
+                      <div class="organize">受众名称：</div>
                       <a-input
                         v-model:value="nameaddd"
-                        style="width: 200px; height: 40px; border-radius: 8px"
-                        placeholder="请输入姓名"
+                        style="width: 260px; height: 40px; border-radius: 8px"
+                        placeholder="请输入受众名称"
                       />
                     </div>
-                  </div>
-                  <div class="btns">
-                    <div class="btn1">
-                      <div class="img1">
-                        <img
-                          src="../../assets/images/courseManage/search0.png"
-                        />
+                    <div class="btns">
+                      <div class="btn1">
+                        <div class="img1">
+                          <img
+                            src="../../assets/images/courseManage/search0.png"
+                          />
+                        </div>
+                        <div class="wz">搜索</div>
                       </div>
-                      <div class="wz">搜索</div>
-                    </div>
-                    <div class="btn2">
-                      <div class="img2">
-                        <img
-                          src="../../assets/images/courseManage/reset1.png"
-                        />
+                      <div class="btn2">
+                        <div class="img2">
+                          <img
+                            src="../../assets/images/courseManage/reset1.png"
+                          />
+                        </div>
+                        <div class="wz">重置</div>
                       </div>
-                      <div class="wz">重置</div>
                     </div>
                   </div>
+
                   <!-- <div class="line">
                   <div class="inline">
                     <div class="left1">
@@ -263,7 +253,7 @@
                     <div class="right1">清空</div>
                   </div>
                 </div> -->
-                  <div class="tabb" style="margin-top: 16px">
+                  <div class="tableBox tabb" style="margin-top: 16px">
                     <a-table
                       style="border: 1px solid #f2f6fe"
                       :columns="tablecolumns2"
@@ -279,7 +269,7 @@
                         onChange: onSelectChange2,
                       }"
                     />
-                    <div class="pa">
+                    <div class="pa" style="margin-top: 20px">
                       <a-pagination
                         showSizeChanger="true"
                         showQuickJumper="true"
@@ -288,6 +278,7 @@
                         :current="currentPage2"
                         :total="tableDataTotal2"
                         class="pagination"
+                        v-if="tabledata2 > 10"
                       />
                     </div>
                   </div>
@@ -300,27 +291,190 @@
           <div class="onerow">
             <div class="onleft">
               <div class="already">已选</div>
-              <div class="count">6</div>
-              <div class="peo">人</div>
+              <!-- <div class="count">6</div>
+              <div class="peo">人</div> -->
             </div>
-            <div class="clbox">
+            <div class="clbox" @click="deleteAll">
               <div class="colose"></div>
               <span class="allclear">全部清除</span>
             </div>
           </div>
           <div class="line"></div>
           <div class="tit">快速选人</div>
-          <div class="selecteds">
-            <!-- 遍历生成 -->
-            <div class="chose" v-for="item in choosepeople" :key="item.id">
-              {{ item.name }}
-              <div class="ch"></div>
+          <div style="position: relative; min-height: 180px">
+            <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 }}</div>
+                  <div class="ch" @click="deleteChoosePeople(item)"></div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="chose"
+              style="
+                position: absolute;
+                right: 32px;
+                bottom: -9px;
+                font-size: 12px;
+                font-weight: 500;
+                color: #409eff;
+                line-height: 22px;
+              "
+              v-if="showMore"
+              @click="morePeopleShow"
+            >
+              <div>
+                查看更多
+                <img
+                  style="width: 10px; height: 12px; margin-top: -2px"
+                  src="../../assets/images/projectadd/go.png"
+                />
+              </div>
+            </div>
+            <div
+              class="chose"
+              style="
+                position: absolute;
+                right: 32px;
+                bottom: -9px;
+                font-size: 12px;
+                font-weight: 500;
+                color: #409eff;
+                line-height: 22px;
+              "
+              v-if="showHidden"
+              @click="morePeopleHidden"
+            >
+              <div>收起  <img
+                  style="width: 10px; height: 12px; margin-top: -2px"
+                  src="../../assets/images/projectadd/pickUp.png"
+                /></div>
             </div>
           </div>
           <div class="line"></div>
           <div class="tit">添加组织</div>
+          <div style="position: relative; min-height: 180px">
+            <div
+              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"
+                >
+                  <div>{{ item.value }}</div>
+                  <div class="ch" @click="deleteChoosePeople1(item)"></div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="chose"
+              style="
+                position: absolute;
+                right: 32px;
+                bottom: -9px;
+                font-size: 12px;
+                font-weight: 500;
+                color: #409eff;
+                line-height: 22px;
+              "
+              v-if="showMore1"
+              @click="morePeopleShow1"
+            >
+              <div>
+                查看更多
+                <img
+                  style="width: 10px; height: 12px; margin-top: -2px"
+                  src="../../assets/images/projectadd/go.png"
+                />
+              </div>
+            </div>
+            <div
+              class="chose"
+              style="
+                position: absolute;
+                right: 32px;
+                bottom: -9px;
+                font-size: 12px;
+                font-weight: 500;
+                color: #409eff;
+                line-height: 22px;
+              "
+              v-if="showHidden1"
+              @click="morePeopleHidden1"
+            >
+              <div>收起  <img
+                  style="width: 10px; height: 12px; margin-top: -2px"
+                  src="../../assets/images/projectadd/pickUp.png"
+                /></div>
+            </div>
+          </div>
           <div class="line"></div>
           <div class="tit">受众关联</div>
+          <div
+            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"
+                >
+                  <div>{{ item.name }}</div>
+                  <div class="ch" @click="deleteRelationPeople(item)"></div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="chose"
+              style="
+                position: absolute;
+                right: 32px;
+                bottom: -9px;
+                font-size: 12px;
+                font-weight: 500;
+                color: #409eff;
+                line-height: 22px;
+              "
+              v-if="showMore2"
+              @click="morePeopleShow2"
+            >
+              <div>
+                查看更多
+                <img
+                  style="width: 10px; height: 12px; margin-top: -2px"
+                  src="../../assets/images/projectadd/go.png"
+                />
+              </div>
+            </div>
+            <div
+              class="chose"
+              style="
+                position: absolute;
+                right: 32px;
+                bottom: -9px;
+                font-size: 12px;
+                font-weight: 500;
+                color: #409eff;
+                line-height: 22px;
+              "
+              v-if="showHidden2"
+              @click="morePeopleHidden2"
+            >
+              <div>收起  <img
+                  style="width: 10px; height: 12px; margin-top: -2px"
+                  src="../../assets/images/projectadd/pickUp.png"
+                /></div>
+            </div>
+          </div>
         </div>
       </div>
       <div class="btnn">
@@ -328,11 +482,44 @@
         <button class="btn2">确定</button>
       </div>
     </div>
+
+    <!-- 确认添加部门弹窗 -->
+    <a-modal
+      v-model:visible="showOrgModal"
+      :footer="null"
+      wrapClassName="confirmAddOrg"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeOrgModal"></div>
+          </div>
+          <div class="body">
+            <span>您确定要添加此组织吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1" @click="closeOrgModal">
+              <div class="btnText">取消</div>
+            </div>
+            <div class="del_btn btn2" @click="addOrg">
+              <div class="btnText">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+    <!-- 确认添加部门弹窗 -->
   </a-drawer>
 </template>
 
 <script>
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
+import elementResizeDetectorMaker from "element-resize-detector";
+import { message } from "ant-design-vue";
 export default {
   name: "StuAdd",
   props: {
@@ -353,19 +540,20 @@ export default {
       pageSize2: 10,
       currentPage2: 1,
       tableDataTotal2: 50,
-      selectedRowKeys: [],
+
       selectedRowKeys1: [],
-      selectedRowKeys2: [],
+
       activeKey: "1",
       value: [], //级联选择框
       choosevalue: null, //受众选择
       valueSelect: null, //树形选择
-      valueSelectboe: null, //boe树形选择
+
       valueSelectboe2: null, //boe树形选择
       name: "",
       nameadd: "",
       nameaddd: "",
       com: "",
+      //组织树
       treeData: [
         {
           title: "京东方",
@@ -383,172 +571,37 @@ export default {
                   title: "研究部",
                   value: "研究部",
                 },
-              ],
-            },
-            {
-              title: "二级标题",
-              value: "二级标题",
-              children: [
                 {
-                  title: "三级标题",
-                  value: "三级标题",
-                  children: [
-                    {
-                      title: "四级标题",
-                      value: "四级标题",
-                      children: [
-                        {
-                          title: "五级标题",
-                          value: "五级标题",
-                          children: [
-                            {
-                              title: "六级标题",
-                              value: "六级标题",
-                              children: [
-                                {
-                                  title: "七级标题",
-                                  value: "七级标题",
-                                  children: [
-                                    {
-                                      title: "八级标题",
-                                      value: "八级标题",
-                                      children: [
-                                        {
-                                          title: "九级标题",
-                                          value: "九级标题",
-                                          children: [
-                                            {
-                                              title: "十级标题",
-                                              value: "十级标题",
-                                              children: [
-                                                {
-                                                  title: "十一级标题",
-                                                  value: "十一级标题",
-                                                  children: [
-                                                    {
-                                                      title: "十二级标题",
-                                                      value: "十二级标题",
-                                                      children: [
-                                                        {
-                                                          title:
-                                                            "十三级标题十三级标题十三级标题十三级标题",
-                                                          value: "十三级标题",
-                                                          children: [
-                                                            {
-                                                              title:
-                                                                "十四级标题",
-                                                              value:
-                                                                "十四级标题",
-                                                              children: [
-                                                                {
-                                                                  title:
-                                                                    "十五级标题",
-                                                                  value:
-                                                                    "十五级标题",
-                                                                  children: [
-                                                                    {
-                                                                      title:
-                                                                        "十六级标题",
-                                                                      value:
-                                                                        "十六级标题",
-                                                                      children:
-                                                                        [
-                                                                          {
-                                                                            title:
-                                                                              "十七级标题",
-                                                                            value:
-                                                                              "十七级标题",
-                                                                            children:
-                                                                              [
-                                                                                {
-                                                                                  title:
-                                                                                    "十八级标题",
-                                                                                  value:
-                                                                                    "十八级标题",
-                                                                                  children:
-                                                                                    [
-                                                                                      {
-                                                                                        title:
-                                                                                          "十九级标题",
-                                                                                        value:
-                                                                                          "十九级标题",
-                                                                                        children:
-                                                                                          [
-                                                                                            {
-                                                                                              title:
-                                                                                                "二十级标题二十级标题",
-                                                                                              value:
-                                                                                                "二十级标题二十级标题",
-                                                                                            },
-                                                                                          ],
-                                                                                      },
-                                                                                    ],
-                                                                                },
-                                                                              ],
-                                                                          },
-                                                                        ],
-                                                                    },
-                                                                  ],
-                                                                },
-                                                              ],
-                                                            },
-                                                          ],
-                                                        },
-                                                      ],
-                                                    },
-                                                  ],
-                                                },
-                                              ],
-                                            },
-                                          ],
-                                        },
-                                      ],
-                                    },
-                                  ],
-                                },
-                              ],
-                            },
-                          ],
-                        },
-                      ],
-                    },
-                  ],
-                },
-              ],
-            },
-            {
-              title: "人力资源部",
-              value: "人力资源部",
-              children: [
-                {
-                  title: "人事部",
-                  value: "人事部",
+                  title: "研究部2",
+                  value: "研究部2",
                 },
                 {
-                  title: "行政部",
-                  value: "行政部",
-                },
-              ],
-            },
-          ],
-        },
-      ],
-      treeData2: [
-        {
-          title: "京东方",
-          value: "京东方",
-          children: [
-            {
-              title: "产研部",
-              value: "产研部",
-              children: [
-                {
-                  title: "产品部",
-                  value: "产品部",
+                  title: "研究3",
+                  value: "研究3",
                 },
                 {
-                  title: "研究部",
-                  value: "研究部",
+                  title: "研究4",
+                  value: "研究4",
+                },
+                {
+                  title: "研究部5",
+                  value: "研究部5",
+                },
+                {
+                  title: "研究部6",
+                  value: "研究部6",
+                },
+                {
+                  title: "研究部7",
+                  value: "研究部7",
+                },
+                {
+                  title: "研究部8",
+                  value: "研究部8",
+                },
+                {
+                  title: "研究部9",
+                  value: "研究部9",
                 },
               ],
             },
@@ -700,24 +753,25 @@ export default {
           ],
         },
       ],
+      //快速选人的table
       tabledata: [
         {
           key: 1,
-          name: "小李",
+          name: "小李小李小李",
           bum: "产研部",
           numb: "000000",
           guishu: "产品部",
         },
         {
           key: 2,
-          name: "小刘",
+          name: "小刘小刘小刘",
           bum: "产研部",
           numb: "000000",
           guishu: "产品部",
         },
         {
           key: 3,
-          name: "小李",
+          name: "小李小李",
           bum: "产研部",
           numb: "000000",
           guishu: "产品部",
@@ -759,7 +813,28 @@ export default {
         },
         {
           key: 9,
-          name: "小李",
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+        {
+          key: 10,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+        {
+          key: 11,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+        {
+          key: 12,
+          name: "小小李",
           bum: "产研部",
           numb: "000000",
           guishu: "产品部",
@@ -799,116 +874,19 @@ export default {
           className: "h",
         },
       ],
-      tabledata1: [
-        {
-          key: 1,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 2,
-          name: "小刘",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 3,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 4,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 5,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 6,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 7,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 8,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-        {
-          key: 9,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
-        },
-      ],
-      tablecolumns1: [
-        {
-          title: "姓名",
-          dataIndex: "name",
-          key: "name",
-          width: 30,
-          align: "left",
-          className: "h",
-        },
-        {
-          title: "工号",
-          dataIndex: "numb",
-          key: "numb",
-          width: 35,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "归属组织",
-          dataIndex: "guishu",
-          key: "guishu",
-          width: 30,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "部门",
-          dataIndex: "bum",
-          key: "bum",
-          width: 40,
-          align: "center",
-          className: "h",
-        },
-      ],
+
+      //受众关联table数据
       tabledata2: [
         {
           key: 1,
-          name: "小李",
+          name: "小李小李小李小李",
           bum: "产研部",
           numb: "000000",
           guishu: "",
         },
         {
           key: 2,
-          name: "小刘",
+          name: "小刘小刘小刘",
           bum: "产研部",
           numb: "000000",
           guishu: "",
@@ -1007,52 +985,31 @@ export default {
           label: "人力资源hrbp",
         },
       ],
-      choosepeople: [
-        {
-          id: 1,
-          name: "李明",
-        },
-        {
-          id: 1,
-          name: "李明",
-        },
-        {
-          id: 1,
-          name: "李明",
-        },
-        {
-          id: 1,
-          name: "李明",
-        },
-        {
-          id: 1,
-          name: "李明",
-        },
-        {
-          id: 1,
-          name: "李明",
-        },
-        {
-          id: 1,
-          name: "李明",
-        },
-        {
-          id: 1,
-          name: "李明",
-        },
-        {
-          id: 1,
-          name: "李明",
-        },
-        {
-          id: 1,
-          name: "李明",
-        },
-        {
-          id: 1,
-          name: "李明",
-        },
-      ],
+      //快速选人-------------------------------------
+      valueSelectboe: null, //快速选人的选择组织
+      choosepeople: [], //总的数组
+      selectedKeys: [], //选中部门
+      showMore: false, //是否显示快速选人的查看更多
+      showHidden: false, //是否显示收回
+      selectedRowKeys: [], //表格选中的key
+      //快速选人-------------------------------------
+      //添加组织-------------------------------------
+
+      selectedKeys1: [], //选中部门的key
+      chooseorganization: [], //添加组织的选择组织
+      chooseorganization1: [], //显示到右侧的数组
+      showMore1: false, //是否显示添加组织的查看更多
+      showHidden1: false, //是否显示添加组织的收回
+
+      showOrgModal: false, //确认弹窗
+      //添加组织-------------------------------------
+
+      //受众关联-------------------------------------
+      relationpeople: [], //总的数组
+      showMore2: false, //是否显示快速选人的查看更多
+      showHidden2: false, //是否显示收回
+      selectedRowKeys2: [], //表格选中的key
+      //受众关联-------------------------------------
     });
     const closeDrawer = () => {
       state.activeKey = "1";
@@ -1062,39 +1019,296 @@ export default {
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
-    const onSelectChange = (selectedRowKeys) => {
-      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys = selectedRowKeys;
-    };
-    const onSelectChange1 = (selectedRowKeys) => {
-      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys1 = selectedRowKeys;
-    };
-    const onSelectChange2 = (selectedRowKeys) => {
-      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      state.selectedRowKeys2 = selectedRowKeys;
-    };
 
-    const getMousePosition = () => {
+    const getClientHeight = () => {
       state.screenHeight = document.body.clientHeight;
     };
+    //     //监测快速选人的高度
+    // const getClientHeightSelecteds = () => {
+    //       state.selectedsHeight = document.getElementById('selecteds').offsetHeight
+    //       console.log('selectedsHeight',state.selectedsHeight)
 
+    //     };
     onMounted(() => {
       // console.log("11111", 1);
-      window.addEventListener("resize", getMousePosition, false);
+      window.addEventListener("resize", getClientHeight, false);
+      //  window.addEventListener("resize", getClientHeightSelecteds, false);
       // judgeUrl();
     });
     onUnmounted(() => {
-      window.removeEventListener("resize", getMousePosition, false);
+      window.removeEventListener("resize", getClientHeight, false);
+      //  window.removeEventListener("resize", getClientHeightSelecteds, false);
     });
+
+    // 开始 快速选人------------------------------------------------------------------
+    //选中部门
+    const departmentSelect = (e, k) => {
+      console.log("选中的部门", e, k);
+      state.selectedKeys = [k.node.key];
+    };
+    //快速选人 选中的数组
+    const onSelectChange = (selectedRowKeys, item) => {
+      // console.log("selectedRowKeys changed: ", selectedRowKeys,item);
+      state.selectedRowKeys = selectedRowKeys;
+      state.choosepeople = item.reverse();
+      selectedsHeight();
+    };
+    //单个删除选中的人
+    const deleteChoosePeople = (item) => {
+      let arr = state.choosepeople;
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i].key === item.key) {
+          arr.splice(i, 1);
+        }
+      }
+      state.choosepeople = arr;
+      let array = state.selectedRowKeys;
+      for (let i = 0; i < array.length; i++) {
+        if (array[i] === item.key) {
+          array.splice(i, 1);
+        }
+      }
+      state.selectedRowKeys = array;
+      console.log("");
+    };
+    //根据右侧快速选人高度，判断是否显示更多
+    const selectedsHeight = () => {
+      let resize = elementResizeDetectorMaker();
+      resize.listenTo(document.getElementById("selecteds"), function (ele) {
+        console.log("ele", ele.offsetHeight);
+        if (ele.offsetHeight > 160 && !state.showHidden) {
+          state.showMore = true;
+          document.getElementById("selectedsBox").style.overflow = "hidden";
+          document.getElementById("selectedsBox").style.height = "160px";
+        } else if (ele.offsetHeight < 160) {
+          state.showMore = false;
+          state.showHidden = false;
+          document.getElementById("selectedsBox").style.overflow = "hidden";
+          document.getElementById("selectedsBox").style.height = "160px";
+        }
+      });
+    };
+    const morePeopleShow = () => {
+      state.showMore = false;
+      state.showHidden = true;
+      document.getElementById("selectedsBox").style.overflow = "";
+      document.getElementById("selectedsBox").style.height = "";
+    };
+    const morePeopleHidden = () => {
+      state.showMore = true;
+      state.showHidden = false;
+      document.getElementById("selectedsBox").style.overflow = "hidden";
+      document.getElementById("selectedsBox").style.height = "160px";
+    };
+
+    // 结束 快速选人------------------------------------------------------------------
+
+    // 开始 添加组织------------------------------------------------------------------
+    //选中部门
+    const departmentSelect1 = (e, k) => {
+      console.log("选中的部门", e, k);
+      if (!k.node.children) {
+        state.selectedKeys1 = e.reverse();
+        if (k.selected) {
+          state.chooseorganization.unshift(k.node);
+        } else {
+          for (let i = 0; i < state.chooseorganization.length; i++) {
+            if (state.chooseorganization[i].key === k.node.key) {
+              state.chooseorganization.splice(i, 1);
+            }
+          }
+        }
+      }
+
+      // console.log("选中的部门2", state.selectedKeys1, state.chooseorganization);
+    };
+    //点击确认添加-判断是否显示确定弹窗
+    const addOrgModal = () => {
+      if (state.chooseorganization.length === 0) {
+        message.destroy();
+        message.warning("请选择部门");
+      } else {
+        state.showOrgModal = true;
+      }
+    };
+    //确定添加
+    const addOrg = () => {
+      console.log("chooseorganization", state.chooseorganization);
+      state.chooseorganization1 = state.chooseorganization;
+      selectedsHeight1();
+      state.showOrgModal = false;
+    };
+    //取消添加
+    const closeOrgModal = () => {
+      state.showOrgModal = false;
+    };
+
+    //单个删除选中的人
+    const deleteChoosePeople1 = (item) => {
+      console.log("item", item);
+      let arr = state.chooseorganization;
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i].key === item.key) {
+          arr.splice(i, 1);
+        }
+      }
+      state.chooseorganization = arr;
+      let array = state.selectedKeys1;
+      for (let i = 0; i < array.length; i++) {
+        if (array[i] === item.key) {
+          array.splice(i, 1);
+        }
+      }
+      state.selectedKeys1 = array;
+      console.log("state.selectedKeys1", state.selectedKeys1);
+    };
+
+    //根据右侧快速选人高度，判断是否显示更多
+    const selectedsHeight1 = () => {
+      let resize = elementResizeDetectorMaker();
+      resize.listenTo(document.getElementById("selecteds1"), function (ele) {
+        console.log("ele", ele.offsetHeight);
+        if (ele.offsetHeight > 160 && !state.showHidden1) {
+          state.showMore1 = true;
+          document.getElementById("selectedsBox1").style.overflow = "hidden";
+          document.getElementById("selectedsBox1").style.height = "160px";
+        } else if (ele.offsetHeight < 160) {
+          state.showMore1 = false;
+          state.showHidden1 = false;
+          document.getElementById("selectedsBox1").style.overflow = "hidden";
+          document.getElementById("selectedsBox1").style.height = "160px";
+        }
+      });
+    };
+    const morePeopleShow1 = () => {
+      state.showMore1 = false;
+      state.showHidden1 = true;
+      document.getElementById("selectedsBox1").style.overflow = "";
+      document.getElementById("selectedsBox1").style.height = "";
+    };
+    const morePeopleHidden1 = () => {
+      state.showMore1 = true;
+      state.showHidden1 = false;
+      document.getElementById("selectedsBox1").style.overflow = "hidden";
+      document.getElementById("selectedsBox1").style.height = "160px";
+    };
+
+    // 结束 添加组织------------------------------------------------------------------
+
+    // 开始 受众关联------------------------------------------------------------------
+
+    //受众关联 选中的数组
+    const onSelectChange2 = (selectedRowKeys, item) => {
+      // console.log("selectedRowKeys changed: ", selectedRowKeys,item);
+      state.selectedRowKeys2 = selectedRowKeys;
+      state.relationpeople = item.reverse();
+      selectedsHeight2();
+    };
+    //单个删除选中的人
+    const deleteChoosePeople2 = (item) => {
+      let arr = state.relationpeople;
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i].key === item.key) {
+          arr.splice(i, 1);
+        }
+      }
+      state.relationpeople = arr;
+      let array = state.selectedRowKeys2;
+      for (let i = 0; i < array.length; i++) {
+        if (array[i] === item.key) {
+          array.splice(i, 1);
+        }
+      }
+      state.selectedRowKeys2 = array;
+      console.log("");
+    };
+    //根据右侧快速选人高度，判断是否显示更多
+    const selectedsHeight2 = () => {
+      let resize = elementResizeDetectorMaker();
+      resize.listenTo(document.getElementById("selecteds2"), function (ele) {
+        console.log("ele", ele.offsetHeight);
+        if (ele.offsetHeight > 160 && !state.showHidden2) {
+          state.showMore2 = true;
+          document.getElementById("selectedsBox2").style.overflow = "hidden";
+          document.getElementById("selectedsBox2").style.height = "160px";
+        } else if (ele.offsetHeight < 160) {
+          state.showMore2 = false;
+          state.showHidden2 = false;
+          document.getElementById("selectedsBox2").style.overflow = "hidden";
+          document.getElementById("selectedsBox2").style.height = "160px";
+        }
+      });
+    };
+    const morePeopleShow2 = () => {
+      state.showMore2 = false;
+      state.showHidden2 = true;
+      document.getElementById("selectedsBox2").style.overflow = "";
+      document.getElementById("selectedsBox2").style.height = "";
+    };
+    const morePeopleHidden2 = () => {
+      state.showMore2 = true;
+      state.showHidden2 = false;
+      document.getElementById("selectedsBox2").style.overflow = "hidden";
+      document.getElementById("selectedsBox2").style.height = "160px";
+    };
+
+    // 结束 受众关联------------------------------------------------------------------
+
+    //全部清除
+    const deleteAll = () => {
+      //快速选人-------------------------------------
+      state.valueSelectboe = null; //快速选人的选择组织
+      state.choosepeople = []; //总的数组
+      state.showMore = false; //是否显示快速选人的查看更多
+      state.showHidden = false; //是否显示收回
+      state.selectedRowKeys = []; //表格选中的key
+      //快速选人-------------------------------------
+      //添加组织-------------------------------------
+
+      state.selectedKeys1 = []; //选中部门的key
+      state.chooseorganization = []; //添加组织的选择组织
+      state.chooseorganization1 = []; //显示到右侧的数组
+      state.showMore1 = false; //是否显示添加组织的查看更多
+      state.showHidden1 = false; //是否显示添加组织的收回
+
+      state.showOrgModal = false; //确认弹窗
+      //添加组织-------------------------------------
+
+      //受众关联-------------------------------------
+      state.relationpeople = []; //总的数组
+      state.showMore2 = false; //是否显示快速选人的查看更多
+      state.showHidden2 = false; //是否显示收回
+      state.selectedRowKeys2 = []; //表格选中的key
+      //受众关联-------------------------------------
+    };
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       onSelectChange,
-      onSelectChange1,
       onSelectChange2,
       // change,
+      departmentSelect,
+      deleteChoosePeople,
+      selectedsHeight,
+      morePeopleShow,
+      morePeopleHidden,
+
+      departmentSelect1,
+      addOrgModal,
+      addOrg,
+      closeOrgModal,
+      selectedsHeight1,
+      morePeopleShow1,
+      morePeopleHidden1,
+      deleteChoosePeople1,
+
+      selectedsHeight2,
+      morePeopleShow2,
+      morePeopleHidden2,
+      deleteChoosePeople2,
+
+      deleteAll,
     };
   },
 };
@@ -1102,13 +1316,16 @@ export default {
 
 <style lang="scss">
 .stuadd {
+  .ant-drawer-content-wrapper {
+    max-width: 1300px !important;
+  }
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
     // overflow-y: auto;
     display: flex;
     flex-direction: column;
-
+    overflow-x: auto;
     .header {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;
@@ -1128,21 +1345,23 @@ export default {
     }
     .main {
       display: flex;
+      //  min-width: 1200px;
       //height: 80%;
       margin-bottom: 72px;
       overflow-y: auto;
+      //  overflow-x: auto;
       .left {
         // overflow-y: auto;
-        width: 65%;
+        width: 772px;
+        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;
+            // justify-content: space-between;
             align-items: center;
             .t1 {
               display: flex;
@@ -1161,6 +1380,7 @@ export default {
             .btns {
               display: flex;
               margin-top: 10px;
+              margin-left: 34px;
               .btn1 {
                 width: 100px;
                 height: 40px;
@@ -1293,21 +1513,64 @@ export default {
             display: flex;
             justify-content: space-between;
             .boeTree {
-              margin-top: 20px;
-              width: 300px;
-              height: 40px;
-              margin-right: 10px;
-              .ant-select {
-                .ant-select-selector {
-                  border-radius: 8px;
-                  height: 40px;
-                  .ant-select-selection-placeholder {
-                    color: #409eff;
-                    margin-left: 72px !important;
-                    margin-top: 4px !important;
-                  }
-                }
+              margin-right: 20px;
+              // margin-top: 20px;
+              // width: 300px;
+              // overflow-y: auto;
+              // margin-right: 10px;
+              // .ant-select {
+              //   .ant-select-selector {
+              //     border-radius: 8px;
+              //     // height: 40px;
+              //     .ant-select-selection-placeholder {
+              //       color: #409eff;
+              //       margin-left: 72px !important;
+              //       margin-top: 4px !important;
+              //     }
+              //   }
+              // }
+              .boeTreeTitle {
+                width: 280px;
+                height: 40px;
+                border-radius: 4px;
+                border: 1px solid #c3c3c3;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 16px;
+                font-weight: 500;
+                color: #409eff;
+                line-height: 22px;
+                margin-bottom: 8px;
+                margin-top: 20px;
               }
+              .treeMain {
+                width: 280px;
+                border-radius: 4px;
+                overflow-x: auto;
+                overflow-y: auto;
+                border: 1px solid #c3c3c3;
+                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 {
+                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 {
@@ -1441,26 +1704,61 @@ export default {
             }
           }
           .boeTree {
-            margin-top: 20px;
-            width: 300px;
-            height: 40px;
-            margin-right: 10px;
-            .ant-select {
-              .ant-select-selector {
-                border-radius: 8px;
-                height: 40px;
-                .ant-select-selection-placeholder {
-                  color: #409eff;
-                  margin-left: 72px !important;
-                  margin-top: 4px !important;
-                }
-              }
+            .boeTreeTitle {
+              width: 280px;
+              height: 40px;
+              border-radius: 4px;
+              border: 1px solid #c3c3c3;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              font-size: 16px;
+              font-weight: 500;
+              color: #409eff;
+              line-height: 22px;
+              margin-bottom: 8px;
+              margin-top: 20px;
             }
+            .treeMain {
+              width: 280px;
+              border-radius: 4px;
+              overflow-x: auto;
+              overflow-y: auto;
+              border: 1px solid #c3c3c3;
+              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 {
+              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;
+            //               }
+            //               .ant-tree-switcher_close+ .ant-tree-checkbox{
+            // display: none !important;
+            //               }
+            //               .ant-tree .ant-tree-title{
+            // background-color: pink;
+            //               }
           }
         }
       }
       .right {
-        width: 35%;
+        width: 320px;
+        flex-shrink: 0;
+        overflow-y: auto;
         .onerow {
           display: flex;
           justify-content: space-between;
@@ -1528,14 +1826,24 @@ export default {
           margin-top: 12px;
           margin-left: 32px;
         }
+        .selectedsBox {
+          position: relative;
+          // height: 160px;
+          overflow: hidden;
+        }
         .selecteds {
           display: flex;
+          // flex-wrap:wrap;
           flex-wrap: wrap;
+          align-content: flex-start;
+          margin-right: 32px;
           margin-left: 32px;
-          height: 200px;
-          overflow-y: hidden;
+          min-height: 100px;
+          // overflow: hidden;
           .chose {
-            width: 64px;
+            // width: 64px;
+            padding-left: 10px;
+            padding-right: 10px;
             height: 24px;
             margin-top: 25px;
             margin-right: 25px;
@@ -1604,6 +1912,7 @@ export default {
     width: 7px !important;
   }
 }
+
 .changetreedropdownboe {
   width: 240px !important;
   border-radius: 5px;
@@ -1618,4 +1927,118 @@ export default {
     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;
+          height: 258px;
+          background: #ffffff;
+          box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+          border-radius: 4px;
+          // position: absolute;
+          // left: 50%;
+          // top: 10%;
+          // transform: translate(-50%, -50%);
+          .del_header {
+            position: absolute;
+            width: calc(100%);
+            height: 68px;
+            background: linear-gradient(
+              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;
+                margin-right: 10px;
+                background-image: url(@/assets/images/taskpage/gan.png);
+                background-size: 100% 100%;
+              }
+              .close_exit {
+                position: absolute;
+                right: 42px;
+                cursor: pointer;
+                width: 20px;
+                height: 20px;
+                background-image: url(@/assets/images/coursewareManage/close.png);
+                background-size: 100% 100%;
+              }
+            }
+            .body {
+              width: 100%;
+              margin: 34px auto 56px auto;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              flex-direction: column;
+              // background-color: red;
+              position: relative;
+              .back {
+                position: absolute;
+                top: 30px;
+                font-size: 12px;
+                font-weight: 400;
+                color: #666666;
+              }
+            }
+            .del_btnbox {
+              display: flex;
+              margin: 30px auto;
+              justify-content: center;
+              .del_btn {
+                width: 100px;
+                height: 40px;
+                background: rgba(64, 158, 255, 0);
+                border-radius: 8px;
+                display: flex;
+                align-items: center;
+                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;
+              }
+            }
+          }
+        }
+      }
+    }
+    .ant-modal-close-x {
+      display: none;
+    }
+  }
+}
 </style>
diff --git a/src/views/certificate/CertificateCenter.vue b/src/views/certificate/CertificateCenter.vue
index 32dff498..4ea4ed49 100644
--- a/src/views/certificate/CertificateCenter.vue
+++ b/src/views/certificate/CertificateCenter.vue
@@ -234,17 +234,17 @@ export default {
     const closeModal = () => {
       state.visible = false;
     };
-    const getMousePosition = () => {
+    const getClientHeight = () => {
       state.screenHeight = document.body.clientHeight;
     };
 
     onMounted(() => {
       // console.log("11111", 1);
-      window.addEventListener("resize", getMousePosition, false);
+      window.addEventListener("resize", getClientHeight, false);
       // judgeUrl();
     });
     onUnmounted(() => {
-      window.removeEventListener("resize", getMousePosition, false);
+      window.removeEventListener("resize", getClientHeight, false);
     });
 
     return {
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 0fb531f9..e466aa16 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -51,7 +51,10 @@
                     <div class="imgIcon"></div>
                   </div>
                   <div class="boxs_right">
-                    <div class="imgIcon" @click="deleteChapter(element.chapterId)"></div>
+                    <div
+                      class="imgIcon"
+                      @click="deleteChapter(element.chapterId)"
+                    ></div>
                   </div>
                 </div>
                 <div class="items2">
@@ -1776,16 +1779,20 @@ export default {
       }
     };
     //删除关卡
-    const deleteChapter=(chapterId)=>{
-let obj={
-  chapterId:chapterId
-}
-api.deleteChapter(obj).then(res=>{
-console.log('删除关卡成功',res)
-}).catch(err=>{
-  console.log('删除关卡失败',err)
-})
-    }
+    const deleteChapter = (chapterId) => {
+      console.log('chapterId',chapterId)
+      let obj = {
+        chapterId: chapterId,
+      };
+      api
+        .deleteChapter(obj)
+        .then((res) => {
+          console.log("删除关卡成功", res);
+        })
+        .catch((err) => {
+          console.log("删除关卡失败", err);
+        });
+    };
     return {
       ...toRefs(state),
       // tableDataFunc,