From 6cd7eb3bdc14a4b1efe065daf3a81749bac9489b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 20 Dec 2022 18:24:42 +0800
Subject: [PATCH 1/7] =?UTF-8?q?--=20=E5=B1=8F=E8=94=BD=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 156 +++++++++++------------
 1 file changed, 78 insertions(+), 78 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 5b03382f..3b375e58 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -71,44 +71,44 @@
                   </div>
                 </div>
               </a-tab-pane>
-              <a-tab-pane :key="2" tab="添加组织">
-                <div
-                    :style="{ height: screenHeight - 235 + 'px' }"
-                >
-                  <div class="tab2">
-                    <a-form-item label="组织：">
-                      <a-input
-                          v-model:value="searchOrgName.keyword"
-                          style="width: 230px; height: 40px; border-radius: 8px"
-                          placeholder="请输入组织"
-                      />
-                      <a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">
-                        <template #icon>
-                          <SearchOutlined/>
-                        </template>
-                        搜索
-                      </a-button>
-                      <a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>
-                    </a-form-item>
-                  </div>
-                  <div class="boeTree">
-                    <a-tree
-                        :tree-data="searchOrgName.keyword ? orgData : treeData"
-                        @select="onOrgSelectChange"
-                        :fieldNames="{
-                          children: 'treeChildList',
-                          key: 'id',
-                          title: 'name',
-                          value: 'name',
-                        }"
-                        row-key="id"
-                        :row-selection="orgRowSelection"
-                        multiple
-                    >
-                    </a-tree>
-                  </div>
-                </div>
-              </a-tab-pane>
+<!--              <a-tab-pane :key="2" tab="添加组织">-->
+<!--                <div-->
+<!--                    :style="{ height: screenHeight - 235 + 'px' }"-->
+<!--                >-->
+<!--                  <div class="tab2">-->
+<!--                    <a-form-item label="组织：">-->
+<!--                      <a-input-->
+<!--                          v-model:value="searchOrgName.keyword"-->
+<!--                          style="width: 230px; height: 40px; border-radius: 8px"-->
+<!--                          placeholder="请输入组织"-->
+<!--                      />-->
+<!--                      <a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">-->
+<!--                        <template #icon>-->
+<!--                          <SearchOutlined/>-->
+<!--                        </template>-->
+<!--                        搜索-->
+<!--                      </a-button>-->
+<!--                      <a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>-->
+<!--                    </a-form-item>-->
+<!--                  </div>-->
+<!--                  <div class="boeTree">-->
+<!--                    <a-tree-->
+<!--                        :tree-data="searchOrgName.keyword ? orgData : treeData"-->
+<!--                        @select="onOrgSelectChange"-->
+<!--                        :fieldNames="{-->
+<!--                          children: 'treeChildList',-->
+<!--                          key: 'id',-->
+<!--                          title: 'name',-->
+<!--                          value: 'name',-->
+<!--                        }"-->
+<!--                        row-key="id"-->
+<!--                        :row-selection="orgRowSelection"-->
+<!--                        multiple-->
+<!--                    >-->
+<!--                    </a-tree>-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--              </a-tab-pane>-->
               <a-tab-pane :key="3" tab="受众关联">
                 <div
                     :style="{ height: screenHeight - 235 + 'px' }"
@@ -180,27 +180,27 @@
           <div v-if="person && selectsData.studentList.length >10" class="ifsw" ><div @click="person = !person" class="sw"> 收起&lt;  </div></div>
 
           <!--组织-->
-          <div  class="dept">添加组织</div>
-          <div v-for="(item,i) in selectsData.deptList"  >
-            <div v-if="i<11">
-            <div class="chose1">
-              <div class="span"> {{ item.name }}</div>
-              <div class="ch1" @click="orgDel(i)"></div>
-            </div>
-            </div>
-            <div v-else> 
-              <div v-if ="dept">
-                    <div class="chose1">
-                      <div class="span"> {{ item.name }}</div>
-                    <div class="ch1" @click="orgDel(i)"></div>
-                    </div>
-                </div>
-               
-             </div>
-           
-          </div>
-          <div v-if="!dept && selectsData.deptList.length >10" class="ifsw"><div @click="dept = !dept" class=“sw”>查看更多></div></div>
-          <div v-if="dept && selectsData.deptList.length >10" class="ifsw" ><div @click="dept = !dept" class="sw"> 收起&lt;  </div></div>
+<!--          <div  class="dept">添加组织</div>-->
+<!--          <div v-for="(item,i) in selectsData.deptList"  >-->
+<!--            <div v-if="i<11">-->
+<!--            <div class="chose1">-->
+<!--              <div class="span"> {{ item.name }}</div>-->
+<!--              <div class="ch1" @click="orgDel(i)"></div>-->
+<!--            </div>-->
+<!--            </div>-->
+<!--            <div v-else> -->
+<!--              <div v-if ="dept">-->
+<!--                    <div class="chose1">-->
+<!--                      <div class="span"> {{ item.name }}</div>-->
+<!--                    <div class="ch1" @click="orgDel(i)"></div>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--               -->
+<!--             </div>-->
+<!--           -->
+<!--          </div>-->
+<!--          <div v-if="!dept && selectsData.deptList.length >10" class="ifsw"><div @click="dept = !dept" class=“sw”>查看更多></div></div>-->
+<!--          <div v-if="dept && selectsData.deptList.length >10" class="ifsw" ><div @click="dept = !dept" class="sw"> 收起&lt;  </div></div>-->
 
 
 <!--受众-->
@@ -290,8 +290,8 @@
 <script setup>
 import {computed, defineEmits, defineProps, ref, watch} from "vue";
 import {useStore} from "vuex";
-import {useBoeApi, useBoeApiPage} from "@/api/request";
-import {AUDIENCE_LIST, ORG_LIST, USER_LIST} from "@/api/ThirdApi";
+import {useBoeApiPage} from "@/api/request";
+import {AUDIENCE_LIST, USER_LIST} from "@/api/ThirdApi";
 import {saveStu} from "@/api/index1";
 
 const store = useStore();
@@ -305,7 +305,7 @@ const props = defineProps({
   }
 })
 const person =ref(false)
-const dept =ref(false)
+// const dept =ref(false)
 const group =ref(false)
 const visiable = ref(false)
 const activeKey = ref(1)
@@ -327,11 +327,11 @@ const audienceName = ref({
   page: 1,
   pageSize: 10
 })
-const searchOrgName = ref({
-  keyword: '',
-  page: 1,
-  pageSize: 10
-})
+// const searchOrgName = ref({
+//   keyword: '',
+//   page: 1,
+//   pageSize: 10
+// })
 
 const stageIds = computed(() => props.stage)
 
@@ -349,10 +349,10 @@ const {
   total: res => res.result.totalElement
 })
 
-const {
-  data: orgData,
-  fetch: searchOrg,
-} = useBoeApi(ORG_LIST, searchOrgName.value)
+// const {
+//   data: orgData,
+//   fetch: searchOrg,
+// } = useBoeApi(ORG_LIST, searchOrgName.value)
 
 const {
   data: audiData,
@@ -506,10 +506,10 @@ function stuDel(i) {
   selectsData.value.studentList.splice(i, 1)
 }
 
-function orgDel(i) {
-  orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
-  selectsData.value.deptList.splice(i, 1)
-}
+// function orgDel(i) {
+//   orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
+//   selectsData.value.deptList.splice(i, 1)
+// }
 
 function AuditDel(i) {
   auditSelectKeys.value = auditSelectKeys.value.filter(e => e !== selectsData.value.groupList[i].id)
@@ -566,9 +566,9 @@ const deleteDepSelect = () => {
 };
 
 //重置组织
-const resetOrg = () => {
-  searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
-};
+// const resetOrg = () => {
+//   searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
+// };
 
 //重置受众
 const resetAudienceInfo = () => {

From 0bbb4403e7650fcaf87f158833a10c02c3e51841 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 20 Dec 2022 18:35:15 +0800
Subject: [PATCH 2/7] -- token bug

---
 src/api/method.js  | 4 ++++
 src/api/request.js | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/api/method.js b/src/api/method.js
index 5c4742d3..f304aa34 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -242,6 +242,10 @@ const setCookie = (name, value, perpetual) => {
 }
 //获取cookie数据
 //先写一个方法
+export function getCookieForName(name) {
+    return document.cookie?.split(";").find(e => e.includes(name))?.replace(`${name}=`, '') || ''
+}
+
 function getCookie(name) {
     //1.获取cookie字符串
     var cookies = document.cookie;
diff --git a/src/api/request.js b/src/api/request.js
index e682b2e1..acac32b1 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -1,5 +1,5 @@
 import {reactive, ref, toRefs, watch} from "vue";
-import {getCookie} from "@/api/method";
+import {getCookieForName} from "@/api/method";
 import JSONBigInt from 'json-bigint';
 
 const JSONBigIntStr = JSONBigInt({storeAsString: true});
@@ -143,7 +143,7 @@ export async function request(_url, params) {
     return fetch(url, {
         method,
         headers: {
-            token: getCookie('token'),
+            token: getCookieForName('token'),
             ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
         },
         ...method !== 'get' ? {body: JSON.stringify(body)} : {}

From 48af0a81becba723a44b6d022fc238b49d11e99b Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Tue, 20 Dec 2022 18:36:55 +0800
Subject: [PATCH 3/7] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                 |   2 +-
 src/components/student/ChangeLevelModal.vue |   4 +-
 src/components/student/CommonStudent.vue    | 971 +++++++++++---------
 3 files changed, 520 insertions(+), 457 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 123504d3..86eaf07b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.9.19------------");
+    console.log("版本0.9.20------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
diff --git a/src/components/student/ChangeLevelModal.vue b/src/components/student/ChangeLevelModal.vue
index d5e4b53f..6fa93375 100644
--- a/src/components/student/ChangeLevelModal.vue
+++ b/src/components/student/ChangeLevelModal.vue
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-12-20 17:00:37
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-20 17:08:12
+ * @LastEditTime: 2022-12-20 17:59:40
  * @FilePath: /fe-manage/src/components/student/ChangeLevelModal.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -25,7 +25,7 @@
       </div>
       <div class="mid">
         <div class="inher">
-          <div class="cur">当前关卡：关卡2</div>
+          <!-- <div class="cur">当前关卡：关卡2</div> -->
           <div class="select">
             <a-select
               v-model:value="curLevel"
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 5b03382f..6d145fde 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -1,143 +1,180 @@
 <!-- eslint-disable vue/no-parsing-error -->
 <!-- eslint-disable vue/require-v-for-key -->
 <template>
-  <div>
+  <div class="CommonStudent">
     <a-drawer
-        :visible="visiable"
-        class="drawerStyle ProjCheckship"
-        placement="right"
-        width="60%"
+      :visible="visiable"
+      class="drawerStyle ProjCheckship"
+      placement="right"
+      width="60%"
     >
       <div class="drawerMain" id="ProjCheckship">
         <div class="header">
           <div class="headerTitle">
-            {{ {1: '添加学员', 2: '添加学员', 3: '添加学员'}[type] || '' }}
+            {{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || "" }}
           </div>
           <img
-              style="width: 29px; height: 29px; cursor: pointer"
-              src="../../assets/images/basicinfo/close.png"
-              @click="closeDrawer"
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="../../assets/images/basicinfo/close.png"
+            @click="closeDrawer"
           />
         </div>
-        <div style="width:100%;display: grid;grid-template-columns: 750px auto;">
-          <div class="tabs" style="min-height:800px;" >
+        <div
+          style="width: 100%; display: grid; grid-template-columns: 750px auto"
+        >
+          <div class="tabs" style="min-height: 800px">
             <a-tabs v-model:activeKey="activeKey">
               <a-tab-pane :key="1" tab="快速选人">
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div class="tab1">
                     <a-form-item label="姓名">
                       <a-input
-                          v-model:value="nameSearch.keyword"
-                          style="width: 270px; height: 40px; border-radius: 8px"
-                          placeholder="请输入姓名"
+                        v-model:value="nameSearch.keyword"
+                        style="width: 270px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
                       />
-                      <a-button type="primary" @click="onSearchStu" style="margin-left: 20px;border-radius: 4px">
+                      <a-button
+                        type="primary"
+                        @click="onSearchStu"
+                        style="margin-left: 20px; border-radius: 4px"
+                      >
                         <template #icon>
-                          <SearchOutlined/>
+                          <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
-                      <a-button @click="resetStu" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                      <a-button
+                        @click="resetStu"
+                        style="margin-left: 20px; border-radius: 4px"
+                        >重置</a-button
+                      >
                     </a-form-item>
                   </div>
-                  <div class="chooseLeft" style="display: grid;grid-template-columns: 250px auto">
-                    <div :style="{ height: screenHeight - 180 + 'px' ,overflowY:'auto'}" style="border: 1px solid #f0f0f0; ;">
-                    <div class="tree" style="margin: 10px 4px 220px 10px;">
-                      <a-tree
+                  <div
+                    class="chooseLeft"
+                    style="display: grid; grid-template-columns: 250px auto"
+                  >
+                    <div
+                      :style="{
+                        height: screenHeight - 180 + 'px',
+                        overflowY: 'auto',
+                      }"
+                      style="border: 1px solid #f0f0f0"
+                    >
+                      <div class="tree" style="margin: 10px 4px 220px 10px">
+                        <a-tree
                           allow-clear
                           tree-default-expand-all
                           :tree-data="treeData"
                           :fieldNames="{
-                          children: 'treeChildList',
-                          key: 'id',
-                          title: 'name',
-                          value: 'name',
-                        }"
+                            children: 'treeChildList',
+                            key: 'id',
+                            title: 'name',
+                            value: 'name',
+                          }"
                           @select="stuStuOrgSelect"
-                      >
-                      </a-tree>
+                        >
+                        </a-tree>
                       </div>
                     </div>
-                    <div class="tableBox tabb"  style="margin: 0px 4px 120px 10px; border: 1px solid #f0f0f0;">
+                    <div
+                      class="tableBox tabb"
+                      style="
+                        margin: 0px 4px 120px 10px;
+                        border: 1px solid #f0f0f0;
+                      "
+                    >
                       <a-table
-                          :columns="stuColumns"
-                          :data-source="stuData"
-                          :pagination="stuPagination"
-                          :loading="stuLoading"
-                          row-key="id"
-                          :row-selection="stuRowSelection"
+                        :columns="stuColumns"
+                        :data-source="stuData"
+                        :pagination="stuPagination"
+                        :loading="stuLoading"
+                        row-key="id"
+                        :row-selection="stuRowSelection"
                       />
                     </div>
                   </div>
                 </div>
               </a-tab-pane>
               <a-tab-pane :key="2" tab="添加组织">
-                <div
-                    :style="{ height: screenHeight - 235 + 'px' }"
-                >
+                <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div class="tab2">
                     <a-form-item label="组织：">
                       <a-input
-                          v-model:value="searchOrgName.keyword"
-                          style="width: 230px; height: 40px; border-radius: 8px"
-                          placeholder="请输入组织"
+                        v-model:value="searchOrgName.keyword"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
                       />
-                      <a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">
+                      <a-button
+                        type="primary"
+                        @click="searchOrg"
+                        style="margin-left: 20px; border-radius: 4px"
+                      >
                         <template #icon>
-                          <SearchOutlined/>
+                          <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
-                      <a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                      <a-button
+                        @click="resetOrg"
+                        style="margin-left: 20px; border-radius: 4px"
+                        >重置</a-button
+                      >
                     </a-form-item>
                   </div>
                   <div class="boeTree">
                     <a-tree
-                        :tree-data="searchOrgName.keyword ? orgData : treeData"
-                        @select="onOrgSelectChange"
-                        :fieldNames="{
-                          children: 'treeChildList',
-                          key: 'id',
-                          title: 'name',
-                          value: 'name',
-                        }"
-                        row-key="id"
-                        :row-selection="orgRowSelection"
-                        multiple
+                      :tree-data="searchOrgName.keyword ? orgData : treeData"
+                      @select="onOrgSelectChange"
+                      :fieldNames="{
+                        children: 'treeChildList',
+                        key: 'id',
+                        title: 'name',
+                        value: 'name',
+                      }"
+                      row-key="id"
+                      :row-selection="orgRowSelection"
+                      multiple
                     >
                     </a-tree>
                   </div>
                 </div>
               </a-tab-pane>
               <a-tab-pane :key="3" tab="受众关联">
-                <div
-                    :style="{ height: screenHeight - 235 + 'px' }"
-                >
+                <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div>
                     <a-form-item label="受众名称：">
                       <a-input
-                          v-model:value="audienceName.keyword"
-                          style="width: 260px; height: 40px; border-radius: 8px"
-                          placeholder="请输入受众名称"
+                        v-model:value="audienceName.keyword"
+                        style="width: 260px; height: 40px; border-radius: 8px"
+                        placeholder="请输入受众名称"
                       />
-                      <a-button type="primary" @click="searchAudi" style="margin-left: 20px;border-radius: 4px">
+                      <a-button
+                        type="primary"
+                        @click="searchAudi"
+                        style="margin-left: 20px; border-radius: 4px"
+                      >
                         <template #icon>
-                          <SearchOutlined/>
+                          <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
-                      <a-button @click="resetAudienceInfo" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                      <a-button
+                        @click="resetAudienceInfo"
+                        style="margin-left: 20px; border-radius: 4px"
+                        >重置</a-button
+                      >
                     </a-form-item>
                   </div>
                   <div class="tableBox tabb">
                     <a-table
-                        style="border: 1px solid #f2f6fe"
-                        row-key="id"
-                        :columns="audiColums"
-                        :data-source="audiData"
-                        :loading="audiLoading"
-                        :pagination="auditPagination"
-                        :row-selection="auditRowSelection"
+                      style="border: 1px solid #f2f6fe"
+                      row-key="id"
+                      :columns="audiColums"
+                      :data-source="audiData"
+                      :loading="audiLoading"
+                      :pagination="auditPagination"
+                      :row-selection="auditRowSelection"
                     />
                   </div>
                 </div>
@@ -145,91 +182,104 @@
             </a-tabs>
           </div>
           <div class="right1">
-          <div class="onerow">
-            <div class="onleft">
-              <div class="already">已选</div>
-            
+            <div class="onerow">
+              <div class="onleft">
+                <div class="already">已选</div>
+              </div>
             </div>
-          
-          </div>
-          <div
-            class="selecteds"
-            :style="{ 'max-height': screenHeight - 235 + 'px' }"
-            style="overflow-y: auto"
-          >
-          <div  class="person">快速选人</div>
-          <div v-for="(item,i) in selectsData.studentList" >
-            <div v-if="i<11">
-            <div class="chose">
-              {{ item.realName }}
-              <div class="ch" @click="stuDel(i)"></div>
-            </div>
-            </div>
-            <div v-else> 
-              <div v-if ="person">
-                    <div class="chose">
+            <div
+              class="selecteds"
+              :style="{ 'max-height': screenHeight - 235 + 'px' }"
+              style="overflow-y: auto"
+            >
+              <div class="person">快速选人</div>
+              <div v-for="(item, i) in selectsData.studentList">
+                <div v-if="i < 11">
+                  <div class="chose">
                     {{ item.realName }}
                     <div class="ch" @click="stuDel(i)"></div>
-                    </div>
+                  </div>
                 </div>
-               
-             </div>
-           
-          </div>
-          <div v-if="!person && selectsData.studentList.length >10" class="ifsw"><div @click="person = !person" class=“sw”>查看更多></div></div>
-          <div v-if="person && selectsData.studentList.length >10" class="ifsw" ><div @click="person = !person" class="sw"> 收起&lt;  </div></div>
+                <div v-else>
+                  <div v-if="person">
+                    <div class="chose">
+                      {{ item.realName }}
+                      <div class="ch" @click="stuDel(i)"></div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                v-if="!person && selectsData.studentList.length > 10"
+                class="ifsw"
+              >
+                <div @click="person = !person" class="“sw”">查看更多></div>
+              </div>
+              <div
+                v-if="person && selectsData.studentList.length > 10"
+                class="ifsw"
+              >
+                <div @click="person = !person" class="sw">收起&lt;</div>
+              </div>
 
-          <!--组织-->
-          <div  class="dept">添加组织</div>
-          <div v-for="(item,i) in selectsData.deptList"  >
-            <div v-if="i<11">
-            <div class="chose1">
-              <div class="span"> {{ item.name }}</div>
-              <div class="ch1" @click="orgDel(i)"></div>
-            </div>
-            </div>
-            <div v-else> 
-              <div v-if ="dept">
-                    <div class="chose1">
-                      <div class="span"> {{ item.name }}</div>
+              <!--组织-->
+              <div class="dept">添加组织</div>
+              <div v-for="(item, i) in selectsData.deptList">
+                <div v-if="i < 11">
+                  <div class="chose1">
+                    <div class="span">{{ item.name }}</div>
                     <div class="ch1" @click="orgDel(i)"></div>
-                    </div>
+                  </div>
                 </div>
-               
-             </div>
-           
-          </div>
-          <div v-if="!dept && selectsData.deptList.length >10" class="ifsw"><div @click="dept = !dept" class=“sw”>查看更多></div></div>
-          <div v-if="dept && selectsData.deptList.length >10" class="ifsw" ><div @click="dept = !dept" class="sw"> 收起&lt;  </div></div>
+                <div v-else>
+                  <div v-if="dept">
+                    <div class="chose1">
+                      <div class="span">{{ item.name }}</div>
+                      <div class="ch1" @click="orgDel(i)"></div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                v-if="!dept && selectsData.deptList.length > 10"
+                class="ifsw"
+              >
+                <div @click="dept = !dept" class="“sw”">查看更多></div>
+              </div>
+              <div v-if="dept && selectsData.deptList.length > 10" class="ifsw">
+                <div @click="dept = !dept" class="sw">收起&lt;</div>
+              </div>
 
-
-<!--受众-->
-          <div  class="group">受众关联</div>
-          <div v-for="(item,i) in selectsData.groupList" >
-            <div v-if="i<11">
-            <div class="chose2">
-              <div class="span"> {{ item.audienceName }}</div>
-              <div class="ch2" @click="AuditDel(i)"></div>
-            </div>
-            </div>
-            <div v-else> 
-              <div v-if ="group">
-                    <div class="chose2">
-                      <div class="span"> {{ item.audienceName }}</div>
+              <!--受众-->
+              <div class="group">受众关联</div>
+              <div v-for="(item, i) in selectsData.groupList">
+                <div v-if="i < 11">
+                  <div class="chose2">
+                    <div class="span">{{ item.audienceName }}</div>
                     <div class="ch2" @click="AuditDel(i)"></div>
-                    </div>
+                  </div>
                 </div>
-               
-             </div>
-           
+                <div v-else>
+                  <div v-if="group">
+                    <div class="chose2">
+                      <div class="span">{{ item.audienceName }}</div>
+                      <div class="ch2" @click="AuditDel(i)"></div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                v-if="!group && selectsData.groupList.length > 10"
+                class="ifsw"
+              >
+                <div @click="group = !group" class="“sw”">查看更多></div>
+              </div>
+              <div v-if="group && selectsData.groupList > 10" class="ifsw">
+                <div @click="group = !group" class="sw">收起&lt;</div>
+              </div>
+            </div>
           </div>
-          <div v-if="!group && selectsData.groupList.length >10" class="ifsw"><div @click="group = !group" class=“sw”>查看更多></div></div>
-          <div v-if="group && selectsData.groupList >10" class="ifsw" ><div @click="group = !group" class="sw"> 收起&lt;  </div></div>
-
-        
-          </div>
-        </div>
-         <!-- <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
+          <!-- <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
             <div>
               <div style="margin-top: 20px">快速选人</div>
               // eslint-disable-next-line vue/require-v-for-key
@@ -274,66 +324,74 @@
       <slot></slot>
     </div>
   </div>
-  <a-modal v-model:visible="stageVisible" width="1000px" title="选择阶段" @ok="handleStageOk">
+  <a-modal
+    v-model:visible="stageVisible"
+    width="1000px"
+    title="选择阶段"
+    @ok="handleStageOk"
+  >
     <div>
-      {{ type === 1 ? '选择阶段' : '选择关卡' }}
-      <a-select style="width: 150px" :placeholder="type===1?'选择阶段':'选择关卡'" v-model:value="selectsData.stageId"
-                className="cus-select">
-        <a-select-option v-for="(item,i) in stageIds" :key="i" :value="item.id">{{
-            item.name || '默认'
-          }}
+      {{ type === 1 ? "选择阶段" : "选择关卡" }}
+      <a-select
+        style="width: 150px"
+        :placeholder="type === 1 ? '选择阶段' : '选择关卡'"
+        v-model:value="selectsData.stageId"
+        className="cus-select"
+      >
+        <a-select-option v-for="(item, i) in stageIds" :key="i" :value="item.id"
+          >{{ item.name || "默认" }}
         </a-select-option>
       </a-select>
     </div>
   </a-modal>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, ref, watch} from "vue";
-import {useStore} from "vuex";
-import {useBoeApi, useBoeApiPage} from "@/api/request";
-import {AUDIENCE_LIST, ORG_LIST, USER_LIST} from "@/api/ThirdApi";
-import {saveStu} from "@/api/index1";
+import { computed, defineEmits, defineProps, ref, watch } from "vue";
+import { useStore } from "vuex";
+import { useBoeApi, useBoeApiPage } from "@/api/request";
+import { AUDIENCE_LIST, ORG_LIST, USER_LIST } from "@/api/ThirdApi";
+import { saveStu } from "@/api/index1";
 
 const store = useStore();
-const emit = defineEmits({})
+const emit = defineEmits({});
 const props = defineProps({
   type: Number,
   id: String,
   stage: {
     type: Array,
-    default: () => []
-  }
-})
-const person =ref(false)
-const dept =ref(false)
-const group =ref(false)
-const visiable = ref(false)
-const activeKey = ref(1)
-const stageVisible = ref(false)
+    default: () => [],
+  },
+});
+const person = ref(false);
+const dept = ref(false);
+const group = ref(false);
+const visiable = ref(false);
+const activeKey = ref(1);
+const stageVisible = ref(false);
 const selectsData = ref({
-  stageId: '',
+  stageId: "",
   studentList: [],
   deptList: [],
-  groupList: []
-})
+  groupList: [],
+});
 const nameSearch = ref({
-  keyword: '',
+  keyword: "",
   departId: null,
   page: 1,
-  pageSize: 10
-})
+  pageSize: 10,
+});
 const audienceName = ref({
-  keyword: '',
+  keyword: "",
   page: 1,
-  pageSize: 10
-})
+  pageSize: 10,
+});
 const searchOrgName = ref({
-  keyword: '',
+  keyword: "",
   page: 1,
-  pageSize: 10
-})
+  pageSize: 10,
+});
 
-const stageIds = computed(() => props.stage)
+const stageIds = computed(() => props.stage);
 
 const {
   data: stuData,
@@ -341,18 +399,18 @@ const {
   page: stuPageNo,
   pageSize: stuPageSize,
   loading: stuLoading,
-  total: stuTotal
+  total: stuTotal,
 } = useBoeApiPage(USER_LIST, nameSearch.value, {
   init: false,
-  result: res => res.result.userInfoList,
-  totalPage: res => res.result.totalPage,
-  total: res => res.result.totalElement
-})
+  result: (res) => res.result.userInfoList,
+  totalPage: (res) => res.result.totalPage,
+  total: (res) => res.result.totalElement,
+});
 
-const {
-  data: orgData,
-  fetch: searchOrg,
-} = useBoeApi(ORG_LIST, searchOrgName.value)
+const { data: orgData, fetch: searchOrg } = useBoeApi(
+  ORG_LIST,
+  searchOrgName.value
+);
 
 const {
   data: audiData,
@@ -360,13 +418,14 @@ const {
   page: audiPageNo,
   pageSize: audiPageSize,
   loading: audiLoading,
-  total: audiTotal
+  total: audiTotal,
 } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
   init: true,
-  result: res => res.result.audienceList.map(e => ({...e, id: e.id + ''})),
-  totalPage: res => res.result.totalPage,
-  total: res => res.result.totalElement
-})
+  result: (res) =>
+    res.result.audienceList.map((e) => ({ ...e, id: e.id + "" })),
+  totalPage: (res) => res.result.totalPage,
+  total: (res) => res.result.totalElement,
+});
 
 const stuColumns = ref([
   {
@@ -405,15 +464,16 @@ const stuColumns = ref([
     className: "h",
     ellipsis: true,
   },
-])
-const audiColums = ref([{
-  title: "id",
-  dataIndex: "id",
-  key: "id",
-  width: 35,
-  align: "center",
-  className: "h",
-},
+]);
+const audiColums = ref([
+  {
+    title: "id",
+    dataIndex: "id",
+    key: "id",
+    width: 35,
+    align: "center",
+    className: "h",
+  },
   {
     title: "受众名称",
     dataIndex: "audienceName",
@@ -439,52 +499,52 @@ const audiColums = ref([{
     align: "center",
     className: "h",
   },
-])
-const stuSelectKeys = ref([])
-const orgSelectKeys = ref([])
-const auditSelectKeys = ref([])
-const screenHeight = ref(document.body.clientHeight)
+]);
+const stuSelectKeys = ref([]);
+const orgSelectKeys = ref([]);
+const auditSelectKeys = ref([]);
+const screenHeight = ref(document.body.clientHeight);
 const stuRowSelection = computed(() => ({
   columnWidth: 20,
   selectedRowKeys: stuSelectKeys.value,
   onChange: onStuSelectChange,
   preserveSelectedRowKeys: true,
-}))
+}));
 const orgRowSelection = computed(() => ({
   columnWidth: 20,
   selectedRowKeys: orgSelectKeys.value,
   onChange: onOrgSelectChange,
   preserveSelectedRowKeys: true,
-}))
+}));
 
 const stuPagination = computed(() => ({
   total: stuTotal.value,
   showSizeChanger: false,
   current: stuPageNo.value,
   pageSize: stuPageSize.value,
-  onChange: changePagination
-}))
+  onChange: changePagination,
+}));
 
 const auditPagination = computed(() => ({
   total: audiTotal.value,
   showSizeChanger: false,
   current: audiPageNo.value,
   pageSize: audiPageSize.value,
-  onChange: auditChangePagination
-}))
+  onChange: auditChangePagination,
+}));
 
 const auditRowSelection = computed(() => ({
   columnWidth: 20,
   selectedRowKeys: auditSelectKeys.value,
   onChange: onAuditSelectChange,
   preserveSelectedRowKeys: true,
-}))
+}));
 
 const closeDrawer = () => {
-  visiable.value = false
+  visiable.value = false;
 };
 const openDrawer = () => {
-  visiable.value = true
+  visiable.value = true;
 };
 //获取组织树
 const treeData = computed(() => {
@@ -492,51 +552,56 @@ const treeData = computed(() => {
 });
 
 function onSearchStu() {
-  nameSearch.value.page = 1
-  searchStu()
+  nameSearch.value.page = 1;
+  searchStu();
 }
 
 function stuStuOrgSelect(e) {
-  nameSearch.value.departId = e.join('')
-  searchStu()
+  nameSearch.value.departId = e.join("");
+  searchStu();
 }
 
 function stuDel(i) {
-  stuSelectKeys.value = stuSelectKeys.value.filter(e => e !== selectsData.value.studentList[i].id)
-  selectsData.value.studentList.splice(i, 1)
+  stuSelectKeys.value = stuSelectKeys.value.filter(
+    (e) => e !== selectsData.value.studentList[i].id
+  );
+  selectsData.value.studentList.splice(i, 1);
 }
 
 function orgDel(i) {
-  orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
-  selectsData.value.deptList.splice(i, 1)
+  orgSelectKeys.value = orgSelectKeys.value.filter(
+    (e) => e !== selectsData.value.deptList[i].id
+  );
+  selectsData.value.deptList.splice(i, 1);
 }
 
 function AuditDel(i) {
-  auditSelectKeys.value = auditSelectKeys.value.filter(e => e !== selectsData.value.groupList[i].id)
-  selectsData.value.groupList.splice(i, 1)
+  auditSelectKeys.value = auditSelectKeys.value.filter(
+    (e) => e !== selectsData.value.groupList[i].id
+  );
+  selectsData.value.groupList.splice(i, 1);
 }
 
-
 // function orgSelect(key, obj) {
-  // console.log(obj)
-   //request(ORG_CHILD_LIST, {orgId: null}).then(res => {
-     //console.log(res.result)
-   //})
- //}
+// console.log(obj)
+//request(ORG_CHILD_LIST, {orgId: null}).then(res => {
+//console.log(res.result)
+//})
+//}
 
 function onStuSelectChange(e, l) {
-  stuSelectKeys.value = e
-  selectsData.value.studentList = l
+  stuSelectKeys.value = e;
+  selectsData.value.studentList = l;
 }
 
 function onOrgSelectChange(e, l) {
-  orgRowSelection.value = e
-  selectsData.value.deptList = l.selectedNodes
+  orgRowSelection.value = e;
+  selectsData.value.deptList = l.selectedNodes;
 }
 
 function onAuditSelectChange(e, l) {
-  auditSelectKeys.value = e
-  selectsData.value.groupList = l
+  auditSelectKeys.value = e;
+  selectsData.value.groupList = l;
 }
 
 // const stuDepartmentSelect = (e) => {
@@ -547,32 +612,32 @@ function onAuditSelectChange(e, l) {
 //分页获取学员
 const changePagination = (page) => {
   nameSearch.value.page = page;
-  searchStu()
+  searchStu();
 };
 
 const auditChangePagination = (page) => {
   audienceName.value.page = page;
-  searchAudi()
+  searchAudi();
 };
 
 //重置
 const resetStu = () => {
   deleteDepSelect();
-  nameSearch.value = {keyword: '', page: 1, pageSize: 10}
+  nameSearch.value = { keyword: "", page: 1, pageSize: 10 };
 };
 //清空选择部门信息
 const deleteDepSelect = () => {
-  stuSelectKeys.value = []
+  stuSelectKeys.value = [];
 };
 
 //重置组织
 const resetOrg = () => {
-  searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
+  searchOrgName.value = { keyword: "", page: 1, pageSize: 10 };
 };
 
 //重置受众
 const resetAudienceInfo = () => {
-  audienceName.value = {keyword: '', page: 1, pageSize: 10}
+  audienceName.value = { keyword: "", page: 1, pageSize: 10 };
 };
 
 //全部清除
@@ -586,242 +651,240 @@ const resetAudienceInfo = () => {
 //确定添加授权
 const submitAuth = () => {
   if (props.type === 2) {
-    stageVisible.value = true
+    stageVisible.value = true;
   } else {
-    handleStageOk()
+    handleStageOk();
   }
 };
 
 function handleStageOk() {
-  stageVisible.value = false
-  visiable.value = false
-  emit('finash', false)
+  stageVisible.value = false;
+  visiable.value = false;
+  emit("finash", false);
   saveStu({
     targetId: props.id,
     type: props.type,
-    deptIds: selectsData.value.deptList?.map(e => e.id),
+    deptIds: selectsData.value.deptList?.map((e) => e.id),
     stageId: selectsData.value.stageId,
-    groupIds: selectsData.value.groupList?.map(e => e.id),
-    studentList: selectsData.value.studentList
+    groupIds: selectsData.value.groupList?.map((e) => e.id),
+    studentList: selectsData.value.studentList,
   }).then(() => {
-    emit('finash', true)
-  })
+    emit("finash", true);
+  });
 }
 
 watch(visiable, () => {
-  stuSelectKeys.value = []
-  orgSelectKeys.value = []
-  auditSelectKeys.value = []
-  stuData.value = []
+  stuSelectKeys.value = [];
+  orgSelectKeys.value = [];
+  auditSelectKeys.value = [];
+  stuData.value = [];
   selectsData.value = {
-    stageId: '',
+    stageId: "",
     studentList: [],
     deptList: [],
-    groupList: []
-  }
-
-})
-
+    groupList: [],
+  };
+});
 </script>
 <style lang="scss">
-.ant-btn-primary {
-  background-color: #4ea6ff !important;
-}
+.CommonStudent {
+  .ant-btn-primary {
+    background-color: #4ea6ff !important;
+  }
 
-.cus-select {
-  height: 40px;
-  border-radius: 8px;
-}
-.tableBox .ant-table-row .ant-table-cell {
+  .cus-select {
+    height: 40px;
+    border-radius: 8px;
+  }
+  .tableBox .ant-table-row .ant-table-cell {
     height: 48px;
-    font-size: 12px;
+    font-size: 14px;
     font-weight: 400;
-    color: #4F5156;
+    color: #4f5156;
     line-height: 29px;
     padding: 0px;
-}
-.tableBox .ant-table-thead  tr  th {
-    font-size: 12px;
-}
-.ant-tabs-tabpane{
-  height: 100%;
-}
-.ant-tabs{
-  overflow:visible;
-}
-.right1 {
-  border-left: 1px solid #f2f6fe;
+  }
+  .tableBox .ant-table-thead tr th {
+    font-size: 14px;
+  }
+  .ant-tabs-tabpane {
+    height: 100%;
+  }
+  .ant-tabs {
+    overflow: visible;
+  }
+  .right1 {
+    border-left: 1px solid #f2f6fe;
     width: 100%;
     margin-left: 20px;
 
-        .onerow {
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          margin-right: 40px;
-          flex-wrap: wrap;
-         
-          width: 100%;
-          .onleft {
-            display: flex;
-            text-align: center;
-            .already {
-              color: rgba(51, 51, 51, 1);
-              font-size: 16px;
-              font-weight: 500;
-              margin-left: 32px;
-              white-space: nowrap;
-              // margin-bottom: 20px;
-            }
-            .count {
-              color: #4ea6ff;
-              font-size: 16px;
-              margin: 0 6px;
-            }
-            .peo {
-              color: rgba(51, 51, 51, 1);
-              font-size: 16px;
-              font-weight: 500;
-            }
-          }
-          .clbox {
-            margin-right: 50px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            cursor: pointer;
-            width: 104px;
-            height: 32px;
-            border-radius: 4px;
-            background: #4ea6ff;
-            .colose {
-              width: 16px;
-              height: 16px;
-              // border-radius: 8px;
-              // background: #ffffff;
-              // position: relative;
-              background-image: url(../../assets/images/basicinfo/ch.png);
-              background-size: 100%;
-              margin-right: 4px;
-            }
-            .allclear {
-              color: rgba(255, 255, 255, 1);
-              font-size: 14px;
-            }
-          }
-        }
-        .selecteds {
-          display: flex;
-          flex-wrap: wrap;
+    .onerow {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-right: 40px;
+      flex-wrap: wrap;
+
+      width: 100%;
+      .onleft {
+        display: flex;
+        text-align: center;
+        .already {
+          color: rgba(51, 51, 51, 1);
+          font-size: 16px;
+          font-weight: 500;
           margin-left: 32px;
-          .person{
-            width:100%;
-            margin-top: 20px;
-            border-top: 1px solid #f2f6fe;
-          }
-          .chose {
-            width: 64px;
-            height: 24px;
-            margin-top: 25px;
-            margin-right: 25px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border-radius: 2px;
-            border: 1px solid rgba(56, 139, 225, 1);
-            color: rgba(56, 139, 225, 1);
-            font-size: 12px;
-            position: relative;
-            .ch {
-              position: absolute;
-              width: 18px;
-              height: 18px;
-              background-image: url(../../assets/images/basicinfo/ch.png);
-              right: -8px;
-              top: -8px;
-            }
-          }
-          .ifsw{
-            display:flex;
-            align-items:end;
-            justify-content: center;
-            color:#4ea6ff;
-          }
-          .sw{
-            display:flex;
-            align-items:center;
-            justify-content: center;
-            text-align: justify;
-            color:#4ea6ff;
-            margin-top: 23px;
-            margin-left:10px;
-          }
-          .dept{
-            width:100%;
-            margin-top: 30px;
-            border-top: 1px solid #f2f6fe;
-          }
-            .chose1 {
-            //width: 90px;
-            height: 24px;
-            margin-top: 25px;
-            margin-right: 25px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border-radius: 2px;
-            border: 1px solid rgba(56, 139, 225, 1);
-            color: rgba(56, 139, 225, 1);
-            font-size: 12px;
-            position: relative;
-            .span{
-              white-space:nowrap;
-            overflow:hidden;
-            text-overflow:ellipsis;
-            }
-            .ch1 {
-              position: absolute;
-              width: 18px;
-              height: 18px;
-              background-image: url(../../assets/images/basicinfo/ch.png);
-              right: -8px;
-              top: -8px;
-            }
-         
-          }
-          .group{
-            width:100%;
-            margin-top: 30px;
-            border-top: 1px solid #f2f6fe;
-          }
-            .chose2 {
-            //width: 120px;
-            height: 24px;
-            margin-top: 25px;
-            margin-right: 25px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border-radius: 2px;
-            border: 1px solid rgba(56, 139, 225, 1);
-            color: rgba(56, 139, 225, 1);
-            font-size: 12px;
-            position: relative;
-           .span{
-            white-space:nowrap;
-            overflow:hidden;
-            text-overflow:ellipsis;
-           }
-            .ch2 {
-              position: absolute;
-              width: 18px;
-              height: 18px;
-              background-image: url(../../assets/images/basicinfo/ch.png);
-              right: -8px;
-              top: -8px;
-            }
-         
-          }
+          white-space: nowrap;
+          // margin-bottom: 20px;
+        }
+        .count {
+          color: #4ea6ff;
+          font-size: 16px;
+          margin: 0 6px;
+        }
+        .peo {
+          color: rgba(51, 51, 51, 1);
+          font-size: 16px;
+          font-weight: 500;
         }
       }
+      .clbox {
+        margin-right: 50px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        cursor: pointer;
+        width: 104px;
+        height: 32px;
+        border-radius: 4px;
+        background: #4ea6ff;
+        .colose {
+          width: 16px;
+          height: 16px;
+          // border-radius: 8px;
+          // background: #ffffff;
+          // position: relative;
+          background-image: url(../../assets/images/basicinfo/ch.png);
+          background-size: 100%;
+          margin-right: 4px;
+        }
+        .allclear {
+          color: rgba(255, 255, 255, 1);
+          font-size: 14px;
+        }
+      }
+    }
+    .selecteds {
+      display: flex;
+      flex-wrap: wrap;
+      margin-left: 32px;
+      .person {
+        width: 100%;
+        margin-top: 20px;
+        border-top: 1px solid #f2f6fe;
+      }
+      .chose {
+        width: 64px;
+        height: 24px;
+        margin-top: 25px;
+        margin-right: 25px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 2px;
+        border: 1px solid rgba(56, 139, 225, 1);
+        color: rgba(56, 139, 225, 1);
+        font-size: 12px;
+        position: relative;
+        .ch {
+          position: absolute;
+          width: 18px;
+          height: 18px;
+          background-image: url(../../assets/images/basicinfo/ch.png);
+          right: -8px;
+          top: -8px;
+        }
+      }
+      .ifsw {
+        display: flex;
+        align-items: end;
+        justify-content: center;
+        color: #4ea6ff;
+      }
+      .sw {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        text-align: justify;
+        color: #4ea6ff;
+        margin-top: 23px;
+        margin-left: 10px;
+      }
+      .dept {
+        width: 100%;
+        margin-top: 30px;
+        border-top: 1px solid #f2f6fe;
+      }
+      .chose1 {
+        //width: 90px;
+        height: 24px;
+        margin-top: 25px;
+        margin-right: 25px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 2px;
+        border: 1px solid rgba(56, 139, 225, 1);
+        color: rgba(56, 139, 225, 1);
+        font-size: 12px;
+        position: relative;
+        .span {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+        .ch1 {
+          position: absolute;
+          width: 18px;
+          height: 18px;
+          background-image: url(../../assets/images/basicinfo/ch.png);
+          right: -8px;
+          top: -8px;
+        }
+      }
+      .group {
+        width: 100%;
+        margin-top: 30px;
+        border-top: 1px solid #f2f6fe;
+      }
+      .chose2 {
+        //width: 120px;
+        height: 24px;
+        margin-top: 25px;
+        margin-right: 25px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 2px;
+        border: 1px solid rgba(56, 139, 225, 1);
+        color: rgba(56, 139, 225, 1);
+        font-size: 12px;
+        position: relative;
+        .span {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+        .ch2 {
+          position: absolute;
+          width: 18px;
+          height: 18px;
+          background-image: url(../../assets/images/basicinfo/ch.png);
+          right: -8px;
+          top: -8px;
+        }
+      }
+    }
+  }
+}
 </style>
\ No newline at end of file

From d2d9992de9019cf6fd383a3fd860949d815a1cee Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 20 Dec 2022 18:43:14 +0800
Subject: [PATCH 4/7] =?UTF-8?q?--=20=E5=8F=97=E4=BC=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 728 ++++++++++++-----------
 1 file changed, 383 insertions(+), 345 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 3b375e58..81d6b4e6 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -20,7 +20,7 @@
           />
         </div>
         <div style="width:100%;display: grid;grid-template-columns: 750px auto;">
-          <div class="tabs" style="min-height:800px;" >
+          <div class="tabs" style="min-height:800px;">
             <a-tabs v-model:activeKey="activeKey">
               <a-tab-pane :key="1" tab="快速选人">
                 <div :style="{ height: screenHeight - 235 + 'px' }">
@@ -41,24 +41,25 @@
                     </a-form-item>
                   </div>
                   <div class="chooseLeft" style="display: grid;grid-template-columns: 250px auto">
-                    <div :style="{ height: screenHeight - 180 + 'px' ,overflowY:'auto'}" style="border: 1px solid #f0f0f0; ;">
-                    <div class="tree" style="margin: 10px 4px 220px 10px;">
-                      <a-tree
-                          allow-clear
-                          tree-default-expand-all
-                          :tree-data="treeData"
-                          :fieldNames="{
+                    <div :style="{ height: screenHeight - 180 + 'px' ,overflowY:'auto'}"
+                         style="border: 1px solid #f0f0f0; ;">
+                      <div class="tree" style="margin: 10px 4px 220px 10px;">
+                        <a-tree
+                            allow-clear
+                            tree-default-expand-all
+                            :tree-data="treeData"
+                            :fieldNames="{
                           children: 'treeChildList',
                           key: 'id',
                           title: 'name',
                           value: 'name',
                         }"
-                          @select="stuStuOrgSelect"
-                      >
-                      </a-tree>
+                            @select="stuStuOrgSelect"
+                        >
+                        </a-tree>
                       </div>
                     </div>
-                    <div class="tableBox tabb"  style="margin: 0px 4px 120px 10px; border: 1px solid #f0f0f0;">
+                    <div class="tableBox tabb" style="margin: 0px 4px 120px 10px; border: 1px solid #f0f0f0;">
                       <a-table
                           :columns="stuColumns"
                           :data-source="stuData"
@@ -71,44 +72,44 @@
                   </div>
                 </div>
               </a-tab-pane>
-<!--              <a-tab-pane :key="2" tab="添加组织">-->
-<!--                <div-->
-<!--                    :style="{ height: screenHeight - 235 + 'px' }"-->
-<!--                >-->
-<!--                  <div class="tab2">-->
-<!--                    <a-form-item label="组织：">-->
-<!--                      <a-input-->
-<!--                          v-model:value="searchOrgName.keyword"-->
-<!--                          style="width: 230px; height: 40px; border-radius: 8px"-->
-<!--                          placeholder="请输入组织"-->
-<!--                      />-->
-<!--                      <a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">-->
-<!--                        <template #icon>-->
-<!--                          <SearchOutlined/>-->
-<!--                        </template>-->
-<!--                        搜索-->
-<!--                      </a-button>-->
-<!--                      <a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>-->
-<!--                    </a-form-item>-->
-<!--                  </div>-->
-<!--                  <div class="boeTree">-->
-<!--                    <a-tree-->
-<!--                        :tree-data="searchOrgName.keyword ? orgData : treeData"-->
-<!--                        @select="onOrgSelectChange"-->
-<!--                        :fieldNames="{-->
-<!--                          children: 'treeChildList',-->
-<!--                          key: 'id',-->
-<!--                          title: 'name',-->
-<!--                          value: 'name',-->
-<!--                        }"-->
-<!--                        row-key="id"-->
-<!--                        :row-selection="orgRowSelection"-->
-<!--                        multiple-->
-<!--                    >-->
-<!--                    </a-tree>-->
-<!--                  </div>-->
-<!--                </div>-->
-<!--              </a-tab-pane>-->
+              <!--              <a-tab-pane :key="2" tab="添加组织">-->
+              <!--                <div-->
+              <!--                    :style="{ height: screenHeight - 235 + 'px' }"-->
+              <!--                >-->
+              <!--                  <div class="tab2">-->
+              <!--                    <a-form-item label="组织：">-->
+              <!--                      <a-input-->
+              <!--                          v-model:value="searchOrgName.keyword"-->
+              <!--                          style="width: 230px; height: 40px; border-radius: 8px"-->
+              <!--                          placeholder="请输入组织"-->
+              <!--                      />-->
+              <!--                      <a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">-->
+              <!--                        <template #icon>-->
+              <!--                          <SearchOutlined/>-->
+              <!--                        </template>-->
+              <!--                        搜索-->
+              <!--                      </a-button>-->
+              <!--                      <a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>-->
+              <!--                    </a-form-item>-->
+              <!--                  </div>-->
+              <!--                  <div class="boeTree">-->
+              <!--                    <a-tree-->
+              <!--                        :tree-data="searchOrgName.keyword ? orgData : treeData"-->
+              <!--                        @select="onOrgSelectChange"-->
+              <!--                        :fieldNames="{-->
+              <!--                          children: 'treeChildList',-->
+              <!--                          key: 'id',-->
+              <!--                          title: 'name',-->
+              <!--                          value: 'name',-->
+              <!--                        }"-->
+              <!--                        row-key="id"-->
+              <!--                        :row-selection="orgRowSelection"-->
+              <!--                        multiple-->
+              <!--                    >-->
+              <!--                    </a-tree>-->
+              <!--                  </div>-->
+              <!--                </div>-->
+              <!--              </a-tab-pane>-->
               <a-tab-pane :key="3" tab="受众关联">
                 <div
                     :style="{ height: screenHeight - 235 + 'px' }"
@@ -145,124 +146,132 @@
             </a-tabs>
           </div>
           <div class="right1">
-          <div class="onerow">
-            <div class="onleft">
-              <div class="already">已选</div>
-            
+            <div class="onerow">
+              <div class="onleft">
+                <div class="already">已选</div>
+
+              </div>
+
             </div>
-          
-          </div>
-          <div
-            class="selecteds"
-            :style="{ 'max-height': screenHeight - 235 + 'px' }"
-            style="overflow-y: auto"
-          >
-          <div  class="person">快速选人</div>
-          <div v-for="(item,i) in selectsData.studentList" >
-            <div v-if="i<11">
-            <div class="chose">
-              {{ item.realName }}
-              <div class="ch" @click="stuDel(i)"></div>
-            </div>
-            </div>
-            <div v-else> 
-              <div v-if ="person">
-                    <div class="chose">
+            <div
+                class="selecteds"
+                :style="{ 'max-height': screenHeight - 235 + 'px' }"
+                style="overflow-y: auto"
+            >
+              <div class="person">快速选人</div>
+              <div v-for="(item,i) in selectsData.studentList">
+                <div v-if="i<11">
+                  <div class="chose">
                     {{ item.realName }}
                     <div class="ch" @click="stuDel(i)"></div>
-                    </div>
+                  </div>
                 </div>
-               
-             </div>
-           
-          </div>
-          <div v-if="!person && selectsData.studentList.length >10" class="ifsw"><div @click="person = !person" class=“sw”>查看更多></div></div>
-          <div v-if="person && selectsData.studentList.length >10" class="ifsw" ><div @click="person = !person" class="sw"> 收起&lt;  </div></div>
+                <div v-else>
+                  <div v-if="person">
+                    <div class="chose">
+                      {{ item.realName }}
+                      <div class="ch" @click="stuDel(i)"></div>
+                    </div>
+                  </div>
 
-          <!--组织-->
-<!--          <div  class="dept">添加组织</div>-->
-<!--          <div v-for="(item,i) in selectsData.deptList"  >-->
-<!--            <div v-if="i<11">-->
-<!--            <div class="chose1">-->
-<!--              <div class="span"> {{ item.name }}</div>-->
-<!--              <div class="ch1" @click="orgDel(i)"></div>-->
-<!--            </div>-->
-<!--            </div>-->
-<!--            <div v-else> -->
-<!--              <div v-if ="dept">-->
-<!--                    <div class="chose1">-->
-<!--                      <div class="span"> {{ item.name }}</div>-->
-<!--                    <div class="ch1" @click="orgDel(i)"></div>-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--               -->
-<!--             </div>-->
-<!--           -->
-<!--          </div>-->
-<!--          <div v-if="!dept && selectsData.deptList.length >10" class="ifsw"><div @click="dept = !dept" class=“sw”>查看更多></div></div>-->
-<!--          <div v-if="dept && selectsData.deptList.length >10" class="ifsw" ><div @click="dept = !dept" class="sw"> 收起&lt;  </div></div>-->
+                </div>
+
+              </div>
+              <div v-if="!person && selectsData.studentList.length >10" class="ifsw">
+                <div @click="person = !person" class=“sw”>查看更多></div>
+              </div>
+              <div v-if="person && selectsData.studentList.length >10" class="ifsw">
+                <div @click="person = !person" class="sw"> 收起&lt;</div>
+              </div>
+
+              <!--组织-->
+              <!--          <div  class="dept">添加组织</div>-->
+              <!--          <div v-for="(item,i) in selectsData.deptList"  >-->
+              <!--            <div v-if="i<11">-->
+              <!--            <div class="chose1">-->
+              <!--              <div class="span"> {{ item.name }}</div>-->
+              <!--              <div class="ch1" @click="orgDel(i)"></div>-->
+              <!--            </div>-->
+              <!--            </div>-->
+              <!--            <div v-else> -->
+              <!--              <div v-if ="dept">-->
+              <!--                    <div class="chose1">-->
+              <!--                      <div class="span"> {{ item.name }}</div>-->
+              <!--                    <div class="ch1" @click="orgDel(i)"></div>-->
+              <!--                    </div>-->
+              <!--                </div>-->
+              <!--               -->
+              <!--             </div>-->
+              <!--           -->
+              <!--          </div>-->
+              <!--          <div v-if="!dept && selectsData.deptList.length >10" class="ifsw"><div @click="dept = !dept" class=“sw”>查看更多></div></div>-->
+              <!--          <div v-if="dept && selectsData.deptList.length >10" class="ifsw" ><div @click="dept = !dept" class="sw"> 收起&lt;  </div></div>-->
 
 
-<!--受众-->
-          <div  class="group">受众关联</div>
-          <div v-for="(item,i) in selectsData.groupList" >
-            <div v-if="i<11">
-            <div class="chose2">
-              <div class="span"> {{ item.audienceName }}</div>
-              <div class="ch2" @click="AuditDel(i)"></div>
-            </div>
-            </div>
-            <div v-else> 
-              <div v-if ="group">
+              <!--受众-->
+              <div class="group">受众关联</div>
+              <div v-for="(item,i) in selectsData.groupList">
+                <div v-if="i<11">
+                  <div class="chose2">
+                    <div class="span"> {{ item.audienceName }}</div>
+                    <div class="ch2" @click="AuditDel(i)"></div>
+                  </div>
+                </div>
+                <div v-else>
+                  <div v-if="group">
                     <div class="chose2">
                       <div class="span"> {{ item.audienceName }}</div>
-                    <div class="ch2" @click="AuditDel(i)"></div>
+                      <div class="ch2" @click="AuditDel(i)"></div>
                     </div>
+                  </div>
+
                 </div>
-               
+
+              </div>
+              <div v-if="!group && selectsData.groupList.length >10" class="ifsw">
+                <div @click="group = !group" class=“sw”>查看更多></div>
+              </div>
+              <div v-if="group && selectsData.groupList >10" class="ifsw">
+                <div @click="group = !group" class="sw"> 收起&lt;</div>
+              </div>
+
+
+            </div>
+          </div>
+          <!-- <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
+             <div>
+               <div style="margin-top: 20px">快速选人</div>
+               // eslint-disable-next-line vue/require-v-for-key
+               <div v-for="(item,i) in selectsData.studentList" >
+
+               <a-tag v-if="i < 10" :closable="true" color="#4ea6ff" @close="stuDel(i)"
+                      :key="i" style="margin-top:20px">
+                 {{ item.realName }}
+               </a-tag>
+               <a-tag v-else :closable="true" color="#4ea6ff" @close="stuDel(i)"
+                       style="margin-top:20px">
+                 {{ item.realName }}
+               </a-tag>
+
+               <div></div>
              </div>
-           
-          </div>
-          <div v-if="!group && selectsData.groupList.length >10" class="ifsw"><div @click="group = !group" class=“sw”>查看更多></div></div>
-          <div v-if="group && selectsData.groupList >10" class="ifsw" ><div @click="group = !group" class="sw"> 收起&lt;  </div></div>
-
-        
-          </div>
-        </div>
-         <!-- <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
-            <div>
-              <div style="margin-top: 20px">快速选人</div>
-              // eslint-disable-next-line vue/require-v-for-key
-              <div v-for="(item,i) in selectsData.studentList" >
-              
-              <a-tag v-if="i < 10" :closable="true" color="#4ea6ff" @close="stuDel(i)" 
-                     :key="i" style="margin-top:20px">
-                {{ item.realName }}
-              </a-tag>
-              <a-tag v-else :closable="true" color="#4ea6ff" @close="stuDel(i)" 
+             </div>
+             <div>
+               <div style="margin-top: 20px">组织添加</div>
+               <a-tag :closable="true" color="#4ea6ff" @close="orgDel(i)" v-for="(item,i) in selectsData.deptList"
+                      :key="i"
                       style="margin-top:20px">
-                {{ item.realName }}
-              </a-tag>
-
-              <div></div>
-            </div>
-            </div>
-            <div>
-              <div style="margin-top: 20px">组织添加</div>
-              <a-tag :closable="true" color="#4ea6ff" @close="orgDel(i)" v-for="(item,i) in selectsData.deptList"
-                     :key="i"
-                     style="margin-top:20px">
-                {{ item.name }}
-              </a-tag>
-            </div>
-            <div>
-              <div style="margin-top: 20px">受众添加</div>
-              <a-tag :closable="true" color="#4ea6ff" @close="AuditDel(i)" v-for="(item,i) in selectsData.groupList"
-                     :key="i" style="margin-top:20px">
-                {{ item.audienceName }}
-              </a-tag>
-            </div>
-          </div>-->
+                 {{ item.name }}
+               </a-tag>
+             </div>
+             <div>
+               <div style="margin-top: 20px">受众添加</div>
+               <a-tag :closable="true" color="#4ea6ff" @close="AuditDel(i)" v-for="(item,i) in selectsData.groupList"
+                      :key="i" style="margin-top:20px">
+                 {{ item.audienceName }}
+               </a-tag>
+             </div>
+           </div>-->
         </div>
         <div class="btnn">
           <button class="btn1" @click="closeDrawer">取消</button>
@@ -304,9 +313,9 @@ const props = defineProps({
     default: () => []
   }
 })
-const person =ref(false)
+const person = ref(false)
 // const dept =ref(false)
-const group =ref(false)
+const group = ref(false)
 const visiable = ref(false)
 const activeKey = ref(1)
 const stageVisible = ref(false)
@@ -518,11 +527,11 @@ function AuditDel(i) {
 
 
 // function orgSelect(key, obj) {
-  // console.log(obj)
-   //request(ORG_CHILD_LIST, {orgId: null}).then(res => {
-     //console.log(res.result)
-   //})
- //}
+// console.log(obj)
+//request(ORG_CHILD_LIST, {orgId: null}).then(res => {
+//console.log(res.result)
+//})
+//}
 
 function onStuSelectChange(e, l) {
   stuSelectKeys.value = e
@@ -613,13 +622,16 @@ watch(visiable, () => {
   orgSelectKeys.value = []
   auditSelectKeys.value = []
   stuData.value = []
+  audienceName.value.keyword=''
+  audienceName.value.page=1
+  audienceName.value.pageSize=10
   selectsData.value = {
     stageId: '',
     studentList: [],
     deptList: [],
     groupList: []
   }
-
+  searchAudi()
 })
 
 </script>
@@ -632,196 +644,222 @@ watch(visiable, () => {
   height: 40px;
   border-radius: 8px;
 }
+
 .tableBox .ant-table-row .ant-table-cell {
-    height: 48px;
-    font-size: 12px;
-    font-weight: 400;
-    color: #4F5156;
-    line-height: 29px;
-    padding: 0px;
+  height: 48px;
+  font-size: 12px;
+  font-weight: 400;
+  color: #4F5156;
+  line-height: 29px;
+  padding: 0px;
 }
-.tableBox .ant-table-thead  tr  th {
-    font-size: 12px;
+
+.tableBox .ant-table-thead tr th {
+  font-size: 12px;
 }
-.ant-tabs-tabpane{
+
+.ant-tabs-tabpane {
   height: 100%;
 }
-.ant-tabs{
-  overflow:visible;
+
+.ant-tabs {
+  overflow: visible;
 }
+
 .right1 {
   border-left: 1px solid #f2f6fe;
-    width: 100%;
-    margin-left: 20px;
+  width: 100%;
+  margin-left: 20px;
 
-        .onerow {
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          margin-right: 40px;
-          flex-wrap: wrap;
-         
-          width: 100%;
-          .onleft {
-            display: flex;
-            text-align: center;
-            .already {
-              color: rgba(51, 51, 51, 1);
-              font-size: 16px;
-              font-weight: 500;
-              margin-left: 32px;
-              white-space: nowrap;
-              // margin-bottom: 20px;
-            }
-            .count {
-              color: #4ea6ff;
-              font-size: 16px;
-              margin: 0 6px;
-            }
-            .peo {
-              color: rgba(51, 51, 51, 1);
-              font-size: 16px;
-              font-weight: 500;
-            }
-          }
-          .clbox {
-            margin-right: 50px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            cursor: pointer;
-            width: 104px;
-            height: 32px;
-            border-radius: 4px;
-            background: #4ea6ff;
-            .colose {
-              width: 16px;
-              height: 16px;
-              // border-radius: 8px;
-              // background: #ffffff;
-              // position: relative;
-              background-image: url(../../assets/images/basicinfo/ch.png);
-              background-size: 100%;
-              margin-right: 4px;
-            }
-            .allclear {
-              color: rgba(255, 255, 255, 1);
-              font-size: 14px;
-            }
-          }
-        }
-        .selecteds {
-          display: flex;
-          flex-wrap: wrap;
-          margin-left: 32px;
-          .person{
-            width:100%;
-            margin-top: 20px;
-            border-top: 1px solid #f2f6fe;
-          }
-          .chose {
-            width: 64px;
-            height: 24px;
-            margin-top: 25px;
-            margin-right: 25px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border-radius: 2px;
-            border: 1px solid rgba(56, 139, 225, 1);
-            color: rgba(56, 139, 225, 1);
-            font-size: 12px;
-            position: relative;
-            .ch {
-              position: absolute;
-              width: 18px;
-              height: 18px;
-              background-image: url(../../assets/images/basicinfo/ch.png);
-              right: -8px;
-              top: -8px;
-            }
-          }
-          .ifsw{
-            display:flex;
-            align-items:end;
-            justify-content: center;
-            color:#4ea6ff;
-          }
-          .sw{
-            display:flex;
-            align-items:center;
-            justify-content: center;
-            text-align: justify;
-            color:#4ea6ff;
-            margin-top: 23px;
-            margin-left:10px;
-          }
-          .dept{
-            width:100%;
-            margin-top: 30px;
-            border-top: 1px solid #f2f6fe;
-          }
-            .chose1 {
-            //width: 90px;
-            height: 24px;
-            margin-top: 25px;
-            margin-right: 25px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border-radius: 2px;
-            border: 1px solid rgba(56, 139, 225, 1);
-            color: rgba(56, 139, 225, 1);
-            font-size: 12px;
-            position: relative;
-            .span{
-              white-space:nowrap;
-            overflow:hidden;
-            text-overflow:ellipsis;
-            }
-            .ch1 {
-              position: absolute;
-              width: 18px;
-              height: 18px;
-              background-image: url(../../assets/images/basicinfo/ch.png);
-              right: -8px;
-              top: -8px;
-            }
-         
-          }
-          .group{
-            width:100%;
-            margin-top: 30px;
-            border-top: 1px solid #f2f6fe;
-          }
-            .chose2 {
-            //width: 120px;
-            height: 24px;
-            margin-top: 25px;
-            margin-right: 25px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border-radius: 2px;
-            border: 1px solid rgba(56, 139, 225, 1);
-            color: rgba(56, 139, 225, 1);
-            font-size: 12px;
-            position: relative;
-           .span{
-            white-space:nowrap;
-            overflow:hidden;
-            text-overflow:ellipsis;
-           }
-            .ch2 {
-              position: absolute;
-              width: 18px;
-              height: 18px;
-              background-image: url(../../assets/images/basicinfo/ch.png);
-              right: -8px;
-              top: -8px;
-            }
-         
-          }
-        }
+  .onerow {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-right: 40px;
+    flex-wrap: wrap;
+
+    width: 100%;
+
+    .onleft {
+      display: flex;
+      text-align: center;
+
+      .already {
+        color: rgba(51, 51, 51, 1);
+        font-size: 16px;
+        font-weight: 500;
+        margin-left: 32px;
+        white-space: nowrap;
+        // margin-bottom: 20px;
       }
+
+      .count {
+        color: #4ea6ff;
+        font-size: 16px;
+        margin: 0 6px;
+      }
+
+      .peo {
+        color: rgba(51, 51, 51, 1);
+        font-size: 16px;
+        font-weight: 500;
+      }
+    }
+
+    .clbox {
+      margin-right: 50px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      cursor: pointer;
+      width: 104px;
+      height: 32px;
+      border-radius: 4px;
+      background: #4ea6ff;
+
+      .colose {
+        width: 16px;
+        height: 16px;
+        // border-radius: 8px;
+        // background: #ffffff;
+        // position: relative;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        background-size: 100%;
+        margin-right: 4px;
+      }
+
+      .allclear {
+        color: rgba(255, 255, 255, 1);
+        font-size: 14px;
+      }
+    }
+  }
+
+  .selecteds {
+    display: flex;
+    flex-wrap: wrap;
+    margin-left: 32px;
+
+    .person {
+      width: 100%;
+      margin-top: 20px;
+      border-top: 1px solid #f2f6fe;
+    }
+
+    .chose {
+      width: 64px;
+      height: 24px;
+      margin-top: 25px;
+      margin-right: 25px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 2px;
+      border: 1px solid rgba(56, 139, 225, 1);
+      color: rgba(56, 139, 225, 1);
+      font-size: 12px;
+      position: relative;
+
+      .ch {
+        position: absolute;
+        width: 18px;
+        height: 18px;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        right: -8px;
+        top: -8px;
+      }
+    }
+
+    .ifsw {
+      display: flex;
+      align-items: end;
+      justify-content: center;
+      color: #4ea6ff;
+    }
+
+    .sw {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      text-align: justify;
+      color: #4ea6ff;
+      margin-top: 23px;
+      margin-left: 10px;
+    }
+
+    .dept {
+      width: 100%;
+      margin-top: 30px;
+      border-top: 1px solid #f2f6fe;
+    }
+
+    .chose1 {
+      //width: 90px;
+      height: 24px;
+      margin-top: 25px;
+      margin-right: 25px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 2px;
+      border: 1px solid rgba(56, 139, 225, 1);
+      color: rgba(56, 139, 225, 1);
+      font-size: 12px;
+      position: relative;
+
+      .span {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      .ch1 {
+        position: absolute;
+        width: 18px;
+        height: 18px;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        right: -8px;
+        top: -8px;
+      }
+
+    }
+
+    .group {
+      width: 100%;
+      margin-top: 30px;
+      border-top: 1px solid #f2f6fe;
+    }
+
+    .chose2 {
+      //width: 120px;
+      height: 24px;
+      margin-top: 25px;
+      margin-right: 25px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 2px;
+      border: 1px solid rgba(56, 139, 225, 1);
+      color: rgba(56, 139, 225, 1);
+      font-size: 12px;
+      position: relative;
+
+      .span {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      .ch2 {
+        position: absolute;
+        width: 18px;
+        height: 18px;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        right: -8px;
+        top: -8px;
+      }
+
+    }
+  }
+}
 </style>
\ No newline at end of file

From 127039cc6139c57a192327fad1814f2a9231604c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 20 Dec 2022 18:48:10 +0800
Subject: [PATCH 5/7] =?UTF-8?q?--=20=E5=8F=97=E4=BC=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 1107 +++++++++-------------
 1 file changed, 472 insertions(+), 635 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index d4fd1f07..81d6b4e6 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -1,221 +1,144 @@
 <!-- eslint-disable vue/no-parsing-error -->
 <!-- eslint-disable vue/require-v-for-key -->
 <template>
-  <div class="CommonStudent">
+  <div>
     <a-drawer
-      :visible="visiable"
-      class="drawerStyle ProjCheckship"
-      placement="right"
-      width="60%"
+        :visible="visiable"
+        class="drawerStyle ProjCheckship"
+        placement="right"
+        width="60%"
     >
       <div class="drawerMain" id="ProjCheckship">
         <div class="header">
           <div class="headerTitle">
-            {{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || "" }}
+            {{ {1: '添加学员', 2: '添加学员', 3: '添加学员'}[type] || '' }}
           </div>
           <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
+              style="width: 29px; height: 29px; cursor: pointer"
+              src="../../assets/images/basicinfo/close.png"
+              @click="closeDrawer"
           />
         </div>
-        <div
-          style="width: 100%; display: grid; grid-template-columns: 750px auto"
-        >
-          <div class="tabs" style="min-height: 800px">
+        <div style="width:100%;display: grid;grid-template-columns: 750px auto;">
+          <div class="tabs" style="min-height:800px;">
             <a-tabs v-model:activeKey="activeKey">
               <a-tab-pane :key="1" tab="快速选人">
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div class="tab1">
                     <a-form-item label="姓名">
                       <a-input
-                        v-model:value="nameSearch.keyword"
-                        style="width: 270px; height: 40px; border-radius: 8px"
-                        placeholder="请输入姓名"
+                          v-model:value="nameSearch.keyword"
+                          style="width: 270px; height: 40px; border-radius: 8px"
+                          placeholder="请输入姓名"
                       />
-                      <a-button
-                        type="primary"
-                        @click="onSearchStu"
-                        style="margin-left: 20px; border-radius: 4px"
-                      >
+                      <a-button type="primary" @click="onSearchStu" style="margin-left: 20px;border-radius: 4px">
                         <template #icon>
-                          <SearchOutlined />
+                          <SearchOutlined/>
                         </template>
                         搜索
                       </a-button>
-                      <a-button
-                        @click="resetStu"
-                        style="margin-left: 20px; border-radius: 4px"
-                        >重置</a-button
-                      >
+                      <a-button @click="resetStu" style="margin-left: 20px;border-radius: 4px">重置</a-button>
                     </a-form-item>
                   </div>
-                  <div
-                    class="chooseLeft"
-                    style="display: grid; grid-template-columns: 250px auto"
-                  >
-                    <div
-                      :style="{
-                        height: screenHeight - 180 + 'px',
-                        overflowY: 'auto',
-                      }"
-                      style="border: 1px solid #f0f0f0"
-                    >
-                      <div class="tree" style="margin: 10px 4px 220px 10px">
+                  <div class="chooseLeft" style="display: grid;grid-template-columns: 250px auto">
+                    <div :style="{ height: screenHeight - 180 + 'px' ,overflowY:'auto'}"
+                         style="border: 1px solid #f0f0f0; ;">
+                      <div class="tree" style="margin: 10px 4px 220px 10px;">
                         <a-tree
-                          allow-clear
-                          tree-default-expand-all
-                          :tree-data="treeData"
-                          :fieldNames="{
-                            children: 'treeChildList',
-                            key: 'id',
-                            title: 'name',
-                            value: 'name',
-                          }"
-                          @select="stuStuOrgSelect"
+                            allow-clear
+                            tree-default-expand-all
+                            :tree-data="treeData"
+                            :fieldNames="{
+                          children: 'treeChildList',
+                          key: 'id',
+                          title: 'name',
+                          value: 'name',
+                        }"
+                            @select="stuStuOrgSelect"
                         >
                         </a-tree>
                       </div>
                     </div>
-                    <div
-                      class="tableBox tabb"
-                      style="
-                        margin: 0px 4px 120px 10px;
-                        border: 1px solid #f0f0f0;
-                      "
-                    >
+                    <div class="tableBox tabb" style="margin: 0px 4px 120px 10px; border: 1px solid #f0f0f0;">
                       <a-table
-                        :columns="stuColumns"
-                        :data-source="stuData"
-                        :pagination="stuPagination"
-                        :loading="stuLoading"
-                        row-key="id"
-                        :row-selection="stuRowSelection"
+                          :columns="stuColumns"
+                          :data-source="stuData"
+                          :pagination="stuPagination"
+                          :loading="stuLoading"
+                          row-key="id"
+                          :row-selection="stuRowSelection"
                       />
                     </div>
                   </div>
                 </div>
               </a-tab-pane>
-<<<<<<< HEAD
-              <a-tab-pane :key="2" tab="添加组织">
-                <div :style="{ height: screenHeight - 235 + 'px' }">
-                  <div class="tab2">
-                    <a-form-item label="组织：">
-                      <a-input
-                        v-model:value="searchOrgName.keyword"
-                        style="width: 230px; height: 40px; border-radius: 8px"
-                        placeholder="请输入组织"
-                      />
-                      <a-button
-                        type="primary"
-                        @click="searchOrg"
-                        style="margin-left: 20px; border-radius: 4px"
-                      >
-                        <template #icon>
-                          <SearchOutlined />
-                        </template>
-                        搜索
-                      </a-button>
-                      <a-button
-                        @click="resetOrg"
-                        style="margin-left: 20px; border-radius: 4px"
-                        >重置</a-button
-                      >
-                    </a-form-item>
-                  </div>
-                  <div class="boeTree">
-                    <a-tree
-                      :tree-data="searchOrgName.keyword ? orgData : treeData"
-                      @select="onOrgSelectChange"
-                      :fieldNames="{
-                        children: 'treeChildList',
-                        key: 'id',
-                        title: 'name',
-                        value: 'name',
-                      }"
-                      row-key="id"
-                      :row-selection="orgRowSelection"
-                      multiple
-                    >
-                    </a-tree>
-                  </div>
-                </div>
-              </a-tab-pane>
-=======
-<!--              <a-tab-pane :key="2" tab="添加组织">-->
-<!--                <div-->
-<!--                    :style="{ height: screenHeight - 235 + 'px' }"-->
-<!--                >-->
-<!--                  <div class="tab2">-->
-<!--                    <a-form-item label="组织：">-->
-<!--                      <a-input-->
-<!--                          v-model:value="searchOrgName.keyword"-->
-<!--                          style="width: 230px; height: 40px; border-radius: 8px"-->
-<!--                          placeholder="请输入组织"-->
-<!--                      />-->
-<!--                      <a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">-->
-<!--                        <template #icon>-->
-<!--                          <SearchOutlined/>-->
-<!--                        </template>-->
-<!--                        搜索-->
-<!--                      </a-button>-->
-<!--                      <a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>-->
-<!--                    </a-form-item>-->
-<!--                  </div>-->
-<!--                  <div class="boeTree">-->
-<!--                    <a-tree-->
-<!--                        :tree-data="searchOrgName.keyword ? orgData : treeData"-->
-<!--                        @select="onOrgSelectChange"-->
-<!--                        :fieldNames="{-->
-<!--                          children: 'treeChildList',-->
-<!--                          key: 'id',-->
-<!--                          title: 'name',-->
-<!--                          value: 'name',-->
-<!--                        }"-->
-<!--                        row-key="id"-->
-<!--                        :row-selection="orgRowSelection"-->
-<!--                        multiple-->
-<!--                    >-->
-<!--                    </a-tree>-->
-<!--                  </div>-->
-<!--                </div>-->
-<!--              </a-tab-pane>-->
->>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
+              <!--              <a-tab-pane :key="2" tab="添加组织">-->
+              <!--                <div-->
+              <!--                    :style="{ height: screenHeight - 235 + 'px' }"-->
+              <!--                >-->
+              <!--                  <div class="tab2">-->
+              <!--                    <a-form-item label="组织：">-->
+              <!--                      <a-input-->
+              <!--                          v-model:value="searchOrgName.keyword"-->
+              <!--                          style="width: 230px; height: 40px; border-radius: 8px"-->
+              <!--                          placeholder="请输入组织"-->
+              <!--                      />-->
+              <!--                      <a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">-->
+              <!--                        <template #icon>-->
+              <!--                          <SearchOutlined/>-->
+              <!--                        </template>-->
+              <!--                        搜索-->
+              <!--                      </a-button>-->
+              <!--                      <a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>-->
+              <!--                    </a-form-item>-->
+              <!--                  </div>-->
+              <!--                  <div class="boeTree">-->
+              <!--                    <a-tree-->
+              <!--                        :tree-data="searchOrgName.keyword ? orgData : treeData"-->
+              <!--                        @select="onOrgSelectChange"-->
+              <!--                        :fieldNames="{-->
+              <!--                          children: 'treeChildList',-->
+              <!--                          key: 'id',-->
+              <!--                          title: 'name',-->
+              <!--                          value: 'name',-->
+              <!--                        }"-->
+              <!--                        row-key="id"-->
+              <!--                        :row-selection="orgRowSelection"-->
+              <!--                        multiple-->
+              <!--                    >-->
+              <!--                    </a-tree>-->
+              <!--                  </div>-->
+              <!--                </div>-->
+              <!--              </a-tab-pane>-->
               <a-tab-pane :key="3" tab="受众关联">
-                <div :style="{ height: screenHeight - 235 + 'px' }">
+                <div
+                    :style="{ height: screenHeight - 235 + 'px' }"
+                >
                   <div>
                     <a-form-item label="受众名称：">
                       <a-input
-                        v-model:value="audienceName.keyword"
-                        style="width: 260px; height: 40px; border-radius: 8px"
-                        placeholder="请输入受众名称"
+                          v-model:value="audienceName.keyword"
+                          style="width: 260px; height: 40px; border-radius: 8px"
+                          placeholder="请输入受众名称"
                       />
-                      <a-button
-                        type="primary"
-                        @click="searchAudi"
-                        style="margin-left: 20px; border-radius: 4px"
-                      >
+                      <a-button type="primary" @click="searchAudi" style="margin-left: 20px;border-radius: 4px">
                         <template #icon>
-                          <SearchOutlined />
+                          <SearchOutlined/>
                         </template>
                         搜索
                       </a-button>
-                      <a-button
-                        @click="resetAudienceInfo"
-                        style="margin-left: 20px; border-radius: 4px"
-                        >重置</a-button
-                      >
+                      <a-button @click="resetAudienceInfo" style="margin-left: 20px;border-radius: 4px">重置</a-button>
                     </a-form-item>
                   </div>
                   <div class="tableBox tabb">
                     <a-table
-                      style="border: 1px solid #f2f6fe"
-                      row-key="id"
-                      :columns="audiColums"
-                      :data-source="audiData"
-                      :loading="audiLoading"
-                      :pagination="auditPagination"
-                      :row-selection="auditRowSelection"
+                        style="border: 1px solid #f2f6fe"
+                        row-key="id"
+                        :columns="audiColums"
+                        :data-source="audiData"
+                        :loading="audiLoading"
+                        :pagination="auditPagination"
+                        :row-selection="auditRowSelection"
                     />
                   </div>
                 </div>
@@ -226,16 +149,18 @@
             <div class="onerow">
               <div class="onleft">
                 <div class="already">已选</div>
+
               </div>
+
             </div>
             <div
-              class="selecteds"
-              :style="{ 'max-height': screenHeight - 235 + 'px' }"
-              style="overflow-y: auto"
+                class="selecteds"
+                :style="{ 'max-height': screenHeight - 235 + 'px' }"
+                style="overflow-y: auto"
             >
               <div class="person">快速选人</div>
-              <div v-for="(item, i) in selectsData.studentList">
-                <div v-if="i < 11">
+              <div v-for="(item,i) in selectsData.studentList">
+                <div v-if="i<11">
                   <div class="chose">
                     {{ item.realName }}
                     <div class="ch" @click="stuDel(i)"></div>
@@ -248,159 +173,105 @@
                       <div class="ch" @click="stuDel(i)"></div>
                     </div>
                   </div>
+
                 </div>
-<<<<<<< HEAD
+
               </div>
-              <div
-                v-if="!person && selectsData.studentList.length > 10"
-                class="ifsw"
-              >
-                <div @click="person = !person" class="“sw”">查看更多></div>
+              <div v-if="!person && selectsData.studentList.length >10" class="ifsw">
+                <div @click="person = !person" class=“sw”>查看更多></div>
               </div>
-              <div
-                v-if="person && selectsData.studentList.length > 10"
-                class="ifsw"
-              >
-                <div @click="person = !person" class="sw">收起&lt;</div>
+              <div v-if="person && selectsData.studentList.length >10" class="ifsw">
+                <div @click="person = !person" class="sw"> 收起&lt;</div>
               </div>
 
               <!--组织-->
-              <div class="dept">添加组织</div>
-              <div v-for="(item, i) in selectsData.deptList">
-                <div v-if="i < 11">
-                  <div class="chose1">
-                    <div class="span">{{ item.name }}</div>
-                    <div class="ch1" @click="orgDel(i)"></div>
-                  </div>
-                </div>
-                <div v-else>
-                  <div v-if="dept">
-                    <div class="chose1">
-                      <div class="span">{{ item.name }}</div>
-                      <div class="ch1" @click="orgDel(i)"></div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                v-if="!dept && selectsData.deptList.length > 10"
-                class="ifsw"
-              >
-                <div @click="dept = !dept" class="“sw”">查看更多></div>
-              </div>
-              <div v-if="dept && selectsData.deptList.length > 10" class="ifsw">
-                <div @click="dept = !dept" class="sw">收起&lt;</div>
-              </div>
+              <!--          <div  class="dept">添加组织</div>-->
+              <!--          <div v-for="(item,i) in selectsData.deptList"  >-->
+              <!--            <div v-if="i<11">-->
+              <!--            <div class="chose1">-->
+              <!--              <div class="span"> {{ item.name }}</div>-->
+              <!--              <div class="ch1" @click="orgDel(i)"></div>-->
+              <!--            </div>-->
+              <!--            </div>-->
+              <!--            <div v-else> -->
+              <!--              <div v-if ="dept">-->
+              <!--                    <div class="chose1">-->
+              <!--                      <div class="span"> {{ item.name }}</div>-->
+              <!--                    <div class="ch1" @click="orgDel(i)"></div>-->
+              <!--                    </div>-->
+              <!--                </div>-->
+              <!--               -->
+              <!--             </div>-->
+              <!--           -->
+              <!--          </div>-->
+              <!--          <div v-if="!dept && selectsData.deptList.length >10" class="ifsw"><div @click="dept = !dept" class=“sw”>查看更多></div></div>-->
+              <!--          <div v-if="dept && selectsData.deptList.length >10" class="ifsw" ><div @click="dept = !dept" class="sw"> 收起&lt;  </div></div>-->
+
 
               <!--受众-->
               <div class="group">受众关联</div>
-              <div v-for="(item, i) in selectsData.groupList">
-                <div v-if="i < 11">
+              <div v-for="(item,i) in selectsData.groupList">
+                <div v-if="i<11">
                   <div class="chose2">
-                    <div class="span">{{ item.audienceName }}</div>
-=======
-               
-             </div>
-           
-          </div>
-          <div v-if="!person && selectsData.studentList.length >10" class="ifsw"><div @click="person = !person" class=“sw”>查看更多></div></div>
-          <div v-if="person && selectsData.studentList.length >10" class="ifsw" ><div @click="person = !person" class="sw"> 收起&lt;  </div></div>
-
-          <!--组织-->
-<!--          <div  class="dept">添加组织</div>-->
-<!--          <div v-for="(item,i) in selectsData.deptList"  >-->
-<!--            <div v-if="i<11">-->
-<!--            <div class="chose1">-->
-<!--              <div class="span"> {{ item.name }}</div>-->
-<!--              <div class="ch1" @click="orgDel(i)"></div>-->
-<!--            </div>-->
-<!--            </div>-->
-<!--            <div v-else> -->
-<!--              <div v-if ="dept">-->
-<!--                    <div class="chose1">-->
-<!--                      <div class="span"> {{ item.name }}</div>-->
-<!--                    <div class="ch1" @click="orgDel(i)"></div>-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--               -->
-<!--             </div>-->
-<!--           -->
-<!--          </div>-->
-<!--          <div v-if="!dept && selectsData.deptList.length >10" class="ifsw"><div @click="dept = !dept" class=“sw”>查看更多></div></div>-->
-<!--          <div v-if="dept && selectsData.deptList.length >10" class="ifsw" ><div @click="dept = !dept" class="sw"> 收起&lt;  </div></div>-->
-
-
-<!--受众-->
-          <div  class="group">受众关联</div>
-          <div v-for="(item,i) in selectsData.groupList" >
-            <div v-if="i<11">
-            <div class="chose2">
-              <div class="span"> {{ item.audienceName }}</div>
-              <div class="ch2" @click="AuditDel(i)"></div>
-            </div>
-            </div>
-            <div v-else> 
-              <div v-if ="group">
-                    <div class="chose2">
-                      <div class="span"> {{ item.audienceName }}</div>
->>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
+                    <div class="span"> {{ item.audienceName }}</div>
                     <div class="ch2" @click="AuditDel(i)"></div>
                   </div>
                 </div>
                 <div v-else>
                   <div v-if="group">
                     <div class="chose2">
-                      <div class="span">{{ item.audienceName }}</div>
+                      <div class="span"> {{ item.audienceName }}</div>
                       <div class="ch2" @click="AuditDel(i)"></div>
                     </div>
                   </div>
+
                 </div>
+
               </div>
-              <div
-                v-if="!group && selectsData.groupList.length > 10"
-                class="ifsw"
-              >
-                <div @click="group = !group" class="“sw”">查看更多></div>
+              <div v-if="!group && selectsData.groupList.length >10" class="ifsw">
+                <div @click="group = !group" class=“sw”>查看更多></div>
               </div>
-              <div v-if="group && selectsData.groupList > 10" class="ifsw">
-                <div @click="group = !group" class="sw">收起&lt;</div>
+              <div v-if="group && selectsData.groupList >10" class="ifsw">
+                <div @click="group = !group" class="sw"> 收起&lt;</div>
               </div>
+
+
             </div>
           </div>
           <!-- <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
-            <div>
-              <div style="margin-top: 20px">快速选人</div>
-              // eslint-disable-next-line vue/require-v-for-key
-              <div v-for="(item,i) in selectsData.studentList" >
-              
-              <a-tag v-if="i < 10" :closable="true" color="#4ea6ff" @close="stuDel(i)" 
-                     :key="i" style="margin-top:20px">
-                {{ item.realName }}
-              </a-tag>
-              <a-tag v-else :closable="true" color="#4ea6ff" @close="stuDel(i)" 
-                      style="margin-top:20px">
-                {{ item.realName }}
-              </a-tag>
+             <div>
+               <div style="margin-top: 20px">快速选人</div>
+               // eslint-disable-next-line vue/require-v-for-key
+               <div v-for="(item,i) in selectsData.studentList" >
 
-              <div></div>
-            </div>
-            </div>
-            <div>
-              <div style="margin-top: 20px">组织添加</div>
-              <a-tag :closable="true" color="#4ea6ff" @close="orgDel(i)" v-for="(item,i) in selectsData.deptList"
-                     :key="i"
-                     style="margin-top:20px">
-                {{ item.name }}
-              </a-tag>
-            </div>
-            <div>
-              <div style="margin-top: 20px">受众添加</div>
-              <a-tag :closable="true" color="#4ea6ff" @close="AuditDel(i)" v-for="(item,i) in selectsData.groupList"
-                     :key="i" style="margin-top:20px">
-                {{ item.audienceName }}
-              </a-tag>
-            </div>
-          </div>-->
+               <a-tag v-if="i < 10" :closable="true" color="#4ea6ff" @close="stuDel(i)"
+                      :key="i" style="margin-top:20px">
+                 {{ item.realName }}
+               </a-tag>
+               <a-tag v-else :closable="true" color="#4ea6ff" @close="stuDel(i)"
+                       style="margin-top:20px">
+                 {{ item.realName }}
+               </a-tag>
+
+               <div></div>
+             </div>
+             </div>
+             <div>
+               <div style="margin-top: 20px">组织添加</div>
+               <a-tag :closable="true" color="#4ea6ff" @close="orgDel(i)" v-for="(item,i) in selectsData.deptList"
+                      :key="i"
+                      style="margin-top:20px">
+                 {{ item.name }}
+               </a-tag>
+             </div>
+             <div>
+               <div style="margin-top: 20px">受众添加</div>
+               <a-tag :closable="true" color="#4ea6ff" @close="AuditDel(i)" v-for="(item,i) in selectsData.groupList"
+                      :key="i" style="margin-top:20px">
+                 {{ item.audienceName }}
+               </a-tag>
+             </div>
+           </div>-->
         </div>
         <div class="btnn">
           <button class="btn1" @click="closeDrawer">取消</button>
@@ -412,94 +283,57 @@
       <slot></slot>
     </div>
   </div>
-  <a-modal
-    v-model:visible="stageVisible"
-    width="1000px"
-    title="选择阶段"
-    @ok="handleStageOk"
-  >
+  <a-modal v-model:visible="stageVisible" width="1000px" title="选择阶段" @ok="handleStageOk">
     <div>
-      {{ type === 1 ? "选择阶段" : "选择关卡" }}
-      <a-select
-        style="width: 150px"
-        :placeholder="type === 1 ? '选择阶段' : '选择关卡'"
-        v-model:value="selectsData.stageId"
-        className="cus-select"
-      >
-        <a-select-option v-for="(item, i) in stageIds" :key="i" :value="item.id"
-          >{{ item.name || "默认" }}
+      {{ type === 1 ? '选择阶段' : '选择关卡' }}
+      <a-select style="width: 150px" :placeholder="type===1?'选择阶段':'选择关卡'" v-model:value="selectsData.stageId"
+                className="cus-select">
+        <a-select-option v-for="(item,i) in stageIds" :key="i" :value="item.id">{{
+            item.name || '默认'
+          }}
         </a-select-option>
       </a-select>
     </div>
   </a-modal>
 </template>
 <script setup>
-<<<<<<< HEAD
-import { computed, defineEmits, defineProps, ref, watch } from "vue";
-import { useStore } from "vuex";
-import { useBoeApi, useBoeApiPage } from "@/api/request";
-import { AUDIENCE_LIST, ORG_LIST, USER_LIST } from "@/api/ThirdApi";
-import { saveStu } from "@/api/index1";
-=======
 import {computed, defineEmits, defineProps, ref, watch} from "vue";
 import {useStore} from "vuex";
 import {useBoeApiPage} from "@/api/request";
 import {AUDIENCE_LIST, USER_LIST} from "@/api/ThirdApi";
 import {saveStu} from "@/api/index1";
->>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
 
 const store = useStore();
-const emit = defineEmits({});
+const emit = defineEmits({})
 const props = defineProps({
   type: Number,
   id: String,
   stage: {
     type: Array,
-<<<<<<< HEAD
-    default: () => [],
-  },
-});
-const person = ref(false);
-const dept = ref(false);
-const group = ref(false);
-const visiable = ref(false);
-const activeKey = ref(1);
-const stageVisible = ref(false);
-=======
     default: () => []
   }
 })
-const person =ref(false)
+const person = ref(false)
 // const dept =ref(false)
-const group =ref(false)
+const group = ref(false)
 const visiable = ref(false)
 const activeKey = ref(1)
 const stageVisible = ref(false)
->>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
 const selectsData = ref({
-  stageId: "",
+  stageId: '',
   studentList: [],
   deptList: [],
-  groupList: [],
-});
+  groupList: []
+})
 const nameSearch = ref({
-  keyword: "",
+  keyword: '',
   departId: null,
   page: 1,
-  pageSize: 10,
-});
+  pageSize: 10
+})
 const audienceName = ref({
-  keyword: "",
+  keyword: '',
   page: 1,
-<<<<<<< HEAD
-  pageSize: 10,
-});
-const searchOrgName = ref({
-  keyword: "",
-  page: 1,
-  pageSize: 10,
-});
-=======
   pageSize: 10
 })
 // const searchOrgName = ref({
@@ -507,9 +341,8 @@ const searchOrgName = ref({
 //   page: 1,
 //   pageSize: 10
 // })
->>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
 
-const stageIds = computed(() => props.stage);
+const stageIds = computed(() => props.stage)
 
 const {
   data: stuData,
@@ -517,25 +350,18 @@ const {
   page: stuPageNo,
   pageSize: stuPageSize,
   loading: stuLoading,
-  total: stuTotal,
+  total: stuTotal
 } = useBoeApiPage(USER_LIST, nameSearch.value, {
   init: false,
-  result: (res) => res.result.userInfoList,
-  totalPage: (res) => res.result.totalPage,
-  total: (res) => res.result.totalElement,
-});
+  result: res => res.result.userInfoList,
+  totalPage: res => res.result.totalPage,
+  total: res => res.result.totalElement
+})
 
-<<<<<<< HEAD
-const { data: orgData, fetch: searchOrg } = useBoeApi(
-  ORG_LIST,
-  searchOrgName.value
-);
-=======
 // const {
 //   data: orgData,
 //   fetch: searchOrg,
 // } = useBoeApi(ORG_LIST, searchOrgName.value)
->>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
 
 const {
   data: audiData,
@@ -543,14 +369,13 @@ const {
   page: audiPageNo,
   pageSize: audiPageSize,
   loading: audiLoading,
-  total: audiTotal,
+  total: audiTotal
 } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
   init: true,
-  result: (res) =>
-    res.result.audienceList.map((e) => ({ ...e, id: e.id + "" })),
-  totalPage: (res) => res.result.totalPage,
-  total: (res) => res.result.totalElement,
-});
+  result: res => res.result.audienceList.map(e => ({...e, id: e.id + ''})),
+  totalPage: res => res.result.totalPage,
+  total: res => res.result.totalElement
+})
 
 const stuColumns = ref([
   {
@@ -589,16 +414,15 @@ const stuColumns = ref([
     className: "h",
     ellipsis: true,
   },
-]);
-const audiColums = ref([
-  {
-    title: "id",
-    dataIndex: "id",
-    key: "id",
-    width: 35,
-    align: "center",
-    className: "h",
-  },
+])
+const audiColums = ref([{
+  title: "id",
+  dataIndex: "id",
+  key: "id",
+  width: 35,
+  align: "center",
+  className: "h",
+},
   {
     title: "受众名称",
     dataIndex: "audienceName",
@@ -624,52 +448,52 @@ const audiColums = ref([
     align: "center",
     className: "h",
   },
-]);
-const stuSelectKeys = ref([]);
-const orgSelectKeys = ref([]);
-const auditSelectKeys = ref([]);
-const screenHeight = ref(document.body.clientHeight);
+])
+const stuSelectKeys = ref([])
+const orgSelectKeys = ref([])
+const auditSelectKeys = ref([])
+const screenHeight = ref(document.body.clientHeight)
 const stuRowSelection = computed(() => ({
   columnWidth: 20,
   selectedRowKeys: stuSelectKeys.value,
   onChange: onStuSelectChange,
   preserveSelectedRowKeys: true,
-}));
+}))
 const orgRowSelection = computed(() => ({
   columnWidth: 20,
   selectedRowKeys: orgSelectKeys.value,
   onChange: onOrgSelectChange,
   preserveSelectedRowKeys: true,
-}));
+}))
 
 const stuPagination = computed(() => ({
   total: stuTotal.value,
   showSizeChanger: false,
   current: stuPageNo.value,
   pageSize: stuPageSize.value,
-  onChange: changePagination,
-}));
+  onChange: changePagination
+}))
 
 const auditPagination = computed(() => ({
   total: audiTotal.value,
   showSizeChanger: false,
   current: audiPageNo.value,
   pageSize: audiPageSize.value,
-  onChange: auditChangePagination,
-}));
+  onChange: auditChangePagination
+}))
 
 const auditRowSelection = computed(() => ({
   columnWidth: 20,
   selectedRowKeys: auditSelectKeys.value,
   onChange: onAuditSelectChange,
   preserveSelectedRowKeys: true,
-}));
+}))
 
 const closeDrawer = () => {
-  visiable.value = false;
+  visiable.value = false
 };
 const openDrawer = () => {
-  visiable.value = true;
+  visiable.value = true
 };
 //获取组织树
 const treeData = computed(() => {
@@ -677,43 +501,31 @@ const treeData = computed(() => {
 });
 
 function onSearchStu() {
-  nameSearch.value.page = 1;
-  searchStu();
+  nameSearch.value.page = 1
+  searchStu()
 }
 
 function stuStuOrgSelect(e) {
-  nameSearch.value.departId = e.join("");
-  searchStu();
+  nameSearch.value.departId = e.join('')
+  searchStu()
 }
 
 function stuDel(i) {
-  stuSelectKeys.value = stuSelectKeys.value.filter(
-    (e) => e !== selectsData.value.studentList[i].id
-  );
-  selectsData.value.studentList.splice(i, 1);
+  stuSelectKeys.value = stuSelectKeys.value.filter(e => e !== selectsData.value.studentList[i].id)
+  selectsData.value.studentList.splice(i, 1)
 }
 
-<<<<<<< HEAD
-function orgDel(i) {
-  orgSelectKeys.value = orgSelectKeys.value.filter(
-    (e) => e !== selectsData.value.deptList[i].id
-  );
-  selectsData.value.deptList.splice(i, 1);
-}
-=======
 // function orgDel(i) {
 //   orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
 //   selectsData.value.deptList.splice(i, 1)
 // }
->>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
 
 function AuditDel(i) {
-  auditSelectKeys.value = auditSelectKeys.value.filter(
-    (e) => e !== selectsData.value.groupList[i].id
-  );
-  selectsData.value.groupList.splice(i, 1);
+  auditSelectKeys.value = auditSelectKeys.value.filter(e => e !== selectsData.value.groupList[i].id)
+  selectsData.value.groupList.splice(i, 1)
 }
 
+
 // function orgSelect(key, obj) {
 // console.log(obj)
 //request(ORG_CHILD_LIST, {orgId: null}).then(res => {
@@ -722,18 +534,18 @@ function AuditDel(i) {
 //}
 
 function onStuSelectChange(e, l) {
-  stuSelectKeys.value = e;
-  selectsData.value.studentList = l;
+  stuSelectKeys.value = e
+  selectsData.value.studentList = l
 }
 
 function onOrgSelectChange(e, l) {
-  orgRowSelection.value = e;
-  selectsData.value.deptList = l.selectedNodes;
+  orgRowSelection.value = e
+  selectsData.value.deptList = l.selectedNodes
 }
 
 function onAuditSelectChange(e, l) {
-  auditSelectKeys.value = e;
-  selectsData.value.groupList = l;
+  auditSelectKeys.value = e
+  selectsData.value.groupList = l
 }
 
 // const stuDepartmentSelect = (e) => {
@@ -744,38 +556,32 @@ function onAuditSelectChange(e, l) {
 //分页获取学员
 const changePagination = (page) => {
   nameSearch.value.page = page;
-  searchStu();
+  searchStu()
 };
 
 const auditChangePagination = (page) => {
   audienceName.value.page = page;
-  searchAudi();
+  searchAudi()
 };
 
 //重置
 const resetStu = () => {
   deleteDepSelect();
-  nameSearch.value = { keyword: "", page: 1, pageSize: 10 };
+  nameSearch.value = {keyword: '', page: 1, pageSize: 10}
 };
 //清空选择部门信息
 const deleteDepSelect = () => {
-  stuSelectKeys.value = [];
+  stuSelectKeys.value = []
 };
 
 //重置组织
-<<<<<<< HEAD
-const resetOrg = () => {
-  searchOrgName.value = { keyword: "", page: 1, pageSize: 10 };
-};
-=======
 // const resetOrg = () => {
 //   searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
 // };
->>>>>>> 0bbb4403e7650fcaf87f158833a10c02c3e51841
 
 //重置受众
 const resetAudienceInfo = () => {
-  audienceName.value = { keyword: "", page: 1, pageSize: 10 };
+  audienceName.value = {keyword: '', page: 1, pageSize: 10}
 };
 
 //全部清除
@@ -789,239 +595,270 @@ const resetAudienceInfo = () => {
 //确定添加授权
 const submitAuth = () => {
   if (props.type === 2) {
-    stageVisible.value = true;
+    stageVisible.value = true
   } else {
-    handleStageOk();
+    handleStageOk()
   }
 };
 
 function handleStageOk() {
-  stageVisible.value = false;
-  visiable.value = false;
-  emit("finash", false);
+  stageVisible.value = false
+  visiable.value = false
+  emit('finash', false)
   saveStu({
     targetId: props.id,
     type: props.type,
-    deptIds: selectsData.value.deptList?.map((e) => e.id),
+    deptIds: selectsData.value.deptList?.map(e => e.id),
     stageId: selectsData.value.stageId,
-    groupIds: selectsData.value.groupList?.map((e) => e.id),
-    studentList: selectsData.value.studentList,
+    groupIds: selectsData.value.groupList?.map(e => e.id),
+    studentList: selectsData.value.studentList
   }).then(() => {
-    emit("finash", true);
-  });
+    emit('finash', true)
+  })
 }
 
 watch(visiable, () => {
-  stuSelectKeys.value = [];
-  orgSelectKeys.value = [];
-  auditSelectKeys.value = [];
-  stuData.value = [];
+  stuSelectKeys.value = []
+  orgSelectKeys.value = []
+  auditSelectKeys.value = []
+  stuData.value = []
+  audienceName.value.keyword=''
+  audienceName.value.page=1
+  audienceName.value.pageSize=10
   selectsData.value = {
-    stageId: "",
+    stageId: '',
     studentList: [],
     deptList: [],
-    groupList: [],
-  };
-});
+    groupList: []
+  }
+  searchAudi()
+})
+
 </script>
 <style lang="scss">
-.CommonStudent {
-  .ant-btn-primary {
-    background-color: #4ea6ff !important;
-  }
+.ant-btn-primary {
+  background-color: #4ea6ff !important;
+}
+
+.cus-select {
+  height: 40px;
+  border-radius: 8px;
+}
+
+.tableBox .ant-table-row .ant-table-cell {
+  height: 48px;
+  font-size: 12px;
+  font-weight: 400;
+  color: #4F5156;
+  line-height: 29px;
+  padding: 0px;
+}
+
+.tableBox .ant-table-thead tr th {
+  font-size: 12px;
+}
+
+.ant-tabs-tabpane {
+  height: 100%;
+}
+
+.ant-tabs {
+  overflow: visible;
+}
+
+.right1 {
+  border-left: 1px solid #f2f6fe;
+  width: 100%;
+  margin-left: 20px;
+
+  .onerow {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-right: 40px;
+    flex-wrap: wrap;
 
-  .cus-select {
-    height: 40px;
-    border-radius: 8px;
-  }
-  .tableBox .ant-table-row .ant-table-cell {
-    height: 48px;
-    font-size: 14px;
-    font-weight: 400;
-    color: #4f5156;
-    line-height: 29px;
-    padding: 0px;
-  }
-  .tableBox .ant-table-thead tr th {
-    font-size: 14px;
-  }
-  .ant-tabs-tabpane {
-    height: 100%;
-  }
-  .ant-tabs {
-    overflow: visible;
-  }
-  .right1 {
-    border-left: 1px solid #f2f6fe;
     width: 100%;
-    margin-left: 20px;
 
-    .onerow {
+    .onleft {
       display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-right: 40px;
-      flex-wrap: wrap;
+      text-align: center;
 
-      width: 100%;
-      .onleft {
-        display: flex;
-        text-align: center;
-        .already {
-          color: rgba(51, 51, 51, 1);
-          font-size: 16px;
-          font-weight: 500;
-          margin-left: 32px;
-          white-space: nowrap;
-          // margin-bottom: 20px;
-        }
-        .count {
-          color: #4ea6ff;
-          font-size: 16px;
-          margin: 0 6px;
-        }
-        .peo {
-          color: rgba(51, 51, 51, 1);
-          font-size: 16px;
-          font-weight: 500;
-        }
+      .already {
+        color: rgba(51, 51, 51, 1);
+        font-size: 16px;
+        font-weight: 500;
+        margin-left: 32px;
+        white-space: nowrap;
+        // margin-bottom: 20px;
       }
-      .clbox {
-        margin-right: 50px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        cursor: pointer;
-        width: 104px;
-        height: 32px;
-        border-radius: 4px;
-        background: #4ea6ff;
-        .colose {
-          width: 16px;
-          height: 16px;
-          // border-radius: 8px;
-          // background: #ffffff;
-          // position: relative;
-          background-image: url(../../assets/images/basicinfo/ch.png);
-          background-size: 100%;
-          margin-right: 4px;
-        }
-        .allclear {
-          color: rgba(255, 255, 255, 1);
-          font-size: 14px;
-        }
+
+      .count {
+        color: #4ea6ff;
+        font-size: 16px;
+        margin: 0 6px;
+      }
+
+      .peo {
+        color: rgba(51, 51, 51, 1);
+        font-size: 16px;
+        font-weight: 500;
       }
     }
-    .selecteds {
+
+    .clbox {
+      margin-right: 50px;
       display: flex;
-      flex-wrap: wrap;
-      margin-left: 32px;
-      .person {
-        width: 100%;
-        margin-top: 20px;
-        border-top: 1px solid #f2f6fe;
+      justify-content: center;
+      align-items: center;
+      cursor: pointer;
+      width: 104px;
+      height: 32px;
+      border-radius: 4px;
+      background: #4ea6ff;
+
+      .colose {
+        width: 16px;
+        height: 16px;
+        // border-radius: 8px;
+        // background: #ffffff;
+        // position: relative;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        background-size: 100%;
+        margin-right: 4px;
       }
-      .chose {
-        width: 64px;
-        height: 24px;
-        margin-top: 25px;
-        margin-right: 25px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 2px;
-        border: 1px solid rgba(56, 139, 225, 1);
-        color: rgba(56, 139, 225, 1);
-        font-size: 12px;
-        position: relative;
-        .ch {
-          position: absolute;
-          width: 18px;
-          height: 18px;
-          background-image: url(../../assets/images/basicinfo/ch.png);
-          right: -8px;
-          top: -8px;
-        }
+
+      .allclear {
+        color: rgba(255, 255, 255, 1);
+        font-size: 14px;
       }
-      .ifsw {
-        display: flex;
-        align-items: end;
-        justify-content: center;
-        color: #4ea6ff;
+    }
+  }
+
+  .selecteds {
+    display: flex;
+    flex-wrap: wrap;
+    margin-left: 32px;
+
+    .person {
+      width: 100%;
+      margin-top: 20px;
+      border-top: 1px solid #f2f6fe;
+    }
+
+    .chose {
+      width: 64px;
+      height: 24px;
+      margin-top: 25px;
+      margin-right: 25px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 2px;
+      border: 1px solid rgba(56, 139, 225, 1);
+      color: rgba(56, 139, 225, 1);
+      font-size: 12px;
+      position: relative;
+
+      .ch {
+        position: absolute;
+        width: 18px;
+        height: 18px;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        right: -8px;
+        top: -8px;
       }
-      .sw {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        text-align: justify;
-        color: #4ea6ff;
-        margin-top: 23px;
-        margin-left: 10px;
+    }
+
+    .ifsw {
+      display: flex;
+      align-items: end;
+      justify-content: center;
+      color: #4ea6ff;
+    }
+
+    .sw {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      text-align: justify;
+      color: #4ea6ff;
+      margin-top: 23px;
+      margin-left: 10px;
+    }
+
+    .dept {
+      width: 100%;
+      margin-top: 30px;
+      border-top: 1px solid #f2f6fe;
+    }
+
+    .chose1 {
+      //width: 90px;
+      height: 24px;
+      margin-top: 25px;
+      margin-right: 25px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 2px;
+      border: 1px solid rgba(56, 139, 225, 1);
+      color: rgba(56, 139, 225, 1);
+      font-size: 12px;
+      position: relative;
+
+      .span {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
-      .dept {
-        width: 100%;
-        margin-top: 30px;
-        border-top: 1px solid #f2f6fe;
+
+      .ch1 {
+        position: absolute;
+        width: 18px;
+        height: 18px;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        right: -8px;
+        top: -8px;
       }
-      .chose1 {
-        //width: 90px;
-        height: 24px;
-        margin-top: 25px;
-        margin-right: 25px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 2px;
-        border: 1px solid rgba(56, 139, 225, 1);
-        color: rgba(56, 139, 225, 1);
-        font-size: 12px;
-        position: relative;
-        .span {
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-        .ch1 {
-          position: absolute;
-          width: 18px;
-          height: 18px;
-          background-image: url(../../assets/images/basicinfo/ch.png);
-          right: -8px;
-          top: -8px;
-        }
+
+    }
+
+    .group {
+      width: 100%;
+      margin-top: 30px;
+      border-top: 1px solid #f2f6fe;
+    }
+
+    .chose2 {
+      //width: 120px;
+      height: 24px;
+      margin-top: 25px;
+      margin-right: 25px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 2px;
+      border: 1px solid rgba(56, 139, 225, 1);
+      color: rgba(56, 139, 225, 1);
+      font-size: 12px;
+      position: relative;
+
+      .span {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
-      .group {
-        width: 100%;
-        margin-top: 30px;
-        border-top: 1px solid #f2f6fe;
-      }
-      .chose2 {
-        //width: 120px;
-        height: 24px;
-        margin-top: 25px;
-        margin-right: 25px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 2px;
-        border: 1px solid rgba(56, 139, 225, 1);
-        color: rgba(56, 139, 225, 1);
-        font-size: 12px;
-        position: relative;
-        .span {
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-        .ch2 {
-          position: absolute;
-          width: 18px;
-          height: 18px;
-          background-image: url(../../assets/images/basicinfo/ch.png);
-          right: -8px;
-          top: -8px;
-        }
+
+      .ch2 {
+        position: absolute;
+        width: 18px;
+        height: 18px;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        right: -8px;
+        top: -8px;
       }
+
     }
   }
 }

From 389d0ac4a5c384677e5e63928bedb04db9ab9523 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 20 Dec 2022 18:56:33 +0800
Subject: [PATCH 6/7] =?UTF-8?q?--=20=E5=8F=97=E4=BC=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 425 +++++++++++------------
 1 file changed, 209 insertions(+), 216 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 81d6b4e6..4fc39d25 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -1,7 +1,7 @@
 <!-- eslint-disable vue/no-parsing-error -->
 <!-- eslint-disable vue/require-v-for-key -->
 <template>
-  <div>
+  <div class="CommonStudent">
     <a-drawer
         :visible="visiable"
         class="drawerStyle ProjCheckship"
@@ -415,14 +415,7 @@ const stuColumns = ref([
     ellipsis: true,
   },
 ])
-const audiColums = ref([{
-  title: "id",
-  dataIndex: "id",
-  key: "id",
-  width: 35,
-  align: "center",
-  className: "h",
-},
+const audiColums = ref([
   {
     title: "受众名称",
     dataIndex: "audienceName",
@@ -622,9 +615,9 @@ watch(visiable, () => {
   orgSelectKeys.value = []
   auditSelectKeys.value = []
   stuData.value = []
-  audienceName.value.keyword=''
-  audienceName.value.page=1
-  audienceName.value.pageSize=10
+  audienceName.value.keyword = ''
+  audienceName.value.page = 1
+  audienceName.value.pageSize = 10
   selectsData.value = {
     stageId: '',
     studentList: [],
@@ -636,229 +629,229 @@ watch(visiable, () => {
 
 </script>
 <style lang="scss">
-.ant-btn-primary {
-  background-color: #4ea6ff !important;
-}
-
-.cus-select {
-  height: 40px;
-  border-radius: 8px;
-}
-
-.tableBox .ant-table-row .ant-table-cell {
-  height: 48px;
-  font-size: 12px;
-  font-weight: 400;
-  color: #4F5156;
-  line-height: 29px;
-  padding: 0px;
-}
-
-.tableBox .ant-table-thead tr th {
-  font-size: 12px;
-}
-
-.ant-tabs-tabpane {
-  height: 100%;
-}
-
-.ant-tabs {
-  overflow: visible;
-}
-
-.right1 {
-  border-left: 1px solid #f2f6fe;
-  width: 100%;
-  margin-left: 20px;
-
-  .onerow {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-right: 40px;
-    flex-wrap: wrap;
-
-    width: 100%;
-
-    .onleft {
-      display: flex;
-      text-align: center;
-
-      .already {
-        color: rgba(51, 51, 51, 1);
-        font-size: 16px;
-        font-weight: 500;
-        margin-left: 32px;
-        white-space: nowrap;
-        // margin-bottom: 20px;
-      }
-
-      .count {
-        color: #4ea6ff;
-        font-size: 16px;
-        margin: 0 6px;
-      }
-
-      .peo {
-        color: rgba(51, 51, 51, 1);
-        font-size: 16px;
-        font-weight: 500;
-      }
-    }
-
-    .clbox {
-      margin-right: 50px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      cursor: pointer;
-      width: 104px;
-      height: 32px;
-      border-radius: 4px;
-      background: #4ea6ff;
-
-      .colose {
-        width: 16px;
-        height: 16px;
-        // border-radius: 8px;
-        // background: #ffffff;
-        // position: relative;
-        background-image: url(../../assets/images/basicinfo/ch.png);
-        background-size: 100%;
-        margin-right: 4px;
-      }
-
-      .allclear {
-        color: rgba(255, 255, 255, 1);
-        font-size: 14px;
-      }
-    }
+.CommonStudent {
+  .ant-btn-primary {
+    background-color: #4ea6ff !important;
   }
 
-  .selecteds {
-    display: flex;
-    flex-wrap: wrap;
-    margin-left: 32px;
+  .cus-select {
+    height: 40px;
+    border-radius: 8px;
+  }
+
+  .tableBox .ant-table-row .ant-table-cell {
+    height: 48px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #4f5156;
+    line-height: 29px;
+    padding: 0px;
+  }
+
+  .tableBox .ant-table-thead tr th {
+    font-size: 14px;
+  }
+
+  .ant-tabs-tabpane {
+    height: 100%;
+  }
+
+  .ant-tabs {
+    overflow: visible;
+  }
+
+  .right1 {
+    border-left: 1px solid #f2f6fe;
+    width: 100%;
+    margin-left: 20px;
+
+    .onerow {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-right: 40px;
+      flex-wrap: wrap;
 
-    .person {
       width: 100%;
-      margin-top: 20px;
-      border-top: 1px solid #f2f6fe;
-    }
 
-    .chose {
-      width: 64px;
-      height: 24px;
-      margin-top: 25px;
-      margin-right: 25px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border-radius: 2px;
-      border: 1px solid rgba(56, 139, 225, 1);
-      color: rgba(56, 139, 225, 1);
-      font-size: 12px;
-      position: relative;
+      .onleft {
+        display: flex;
+        text-align: center;
 
-      .ch {
-        position: absolute;
-        width: 18px;
-        height: 18px;
-        background-image: url(../../assets/images/basicinfo/ch.png);
-        right: -8px;
-        top: -8px;
+        .already {
+          color: rgba(51, 51, 51, 1);
+          font-size: 16px;
+          font-weight: 500;
+          margin-left: 32px;
+          white-space: nowrap;
+          // margin-bottom: 20px;
+        }
+
+        .count {
+          color: #4ea6ff;
+          font-size: 16px;
+          margin: 0 6px;
+        }
+
+        .peo {
+          color: rgba(51, 51, 51, 1);
+          font-size: 16px;
+          font-weight: 500;
+        }
+      }
+
+      .clbox {
+        margin-right: 50px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        cursor: pointer;
+        width: 104px;
+        height: 32px;
+        border-radius: 4px;
+        background: #4ea6ff;
+
+        .colose {
+          width: 16px;
+          height: 16px;
+          // border-radius: 8px;
+          // background: #ffffff;
+          // position: relative;
+          background-image: url(../../assets/images/basicinfo/ch.png);
+          background-size: 100%;
+          margin-right: 4px;
+        }
+
+        .allclear {
+          color: rgba(255, 255, 255, 1);
+          font-size: 14px;
+        }
       }
     }
 
-    .ifsw {
+    .selecteds {
       display: flex;
-      align-items: end;
-      justify-content: center;
-      color: #4ea6ff;
-    }
+      flex-wrap: wrap;
+      margin-left: 32px;
 
-    .sw {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      text-align: justify;
-      color: #4ea6ff;
-      margin-top: 23px;
-      margin-left: 10px;
-    }
-
-    .dept {
-      width: 100%;
-      margin-top: 30px;
-      border-top: 1px solid #f2f6fe;
-    }
-
-    .chose1 {
-      //width: 90px;
-      height: 24px;
-      margin-top: 25px;
-      margin-right: 25px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border-radius: 2px;
-      border: 1px solid rgba(56, 139, 225, 1);
-      color: rgba(56, 139, 225, 1);
-      font-size: 12px;
-      position: relative;
-
-      .span {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
+      .person {
+        width: 100%;
+        margin-top: 20px;
+        border-top: 1px solid #f2f6fe;
       }
 
-      .ch1 {
-        position: absolute;
-        width: 18px;
-        height: 18px;
-        background-image: url(../../assets/images/basicinfo/ch.png);
-        right: -8px;
-        top: -8px;
+      .chose {
+        width: 64px;
+        height: 24px;
+        margin-top: 25px;
+        margin-right: 25px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 2px;
+        border: 1px solid rgba(56, 139, 225, 1);
+        color: rgba(56, 139, 225, 1);
+        font-size: 12px;
+        position: relative;
+
+        .ch {
+          position: absolute;
+          width: 18px;
+          height: 18px;
+          background-image: url(../../assets/images/basicinfo/ch.png);
+          right: -8px;
+          top: -8px;
+        }
       }
 
-    }
-
-    .group {
-      width: 100%;
-      margin-top: 30px;
-      border-top: 1px solid #f2f6fe;
-    }
-
-    .chose2 {
-      //width: 120px;
-      height: 24px;
-      margin-top: 25px;
-      margin-right: 25px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border-radius: 2px;
-      border: 1px solid rgba(56, 139, 225, 1);
-      color: rgba(56, 139, 225, 1);
-      font-size: 12px;
-      position: relative;
-
-      .span {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
+      .ifsw {
+        display: flex;
+        align-items: end;
+        justify-content: center;
+        color: #4ea6ff;
       }
 
-      .ch2 {
-        position: absolute;
-        width: 18px;
-        height: 18px;
-        background-image: url(../../assets/images/basicinfo/ch.png);
-        right: -8px;
-        top: -8px;
+      .sw {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        text-align: justify;
+        color: #4ea6ff;
+        margin-top: 23px;
+        margin-left: 10px;
       }
 
+      .dept {
+        width: 100%;
+        margin-top: 30px;
+        border-top: 1px solid #f2f6fe;
+      }
+
+      .chose1 {
+        //width: 90px;
+        height: 24px;
+        margin-top: 25px;
+        margin-right: 25px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 2px;
+        border: 1px solid rgba(56, 139, 225, 1);
+        color: rgba(56, 139, 225, 1);
+        font-size: 12px;
+        position: relative;
+
+        .span {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .ch1 {
+          position: absolute;
+          width: 18px;
+          height: 18px;
+          background-image: url(../../assets/images/basicinfo/ch.png);
+          right: -8px;
+          top: -8px;
+        }
+      }
+
+      .group {
+        width: 100%;
+        margin-top: 30px;
+        border-top: 1px solid #f2f6fe;
+      }
+
+      .chose2 {
+        //width: 120px;
+        height: 24px;
+        margin-top: 25px;
+        margin-right: 25px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 2px;
+        border: 1px solid rgba(56, 139, 225, 1);
+        color: rgba(56, 139, 225, 1);
+        font-size: 12px;
+        position: relative;
+
+        .span {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .ch2 {
+          position: absolute;
+          width: 18px;
+          height: 18px;
+          background-image: url(../../assets/images/basicinfo/ch.png);
+          right: -8px;
+          top: -8px;
+        }
+      }
     }
   }
 }

From b6cc723c25d783f405cf3e594e4136c3dffdb45a Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 20 Dec 2022 19:11:58 +0800
Subject: [PATCH 7/7] =?UTF-8?q?--=20=E5=8F=97=E4=BC=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 345 ++++++++++++-----------
 1 file changed, 173 insertions(+), 172 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 4fc39d25..ea3b1f14 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -660,199 +660,200 @@ watch(visiable, () => {
     overflow: visible;
   }
 
-  .right1 {
-    border-left: 1px solid #f2f6fe;
+}
+.right1 {
+  border-left: 1px solid #f2f6fe;
+  width: 100%;
+  margin-left: 20px;
+
+  .onerow {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-right: 40px;
+    flex-wrap: wrap;
+
     width: 100%;
-    margin-left: 20px;
 
-    .onerow {
+    .onleft {
       display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-right: 40px;
-      flex-wrap: wrap;
+      text-align: center;
 
-      width: 100%;
-
-      .onleft {
-        display: flex;
-        text-align: center;
-
-        .already {
-          color: rgba(51, 51, 51, 1);
-          font-size: 16px;
-          font-weight: 500;
-          margin-left: 32px;
-          white-space: nowrap;
-          // margin-bottom: 20px;
-        }
-
-        .count {
-          color: #4ea6ff;
-          font-size: 16px;
-          margin: 0 6px;
-        }
-
-        .peo {
-          color: rgba(51, 51, 51, 1);
-          font-size: 16px;
-          font-weight: 500;
-        }
+      .already {
+        color: rgba(51, 51, 51, 1);
+        font-size: 16px;
+        font-weight: 500;
+        margin-left: 32px;
+        white-space: nowrap;
+        // margin-bottom: 20px;
       }
 
-      .clbox {
-        margin-right: 50px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        cursor: pointer;
-        width: 104px;
-        height: 32px;
-        border-radius: 4px;
-        background: #4ea6ff;
+      .count {
+        color: #4ea6ff;
+        font-size: 16px;
+        margin: 0 6px;
+      }
 
-        .colose {
-          width: 16px;
-          height: 16px;
-          // border-radius: 8px;
-          // background: #ffffff;
-          // position: relative;
-          background-image: url(../../assets/images/basicinfo/ch.png);
-          background-size: 100%;
-          margin-right: 4px;
-        }
-
-        .allclear {
-          color: rgba(255, 255, 255, 1);
-          font-size: 14px;
-        }
+      .peo {
+        color: rgba(51, 51, 51, 1);
+        font-size: 16px;
+        font-weight: 500;
       }
     }
 
-    .selecteds {
+    .clbox {
+      margin-right: 50px;
       display: flex;
-      flex-wrap: wrap;
-      margin-left: 32px;
+      justify-content: center;
+      align-items: center;
+      cursor: pointer;
+      width: 104px;
+      height: 32px;
+      border-radius: 4px;
+      background: #4ea6ff;
 
-      .person {
-        width: 100%;
-        margin-top: 20px;
-        border-top: 1px solid #f2f6fe;
+      .colose {
+        width: 16px;
+        height: 16px;
+        // border-radius: 8px;
+        // background: #ffffff;
+        // position: relative;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        background-size: 100%;
+        margin-right: 4px;
       }
 
-      .chose {
-        width: 64px;
-        height: 24px;
-        margin-top: 25px;
-        margin-right: 25px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 2px;
-        border: 1px solid rgba(56, 139, 225, 1);
-        color: rgba(56, 139, 225, 1);
-        font-size: 12px;
-        position: relative;
+      .allclear {
+        color: rgba(255, 255, 255, 1);
+        font-size: 14px;
+      }
+    }
+  }
 
-        .ch {
-          position: absolute;
-          width: 18px;
-          height: 18px;
-          background-image: url(../../assets/images/basicinfo/ch.png);
-          right: -8px;
-          top: -8px;
-        }
+  .selecteds {
+    display: flex;
+    flex-wrap: wrap;
+    margin-left: 32px;
+
+    .person {
+      width: 100%;
+      margin-top: 20px;
+      border-top: 1px solid #f2f6fe;
+    }
+
+    .chose {
+      width: 64px;
+      height: 24px;
+      margin-top: 25px;
+      margin-right: 25px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 2px;
+      border: 1px solid rgba(56, 139, 225, 1);
+      color: rgba(56, 139, 225, 1);
+      font-size: 12px;
+      position: relative;
+
+      .ch {
+        position: absolute;
+        width: 18px;
+        height: 18px;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        right: -8px;
+        top: -8px;
+      }
+    }
+
+    .ifsw {
+      display: flex;
+      align-items: end;
+      justify-content: center;
+      color: #4ea6ff;
+    }
+
+    .sw {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      text-align: justify;
+      color: #4ea6ff;
+      margin-top: 23px;
+      margin-left: 10px;
+    }
+
+    .dept {
+      width: 100%;
+      margin-top: 30px;
+      border-top: 1px solid #f2f6fe;
+    }
+
+    .chose1 {
+      //width: 90px;
+      height: 24px;
+      margin-top: 25px;
+      margin-right: 25px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 2px;
+      border: 1px solid rgba(56, 139, 225, 1);
+      color: rgba(56, 139, 225, 1);
+      font-size: 12px;
+      position: relative;
+
+      .span {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
 
-      .ifsw {
-        display: flex;
-        align-items: end;
-        justify-content: center;
-        color: #4ea6ff;
+      .ch1 {
+        position: absolute;
+        width: 18px;
+        height: 18px;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        right: -8px;
+        top: -8px;
+      }
+    }
+
+    .group {
+      width: 100%;
+      margin-top: 30px;
+      border-top: 1px solid #f2f6fe;
+    }
+
+    .chose2 {
+      //width: 120px;
+      height: 24px;
+      margin-top: 25px;
+      margin-right: 25px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 2px;
+      border: 1px solid rgba(56, 139, 225, 1);
+      color: rgba(56, 139, 225, 1);
+      font-size: 12px;
+      position: relative;
+
+      .span {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
 
-      .sw {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        text-align: justify;
-        color: #4ea6ff;
-        margin-top: 23px;
-        margin-left: 10px;
-      }
-
-      .dept {
-        width: 100%;
-        margin-top: 30px;
-        border-top: 1px solid #f2f6fe;
-      }
-
-      .chose1 {
-        //width: 90px;
-        height: 24px;
-        margin-top: 25px;
-        margin-right: 25px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 2px;
-        border: 1px solid rgba(56, 139, 225, 1);
-        color: rgba(56, 139, 225, 1);
-        font-size: 12px;
-        position: relative;
-
-        .span {
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-
-        .ch1 {
-          position: absolute;
-          width: 18px;
-          height: 18px;
-          background-image: url(../../assets/images/basicinfo/ch.png);
-          right: -8px;
-          top: -8px;
-        }
-      }
-
-      .group {
-        width: 100%;
-        margin-top: 30px;
-        border-top: 1px solid #f2f6fe;
-      }
-
-      .chose2 {
-        //width: 120px;
-        height: 24px;
-        margin-top: 25px;
-        margin-right: 25px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 2px;
-        border: 1px solid rgba(56, 139, 225, 1);
-        color: rgba(56, 139, 225, 1);
-        font-size: 12px;
-        position: relative;
-
-        .span {
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-
-        .ch2 {
-          position: absolute;
-          width: 18px;
-          height: 18px;
-          background-image: url(../../assets/images/basicinfo/ch.png);
-          right: -8px;
-          top: -8px;
-        }
+      .ch2 {
+        position: absolute;
+        width: 18px;
+        height: 18px;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        right: -8px;
+        top: -8px;
       }
     }
   }
 }
+
 </style>
\ No newline at end of file