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

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

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

From 307e53dbf0d84cae7d94bf3312b5455e63387754 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Sun, 13 Nov 2022 22:28:23 +0800
Subject: [PATCH 2/5] =?UTF-8?q?style:=E6=8A=95=E7=A5=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexEval.js                         |  15 +-
 src/components/drawers/AddEval.vue           | 354 ++++------
 src/components/drawers/AddInvist.vue         | 305 +++------
 src/components/drawers/AddLive.vue           | 102 +--
 src/components/drawers/CreVote.vue           | 488 --------------
 src/components/drawers/EvList.vue            | 529 +++++++++++++++
 src/components/{drawers => vote}/AddVote.vue | 259 ++++----
 src/components/vote/CreateVote.vue           | 652 +++++++++++++++++++
 src/components/vote/VoteQuestion.vue         | 454 +++++++++++++
 src/components/vote/VoteQuestionItem.vue     | 439 +++++++++++++
 src/views/learningpath/LevelAddDetail.vue    |  10 +-
 src/views/projectcenter/TaskAdd.vue          | 210 +-----
 src/views/projectcenter/TaskPage.vue         |   4 +-
 src/views/system/SystemManage.vue            |   2 +-
 14 files changed, 2462 insertions(+), 1361 deletions(-)
 delete mode 100644 src/components/drawers/CreVote.vue
 create mode 100644 src/components/drawers/EvList.vue
 rename src/components/{drawers => vote}/AddVote.vue (76%)
 create mode 100644 src/components/vote/CreateVote.vue
 create mode 100644 src/components/vote/VoteQuestion.vue
 create mode 100644 src/components/vote/VoteQuestionItem.vue

diff --git a/src/api/indexEval.js b/src/api/indexEval.js
index 01f7794f..692a416d 100644
--- a/src/api/indexEval.js
+++ b/src/api/indexEval.js
@@ -55,7 +55,12 @@ export const deleteEvaluationById = (obj) => http.post('/evaluation/deleteEvalua
 
 //根据ID获取测评信息详情
 export const queryEvaluationDetailById = (obj) =>
-  http.post("/evaluation/queryEvaluationDetailById", { params: obj });
+  http.post("/evaluation/queryEvaluationDetailById", obj,{
+    headers: {
+      'token': '123',
+      'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+    }
+});
 
 //修改测评信息
 export const updateEvaluation = (obj) =>
@@ -68,3 +73,11 @@ export const updateEvaluation = (obj) =>
 // }).catch(err => {
 // 	console.log(err)
 // })
+//根据name获取测评信息详情
+export const getEvalListByName = (obj) =>
+  http.post("/evaluation/queryEvaluationDetailById", obj,{
+    headers: {
+      'token': '123',
+      'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+    }
+});
\ No newline at end of file
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 2f3ea0c4..06daaada 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -9,8 +9,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div v-if="edit" class="headerTitle">编辑测评</div>
-        <div v-else class="headerTitle">添加测评</div>
+        <div class="headerTitle">{{edit?'编辑':'添加'}}测评</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -49,11 +48,16 @@
               <span style="margin-right: 3px">选择测评：</span>
             </div>
             <div class="btnbox">
-              <a-input
-                v-model:value="inputV2"
-                style="width: 424px; height: 32px"
-                placeholder="请输入名称或编码后选择"
+              <button class="checkEval" @click="showEvalDrawer">选择测评</button>
+            </div>
+            <div>
+           <div><EvList
+                v-model:EvalListVisible="EvalListVisible"
+                v-model:evaluationTypeId="evaluationTypeId"
+                v-model:evaluationTypeName="evaluationTypeName"
               />
+           </div>
+        
             </div>
           </div>
           <div class="main_item">
@@ -71,29 +75,11 @@
           </div>
           <div class="main_item2">
             <div class="signbox">
-              <span style="margin-right: 3px">图片：</span>
+              <span style="margin-right: 3px">测评说明：</span>
             </div>
             <div class="textarea">
-              <a-upload
-                v-model:file-list="fileList"
-                name="file"
-                list-type="picture-card"
-                class="avatar-uploader"
-                :show-upload-list="false"
-                action="/api/file/upload"
-                :before-upload="beforeUpload"
-                @change="handleChange"
-              >
-                <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
-                <div v-else>
-                  <loading-outlined v-if="loading"></loading-outlined>
-                  <plus-outlined v-else></plus-outlined>
-                  <div class="ant-upload-text">Upload</div>
-                </div>
-              </a-upload>
-              <span style="padding-bottom: 20px; color: #878b92"
-                >图片格式为JPG/PNG 图片大小不可超过1MB</span
-              >
+              <a-textarea v-model:value="description" placeholder="请输入测评说明" style="width:424px; height: 120px;" allowClear/>
+                
             </div>
           </div>
         </div>
@@ -109,30 +95,32 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, toRefs } from "vue";
 // import { useRouter } from "vue-router";
+import EvList from "./EvList.vue";
 import * as api from "../../api/indexEval";
 import * as apitaskadd from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
-import { toDate } from "../../api/method";
 import { RouterEditTask } from "@/api/indexTask";
+import dayjs from 'dayjs';
 // const router = useRouter();
 export default {
   name: "AddEval",
-  // components: {
-  // },
+   components: {
+    EvList,
+  },
   props: {
     addevalVisible: {
       type: Boolean,
       default: false,
     },
-    edit: {
-      type: Boolean,
-      default: false,
-    },
-    learn: {
+    EditEvalId: {
       type: Number,
-      default: 0,
+      default: null,
+    },
+    edit: { //  是否为编辑
+      type: Boolean,
+      default: null,
     },
     projectId: {
       type: Number,
@@ -142,7 +130,15 @@ export default {
       type: Number,
       default: null,
     },
-    isactive: {
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    projectTaskId: { // 要编辑的projectId 
       type: Number,
       default: null,
     },
@@ -150,9 +146,9 @@ export default {
       type: Number,
       default: null,
     },
-    EditEvalId: {
+    isactive: {
       type: Number,
-      default: 147,
+      default: null,
     },
   },
   setup(props, ctx) {
@@ -160,15 +156,11 @@ export default {
       inputV1: "",
       inputV2: "",
       time: undefined,
-      endTimes: "",
-      startTimes: "",
-      picUrl: "",
-      tableData: [],
-      deletePathId: null, //删除路径id
-      editPathId: null, //修改路径id
-      currentPage: 1, //当前页
-      tableDataTotal: -1, //学习路径列表总数
-      pageSize: 10, //每页10条数据
+      EvalId: null,
+      evaluationTypeId:null,
+      evaluationTypeName:"",
+      description:"",
+      EvalListVisible:false,
       // addLoading:false,
     });
 
@@ -179,54 +171,63 @@ export default {
       state.inputV2 = "";
     };
     const afterVisibleChange = (bool) => {
-      console.log("state", bool);
-    };
-    //上传组件
-    function getBase64(img, callback) {
-      const reader = new FileReader();
-      reader.addEventListener("load", () => callback(reader.result));
-      reader.readAsDataURL(img);
-    }
-
-    const fileList = ref([]);
-    const loading = ref(false);
-    const imageUrl = ref("");
-
-    const handleChange = (info) => {
-      if (info.file.status === "uploading") {
-        loading.value = true;
-        return;
+      if(props.edit && bool){
+        queryEval();
       }
-      if (info.file.status === "done") {
-        console.log("上传图片返回的信息 %o", info);
-        state.picUrl = info.file.response.data;
-        // Get this url from response in real world.
-        getBase64(info.file.originFileObj, (base64Url) => {
-          imageUrl.value = base64Url;
-          loading.value = false;
+    };
+    const showEvalDrawer = () =>{
+      state.EvalListVisible = true;
+      console.log("进来了吗");
+    };
+    const queryEval = () =>{
+      api
+      .queryEvaluationDetailById({evaluationId:props.evaluationId})
+      .then((res) => {
+        console.log("调用项目添加接口后", res.data.data);
+        state.inputV1 = res.data.data.evaluationName;
+        state.time = [dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"), dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD")];
+        state.evaluationTypeId = res.data.data.evaluationTypeId;
+        state.evaluationTypeName =res.data.data.evaluationTypeName;
+        //state.description = 
+        })
+        .catch((err) => {
+          console.log(err);
         });
+    }
+    const updateTask = (res)=>{
+      if(props.isLevel){
+        apitaskadd
+            .addTask({
+              courseId: res.data.data.evaluationId,
+              name: res.data.data.evaluationName,
+              projectId: props.projectId,
+              projectTaskId: props.projectTaskId || 0,
+              stageId: props.chooseStageId,
+              type: 10,
+            })
+            .then((res) => {
+              console.log("调用项目添加接口后", res.data);
+            
+            })
+            .catch((err) => {
+              console.log(err);
+            });
+      }else{
+        RouterEditTask({
+                chapterId: props.isactive,
+                courseId: res.data.data.evaluationId,
+                name: res.data.data.evaluationName,
+                routerId: props.routerId,
+                routerTaskId: props.routerTaskId || 0,
+                type: 10,
+              }).then((res) => {
+              console.log("调用项目添加接口后", res.data);
+             
+            }).catch((err) => {
+              console.log(err);
+            });
       }
-      if (info.file.status === "error") {
-        loading.value = false;
-        message.error("upload error");
-      }
-    };
-
-    const beforeUpload = (file) => {
-      const isJpgOrPng =
-        file.type === "image/jpeg" || file.type === "image/png";
-      if (!isJpgOrPng) {
-        message.error("You can only upload JPG file!");
-      }
-      const isLt2M = file.size / 1024 / 1024 < 1;
-      if (!isLt2M) {
-        message.error("Image must smaller than 1MB!");
-      }
-      return isJpgOrPng && isLt2M;
-    };
-
-
-
+    }
     //创建或编辑测评信息
     const createEvalText = () => {
       if (!state.inputV1) {
@@ -237,130 +238,45 @@ export default {
         message.destroy();
         return message.info("请选择测评");
       }
-      if (state.time != undefined) {
-        state.endTimes = toDate(
-          new Date(state.time[0].$d).getTime() / 1000,
-          "Y-M-D"
-        );
-        state.startTimes = toDate(
-          new Date(state.time[1].$d).getTime() / 1000,
-          "Y-M-D"
-        );
+      if (!state.time) {
+        message.destroy();
+        return message.warning("请输入直播时间");
       }
 
       let obj = {
         evaluationName: state.inputV1,
-        createTime: "",
-        createUser: 0,
-        evaluationEndTime: state.endTimes,
-        evaluationFlag: "",
-        evaluationId: 0,
-        evaluationPictureAddress: "",
-        evaluationStartTime: state.startTimes,
-        evaluationTag: "",
-        evaluationTypeId: 0,
-        evaluationTypeName: "",
-        updateTime: "",
-        updateUser: 0,
+        evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
+        evaluationId: props.edit?props.evaluationId:0,
+        evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
+        evaluationTypeId:state.evaluationTypeId,
+        evaluationTypeName:state.evaluationTypeName,
+        //state.description
       };
-      let objedit = {
-        createTime: "",
-        createUser: 0,
-        evaluationEndTime: "",
-        evaluationFlag: "",
-        evaluationId: props.EditEvalId == null ? 0 : props.EditEvalId,
-        evaluationName: state.inputV1,
-        evaluationPictureAddress: "",
-        evaluationStartTime: "",
-        evaluationTag: "",
-        evaluationTypeId: 0,
-        evaluationTypeName: "",
-        updateTime: "",
-        updateUser: 0,
-      };
-      let queryobj = {
-        evaluationId:props.EditEvalId
-      }
-      console.log(queryobj,'ssssssssss');
-      if (props.edit == false) {
+      if(props.edit){
         api
-          .createEvaluation(obj)
-          .then((res) => {
-            console.log("创建成功", res);
-            message.success("创建成功");
-            closeDrawer();
-            //渲染到项目列表            
-            if (props.learn == 0)
-              apitaskadd
-                .addTask({
-                  courseId: res.data.data.evaluationId,
-                  duration: 0,
-                  flag: true,
-                  name: obj.evaluationName,
-                  projectId: props.projectId,
-                  projectTaskId: 0,
-                  stageId: props.chooseStageId,
-                  type: 10,
-                })
-                .then((res) => {
-                  console.log("调用项目添加接口后", res.data);
-                  //自定义事件给父组件传值
-                  ctx.emit("changeData", false);
-                  //重新获取任务列表
-                  // apiTask.getTask({ projectId: 28 });
-                  // router.push("/taskadd");
-                })
-                .catch((err) => {
-                  console.log(err);
-                });
-            //渲染到学历路径
-            else {
-              let editObj1 = {
-                chapterId: props.isactive,
-                courseId:  res.data.data.evaluationId,
-                duration: 0,
-                flag: true,
-                name: obj.evaluationName,
-                routerId: props.routerId,
-                routerTaskId: 0,
-                type: 10,
-              };
-              RouterEditTask(editObj1)
-            }
-          })
-          .catch((err) => {
-            console.log("创建失败", err);
-            // state.createLoading = false;
-          });
-      }
-      else {
+        .createEvaluation(obj)
+        .then((res) => {
+          updateTask(res);
+          message.success("创建成功");
+          closeDrawer();
+          ctx.emit("changeData", false);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+      }else{
         api
-          .queryEvaluationDetailById(queryobj)
-          .then((res) => {
-              setTimeout(() => {
-                console.log("获取成功", res,objedit.evaluationId);
-                message.success("获取成功");
-                
-              }, 1000);
-            })
-            .catch((err) => {
-              console.log("获取失败", err);
-            });
-          api
-            .updateEvaluation(objedit)
-            .then((res) => {
-              setTimeout(() => {
-                console.log("修改成功", res);
-                message.success("修改成功");
-              }, 1000);
-            })
-            .catch((err) => {
-              console.log("修改失败", err);
-              // state.createLoading = false;
-              //重新获取列表
-              // getTask();
-            });
-        }
+        .updateEvaluation(obj)
+        .then((res) => {
+          updateTask(res);
+          message.success("创建成功");
+          closeDrawer();
+          ctx.emit("changeData", false);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+      }
     };
 
     return {
@@ -369,12 +285,8 @@ export default {
       closeDrawer,
       //增改
       createEvalText,
-      //上传组件
-      fileList,
-      loading,
-      imageUrl,
-      handleChange,
-      beforeUpload,
+      showEvalDrawer,
+      updateTask,
     };
   },
 };
@@ -424,14 +336,14 @@ export default {
             display: flex;
             flex: 1;
             align-items: center;
-            .xkbtn {
+            .checkEval {
               cursor: pointer;
               width: 130px;
               height: 40px;
-              background: #388be1;
+              background: #4ea6ff;
               border-radius: 8px;
               border: 0;
-              margin-right: 8px;
+              margin-left: 15px;
               color: #fff;
             }
           }
@@ -475,7 +387,7 @@ export default {
               cursor: pointer;
               width: 130px;
               height: 40px;
-              background: #388be1;
+              background: #4ea6ff;
               border-radius: 8px;
               border: 0;
               margin-right: 16px 8px 32px 0;
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index d84c6c9e..dc7e3929 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -28,7 +28,7 @@
                 maxlength="20"
               />
             </div>
-            <div class="btns" @click="searchInvist">
+            <div class="btns" @click="getAllInvistText">
               <div class="search"></div>
               <div class="btnText">搜索</div>
             </div>
@@ -59,6 +59,7 @@
                 :current="currentPage"
                 :total="tableDataTotal"
                 class="pagination"
+                @change="handelChangePage"
               />
             </div>
           </div>
@@ -66,17 +67,17 @@
       </div>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="createInvist">确定</button>
+        <button class="btn2" @click="updateTask">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
 <script>
 import { reactive, toRefs, onMounted } from "vue";
-import * as api from "../../api/indexInvist";
-import * as apitaskadd from "../../api/indexTaskadd";
+import * as api from "../../api/indexInvist.js";
+import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
-import { toDate } from "../../api/method";
+import dayjs from "dayjs";
 import { RouterEditTask } from "@/api/indexTask";
 export default {
   name: "AddInvist",
@@ -87,13 +88,13 @@ export default {
       type: Boolean,
       default: false,
     },
-    edit: {
-      type: Boolean,
-      default: false,
-    },
-    learn: {
+    EditInvistId: {
       type: Number,
-      default: 0,
+      default: null,
+    },
+    edit: { //  是否为编辑
+      type: Boolean,
+      default: null,
     },
     projectId: {
       type: Number,
@@ -103,6 +104,27 @@ export default {
       type: Number,
       default: null,
     },
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    projectTaskId: { // 要编辑的projectId 
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    }
+  
   },
   setup(props, ctx) {
     const state = reactive({
@@ -110,16 +132,15 @@ export default {
       time: undefined,
       currentPage: 1,
       pageSize: 10,
-      tableDataTotal: -1,
+      tableDataTotal: 0,
       tableData: [
-        // {
-        //   key: 1,
-        //   name: "评估",
-        //   num: "2",
-        //   creator: "管理员",
-        //   time: "2022-07-21 14:30:25",
-        // },
+
       ],
+      assessmentId:null,
+      assessmentName:"",
+
+
+     
     });
     const closeDrawer = () => {
       ctx.emit("update:addinvistVisible", false);
@@ -139,23 +160,6 @@ export default {
           width: "150px",
           align: "left",
           className: "classify",
-
-          scopedSlots: { customRender: "action" }, //引入的插槽
-          customRender: (text) => {
-            // console.log(text.record.checked1);
-            return (
-              <div class="racona">
-                <span> {text.record.name}</span>
-
-                {/**
-								<div class="img"></div>
-                <a-checkbox class="ch" checked={text.record.checkedd}>
-                  {text.record.lei}
-                </a-checkbox>
-*/}
-              </div>
-            );
-          },
         },
         {
           title: "题数",
@@ -183,48 +187,31 @@ export default {
     };
     const rowSelection = {
       type: "radio",
-      // onChange: (selectedRowKeys, selectedRows) => {
-      //   this.selectedRowKeys = selectedRowKeys
-      //   if (selectedRows.length > 1) {
-      //     //获取选中的数据的key
-      //     var selectNumber = this.selectedRowKeys[1]
-      //     //清空选中的key
-      //     this.selectedRowKeys = []
-      //     //选中的数据的key重新赋值给selectedRowKeys
-      //     this.selectedRowKeys.push(selectNumber)
-      //   }
-      // },
-      // getCheckboxProps: (record) => ({
-      //   // disabled: record.name === 'Disabled User',
-      //   // // Column configuration not to be checked
-      //   name: record.name,
-      // }),
       onSelect: (selectedRows, selected, selectedRowKeys) => {
         console.log(
-          "selectedRowKeys",
-          selectedRowKeys,
-          "selectedRows",
-          selectedRows,
-          "selected",
-          selected
-        );
+          "selectedRowKeys",selectedRowKeys,"selectedRows",selectedRows, "selected",selected );
+        console.log(selectedRows.assessmentId);
+        state.assessmentId =selectedRows.assessmentId;
+        state.assessmentName = selectedRows.name;
       },
+     
+    };
+    const handelChangePage = (page, pageSize) => {
+      state.currentPage = page;
+      state.pageSize = pageSize;
+      getAllInvistText();
     };
-
     const getTableDate = (tableData) => {
       let data = tableData;
       let array = [];
       data.map((value, index) => {
-        // console.log("123", value);
         let obj = {
-          // id: value.routerId,
           key: index,
+          assessmentId:value.assessmentId,
           num: value.essayQuestionVoList.length,
           name: value.assessmentName ? value.assessmentName : "-",
           creator: value.createUser ? value.createUser : "-",
-          time: value.createTime
-            ? toDate(new Date(value.createTime).getTime() / 1000, "Y-M-D h:m:s")
-            : "-",
+          time: dayjs(value.createTime).format("YYYY-MM-DD"),
         };
         array.push(obj);
       });
@@ -232,169 +219,73 @@ export default {
     };
     //获取全部评估信息接口
     const getAllInvistText = () => {
-      let obj = {
-        assessmentName: "",
+    
+      api
+        .queryAssessmentDetailList({
+        assessmentName:state.inputV1,
         pageNo: state.currentPage,
         pageSize: state.pageSize,
-        releaseStatus: "",
-        searchEndTime: "",
-        searchStartTime: "",
-      };
-      api
-        .queryAssessmentDetailList(obj)
+      })
         .then((res) => {
+          let arr = res.data.data.rows;
           if (res.status === 200) {
             // console.log("获取全部评估信息", res.data.data);
-            let arr = res.data.data.rows;
-            if (
-              arr.length === 0 &&
-              res.data.data.total > 0 &&
-              state.currentPage > 1
-            ) {
-              state.currentPage = state.currentPage - 1;
-              getAllInvistText();
-            }
             getTableDate(arr);
             state.tableDataTotal = Number(res.data.data.total);
           }
-          // console.log("获取全部评估信息接口成功", res);
-          // message.success("获取全部评估信息接口成功");
-          // console.log(obj);
         })
         .catch((err) => {
           console.log("获取全部评估信息接口失败", err);
           // state.createLoading = false;
         });
     };
-    //创建评估信息
-    const createInvist = () => {
-      let obj = {
-        appraiseName: state.inputV1,
-        appraiseEndTime: "",
-        appraiseExplain: "",
-        appraiseFlag: "",
-        appraiseId: 0,
-        appraiseStartTime: "",
-        appraiseTag: "",
-        createUser: 0,
-        researchId: 0,
-        researchName: "",
-        updateTime: "",
-        updateUser: 0,
-      };
-      api
-        .createAppraiseMessage(obj)
-        .then((res) => {
-          console.log("创建成功", res);
-          message.success("创建成功");
-          closeDrawer();
-          getAllInvistText();
-          if (props.learn == 0)
-            apitaskadd
-              .addTask({
-                courseId: 0,
-                duration: 0,
-                flag: true,
-                name: obj.appraiseName,
-                projectId: props.projectId,
-                projectTaskId: 0,
-                stageId: props.chooseStageId,
-                type: 11,
-              })
+    const updateTask =()=>{
+      console.log("jinlaile=================",state.assessmentName)
+      if(props.isLevel){
+        RouterEditTask({
+              chapterId: props.isactive,
+              courseId: state.assessmentId,
+              name: state.assessmentName,
+              routerId: props.routerId,
+              routerTaskId: props.routerTaskId || 0,
+              type: 11,
+            })
               .then((res) => {
-                console.log("调用项目添加接口后", res.data);
-                //自定义事件给父组件传值
+                console.log(res, 11111);
+                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
                 ctx.emit("changeData", false);
-                //重新获取任务列表
-                // apiTask.getTask({ projectId: 28 });
-                // router.push("/taskadd");
+                closeDrawer();
+                state.addLoading = false;               
               })
               .catch((err) => {
-                console.log(err);
+                console.log(err, 1111);
               });
-          else {
-            let editObj1 = {
-              chapterId: 36,
-              courseId: 0,
-              duration: 0,
-              flag: true,
-              name: obj.appraiseName,
-              routerId: 92,
-              routerTaskId: 0,
+      }else{
+        console.log("=========projectTaskId",props.projectTaskId);
+        apiTask
+            .addTask({
+              courseId: state.assessmentId,
+              name: state.assessmentName,
+              projectId: props.projectId,
+              projectTaskId: props.projectTaskId || 0,
+              stageId: props.chooseStageId,
               type: 11,
-            };
-            RouterEditTask(editObj1);
-          }
-        })
-        .catch((err) => {
-          console.log("创建失败", err);
-          // state.createLoading = false;
-        });
-    };
-    //搜索评估信息接口
-    const searchInvist = () => {
-      let objsearch = {
-        assessmentName: state.inputV1,
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-        releaseStatus: "",
-        searchEndTime: "",
-        searchStartTime: "",
-      };
-      api
-        .queryAssessmentDetailList(objsearch)
-        .then((res) => {
-          if (res.status === 200) {
-            console.log("获取搜索的评估信息", res.data.data);
-            let arr = res.data.data.rows;
-            if (
-              arr.length === 0 &&
-              res.data.data.total > 0 &&
-              state.currentPage > 1
-            ) {
-              state.currentPage = state.currentPage - 1;
-              getAllInvistText();
-            }
-            getTableDate(arr);
-            state.tableDataTotal = Number(res.data.data.total);
-          }
-        })
-        .catch((err) => {
-          console.log("获取全部评估信息接口失败", err);
-        });
-    };
+            })
+            .then((res) => {
+              console.log("调用项目添加接口后111", res.data, 11111);
+              ctx.emit("changeData", false); 
+              closeDrawer();    
+            })
+            .catch((err) => {
+              console.log(err, 111111);
+            });
+      }
+    }
+ 
     //重置评估信息
     const resetInvist = () => {
       state.inputV1 = "";
-      let objreset = {
-        assessmentName: state.inputV1,
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-        releaseStatus: "",
-        searchEndTime: "",
-        searchStartTime: "",
-      };
-      api
-        .queryAssessmentDetailList(objreset)
-        .then((res) => {
-          if (res.status === 200) {
-            console.log("获取重置后的评估信息", res.data.data);
-            let arr = res.data.data.rows;
-            if (
-              arr.length === 0 &&
-              res.data.data.total > 0 &&
-              state.currentPage > 1
-            ) {
-              state.currentPage = state.currentPage - 1;
-              getAllInvistText();
-            }
-            getTableDate(arr);
-            state.tableDataTotal = Number(res.data.data.total);
-          }
-        })
-        .catch((err) => {
-          console.log("获取重置的评估信息接口失败", err);
-        });
+      getAllInvistText();
     };
     onMounted(() => {
       // createInvist();
@@ -406,10 +297,10 @@ export default {
       closeDrawer,
       tableDataFunc,
       rowSelection,
-      createInvist,
       getAllInvistText,
-      searchInvist,
+      updateTask,
       resetInvist,
+      handelChangePage,
     };
   },
 };
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index f96da6b0..43904a80 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -328,8 +328,6 @@ const rowSelection = ref({
 });
 export default {
   name: "AddLive",
-  // components: {
-  // },
   props: {
     addliveVisible: {
       type: Boolean,
@@ -360,10 +358,6 @@ export default {
       type: Boolean,
       default: null,
     },
-    EditWorkId: { // 要编辑的workId 
-      type: Number,
-      default: null,
-    },
     projectTaskId: { // 要编辑的projectId 
       type: Number,
       default: null,
@@ -381,89 +375,6 @@ export default {
   setup(props, ctx) {
     // const router = useRouter();
     const state = reactive({
-      tableData1: [
-        {
-          key: "1",
-          num: "JDF2022071100001",
-          name: "时间管理课程",
-          content: "通用力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "2",
-          num: "JDF2022071100001",
-          name: "管理能力课程",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "3",
-          num: "JDF2022071100001",
-          name: "快速换模SMED",
-          content: "通用力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "4",
-          num: "JDF2022071100001",
-          name: "巧妙对话人见人夸",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "5",
-          num: "JDF2022071100001",
-          name: "管理能力课程",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "6",
-          num: "JDF2022071100001",
-          name: "时间管理课程",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "7",
-          num: "JDF2022071100001",
-          name: "时间管理课程",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "8",
-          num: "JDF2022071100001",
-          name: "时间管理课程",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "9",
-          num: "JDF2022071100001",
-          name: "时间管理课程",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-      ],
       currentPage: 1,
       tableDataTotal: 100,
       pageSize: 10,
@@ -646,18 +557,7 @@ export default {
         message.destroy();
         return message.warning("直播时长需大于0");
       }  
-      const reg = /(https?|ftp|file):\/\/[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]/;
-      if (!reg.test(state.inputV3)) {
-        message.destroy();
-        return message.warning("请输入有效直播链接地址");
-      }
-      if (!reg.test(state.inputV5)) {
-        message.destroy();
-        return message.warning("请输入有效回放地址");
-      }
-      //if (!state.inputV3) return message.warning("请输入授课老师");
-   
-      //let check = state.checkedC2 ;
+  
       let startTime = toDate(
         new Date(state.time[0].$d).getTime() / 1000,
         "Y-M-D"
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
deleted file mode 100644
index 29c1fe21..00000000
--- a/src/components/drawers/CreVote.vue
+++ /dev/null
@@ -1,488 +0,0 @@
-<template>
-  <a-drawer
-    :visible="crevoteVisible"
-    class="drawerStyle crevoteDrawer"
-    width="80%"
-    title="创建投票"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
-  >
-    <div class="drawerMain">
-      <div class="header">
-        <div class="headerTitle">创建投票</div>
-        <img
-          style="width: 29px; height: 29px; cursor: pointer"
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
-      </div>
-      <div class="contentMain">
-        <div class="main_item">
-          <div class="signbox">
-            <div class="sign">
-              <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-            </div>
-            <span style="margin-right: 3px">投票名称</span>
-          </div>
-          <div class="btnbox">
-            <a-input
-              v-model:value="inputV1"
-              style="width: 424px; height: 32px"
-              placeholder="请输入投票名称"
-            />
-          </div>
-        </div>
-        <div class="box" @click="showDrawerCreVote">
-          <button class="cjtpbtn" @click="addQue()">创建题干</button>
-        </div>
-        <div class="queBox" v-for="(q, index) in questions" :key="index">
-          <div class="delBtn" v-if="questions.length > 1">
-            <img src="@/assets/images/projectadd/delete.png" alt="" />
-            <div class="btnText">删除题干</div>
-          </div>
-          <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px"
-                >{{ q.stemTit }}{{ index + 1 }}</span
-              >
-            </div>
-            <div class="btnbox">
-              <a-input
-                v-model:value="q.inputV"
-                style="width: 424px; height: 32px"
-                placeholder="请输入题干"
-              />
-            </div>
-          </div>
-          <div class="option" v-for="(o, index) in q.options" :key="index">
-            <div class="mainoptions">
-              <div class="signbox">
-                <div class="sign">
-                  <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
-                </div>
-                <span style="margin-right: 3px">{{ o.title }}{{index+1}}</span>
-              </div>
-              <div class="optionbox">
-                <div class="btnbox">
-                  <a-input
-                    v-model:value="o.opvalue"
-                    style="width: 424px; height: 32px"
-                  />
-                  <button v-if="q.options.length > 2" class="delbtn" :key="index" @click="delOpt(q.options)">
-                    删除
-                  </button>
-                </div>
-                <a-button type="link">+ 上传图片</a-button>
-                <!-- <input class="file-upload" type="file" accept="image/*" name="picture"/> -->
-              </div>
-            </div>
-          </div>
-          <div class="main_item">
-            <div class="signbox"></div>
-            <div class="btnbox">
-              <div class="tjxxbtn" @click="addOpt(q.options)">
-                <div class="btntext">添加选项</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="main_btns">
-        <button class="btn1">取消</button>
-        <button class="btn2" @click="createQueTit">确定</button>
-      </div>
-    </div>
-  </a-drawer>
-</template>
-  <script>
-import { reactive, toRefs } from "vue";
-import * as api from "../../api/indexVote";
-import { message } from "ant-design-vue";
-export default {
-  name: "CreVote",
-  props: {
-    crevoteVisible: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  setup(props, ctx) {
-    const state = reactive({
-      inputV1: "",
-      creVote: true,
-      questions: [
-        {
-          stemTit: "题干",
-          inputV: "",
-          options: [
-            {
-              title: "选项",
-              opvalue: "",
-            },
-            {
-              title: "选项",
-              opvalue: "",
-            },
-          ],
-        },
-      ],
-    });
-    const addQue = () => {
-      state.questions.push({
-        stemTit: "题干",
-        inputV: "",
-        options: [
-          {
-            title: "选项",
-            opvalue: "",
-          },
-          {
-            title: "选项",
-            opvalue: "",
-          },
-        ],
-      });
-    };
-    const addOpt = (value) => {
-      console.log(value);
-      value.push({
-        // title: "选项" + (value.length + 1 * 1),
-        title: "选项",
-        opvalue: "",
-      });
-    };
-    const delOpt = (value) => {
-      console.log('gys', value);
-      // delete value[0]
-      value.pop()
-    }
-    const closeDrawer = () => {
-      ctx.emit("update:crevoteVisible", false);
-    };
-    const afterVisibleChange = (bool) => {
-      console.log("state", bool);
-    };
-
-    //创建题干接口
-    const createQueTit = () => {
-      if (state.inputV1 == "") {
-        message.destroy();
-        return message.info("请输入投票名称");
-      }
-      // if (!state.questions.inputV) {
-      //   message.destroy();
-      //   return message.info("请输入题干");
-      // }
-      // if (!state.questions.optins.opvalue) {
-      //   message.destroy();
-      //   return message.info("请输入选项");
-      // }
-      console.log("111111", state.questions);
-      // console.log('22222',state.questions.inputV);
-      // console.log('333333',state.questions.options);
-      let obj = [
-        {
-          ascriptionId: 0,
-          createUser: 0,
-          optionDetailList: [
-            {
-              createUser: 0,
-              optionId: 0,
-              optionName: state.questions[0].options[0].opvalue,
-              optionOrderNum: "",
-              optionPictureAddress: "",
-              stem: "",
-              updateTime: "",
-              updateUser: 0,
-              voteStemId: 0,
-            },
-          ],
-          orderNumber: "",
-          updateTime: "",
-          updateUser: 0,
-          voteStemFlag: "",
-          voteStemId: 0,
-          voteStemName: state.questions[0].inputV,
-        },
-      ];
-      api
-        .createOptionMessage(obj)
-        .then((res) => {
-          console.log("创建成功", res);
-          // console.log('res.data.data[0].ascriptionId',res.data.data[0].ascriptionId);
-          // console.log('res.data.data[0].voteStemId',res.data.data[0].voteStemId);
-          // console.log('state.questions[0].inputV',state.questions[0].inputV);
-          message.success("创建成功");
-          //获取题干信息
-          let objstem = {
-            stemId: res.data.data[0].ascriptionId,
-            ascriptionId: res.data.data[0].voteStemId,
-          };
-          api
-            .queryStemByStemId(objstem)
-            .then((res) => {
-              console.log("获取成功", res);
-              message.success("获取成功");
-            })
-            .catch((err) => {
-              console.log(err);
-            });
-          let stemData = {
-            creVote: state.creVote,
-            ascriptionId: res.data.data[0].ascriptionId,
-            voteStemId: res.data.data[0].voteStemId,
-            voteStemName: state.questions[0].inputV,
-          };
-          ctx.emit("getData", stemData);
-          closeDrawer();
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    };
-    return {
-      ...toRefs(state),
-      afterVisibleChange,
-      closeDrawer,
-      addQue,
-      addOpt,
-      delOpt,
-      createQueTit,
-    };
-  },
-};
-</script>
-  <style lang="scss">
-.ant-table-striped :deep(.table-striped) td {
-  background-color: #fafafa !important;
-}
-.crevoteDrawer {
-  .drawerMain {
-    .header {
-      height: 73px;
-      border-bottom: 1px solid #e8e8e8;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .headerTitle {
-        font-size: 18px;
-        font-weight: 600;
-        color: #333333;
-        line-height: 25px;
-        margin-left: 24px;
-      }
-    }
-    .contentMain {
-      .box {
-        display: flex;
-        flex: 1;
-        align-items: center;
-        margin-bottom: 30px;
-        .cjtpbtn {
-          cursor: pointer;
-          width: 130px;
-          height: 40px;
-          background: #388be1;
-          border-radius: 8px;
-          border: 0;
-          margin-right: 8px;
-          color: #fff;
-        }
-      }
-      .main_item {
-        display: flex;
-        align-items: center;
-        margin-bottom: 32px;
-        .signbox {
-          width: 120px;
-          display: flex;
-          justify-content: end;
-          align-items: center;
-          margin-right: 5px;
-          .sign {
-            margin-right: 5px;
-          }
-        }
-        .btnbox {
-          display: flex;
-          flex: 1;
-          align-items: center;
-        }
-      }
-      .mainoptions {
-        display: flex;
-        align-items: flex-start;
-        margin-bottom: 32px;
-        .signbox {
-          width: 120px;
-          display: flex;
-          justify-content: end;
-          align-items: center;
-          padding-top: 5px;
-          margin-right: 5px;
-          .sign {
-            margin-right: 5px;
-          }
-        }
-        .optionbox {
-          .btnbox {
-            display: flex;
-            align-items: center;
-          }
-          .delbtn {
-            border: none;
-            color: #4ea6ff;
-            background-color: #fff;
-            cursor: pointer;
-          }
-        }
-      }
-      .queBox {
-        border: 1px solid #e8e8e8;
-        box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
-        padding-top: 30px;
-        margin-bottom: 30px;
-        .delBtn {
-          width: 130px;
-          height: 40px;
-          border: 1px solid #4ea6ff;
-          border-radius: 8px;
-          color: #4ea6ff;
-          background-color: #fff;
-          cursor: pointer;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          margin-left: 20px;
-          margin-bottom: 20px;
-          img {
-            margin-right: 10px;
-          }
-        }
-        .main_item {
-          display: flex;
-          align-items: center;
-          margin-bottom: 32px;
-          .signbox {
-            width: 120px;
-            display: flex;
-            justify-content: end;
-            align-items: center;
-            .sign {
-              margin-right: 5px;
-            }
-          }
-          .btnbox {
-            display: flex;
-            flex: 1;
-            align-items: center;
-            .tjxxbtn {
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              cursor: pointer;
-              width: 130px;
-              height: 40px;
-              background: #388be1;
-              border-radius: 8px;
-              border: 0;
-              margin-right: 8px;
-              .btntext {
-                color: #fff;
-              }
-            }
-          }
-        }
-        .main_item2 {
-          display: flex;
-          align-items: flex-start;
-          margin-bottom: 32px;
-          .signbox {
-            width: 120px;
-            display: flex;
-            justify-content: end;
-            align-items: center;
-            .sign {
-              margin-right: 5px;
-            }
-          }
-          .kqszbox {
-            .qdqtbox {
-              margin-left: 56px;
-            }
-            .setbox {
-              display: flex;
-              flex-wrap: wrap;
-              margin-top: 10px;
-              margin-bottom: 24px;
-              .timerbox {
-                margin-top: 6px;
-                margin-right: 32px;
-                display: flex;
-                align-items: center;
-                flex-wrap: nowrap;
-              }
-            }
-          }
-          .btnbox2 {
-            display: flex;
-            flex-direction: column;
-            justify-content: flex-start;
-            .xkbtn {
-              cursor: pointer;
-              width: 130px;
-              height: 40px;
-              background: #388be1;
-              border-radius: 8px;
-              border: 0;
-              margin-right: 16px 8px 32px 0;
-              color: #fff;
-              margin-top: 16px;
-              margin-bottom: 60px;
-            }
-          }
-        }
-      }
-    }
-    .main_btns {
-      height: 72px;
-      width: 100%;
-      bottom: 0;
-      left: 0;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
-      .btn1 {
-        width: 100px;
-        height: 40px;
-        border: 1px solid #4ea6ff;
-        border-radius: 8px;
-        color: #4ea6ff;
-        background-color: #fff;
-        cursor: pointer;
-      }
-      .btn2 {
-        cursor: pointer;
-        width: 100px;
-        height: 40px;
-        background: #4ea6ff;
-        border-radius: 8px;
-        border: 0;
-        margin-left: 15px;
-        color: #fff;
-      }
-    }
-  }
-}
-</style>
-  
\ No newline at end of file
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
new file mode 100644
index 00000000..da3b6361
--- /dev/null
+++ b/src/components/drawers/EvList.vue
@@ -0,0 +1,529 @@
+<template>
+    <a-drawer
+      :visible="EvalListVisible"
+      class="drawerStyle addonlineDrawer"
+      width="80%"
+      title="选择测评"
+      placement="right"
+      @after-visible-change="afterVisibleChange"
+    >
+      <div class="drawerMain">
+        <div class="header">
+          <div class="headerTitle">选择测评</div>
+          <img
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="../../assets/images/basicinfo/close.png"
+            @click="closeDrawer"
+          />
+        </div>
+        <div class="contentMain">
+          <div class="main_items">
+            <div class="mi_ipts">
+              <div class="mii_ipt">
+                <div class="ipt_name">测评信息：</div>
+                <div class="fi_input">
+                  <a-input
+                    v-model:value="value1"
+                    style="width: 240px; height: 40px; border-radius: 8px"
+                    placeholder="请输入项目名称"
+                  />
+                </div>
+              </div>
+         
+            </div>
+            <div class="mi_btns">
+              <div class="btn btn1">
+                <div class="search"></div>
+                <div class="btnText">搜索</div>
+              </div>
+              <div class="btn btn2">
+                <div class="search"></div>
+                <div class="btnText">重置</div>
+              </div>
+            </div>
+          </div>
+       
+          <div class="main_table">
+            <a-table
+            style="border: 1px solid #f2f6fe"
+            :columns="tablecolumns"
+            :data-source="tabledata"
+            :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true"
+            @expand="expandTable"
+            :pagination="false"
+            :row-selection="{
+              columnWidth: 30,
+              selectedRowKeys: selectedRowKeys,
+              onChange: onSelectChange,
+            }"
+          />
+          <div class="pa">
+            <a-pagination
+              v-if="total > 10"
+              showSizeChanger="true"
+              showQuickJumper="true"
+              hideOnSinglePage="true"
+              :pageSize="pageSize"
+              :current="currentPage"
+              :total="total"
+              class="pagination"
+              @change="changePagination"
+            />
+          </div>
+          </div>
+        </div>
+        <div class="main_btns">
+          <button class="btn1" @click="closeDrawer">取消</button>
+          <button class="btn2" @click="checkFinish">确定</button>
+        </div>
+      </div>
+    </a-drawer>
+</template>
+<script>
+  import { reactive, toRefs, ref } from "vue";
+  import * as api from "../../api/indexEval";
+   export default {
+    name: "EvList",
+    props: {
+        EvalListVisible: {
+        type: Boolean,
+        default: false,
+        },
+        evaluationTypeId: {
+        type: Number,
+        default: null,
+        },
+        evaluationTypeName:{
+          type: String,
+        default: "",
+        },
+    },
+    setup(props, ctx) {
+      const state = reactive({
+        tableData1: [
+          {
+            key: "1",
+            num: "JDF2022071100001",
+            name: "时间管理课程",
+            content: "通用力",
+            teacher: "BOE教师",
+            creator: "管理员",
+            time: "2022-10-31 23:12:00",
+          },
+          {
+            key: "2",
+            num: "JDF2022071100001",
+            name: "管理能力课程",
+            content: "领导力",
+            teacher: "BOE教师",
+            creator: "管理员",
+            time: "2022-10-31 23:12:00",
+          },
+          {
+            key: "3",
+            num: "JDF2022071100001",
+            name: "快速换模SMED",
+            content: "通用力",
+            teacher: "BOE教师",
+            creator: "管理员",
+            time: "2022-10-31 23:12:00",
+          },
+          {
+            key: "4",
+            num: "JDF2022071100001",
+            name: "巧妙对话人见人夸",
+            content: "领导力",
+            teacher: "BOE教师",
+            creator: "管理员",
+            time: "2022-10-31 23:12:00",
+          },
+          {
+            key: "5",
+            num: "JDF2022071100001",
+            name: "管理能力课程",
+            content: "领导力",
+            teacher: "BOE教师",
+            creator: "管理员",
+            time: "2022-10-31 23:12:00",
+          },
+          {
+            key: "6",
+            num: "JDF2022071100001",
+            name: "时间管理课程",
+            content: "领导力",
+            teacher: "BOE教师",
+            creator: "管理员",
+            time: "2022-10-31 23:12:00",
+          },
+          {
+            key: "7",
+            num: "JDF2022071100001",
+            name: "时间管理课程",
+            content: "领导力",
+            teacher: "BOE教师",
+            creator: "管理员",
+            time: "2022-10-31 23:12:00",
+          },
+          {
+            key: "8",
+            num: "JDF2022071100001",
+            name: "时间管理课程",
+            content: "领导力",
+            teacher: "BOE教师",
+            creator: "管理员",
+            time: "2022-10-31 23:12:00",
+          },
+          {
+            key: "9",
+            num: "JDF2022071100001",
+            name: "时间管理课程",
+            content: "领导力",
+            teacher: "BOE教师",
+            creator: "管理员",
+            time: "2022-10-31 23:12:00",
+          },
+        ],
+        currentPage: 1,
+        tableDataTotal: 100,
+        pageSize: 10,
+        vlue1:"",
+        tabledata: [
+      ],
+      });
+      const options1 = ref([
+    {
+      value: "value1",
+      label: "请选择状态",
+    },
+  ]);
+    const columns1 = [
+      {
+        title: "课程编号",
+        width: "20%",
+        dataIndex: "num",
+        key: "num",
+        align: "center",
+      },
+      {
+        title: "title",
+        width: "20%",
+        dataIndex: "name",
+        key: "name",
+        align: "center",
+      },
+      {
+        title: "备注",
+        width: "13%",
+        dataIndex: "content",
+        key: "content",
+        align: "center",
+      },
+      {
+        title: "状态",
+        width: "13%",
+        dataIndex: "teacher",
+        key: "teacher",
+        align: "center",
+      },
+      {
+        title: "价格",
+        width: "13%",
+        dataIndex: "creator",
+        key: "creator",
+        align: "center",
+      },
+      {
+        title: "可答题人数",
+        width: "20%",
+        dataIndex: "time",
+        key: "time",
+        align: "center",
+      },
+    ];
+    const rowSelection = ref({
+      checkStrictly: false,
+      onChange: (selectedRowKeys, selectedRows) => {
+        console.log(
+          `selectedRowKeys: ${selectedRowKeys}`,
+          "selectedRows: ",
+          selectedRows
+        );
+      },
+      onSelect: (record, selected, selectedRows) => {
+        console.log(record, selected, selectedRows);
+      },
+      onSelectAll: (selected, selectedRows, changeRows) => {
+        console.log(selected, selectedRows, changeRows);
+      },
+    });
+    const closeDrawer = () => {
+      ctx.emit("update:EvalListVisible", false);
+    };
+    const afterVisibleChange = (bool) => {
+      console.log("state", bool);
+      getEvalList();
+    };
+    const checkFinish =() =>{
+      ctx.emit("update:evaluationTypeId", state.evaluationTypeId);
+      ctx.emit("update:evaluationTypeName", state.evaluationTypeName);
+      closeDrawer();
+    }
+    const changePagination = (page) => {
+      state.currentPage = page;
+      getEvalList();
+    };
+    const getTableDataList = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value) => {
+        let obj = {
+          key: value.studentId,
+          projectId: value.projectId, //项目id
+          groupId: value.groupId, //小组id
+          group: value.groupName, //小组名
+          studentId: value.studentId, //学生id
+          currentStageId: value.currentStageId, //当前关卡id
+          name: value.name, //用户名
+          bum: value.userInfoBo.deptName, //部门
+          gangw: value.userInfoBo.jobName, //岗位
+          completeStageCnt: value.completeStageCnt, //当前完成阶段数
+          totalStageCnt: value.totalStageCnt, //总阶段数
+          progress: value.completeStageCnt + "/" + value.totalStageCnt,
+
+        };
+        array.push(obj);
+      });
+      state.tabledata = array;
+    };
+    const getEvalList =(o)=>{
+      let obj = o || {
+        evaluationTypeName:state.value1
+      }
+    api
+      .getEvalListByName(obj).then((res) => {
+   
+        console.log(res.data.data, "获取测评");
+        let leng = res.data.data.rows.length;
+        state.total = res.data.data.total;
+        if (leng > 0) {
+          let arr = res.data.data.rows;
+          getTableDataList(arr);
+        }
+      });
+    };
+    return {
+      ...toRefs(state),
+      afterVisibleChange,
+      closeDrawer,
+      options1,
+      columns1,
+      rowSelection,
+      checkFinish,
+      changePagination,
+    };
+    },
+  };
+</script>
+<style lang="scss">
+  .ant-table-striped :deep(.table-striped) td {
+    background-color: #fafafa !important;
+  }
+  .addonlineDrawer {
+      .drawerMain {
+        .header {
+          height: 73px;
+          border-bottom: 1px solid #e8e8e8;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          flex-shrink: 0;
+          .headerTitle {
+            font-size: 18px;
+            font-weight: 600;
+            color: #333333;
+            line-height: 25px;
+            margin-left: 24px;
+          }
+        }
+        .contentMain {
+            padding-right: 12px;
+          .main_items {
+            display: flex;
+          
+            margin-bottom: 12px;
+            flex-wrap: wrap;
+            .mi_ipts {
+              display: flex;
+              margin-bottom: 20px;
+              .mii_ipt {
+                display: flex;
+                align-items: center;
+                margin-right: 24px;
+                .ipt_name {
+                  white-space: nowrap;
+                }
+              }
+            }
+            .mi_btns {
+              display: flex;
+              margin-left: 38px;
+              margin-bottom: 20px;
+              cursor: pointer;
+              .btn {
+                padding: 0px 26px 0px 26px;
+                height: 38px;
+                border-radius: 8px;
+                border: 1px solid rgba(64, 158, 255, 1);
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                margin-left: 14px;
+                flex-shrink: 0;
+                .search {
+                  background-size: 100%;
+                }
+                .btnText {
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 36px;
+                  margin-left: 5px;
+                }
+              }
+              .btn1 {
+                background: rgb(64, 158, 255);
+                .search {
+                  width: 15px;
+                  height: 17px;
+                  background-image: url("@/assets/images/coursewareManage/search0.png");
+                }
+                .btnText {
+                  color: rgb(255, 255, 255);
+                }
+              }
+              .btn2 {
+                background: rgb(255, 255, 255);
+                .search {
+                  width: 15px;
+                  height: 17px;
+                  background-image: url("@/assets/images/coursewareManage/reset1.png");
+                }
+                .btnText {
+                  color: rgb(64, 158, 255);
+                }
+              }
+              .btn1:hover {
+                background: rgb(255, 255, 255);
+                .search {
+                  background-image: url("@/assets/images/courseManage/search1.png");
+                }
+                .btnText {
+                  color: #388be1;
+                }
+              }
+              .btn2:hover {
+                background: rgba(64, 158, 255, 1);
+                .search {
+                  background-image: url("@/assets/images/courseManage/reset0.png");
+                }
+                .btnText {
+                  color: #ffffff;
+                }
+              }
+            }
+          }
+          .main_notice {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 32px;
+            height: 40px;
+            background-color: #e9f6fe;
+            .mntc_left {
+              display: flex;
+              align-items: center;
+              .notice_icon {
+                width: 14px;
+                height: 14px;
+                margin-right: 9px;
+                margin-left: 9px;
+                background-image: url(@/assets/images/coursewareManage/gan.png);
+                background-size: 100% 100%;
+              }
+            }
+            .mntc_right {
+              cursor: pointer;
+            }
+          }
+          .main_table {
+            position: relative;
+              padding-bottom: 80px;
+              .classify {
+                margin-left: 10px !important;
+                padding-left: 9px !important;
+              }
+              .ant-checkbox-wrapper {
+                align-items: center;
+                margin-top: -2px;
+              }
+              .ant-table-selection-column {
+                padding: 0px !important;
+                padding-left: 60px !important;
+              }
+              .ant-table-thead > tr > th {
+                background-color: rgba(239, 244, 252, 1);
+              }
+              th.h {
+                background-color: #eff4fc !important;
+              }
+  
+              .ant-table-tbody
+                > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+                > td {
+                background: #f6f9fd;
+              }
+              .pa {
+                left: 0;
+                width: 100%;
+                // height: 20px;
+                // background-color: red;
+                display: flex;
+                justify-content: center;
+                position: absolute;
+                bottom: 20px;
+              }
+            }
+        }
+  
+        .main_btns {
+          height: 72px;
+          width: 100%;
+          bottom: 0;
+          left: 0;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+          .btn1 {
+            width: 100px;
+            height: 40px;
+            border: 1px solid #4ea6ff;
+            border-radius: 8px;
+            color: #4ea6ff;
+            background-color: #fff;
+            cursor: pointer;
+          }
+          .btn2 {
+            cursor: pointer;
+            width: 100px;
+            height: 40px;
+            background: #4ea6ff;
+            border-radius: 8px;
+            border: 0;
+            margin-left: 15px;
+            color: #fff;
+          }
+        }
+      }
+  }
+ </style>
\ No newline at end of file
diff --git a/src/components/drawers/AddVote.vue b/src/components/vote/AddVote.vue
similarity index 76%
rename from src/components/drawers/AddVote.vue
rename to src/components/vote/AddVote.vue
index 57195b43..cac42791 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -9,8 +9,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div v-if="edit" class="headerTitle">编辑投票</div>
-        <div v-else class="headerTitle">添加投票</div>
+        <div  class="headerTitle">添加投票任务</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -33,7 +32,7 @@
               <a-input
                 v-model:value="inputV1"
                 style="width: 424px; height: 32px"
-                placeholder="请输入投票名称"
+                placeholder="请输入任务名称"
                 maxlength="20"
               />
             </div>
@@ -52,14 +51,14 @@
               <button
                 class="xkbtn"
                 :style="{ display: creVote ? 'none' : 'block' }"
-                @click="showDrawerCreVote"
+                @click="showDrawerCreateVote"
               >
                 创建投票
               </button>
               <button
                 class="xkbtn"
                 :style="{ display: creVote ? 'block' : 'none' }"
-                @click="showDrawerCreVote"
+                @click="showDrawerCreateVote"
               >
                 编辑投票
               </button>
@@ -72,9 +71,9 @@
             </div>
             <!-- 创建投票侧弹窗 -->
             <div>
-              <cre-vote
-                v-model:crevoteVisible="crevotevisible"
-                @getData="changeVData"
+              <CreateVote
+                v-model:createVoteVisible="createVoteVisible"
+          
               />
             </div>
             <!-- 创建投票侧弹窗 -->
@@ -86,6 +85,7 @@
             <div class="btnbox">
               <a-range-picker
                 style="width: 424px"
+                v-model:value="time"
                 :placeholder="['      开始时间', '        结束时间']"
               />
             </div>
@@ -127,54 +127,33 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
-import CreVote from "../../components/drawers/CreVote.vue";
+import { reactive, toRefs} from "vue";
+import CreateVote from "./CreateVote.vue";
 import * as api from "../../api/indexVote";
 import * as apitaskadd from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
 import { toDate } from "../../api/method";
 import { RouterEditTask } from "@/api/indexTask";
-const options1 = ref([
-  {
-    value: "value1",
-    label: "请选择状态",
-  },
-]);
-const rowSelection = ref({
-  checkStrictly: false,
-  onChange: (selectedRowKeys, selectedRows) => {
-    console.log(
-      `selectedRowKeys: ${selectedRowKeys}`,
-      "selectedRows: ",
-      selectedRows
-    );
-  },
-  onSelect: (record, selected, selectedRows) => {
-    console.log(record, selected, selectedRows);
-  },
-  onSelectAll: (selected, selectedRows, changeRows) => {
-    console.log(selected, selectedRows, changeRows);
-  },
-});
+import dayjs from 'dayjs';
 
 export default {
   name: "AddVote",
   components: {
-    CreVote,
+    CreateVote,
   },
   props: {
     addvoteVisible: {
       type: Boolean,
       default: false,
     },
-    edit: {
-      type: Boolean,
-      default: false,
-    },
-    learn: {
+    EditVoteId:{
       type: Number,
       default: 0,
     },
+    edit: { //  是否为编辑
+      type: Boolean,
+      default: null,
+    },
     projectId: {
       type: Number,
       default: null,
@@ -183,63 +162,56 @@ export default {
       type: Number,
       default: null,
     },
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    projectTaskId: { // 要编辑的projectId 
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    }
+  
   },
-  setup(props, ctx) {
+  setup(props,ctx) {
     const state = reactive({
-      inputV1: "",
-      textV1: "",
-      creVote: false,
-      crevotevisible: false,
+      voteName: "",
+      voteExplain: "",
+      createVoteVisible: false,
       time: undefined,
       basevote: "",
-      endTimes: "",
-      startTimes: "",
       ascriptionId: "",
-      voteStemId: "",
-      voteId:"",
-      voteStemName:"",
     });
     const closeDrawer = () => {
+
       ctx.emit("update:addvoteVisible", false);
       ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
-    const showDrawerCreVote = () => {
-      state.crevotevisible = true;
+    const showDrawerCreateVote = () => {
+      state.createVoteVisible = true;
+      console.log("进来了====");
     };
     const changeVData = (data) => {
-      console.log("111", data);
-      state.creVote = data.creVote;
       state.ascriptionId = data.ascriptionId;
-      state.voteStemId = data.voteStemId;
-      state.voteStemName = data.voteStemName;
-      console.log("222", state.creVote);
-      console.log("333", state.ascriptionId);
+
     };
     const delBox = () => {
-      state.creVote = false;
       dleVoteStem()
     };
-
-    //获取题干信息
-    // const getStemText = () => {
-    //   let objstem = {
-    //     stemId: state.ascriptionId,
-    //     ascriptionId: state.voteStemId,
-    //   }
-    //   api
-    //     .queryStemByStemId(objstem)
-    //     .then((res) => {
-    //       console.log("获取成功", res);
-    //       message.success("获取成功");
-    //     })
-    //     .catch((err) => {
-    //       console.log(err);
-    //     });
-    // }
-
     //删除题干信息接口
     const dleVoteStem = () => {
       let objdelstem = {
@@ -251,100 +223,101 @@ export default {
           message.success('删除题干信息成功')
       })
     }
-    //创建投票信息
-    const createVoteText = () => {
-      if (!state.inputV1) {
-        message.destroy();
-        return message.info("请输入投票名称");
-      }
-
-      if (state.basevote == "") {
-        state.basevote = 1;
-      }
-
-      if (state.time != undefined) {
-        state.endTimes = toDate(
-          new Date(state.time[0].$d).getTime() / 1000,
-          "Y-M-D"
-        );
-        state.startTimes = toDate(
-          new Date(state.time[1].$d).getTime() / 1000,
-          "Y-M-D"
-        );
-      }
-
-      // if (state.crevotevisible = false) {
-      //   changeVData()
-      // };
-
-      let obj = {
-        ascriptionId: state.ascriptionId,
-        baseVote: state.basevote,
-        createUser: 0,
-        updateUser: 0,
-        voteEndTime: state.endTimes,
-        voteExplain: state.textV1,
-        voteFlag: "",
-        voteName: state.inputV1,
-        voteStartTime: state.startTimes,
-        voteTag: "",
-      };
-      api
-        .createVote(obj)
-        .then((res) => {
-          console.log("创建成功123", res);
-          message.success("创建成功");
-          ctx.emit("getData", res.data.data.voteId);
-          closeDrawer();
-          if (props.learn == 0)
+    const updteVote = (res) =>{
+      if (props.isLevel)
             apitaskadd
               .addTask({
-                courseId: 0,
-                duration: 0,
-                flag: true,
-                name: obj.voteName,
+                courseId: res.data.data.voteId,
+                name: res.data.data.voteName,
                 projectId: props.projectId,
-                projectTaskId: 0,
+                projectTaskId:props.projectTaskId || 0,
                 stageId: props.chooseStageId,
                 type: 12,
               })
               .then((res) => {
                 console.log("调用项目添加接口后", res.data);
-                //自定义事件给父组件传值
                 ctx.emit("changeData", false);
-                //重新获取任务列表
-                // apiTask.getTask({ projectId: 28 });
-                // router.push("/taskadd");
               })
               .catch((err) => {
                 console.log(err);
               });
           else {
-            let editObj1 = {
-              chapterId: 36,
-              courseId: 0,
-              duration: 0,
-              flag: true,
-              name: obj.voteName,
-              routerId: 92,
-              routerTaskId: 0,
+            RouterEditTask({
+              chapterId: props.isactive,
+              courseId: res.data.data.voteId,
+              name: res.data.data.voteName,
+              routerId: props.routerId,
+              routerTaskId: props.routerTaskId,
               type: 12,
-            };
-            RouterEditTask(editObj1);
+            }) .then((res) => {
+                console.log("调用项目添加接口后", res.data);
+                ctx.emit("changeData", false);
+              })
+              .catch((err) => {
+                console.log(err);
+              });
           }
+    }
+    //创建投票信息
+    const createVoteText = () => {
+      if (!state.voteName) {
+        message.destroy();
+        return message.info("请输入投票名称");
+      }
+      if (state.basevote == "") {
+        state.basevote = 1;
+      }
+      if (state.time != undefined) {
+        state.time[0] = toDate(
+          new Date(state.time[0].$d).getTime() / 1000,
+          "Y-M-D"
+        );
+        state.time[1] = toDate(
+          new Date(state.time[1].$d).getTime() / 1000,
+          "Y-M-D"
+        );
+      }
+
+      let obj = {
+        ascriptionId: state.ascriptionId,
+        baseVote: state.basevote,
+        voteEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
+        voteExplain: state.voteExplain,
+        voteName: state.voteName,
+        voteStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
+      };
+      if(props.edit){
+        api
+        .editVote(obj)
+        .then((res) => {
+          console.log("创建成功123", res);
+          message.success("创建成功");
+          updteVote(res);
+          closeDrawer();
+          
         })
         .catch((err) => {
           console.log("创建失败", err);
         });
+      }else{
+        api
+        .createVote(obj)
+        .then((res) => {
+          updteVote(res);
+          closeDrawer();
+          
+        })
+        .catch((err) => {
+          console.log("创建失败", err);
+        });
+      } 
     };
     return {
       ...toRefs(state),
-      showDrawerCreVote,
+      showDrawerCreateVote,
       afterVisibleChange,
       closeDrawer,
       changeVData,
-      rowSelection,
-      options1,
       dleVoteStem,
       createVoteText,
       delBox,
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
new file mode 100644
index 00000000..2b9d3e18
--- /dev/null
+++ b/src/components/vote/CreateVote.vue
@@ -0,0 +1,652 @@
+<!-- 评估管理-创建评估页面 -->
+<template>
+    <a-drawer
+    :visible="createVoteVisible"
+    class="drawerStyle createvoteDrawer"
+    width="80%"
+    placement="right"
+    @after-visible-change="afterVisibleChange"
+  >
+  <div class="researchadd">
+    <div class="header">
+        <div  class="headerTitle">创建投票</div>
+        <img
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
+        />
+      </div>
+    <div class="main_left">
+      <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">投票名称：</span>
+            </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="voteName"
+                style="width: 424px; height: 32px"
+                placeholder="请输入任务名称"
+                maxlength="20"
+              />
+            </div>
+        </div>
+      <div class="main_item">
+        <div class="signbox">
+          <div class="sign">
+            <img
+              src="@/assets/images/coursewareManage/asterisk.png"
+              alt=""
+            />
+          </div>
+          <span>创建题干：</span>
+        </div>
+        <div class="btnbox">
+          <button
+            class="xkbtn"
+            @click="handleTypes"
+          >
+            创建题干
+          </button>
+        </div>
+      </div> <!-- 创建投票侧弹窗 -->
+    </div>
+    <div v-for="(item, index) in allFormsData" :key="index">
+      <VoteQuestion
+        :item="item"
+        :assessmentId="assessmentId"
+        @del="handleDel"
+        
+      />
+      
+    </div>
+ 
+    <div class="footer">
+      <div class="btn">
+        <a-button
+          type="primary"
+          style="width: 100px;height: 40px;border-radius: 8px; background-color: #409eff;"
+          @click="handleSave"
+        >
+          保存
+        </a-button>
+        <a-button
+          type="primary"
+          ghost
+          style="width: 100px;height: 40px;margin-left: 14px;border-radius: 8px;"
+          @click="handleAllCancel"
+        >
+          取消
+        </a-button>
+      </div>
+    </div>
+  </div>
+</a-drawer>
+</template>
+<script>
+import { reactive,toRefs} from "vue";
+// import { message } from "ant-design-vue";
+// import { createResearch } from "../../api/indexResearch";
+import VoteQuestion from "./VoteQuestion.vue";
+
+import {
+  sortBy,
+  traverseArr,
+  filterCommon,
+  deepCloneFilterString,
+} from "../../utils/utils";
+
+import { useRouter } from "vue-router";
+//import store from "@/store";
+import {
+  queryResearchDetailById,
+  editResearchMessage,
+  createResearch,
+
+} from "@/api/indexResearch";
+import { message } from "ant-design-vue";
+
+export default {
+  name: "CreateVote",
+  components: {
+    VoteQuestion,
+
+  },
+  props: {
+    createVoteVisible: {
+      type: Boolean,
+      default: false,
+    },
+    
+  },
+  setup(props,ctx) {
+    const router = useRouter();
+    const state = reactive({
+      createVoteVisible:false,
+      allFormsData: [],
+     
+    });
+    const afterVisibleChange = (bool) => {
+      console.log("state======进来creates", bool);
+      handleTypes();
+    };
+    const closeDrawer = () => {
+      ctx.emit("update:createVoteVisible", false);
+     
+      console.log("======关闭");
+    }
+    // 详情
+    const getInfoDate = async () => {
+      let id = router.currentRoute.value.params.id;
+      if (id) {
+        state.assessmentId = id;
+        let res = await queryResearchDetailById({
+          assessmentId: state.assessmentId,
+        }).then((res) => {
+          if (res.data.code === 200) {
+            return res.data.data;
+          }
+        });
+        state.assessmentName = res.assessmentName;
+        state.valueMore = res.assessmentMark;
+        let renderArr = [
+          ...res.singleStemVoList,
+          ...res.multipleStemVoList,
+          ...res.essayQuestionVoList,
+          ...res.scoringQuestionVoList,
+        ];
+        sortBy(renderArr, "orderNumber"); //序号
+        state.allFormsData = parseData(renderArr, "questionType"); //类型
+        // console.log("state.allFormsData");
+        // console.log(state.allFormsData);
+      }
+    };
+    getInfoDate();
+
+    // 转换成前端格式
+    const parseData = (arr, typeKey) => {
+      const resultArr = [];
+      arr.forEach((item) => {
+        let key = Number(item[typeKey]);
+        let obj = {};
+        if (key === 1) {
+          let restList = traverseArr(item.assessmentSingleChoiceVoList, {
+            inputVal: "singleOptionName",
+            imgVal: "singleOptionPictureAddress",
+            optionId: "singleOptionId",
+          }).map((itm, idx) => {
+            itm.id = idx + 1;
+            return itm;
+          });
+
+          obj = {
+            type: key,
+            valueSingle: item.singleStemName,
+            singleList: restList,
+            orderNumber: item.orderNumber,
+          };
+          resultArr.push(obj);
+        }
+        if (key === 2) {
+          let restList = traverseArr(item.multipleChoiceVoList, {
+            inputVal: "multipleOptionName",
+            imgVal: "multipleOptionPictureAddress",
+            optionId: "multipleOptionId",
+          }).map((itm, idx) => {
+            itm.id = idx + 1;
+            return itm;
+          });
+
+          obj = {
+            type: key,
+            valueMutil: item.multipleStemName,
+            mutilList: restList,
+            orderNumber: item.orderNumber,
+          };
+          resultArr.push(obj);
+        }
+        if (key === 3) {
+          obj = {
+            type: key,
+            valueAsk: item.assessmentQaTitle,
+            valueAskDesc: item.assessmentQaDescribe,
+            optionId: item.assessmentQaId,
+          };
+          resultArr.push(obj);
+        }
+        if (key === 4) {
+          obj = {
+            type: key,
+            valuePin: item.assessmentScTitle,
+            minScore: item.assessmentMinScore,
+            maxScore: item.assessmentMaxScore,
+            pinQuan: item.weightScale,
+            optionId: item.assessmentScId,
+          };
+          resultArr.push(obj);
+        }
+      });
+      resultArr.map((itm, idx) => {
+        itm.id = idx + 1;
+        return itm;
+      });
+      return resultArr;
+    };
+    // 转换成后端格式
+    const restData = (arr, typeKey) => {
+      const resultArr = [];
+      arr.forEach((item) => {
+        let obj = {};
+        if (item[typeKey] === 1) {
+          let restList = traverseArr(item.singleList, {
+            singleOptionName: "inputVal",
+            singleOptionPictureAddress: "imgVal",
+            singleOptionId: "optionId",
+          }).map((itm, idx) => {
+            itm.optionOrderNum = idx + 1;
+            return itm;
+          });
+          restList.forEach((item) => {
+            item.singleOptionId = item.singleOptionId
+              ? item.singleOptionId
+              : "";
+          });
+
+          obj = {
+            questionType: item[typeKey],
+            singleStemName: item.valueSingle,
+            singleList: restList,
+            orderNumber: item.orderNumber,
+          };
+          resultArr.push(obj);
+        }
+        if (item[typeKey] === 2) {
+          let restList = traverseArr(item.mutilList, {
+            multipleOptionName: "inputVal",
+            multipleOptionPictureAddress: "imgVal",
+            multipleOptionId: "optionId",
+          }).map((itm, idx) => {
+            itm.optionOrderNum = idx + 1;
+            return itm;
+          });
+          restList.forEach((item) => {
+            item.multipleOptionId = item.multipleOptionId
+              ? item.multipleOptionId
+              : "";
+          });
+
+          obj = {
+            questionType: item[typeKey],
+            multipleStemName: item.valueMutil,
+            mutilList: restList,
+            orderNumber: item.orderNumber,
+          };
+          resultArr.push(obj);
+        }
+        if (item[typeKey] === 3) {
+          obj = {
+            questionType: item[typeKey],
+            assessmentQaTitle: item.valueAsk,
+            assessmentQaDescribe: item.valueAskDesc,
+            assessmentQaId: item.optionId ? item.optionId : "",
+          };
+          resultArr.push(obj);
+        }
+        if (item[typeKey] === 4) {
+          obj = {
+            questionType: item[typeKey],
+            assessmentScTitle: item.valuePin,
+            assessmentMinScore: item.minScore,
+            assessmentMaxScore: item.maxScore,
+            weightScale: item.pinQuan,
+            assessmentScId: item.optionId ? item.optionId : "",
+          };
+          resultArr.push(obj);
+        }
+      });
+      resultArr.map((itm, idx) => {
+        itm.orderNumber = idx + 1;
+        return itm;
+      });
+      return resultArr;
+    };
+    // 解散传值
+    const parseItem = (arr) => {
+      const filterComObj = filterCommon(arr, "questionType");
+      let resultObj = {};
+      for (let key in filterComObj) {
+        if (key === "1") {
+          let arrSingle = filterComObj[key];
+          let arr = [];
+          arrSingle.forEach((item) => {
+            if (item.singleList.length) {
+              item.singleList.forEach((itm) => {
+                arr.push({
+                  ...itm,
+                  singleStemName: item.singleStemName,
+                  orderNumber: item.orderNumber,
+                  questionType: item.questionType,
+                });
+              });
+            }
+          });
+          resultObj.assessmentSingleChoiceDtoList = arr;
+        }
+        if (key === "2") {
+          let arrMulti = filterComObj[key];
+          let arr = [];
+          arrMulti.forEach((item) => {
+            if (item.mutilList.length) {
+              item.mutilList.forEach((itm) => {
+                arr.push({
+                  ...itm,
+                  multipleStemName: item.multipleStemName,
+                  orderNumber: item.orderNumber,
+                  questionType: item.questionType,
+                });
+              });
+            }
+          });
+          resultObj.assessmentMultipleChoiceDtoList = arr;
+        }
+        if (key === "3") {
+          resultObj.assessmentEssayQuestionDtoList = filterComObj[key];
+        }
+        if (key === "4") {
+          resultObj.assessmentScoringQuestionDtoList = filterComObj[key];
+        }
+      }
+      return resultObj;
+    };
+
+
+    const handleTypes = () => {
+      let   obj = {
+            id: state.allFormsData.length,
+            valueSingle: "",
+            singleList: [
+              {
+                id: 1,
+                inputVal: "",
+                imgVal: "",
+              },
+            ],
+          };
+      state.allFormsData.push(obj);
+      console.log("state.allFormsData=====",state.allFormsData,state.allFormsData.length);
+    };
+
+    const handleDel = ({ id ,curItem}) => {
+      state.allFormsData.forEach((item, index) => {
+        if (item.id === id) {
+          state.allFormsData.splice(index, 1);
+        }
+      });
+      state.allFormsData.map((item, index) => {
+        item.id = index + 1;
+        return item;
+      });
+      console.log("curItem.orderNumber",curItem.orderNumber);
+     
+       // orderNumber: curItem.orderNumber,
+     
+      
+    };
+
+    const handleSave = () => {
+      let resultPost = {};
+      let filterData = parseItem(restData(state.allFormsData, "type"));
+      // 校验
+      if (!checkVal(filterData)) {
+        return false;
+      }
+      console.log(12121212);
+      console.log(filterData);
+
+      if (state.assessmentId) {
+        resultPost = {
+          assessmentId: state.assessmentId,
+          assessmentName: state.assessmentName,
+          assessmentMark: state.valueMore,
+          ...filterData,
+        };
+        resultPost = deepCloneFilterString(resultPost, [
+          "assessmentMaxScore",
+          "assessmentMinScore",
+        ]);
+        console.log(1212334);
+        console.log(resultPost);
+        editResearchMessage(resultPost).then((res) => {
+          if (res.data.code === 200) {
+            message.success("编辑成功");
+            router.push({
+              path: "/researchmanage",
+            });
+          }
+        });
+      } else {
+        resultPost = {
+          assessmentName: state.assessmentNameNew,
+          assessmentMark: state.valueMore,
+          ...filterData,
+        };
+        resultPost = deepCloneFilterString(resultPost, [
+          "assessmentMaxScore",
+          "assessmentMinScore",
+        ]);
+        createResearch(resultPost).then((res) => {
+          if (res.data.code === 200) {
+            message.success("创建成功");
+            router.push({
+              path: "/researchmanage",
+            });
+          }
+        });
+      }
+    };
+    const handleAllCancel = () => {
+      state.allFormsData = [];
+      router.push({
+        path: "/researchmanage",
+      });
+    };
+    const checkVal = (filterData) => {
+      // 问答
+      if (
+        filterData.assessmentEssayQuestionDtoList &&
+        filterData.assessmentEssayQuestionDtoList.length
+      ) {
+        let arr = filterData.assessmentEssayQuestionDtoList;
+        for (let item of arr) {
+          if (!item.assessmentQaTitle) {
+            message.error("问答题干为必填 请确认");
+            return false;
+          }
+        }
+      }
+      // 多选
+      if (
+        filterData.assessmentMultipleChoiceDtoList &&
+        filterData.assessmentMultipleChoiceDtoList.length
+      ) {
+        let arr = filterData.assessmentMultipleChoiceDtoList;
+        for (let item of arr) {
+          if (!item.multipleStemName) {
+            message.error("多选题干为必填 请确认");
+            return false;
+          }
+        }
+      }
+      // 评分
+      if (
+        filterData.assessmentScoringQuestionDtoList &&
+        filterData.assessmentScoringQuestionDtoList.length
+      ) {
+        let CountNum = 0;
+        let CountArr = filterData.assessmentScoringQuestionDtoList;
+        for (let item of CountArr) {
+          if (!item.assessmentScTitle) {
+            message.error("评分题干为必填 请确认");
+            return false;
+          }
+          CountNum += Number(item["weightScale"]);
+        }
+        if (CountNum !== 100) {
+          message.error("当前权重设置是百分制 请重新配置");
+          return false;
+        }
+      }
+      // 单选
+      if (
+        filterData.assessmentSingleChoiceDtoList &&
+        filterData.assessmentSingleChoiceDtoList.length
+      ) {
+        let arr = filterData.assessmentSingleChoiceDtoList;
+        for (let item of arr) {
+          if (!item.singleStemName) {
+            message.error("单选题干为必填 请确认");
+            return false;
+          }
+        }
+      }
+      return true;
+    };
+
+    return {
+      ...toRefs(state),
+      handleTypes,
+      handleSave,
+      handleAllCancel,
+      handleDel,
+      afterVisibleChange,
+      closeDrawer,
+    };
+  },
+};
+</script>
+<style lang="scss">
+  .researchadd {
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      flex-shrink: 0;
+      margin-bottom: 25px;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        margin-left: 24px;
+      }
+    }
+    .main_left {
+        padding-right: 30px;
+        flex: 1;
+        border-right: 1px solid #e8e8e8;
+        .main_item {
+          display: flex;
+          align-items: center;
+          margin-bottom: 32px;
+          .signbox {
+            width: 120px;
+            display: flex;
+            justify-content: end;
+            align-items: center;
+            .sign {
+              margin-right: 5px;
+            }
+          }
+          .btnbox {
+            display: flex;
+            flex: 1;
+            align-items: center;
+            .xkbtn {
+              cursor: pointer;
+              width: 130px;
+              height: 40px;
+              background: #388be1;
+              border-radius: 8px;
+              border: 0;
+              margin-right: 8px;
+              color: #fff;
+              margin-right: 10px;
+            }
+            .fileTigan {
+              display: flex;
+              align-items: center;
+              padding: 3px 5px;
+              background-color: rgba(42, 103, 209, 0.4);
+              span {
+                margin-right: 5px;
+              }
+              .delBox {
+                width: 13px;
+                height: 13px;
+                background-image: url(@/assets/images/basicinfo/ch.png);
+                background-size: 100% 100%;
+                border-radius: 50%;
+              }
+            }
+          }
+        }
+        .main_item2 {
+          display: flex;
+          align-items: flex-start;
+          margin-bottom: 32px;
+          .signbox {
+            width: 120px;
+            display: flex;
+            justify-content: end;
+            align-items: center;
+            .sign {
+              margin-right: 5px;
+            }
+          }
+          .kqszbox {
+            .qdqtbox {
+              margin-left: 56px;
+            }
+            .setbox {
+              display: flex;
+              flex-wrap: wrap;
+              margin-top: 10px;
+              margin-bottom: 24px;
+              .timerbox {
+                margin-top: 6px;
+                margin-right: 32px;
+                display: flex;
+                align-items: center;
+                flex-wrap: nowrap;
+              }
+            }
+          }
+          .btnbox2 {
+            display: flex;
+            flex-direction: column;
+            justify-content: flex-start;
+            .xkbtn {
+              cursor: pointer;
+              width: 130px;
+              height: 40px;
+              background: #388be1;
+              border-radius: 8px;
+              border: 0;
+              margin-right: 16px 8px 32px 0;
+              color: #fff;
+              margin-top: 16px;
+              margin-bottom: 60px;
+            }
+          }
+        }
+    }
+
+  }
+</style>
diff --git a/src/components/vote/VoteQuestion.vue b/src/components/vote/VoteQuestion.vue
new file mode 100644
index 00000000..d63e2b07
--- /dev/null
+++ b/src/components/vote/VoteQuestion.vue
@@ -0,0 +1,454 @@
+<!-- 评估管理-创建评估页面 -->
+<template>
+  <!-- 单选题 -->
+  <div class="content">
+    <div class="tagbox">
+      <div class="deleteop" @click="handleTypesDel">
+        <div><img src="../../assets/images/projectadd/delete.png" /></div>
+        <div class="del_text">删除选项</div>
+      </div>
+    </div>
+    <div class="name">
+      <div class="namebox">
+        <img
+          class="nameimg"
+          src="../../assets/images/basicinfo/asterisk.png"
+        />
+        <div class="inname">题干{{item.id}}</div>
+      </div>
+      <div class="in">
+        <a-input
+          v-model:value="curItem.valueSingle"
+          placeholder="请输入题干名称"
+          show-count
+          :maxlength="20"
+          style="border-radius: 8px"
+        />
+      </div>
+    </div>
+    <VoteQuestionItem
+      v-for="(item, index) in curItem.singleList"
+      :key="index"
+      :item="item"
+      @input="input"
+      @src="imgSrc"
+      @delImg="delImg"
+      @del="del"
+    />
+    <div class="name">
+      <div class="in" style="margin-left: 85px; margin-bottom: 20px">
+        <a-button
+          type="primary"
+          style="width: 100px;height: 40px;border-radius: 8px;background-color: #409eff;"
+          @click="handleSingleAdd"
+        >
+          添加选项
+        </a-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import VoteQuestionItem from "./VoteQuestionItem.vue";
+import { ref } from "vue";
+export default {
+  name: "CreateVote",
+  components: {
+    VoteQuestionItem,
+  },
+  props: {
+    num:{
+      type: Number,
+      default: null,
+    },
+    item: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    
+  },
+  setup(props,{ emit }) {
+  
+    
+   
+    const curItem = ref(props.item);
+    const handleTypesDel = () => {
+      emit("del", { id: curItem.value.id, curItem: curItem.value });
+    
+    };
+
+    const handleSingleAdd = () => {
+      curItem.value.singleList.push({
+        id: curItem.value.singleList.length + 1,
+        inputVal: "",
+        imgVal: "",
+      });
+    };
+    const input = ({ id, val }) => {
+      curItem.value.singleList.forEach((item) => {
+        if (item.id === id) {
+          item.inputVal = val;
+        }
+      });
+    };
+    const imgSrc = ({ id, src }) => {
+      curItem.value.singleList.forEach((item) => {
+        if (item.id === id) {
+          item.imgVal = src;
+        }
+      });
+    };
+    const delImg = ({ id }) => {
+      curItem.value.singleList.forEach((item) => {
+        if (item.id === id) {
+          item.imgVal = "";
+        }
+      });
+    };
+    const del = ({ id, optionId }) => {
+      curItem.value.singleList.forEach((item, index) => {
+        if (item.id === id) {
+          curItem.value.singleList.splice(index, 1);
+        }
+        console.log("删除=====",id,optionId);
+      });
+
+      
+  
+    };
+
+    return {
+      curItem,
+      handleTypesDel,
+      handleSingleAdd,
+      input,
+      imgSrc,
+      delImg,
+      del,
+    };
+  },
+};
+</script>
+<style lang="scss">
+.researchadd {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  .header {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    .title {
+      color: #000000;
+      font-size: 18px;
+      //line-height: 36px;
+      padding-top: 30px;
+      padding-left: 37px;
+      //font-weight: 500;
+    }
+    .goback {
+      padding-right: 70px;
+      //padding-top: 37px;
+      position: relative;
+      .return {
+        display: inline-block;
+        width: 42px;
+        height: 42px;
+        margin-top: 17px;
+        margin-right: 10px;
+        background-image: url("../../assets/images/projectadd/return.png");
+      }
+      .returntext {
+        display: inline-block;
+        position: absolute;
+        top: 27px;
+        color: #4ea6ff;
+        font-size: 14px;
+      }
+    }
+  }
+  .addtype {
+    display: flex;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+    margin-right: 20px;
+    align-items: center;
+    margin-left: 41px;
+    .addtypen {
+      color: #6f6f6f;
+      font-size: 14px;
+    }
+    .types {
+      cursor: pointer;
+      width: 80px;
+      height: 40px;
+      color: #409eff;
+      border: 1px solid #409eff;
+      border-radius: 4px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin: 20px 10px;
+    }
+    .typesCur {
+      color: #fff;
+      background: #409eff;
+    }
+  }
+  .content {
+    display: flex;
+    flex-direction: column;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    width: 70%;
+    min-width: 690px;
+    margin-left: 38px;
+    margin-top: 20px;
+    .tagbox {
+      display: flex;
+      justify-content: right;
+      .tagname {
+        width: 90px;
+        height: 32px;
+        margin-top: 24px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-left: 134px;
+        background: rgba(78, 166, 255, 0.1);
+        border-radius: 4px;
+        color: rgba(64, 158, 255, 1);
+        font-size: 16px;
+      }
+      .deleteop {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        margin-top: 20px;
+        margin-right: 30px;
+        border: 1px solid #409eff;
+        border-radius: 8px;
+        cursor: pointer;
+        .del_text {
+          color: #409eff;
+          font-size: 14px;
+          margin-left: 5px;
+        }
+      }
+    }
+    .scorebox {
+      display: flex;
+      align-items: center;
+      margin-top: 20px;
+      margin-left: 70px;
+      .scoretext {
+        font-size: 14px;
+        color: #56a3f9;
+      }
+      .number {
+        display: flex;
+        border: 1px solid #d7e5fd;
+        border-radius: 5px;
+        margin: 0 10px;
+        padding: 5px;
+        .btn {
+          width: 40px;
+          height: 40px;
+          border: 1px solid #56a3f9;
+          border-radius: 8px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          margin: 5px;
+          font-size: 14px;
+          font-weight: 400;
+          color: #56a3f9;
+          line-height: 24px;
+          cursor: pointer;
+        }
+        .curBtn {
+          background: #56a3f9;
+          color: #fff;
+        }
+      }
+    }
+    .picture {
+      width: 100px;
+      display: flex;
+      flex-direction: column;
+      margin-top: 20px;
+      margin-left: 133px;
+      .pictureimg {
+        width: 100px;
+        height: 100px;
+      }
+      .picturename {
+        color: #6f6f6f;
+        font-size: 14px;
+      }
+    }
+    .options {
+      display: flex;
+    }
+    .delete {
+      cursor: pointer;
+      margin-top: 32px;
+      margin-left: 107px;
+      // float: right;
+      color: #4ea6ff;
+      font-size: 14px;
+    }
+    .name2 {
+      display: flex;
+      align-items: flex-start;
+    }
+    .name {
+      width: 60%;
+      // background-color: lightcoral;
+      display: flex;
+      margin-top: 20px;
+      //align-items: center;
+      //height: 40px;
+      // border: 1px solid black;
+      .namebox {
+        width: 120px;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        flex-shrink: 0;
+        .nameimg {
+          width: 10px;
+          height: 10px;
+        }
+      }
+      .inname {
+        color: #6f6f6f;
+        font-size: 14px;
+        margin-left: 7px;
+        font-weight: 700;
+      }
+      .in {
+        margin-left: 14px;
+        flex: 1;
+        .assess {
+          display: flex;
+          width: 226px;
+          height: 40px;
+          border: 1px solid #56a3f9;
+          //margin-bottom: 20px;
+          .assesstype {
+            width: 50%;
+            background: #56a3f9;
+            color: #ffffff;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+          .assesswhole {
+            width: 50%;
+            background: rgba(86, 163, 249, 0.1);
+            font-size: 14px;
+            color: #6f6f6f;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+          .ratio {
+            position: absolute;
+            right: 10px;
+            top: 8px;
+            color: #6f6f6f;
+            font-size: 14px;
+          }
+        }
+        .addimg {
+          cursor: pointer;
+          color: rgba(78, 166, 255, 1);
+          font-size: 14px;
+        }
+        .text {
+          color: rgba(109, 117, 132, 1);
+          font-size: 14px;
+          //line-height: 24px;
+        }
+        .ant-radio-wrapper {
+        }
+        .ant-input {
+          border-radius: 5px;
+          // height: 120%;
+          width: 100%;
+          height: 35px;
+        }
+        .ant-select-selector {
+          border-radius: 5px;
+          // height: 120%;
+          width: 100%;
+          height: 40px;
+        }
+      }
+      .numberInp {
+        width: 200px;
+        .ant-input-number {
+          width: 200px;
+          height: 40px;
+          border-radius: 8px;
+        }
+        // .ant-input-number-input-wrap {
+        //   width: 200px;
+        // }
+      }
+    }
+  }
+  .name2 {
+    display: flex;
+    align-items: flex-start;
+  }
+  .opinion {
+    display: flex;
+    margin-top: 30px;
+    .namebox {
+      width: 120px;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      flex-shrink: 0;
+    }
+    .in {
+      margin-left: 14px;
+      width: 500px;
+      .ant-input-textarea-show-count {
+        position: relative;
+        height: 110px;
+      }
+      .ant-input-textarea-show-count::after {
+        position: absolute;
+        right: 10px;
+        bottom: 0px;
+      }
+      .ant-input {
+        border-radius: 8px;
+      }
+    }
+  }
+  .footer {
+    width: 100%;
+    margin-top: 31px;
+    margin-bottom: 14px;
+    .btn {
+      display: flex;
+      margin-bottom: 20px;
+      justify-content: center;
+      cursor: pointer;
+    }
+  }
+
+  .uploadContent {
+    display: block !important;
+    .uploadBtn {
+      margin-left: 120px !important;
+    }
+  }
+}
+</style>
diff --git a/src/components/vote/VoteQuestionItem.vue b/src/components/vote/VoteQuestionItem.vue
new file mode 100644
index 00000000..97776f69
--- /dev/null
+++ b/src/components/vote/VoteQuestionItem.vue
@@ -0,0 +1,439 @@
+<!-- 评估管理-创建评估页面 -->
+<template>
+  <div class="itemRow">
+    <div class="options">
+      <div class="name">
+        <div class="namebox">
+          <div class="inname">选项{{ item.id }}</div>
+        </div>
+        <div class="in">
+          <a-input
+            v-model:value="curItem.inputVal"
+            show-count
+            :maxlength="30"
+            style="border-radius: 8px"
+            @change="handleInput"
+          />
+        </div>
+      </div>
+      <div class="delete" @click="handleDel">删除</div>
+    </div>
+    <div class="name uploadContent">
+      <a-upload
+        v-show="!item.imgVal"
+        class="in uploadBtn"
+        :show-upload-list="false"
+        :before-upload="beforeUpload"
+      >
+        <div class="addimg">+添加图片</div>
+      </a-upload>
+      <div v-show="item.imgVal" class="picture" style="position: relative">
+        <img class="pictureimg" :src="item.imgVal" />
+        <div class="picturename" v-show="hasImgName">{{ hasImgName }}</div>
+        <img
+          style="
+            cursor: pointer;
+            width: 20px;
+            height: 20px;
+            position: absolute;
+            right: 0;
+            top: 0;
+          "
+          src="../../assets/images/basicinfo/close.png"
+          @click="handleCancel"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { reactive, toRefs, ref } from "vue";
+import { message } from "ant-design-vue";
+import { fileUp } from "../../api/indexEval";
+
+export default {
+  name: "VoteQuestionItem",
+  props: {
+    item: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  setup(props, { emit }) {
+    const curItem = ref(props.item);
+    const state = reactive({
+      hasImgName: "",
+    });
+
+    const handleInput = () => {
+      emit("input", { id: curItem.value.id, val: curItem.value.inputVal });
+    };
+    const handleDel = () => {
+      handleCancel();
+      emit("del", { id: curItem.value.id, optionId: curItem.value.optionId });
+    };
+    const handleCancel = () => {
+      state.hasImgName = "";
+      emit("delImg", { id: curItem.value.id });
+    };
+    const beforeUpload = (file) => {
+      const isJpgOrPng =
+        file.type === "image/jpg" ||
+        file.type === "image/jpeg" ||
+        file.type === "image/png" ||
+        file.type === "image/svg" ||
+        file.type === "image/bmp" ||
+        file.type === "image/gif";
+      if (!isJpgOrPng) {
+        message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
+        return false;
+      }
+
+      let isLt1M = file.size / 10240 / 10240 <= 1;
+      if (!isLt1M) {
+        this.$message.error("图片大小超过10MB!");
+        return false;
+      }
+
+      const formData = new FormData();
+      formData.append("file", file);
+      console.log(file);
+      fileUp(formData).then((res) => {
+        if (res.data.code === 200) {
+          state.hasImgName = file.name;
+          emit("src", { id: curItem.value.id, src: res.data.data });
+        }
+      });
+      return false;
+    };
+
+    return {
+      ...toRefs(state),
+      curItem,
+      handleInput,
+      handleDel,
+      handleCancel,
+      beforeUpload,
+    };
+  },
+};
+</script>
+<style lang="scss">
+.researchadd {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  .header {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    .title {
+      color: #000000;
+      font-size: 18px;
+      //line-height: 36px;
+      padding-top: 30px;
+      padding-left: 37px;
+      //font-weight: 500;
+    }
+    .goback {
+      padding-right: 70px;
+      //padding-top: 37px;
+      position: relative;
+      .return {
+        display: inline-block;
+        width: 42px;
+        height: 42px;
+        margin-top: 17px;
+        margin-right: 10px;
+        background-image: url("../../assets/images/projectadd/return.png");
+      }
+      .returntext {
+        display: inline-block;
+        position: absolute;
+        top: 27px;
+        color: #4ea6ff;
+        font-size: 14px;
+      }
+    }
+  }
+  .addtype {
+    display: flex;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+    margin-right: 20px;
+    align-items: center;
+    margin-left: 41px;
+    .addtypen {
+      color: #6f6f6f;
+      font-size: 14px;
+    }
+    .types {
+      cursor: pointer;
+      width: 80px;
+      height: 40px;
+      color: #409eff;
+      border: 1px solid #409eff;
+      border-radius: 4px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin: 20px 10px;
+    }
+    .typesCur {
+      color: #fff;
+      background: #409eff;
+    }
+  }
+  .content {
+    display: flex;
+    flex-direction: column;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    width: 70%;
+    min-width: 690px;
+    margin-left: 38px;
+    margin-top: 20px;
+    .tagbox {
+      display: flex;
+      justify-content: space-between;
+      .tagname {
+        width: 90px;
+        height: 32px;
+        margin-top: 24px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-left: 134px;
+        background: rgba(78, 166, 255, 0.1);
+        border-radius: 4px;
+        color: rgba(64, 158, 255, 1);
+        font-size: 16px;
+      }
+      .deleteop {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        margin-top: 20px;
+        margin-right: 30px;
+        border: 1px solid #409eff;
+        border-radius: 8px;
+        cursor: pointer;
+        .del_text {
+          color: #409eff;
+          font-size: 14px;
+          margin-left: 5px;
+        }
+      }
+    }
+    .scorebox {
+      display: flex;
+      align-items: center;
+      margin-top: 20px;
+      margin-left: 70px;
+      .scoretext {
+        font-size: 14px;
+        color: #56a3f9;
+      }
+      .number {
+        display: flex;
+        border: 1px solid #d7e5fd;
+        border-radius: 5px;
+        margin: 0 10px;
+        padding: 5px;
+        .btn {
+          width: 40px;
+          height: 40px;
+          border: 1px solid #56a3f9;
+          border-radius: 8px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          margin: 5px;
+          font-size: 14px;
+          font-weight: 400;
+          color: #56a3f9;
+          line-height: 24px;
+          cursor: pointer;
+        }
+      }
+    }
+    .picture {
+      width: 100px;
+      display: flex;
+      flex-direction: column;
+      margin-top: 20px;
+      margin-left: 133px;
+      .pictureimg {
+        width: 100px;
+        height: 100px;
+      }
+      .picturename {
+        color: #6f6f6f;
+        font-size: 14px;
+      }
+    }
+    .options {
+      display: flex;
+    }
+    .delete {
+      cursor: pointer;
+      margin-top: 32px;
+      margin-left: 107px;
+      // float: right;
+      color: #4ea6ff;
+      font-size: 14px;
+    }
+    .name2 {
+      display: flex;
+      align-items: flex-start;
+    }
+    .name {
+      width: 60%;
+      // background-color: lightcoral;
+      display: flex;
+      margin-top: 20px;
+      //align-items: center;
+      //height: 40px;
+      // border: 1px solid black;
+      .namebox {
+        width: 120px;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        flex-shrink: 0;
+        .nameimg {
+          width: 10px;
+          height: 10px;
+        }
+      }
+      .inname {
+        color: #6f6f6f;
+        font-size: 14px;
+        margin-left: 7px;
+        font-weight: 700;
+      }
+      .in {
+        margin-left: 14px;
+        flex: 1;
+        .assess {
+          display: flex;
+          width: 226px;
+          height: 40px;
+          border: 1px solid #56a3f9;
+          //margin-bottom: 20px;
+          .assesstype {
+            width: 50%;
+            background: #56a3f9;
+            color: #ffffff;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+          .assesswhole {
+            width: 50%;
+            background: rgba(86, 163, 249, 0.1);
+            font-size: 14px;
+            color: #6f6f6f;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+          .ratio {
+            position: absolute;
+            right: 10px;
+            top: 8px;
+            color: #6f6f6f;
+            font-size: 14px;
+          }
+        }
+        .addimg {
+          cursor: pointer;
+          color: rgba(78, 166, 255, 1);
+          font-size: 14px;
+        }
+        .text {
+          color: rgba(109, 117, 132, 1);
+          font-size: 14px;
+          //line-height: 24px;
+        }
+        .ant-radio-wrapper {
+        }
+        .ant-input {
+          border-radius: 5px;
+          // height: 120%;
+          width: 100%;
+          height: 35px;
+        }
+        .ant-select-selector {
+          border-radius: 5px;
+          // height: 120%;
+          width: 100%;
+          height: 40px;
+        }
+      }
+      .numberInp {
+        width: 200px;
+        .ant-input-number {
+          width: 200px;
+          height: 40px;
+          border-radius: 8px;
+        }
+        // .ant-input-number-input-wrap {
+        //   width: 200px;
+        // }
+      }
+    }
+  }
+  .name2 {
+    display: flex;
+    align-items: flex-start;
+  }
+  .opinion {
+    display: flex;
+    margin-top: 30px;
+    .namebox {
+      width: 120px;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      flex-shrink: 0;
+    }
+    .in {
+      margin-left: 14px;
+      width: 500px;
+      .ant-input-textarea-show-count {
+        position: relative;
+        height: 110px;
+      }
+      .ant-input-textarea-show-count::after {
+        position: absolute;
+        right: 10px;
+        bottom: 0px;
+      }
+      .ant-input {
+        border-radius: 8px;
+      }
+    }
+  }
+  .footer {
+    width: 100%;
+    margin-top: 31px;
+    margin-bottom: 14px;
+    .btn {
+      display: flex;
+      margin-bottom: 20px;
+      justify-content: center;
+      cursor: pointer;
+    }
+  }
+
+  .uploadContent {
+    display: block !important;
+    .uploadBtn {
+      margin-left: 120px !important;
+    }
+  }
+}
+</style>
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 5da3bc3b..e20b8b05 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -909,7 +909,7 @@ import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
 import AddActive from "../../components/drawers/AddActive.vue";
 import AddEval from "../../components/drawers/AddEval.vue";
 import AddInvist from "../../components/drawers/AddInvist.vue";
-import AddVote from "../../components/drawers/AddVote.vue";
+import AddVote from "../../components/vote/AddVote.vue";
 import AddLive from "../../components/drawers/AddLive.vue";
 import AddRef from "../../components/drawers/AddRef.vue";
 import * as api from "../../api/indexLevel";
@@ -1241,15 +1241,15 @@ export default {
     };
     //测试评估投票抽屉
     const showDrawerAddEval = (id, eleId) => {
-    
-      state.addhomeworkvisible = true;
+      state.addevalVisible = true;
       state.EditEvalId = id;
       state.routerTaskId = eleId;
     };
     const showDrawerAddInvist = (id, eleId) => {
-      state.addhomeworkvisible = true;
-      state.EditInvistId = id;
+      state.addinvistVisible = true;
       state.routerTaskId = eleId;
+      state.EditInvistId =id;
+     
     };
     const showDrawerAddVote = (id, eleId) => {
       state.addhomeworkvisible = true;
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 360f5a35..fa2842b9 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -280,6 +280,7 @@
               v-model:edit="edit"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
+              v-model:projectTaskId="projectTaskId"
               v-model:EditEvalId="EditEvalId"
             />
           </div>
@@ -301,6 +302,8 @@
               v-model:edit="edit"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
+              v-model:projectTaskId="projectTaskId"
+              v-model:EditInvistId = "EditInvistId"
             />
           </div>
           <!-- 添加评估侧弹窗 -->
@@ -321,6 +324,8 @@
                 v-model:edit="edit"
                 v-model:projectId="projectId"
                 v-model:chooseStageId="chooseStageId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:EditVoteId = "EditVoteId"
               />
             </div>
             <!-- 添加投票侧弹窗 -->
@@ -837,22 +842,14 @@ import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
 import AddActive from "../../components/drawers/AddActive.vue";
 import AddEval from "../../components/drawers/AddEval.vue";
 import AddInvist from "../../components/drawers/AddInvist.vue";
-import AddVote from "../../components/drawers/AddVote.vue";
+import AddVote from "../../components/vote/AddVote.vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/indexTaskadd";
-import * as apilive from "../../api/indexLiveBroadcast";
-import * as apiExternal from "../../api/indexExternalChain";
-import * as apidiscuss from "../../api/indexDiscuss";
-import * as apiactivity from "../../api/indexActivity";
-import * as apieval from "../../api/indexEval";
-import * as apiinvist from "../../api/indexInvist";
-import * as apivote from "../../api/indexVote";
 import * as apistage from "../../api/indexStage";
 import * as apimove from "../../api/indexMovetask";
 import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
-import { deleteExaminationById } from "@/api/indexExam";
-import { deleteWorkTask } from "@/api/indexWork";
+
 
 const drawercolumns = [
   {
@@ -928,6 +925,8 @@ export default {
       EditWorkId:null, // 要编辑的作业id
       EditTestId: null,// 要编辑的考试id
       EditEvalId:null,
+      EditInvistId:null,
+      EditVoteId:null,
       projectTaskId:null, // 要编辑的具体任务id
       projectNameList: [
         {
@@ -1352,13 +1351,7 @@ export default {
         });
     };
 
-    //获取阶段
-    // const getStage = () =>{
-    //   let obj = {
-    //     projectId:state.projectId
-    //   }
 
-    // }
 
     //获取删除id（投票)
     const changeVData = (data) => {
@@ -1370,150 +1363,7 @@ export default {
       console.log("添加数据", data);
       getTask(data);
     };
-    // 删除考试
-    const deleteTest = () => {
-      let obj = {
-        examinationId: state.deleteID,
-      };
-      deleteExaminationById(obj)
-        .then((res) => {
-          console.log("删除成功", res);
-          message.success("删除成功");
-          //重新获取列表
-          getTask();
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    };
-
-    // 删除作业
-    const deleteWork = () => {
-      let obj = {
-        workId: state.deleteID,
-      };
-      deleteWorkTask(obj)
-        .then((res) => {
-          console.log("删除成功", res);
-          message.success("删除成功");
-          //重新获取列表
-          getTask();
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    };
-
-    //删除直播
-    const deleteLiveBroadcast = () => {
-      let obj = {
-        liveId: state.deleteLiveID,
-      };
-      apilive
-        .deleteLiveBroadcast(obj)
-        .then((res) => {
-          console.log("删除成功", res);
-          message.success("删除成功");
-          //重新获取列表
-          getTask();
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    };
-
-    //删除外链
-    const deleteExternalChain = () => {
-      let obj = {
-        linkId: state.deleteExternalID,
-        // linkId: 11,
-      };
-      apiExternal
-        .deleteLink(obj)
-        .then((res) => {
-          console.log(res);
-          //重新获取列表
-          getTask();
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    };
-    //删除讨论
-    const deleteDiscuss = () => {
-      let obj = {
-        discussId: state.deleteDiscussID,
-      };
-      apidiscuss
-        .deleteDiscuss(obj)
-        .then((res) => {
-          console.log("删除成功", res);
-          message.success("删除成功");
-          state.deleteModal = false;
-          //重新获取列表
-          getTask();
-        })
-        .catch((err) => {
-          console.log("删除失败", err);
-        });
-    };
-    //删除活动
-    const deleteActivity = () => {
-      let obj = {
-        activityId: state.deleteActivityID,
-      };
-      apiactivity
-        .deleteActivity(obj)
-        .then((res) => {
-          console.log("删除成功", res);
-          message.success("删除成功");
-          state.deleteModal = false;
-          //重新获取列表
-          getTask();
-        })
-        .catch((err) => {
-          console.log("删除失败", err);
-        });
-    };
-   
-    //删除测评测试
-    const deleteEvalText = () => {
-      let obj = {
-        evaluationId: "",
-        token: 123,
-      };
-      apieval
-        .deleteEvaluationById(obj)
-        .then((res) => {
-          console.log("删除成功", res);
-          message.success("删除成功");
-          //重新获取列表
-          getTask();
-        })
-        .catch((err) => {
-          console.log("删除失败", err);
-        });
-    };
-
-    //删除评估测试
-    const deleteInvistText = () => {
-      let obj = {
-        评估信息Id: "",
-        token: "",
-      };
-      apiinvist
-        .deleteAppraise(obj)
-        .then((res) => {
-          console.log("删除成功", res);
-          message.success("删除成功");
-          //重新获取列表
-          getTask();
-        })
-        .catch((err) => {
-          console.log("删除失败", err);
-        });
-    };
-
+    
     //删除任务
     const deleteTask = () => {
       let obj = { projectTaskIds: state.deleteID };
@@ -1528,25 +1378,6 @@ export default {
         });
     };
 
-    //删除投票信息
-    const deleteVoteText = () => {
-      let obj = {
-        voteId: state.voteId,
-      };
-      apivote
-        .deleteVoteMessage(obj)
-        .then((res) => {
-          console.log("删除成功", res);
-          message.success("删除成功");
-          //重新获取列表
-          getTask();
-        })
-        .catch((err) => {
-          console.log("删除失败", err);
-        });
-    };
-
-    
     const showChangeModal = () => {
       state.visiblene = true;
     };
@@ -1678,14 +1509,19 @@ export default {
       state.projectTaskId = eleId;
       console.log("active=======",id);
     };
-    const showDrawerAddEval = () => {
+    const showDrawerAddEval = (id, eleId) => {
       state.addevalvisible = true;
+      state.evaluationId = id;
+      state.projectTaskId = eleId;
     };
-    const showDrawerAddInvist = () => {
+    const showDrawerAddInvist = (id, eleId) => {
       state.addinvistvisible = true;
+      state.projectTaskId = eleId;
     };
-    const showDrawerAddVote = () => {
+    const showDrawerAddVote = (id, eleId) => {
       state.addvotevisible = true;
+      state.EditVoteId = id;
+      state.projectTaskId = eleId;
     };
     const showConfirm = () => {
       state.confirmModal = true;
@@ -1840,14 +1676,6 @@ export default {
       closeChangeModal,
       changebgc,
       getTask,
-      deleteLiveBroadcast,
-      deleteDiscuss,
-     
-      deleteEvalText,
-      deleteExternalChain,
-      deleteActivity,
-      deleteVoteText,
-      deleteInvistText,
       getTableData,
       deleteTask,
       editStage,
@@ -1859,8 +1687,6 @@ export default {
       getStageData,
       moveTask,
       deleteTaskAll,
-      deleteTest,
-      deleteWork,
       decideType,
       
       
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index b1f03ad5..2b331d6f 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -425,7 +425,7 @@
                   </div>
                 </a-collapse-panel>
               </a-collapse>
-              <!-- 无数据创建任务 -->
+              <!-- 无数据创建任务  v-if="taskSyllabus.length == 0"-->
               <router-link
                 to="/taskadd"
                 class="taskbox"
@@ -433,7 +433,7 @@
                   background: linear-gradient(180deg, #ddeaff, #f0f8fe);
                   display: block;
                 "
-                v-if="taskSyllabus.length == 0"
+               
               >
                 <div class="leftt">
                   <img src="../../assets/images/taskpage/left2.png" />
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index 1c024efb..8b9ad42a 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -92,7 +92,7 @@
 </template>
 <script>
 import { reactive, toRefs } from "vue";
-import AddVote from "../../components/drawers/AddVote";
+import AddVote from "../../components/vote/AddVote";
 // import { PlusOutlined, LoadingOutlined } from "@ant-design/icons-vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/index1";

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

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

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

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

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

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

literal 0
HcmV?d00001

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

literal 0
HcmV?d00001

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

From 1c30ec788c7b5d3e2f9c50c935e91f2c42cf5b21 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Mon, 14 Nov 2022 10:23:26 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=95=E7=A5=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddVote.vue        | 506 +++++++++++++++++++++
 src/components/drawers/CreVote.vue        | 509 ++++++++++++++++++++++
 src/views/learningpath/LevelAddDetail.vue |   2 +-
 src/views/projectcenter/TaskAdd.vue       |   2 +-
 src/views/system/SystemManage.vue         |   2 +-
 5 files changed, 1018 insertions(+), 3 deletions(-)
 create mode 100644 src/components/drawers/AddVote.vue
 create mode 100644 src/components/drawers/CreVote.vue

diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
new file mode 100644
index 00000000..63b38ae1
--- /dev/null
+++ b/src/components/drawers/AddVote.vue
@@ -0,0 +1,506 @@
+<template>
+  <a-drawer
+    :visible="addvoteVisible"
+    class="drawerStyle addvoteDrawer"
+    width="80%"
+    title="添加投票"
+    placement="right"
+    @after-visible-change="afterVisibleChange"
+  >
+    <div class="drawerMain">
+      <div class="header">
+        <div v-if="edit" class="headerTitle">编辑投票</div>
+        <div v-else class="headerTitle">添加投票</div>
+        <img
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
+        />
+      </div>
+      <div class="contentMain">
+        <div class="main_left">
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">任务名称：</span>
+            </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="inputV1"
+                style="width: 424px; height: 32px"
+                placeholder="请输入投票名称"
+                maxlength="20"
+              />
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span>创建投票：</span>
+            </div>
+            <div class="btnbox">
+              <button
+                class="xkbtn"
+                :style="{ display: creVote ? 'none' : 'block' }"
+                @click="showDrawerCreVote"
+              >
+                创建投票
+              </button>
+              <button
+                class="xkbtn"
+                :style="{ display: creVote ? 'block' : 'none' }"
+                @click="showDrawerCreVote"
+              >
+                编辑投票
+              </button>
+              <div :style="{ display: creVote ? 'block' : 'none' }">
+                <div class="fileTigan">
+                  <span style="color: #388be1">{{voteStemName}}</span>
+                  <div class="delBox" @click="dleVoteStem()"></div>
+                </div>
+              </div>
+            </div>
+            <!-- 创建投票侧弹窗 -->
+            <div>
+              <cre-vote
+                v-model:crevoteVisible="crevotevisible"
+                @getData="getStemId"
+                v-model:voteStemId="voteStemId"
+              />
+            </div>
+            <!-- 创建投票侧弹窗 -->
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <span style="margin-right: 3px">起止时间：</span>
+            </div>
+            <div class="btnbox">
+              <a-range-picker
+                style="width: 424px"
+                :placeholder="['      开始时间', '        结束时间']"
+              />
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <span style="margin-right: 3px">基础投票数：</span>
+            </div>
+            <div class="btnbox">
+              <button class="xkbtn">点击上传</button>
+            </div>
+          </div>
+          <div class="main_item" style="margin-top: -25px">
+            <div class="signbox"></div>
+            <div class="btnbox">
+              <span style="color: #999999">支持：xls.xlsx</span>
+            </div>
+          </div>
+          <div class="main_item2">
+            <div class="signbox">
+              <span style="margin-right: 3px">投票说明：</span>
+            </div>
+            <div class="textarea">
+              <a-textarea
+                v-model:value="textV1"
+                placeholder="请输入投票说明"
+                allow-clear
+                maxlength="150"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="main_btns">
+        <button class="btn1">取消</button>
+        <button class="btn2" @click="createVoteText()">确定</button>
+      </div>
+    </div>
+  </a-drawer>
+</template>
+<script>
+import { reactive, toRefs, ref } from "vue";
+import CreVote from "../../components/drawers/CreVote.vue";
+import * as api from "../../api/indexVote";
+import * as apitaskadd from "../../api/indexTaskadd";
+import { message } from "ant-design-vue";
+import { toDate } from "../../api/method";
+import { RouterEditTask } from "@/api/indexTask";
+const options1 = ref([
+  {
+    value: "value1",
+    label: "请选择状态",
+  },
+]);
+const rowSelection = ref({
+  checkStrictly: false,
+  onChange: (selectedRowKeys, selectedRows) => {
+    console.log(
+      `selectedRowKeys: ${selectedRowKeys}`,
+      "selectedRows: ",
+      selectedRows
+    );
+  },
+  onSelect: (record, selected, selectedRows) => {
+    console.log(record, selected, selectedRows);
+  },
+  onSelectAll: (selected, selectedRows, changeRows) => {
+    console.log(selected, selectedRows, changeRows);
+  },
+});
+
+export default {
+  name: "AddVote",
+  components: {
+    CreVote,
+  },
+  props: {
+    addvoteVisible: {
+      type: Boolean,
+      default: false,
+    },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    learn: {
+      type: Number,
+      default: 0,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      inputV1: "",
+      textV1: "",
+      creVote: false,
+      crevotevisible: false,
+      time: undefined,
+      basevote: "",
+      endTimes: "",
+      startTimes: "",
+      ascriptionId: "",
+      voteStemId: null,
+      voteId:"",
+      voteStemName:"",
+    });
+    const closeDrawer = () => {
+      ctx.emit("update:addvoteVisible", false);
+      ctx.emit("update:edit", false);
+    };
+    const afterVisibleChange = (bool) => {
+      console.log("state", bool);
+    };
+    const showDrawerCreVote = () => {
+      state.crevotevisible = true;
+    };
+    const getStemId = (data) => {
+      state.voteStemName = data.voteStemName;
+      state.voteStemId = Number(data.voteStemId);
+      state.creVote = data.creVote;
+      console.log('state.voteStemId', state.voteStemId);
+      console.log('state.voteStemId', state.creVote);
+    }
+    //暂时没用 之前给子用传参来着
+    const changeVData = (data) => {
+      console.log("111", data);
+      state.creVote = data.creVote;
+      state.ascriptionId = data.ascriptionId;
+      state.voteStemId = data.voteStemId;
+      state.voteStemName = data.voteStemName;
+      console.log("222", state.creVote);
+      console.log("333", state.ascriptionId);
+    };
+    const delBox = () => {
+      state.creVote = false;
+    };
+
+    const updateTableData = (data) => {
+      console.log(data, 'data');
+    }
+
+    //删除题干信息接口
+    const dleVoteStem = () => {
+      let objdelstem = {
+        voteStemId:state.voteStemId
+      }
+      api.deleteVoteStem(objdelstem)
+        .then((res) => {
+          console.log('删除题干信息成功', res)
+          message.success('删除题干信息成功')
+          delBox()
+      })
+    }
+    //创建投票信息
+    const createVoteText = () => {
+      if (!state.inputV1) {
+        message.destroy();
+        return message.info("请输入投票名称");
+      }
+
+      if (state.basevote == "") {
+        state.basevote = 1;
+      }
+
+      if (state.time != undefined) {
+        state.endTimes = toDate(
+          new Date(state.time[0].$d).getTime() / 1000,
+          "Y-M-D"
+        );
+        state.startTimes = toDate(
+          new Date(state.time[1].$d).getTime() / 1000,
+          "Y-M-D"
+        );
+      }
+
+
+      let obj = {
+        ascriptionId: state.ascriptionId,
+        baseVote: state.basevote,
+        createUser: 0,
+        updateUser: 0,
+        voteEndTime: state.endTimes,
+        voteExplain: state.textV1,
+        voteFlag: "",
+        voteName: state.inputV1,
+        voteStartTime: state.startTimes,
+        voteTag: "",
+      };
+      api
+        .createVote(obj)
+        .then((res) => {
+          console.log("创建成功123", res);
+          message.success("创建成功");
+          ctx.emit("getData", res.data.data.voteId);
+          closeDrawer();
+          if (props.learn == 0)
+            apitaskadd
+              .addTask({
+                courseId: 0,
+                duration: 0,
+                flag: true,
+                name: obj.voteName,
+                projectId: props.projectId,
+                projectTaskId: 0,
+                stageId: props.chooseStageId,
+                type: 12,
+              })
+              .then((res) => {
+                console.log("调用项目添加接口后", res.data);
+                //自定义事件给父组件传值
+                ctx.emit("changeData", false);
+                //重新获取任务列表
+                // apiTask.getTask({ projectId: 28 });
+                // router.push("/taskadd");
+              })
+              .catch((err) => {
+                console.log(err);
+              });
+          else {
+            let editObj1 = {
+              chapterId: 36,
+              courseId: 0,
+              duration: 0,
+              flag: true,
+              name: obj.voteName,
+              routerId: 92,
+              routerTaskId: 0,
+              type: 12,
+            };
+            RouterEditTask(editObj1);
+          }
+        })
+        .catch((err) => {
+          console.log("创建失败", err);
+        });
+    };
+    return {
+      ...toRefs(state),
+      showDrawerCreVote,
+      afterVisibleChange,
+      closeDrawer,
+      getStemId,
+      changeVData,
+      rowSelection,
+      options1,
+      dleVoteStem,
+      createVoteText,
+      delBox,
+      updateTableData,
+    };
+  },
+};
+</script>
+<style lang="scss">
+.ant-table-striped :deep(.table-striped) td {
+  background-color: #fafafa !important;
+}
+.addvoteDrawer {
+  .drawerMain {
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      flex-shrink: 0;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        margin-left: 24px;
+      }
+    }
+    .contentMain {
+      display: flex;
+      justify-content: space-between;
+      .main_left {
+        padding-right: 30px;
+        flex: 1;
+        border-right: 1px solid #e8e8e8;
+        .main_item {
+          display: flex;
+          align-items: center;
+          margin-bottom: 32px;
+          .signbox {
+            width: 120px;
+            display: flex;
+            justify-content: end;
+            align-items: center;
+            .sign {
+              margin-right: 5px;
+            }
+          }
+          .btnbox {
+            display: flex;
+            flex: 1;
+            align-items: center;
+            .xkbtn {
+              cursor: pointer;
+              width: 130px;
+              height: 40px;
+              background: #388be1;
+              border-radius: 8px;
+              border: 0;
+              margin-right: 8px;
+              color: #fff;
+              margin-right: 10px;
+            }
+            .fileTigan {
+              display: flex;
+              align-items: center;
+              padding: 3px 5px;
+              background-color: rgba(42, 103, 209, 0.4);
+              span {
+                margin-right: 5px;
+              }
+              .delBox {
+                width: 13px;
+                height: 13px;
+                background-image: url(@/assets/images/basicinfo/ch.png);
+                background-size: 100% 100%;
+                border-radius: 50%;
+              }
+            }
+          }
+        }
+        .main_item2 {
+          display: flex;
+          align-items: flex-start;
+          margin-bottom: 32px;
+          .signbox {
+            width: 120px;
+            display: flex;
+            justify-content: end;
+            align-items: center;
+            .sign {
+              margin-right: 5px;
+            }
+          }
+          .kqszbox {
+            .qdqtbox {
+              margin-left: 56px;
+            }
+            .setbox {
+              display: flex;
+              flex-wrap: wrap;
+              margin-top: 10px;
+              margin-bottom: 24px;
+              .timerbox {
+                margin-top: 6px;
+                margin-right: 32px;
+                display: flex;
+                align-items: center;
+                flex-wrap: nowrap;
+              }
+            }
+          }
+          .btnbox2 {
+            display: flex;
+            flex-direction: column;
+            justify-content: flex-start;
+            .xkbtn {
+              cursor: pointer;
+              width: 130px;
+              height: 40px;
+              background: #388be1;
+              border-radius: 8px;
+              border: 0;
+              margin-right: 16px 8px 32px 0;
+              color: #fff;
+              margin-top: 16px;
+              margin-bottom: 60px;
+            }
+          }
+        }
+      }
+    }
+    .main_btns {
+      height: 72px;
+      width: 100%;
+      bottom: 0;
+      left: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+      .btn1 {
+        width: 100px;
+        height: 40px;
+        border: 1px solid #4ea6ff;
+        border-radius: 8px;
+        color: #4ea6ff;
+        background-color: #fff;
+        cursor: pointer;
+      }
+      .btn2 {
+        cursor: pointer;
+        width: 100px;
+        height: 40px;
+        background: #4ea6ff;
+        border-radius: 8px;
+        border: 0;
+        margin-left: 15px;
+        color: #fff;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
new file mode 100644
index 00000000..eb05cc62
--- /dev/null
+++ b/src/components/drawers/CreVote.vue
@@ -0,0 +1,509 @@
+<template>
+  <a-drawer
+    :visible="crevoteVisible"
+    class="drawerStyle crevoteDrawer"
+    width="80%"
+    title="创建投票"
+    placement="right"
+    @after-visible-change="afterVisibleChange"
+  >
+    <div class="drawerMain">
+      <div class="header">
+        <div class="headerTitle">创建投票</div>
+        <img
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
+        />
+      </div>
+      <div class="contentMain">
+        <div class="main_item">
+          <div class="signbox">
+            <div class="sign">
+              <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+            </div>
+            <span style="margin-right: 3px">投票名称</span>
+          </div>
+          <div class="btnbox">
+            <a-input
+              v-model:value="inputV1"
+              style="width: 424px; height: 32px"
+              placeholder="请输入投票名称"
+            />
+          </div>
+        </div>
+        <div class="box" @click="showDrawerCreVote">
+          <button class="cjtpbtn" @click="addQue()">创建题干</button>
+        </div>
+        <div class="queBox" v-for="(q, index) in questions" :key="index">
+          <div class="delBtn" v-if="questions.length > 1" @click="delQue(questions,index)">
+            <img src="@/assets/images/projectadd/delete.png" alt="" />
+            <div class="btnText">删除题干</div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px"
+                >{{ q.stemTit }}{{ index + 1 }}</span
+              >
+            </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="q.inputV"
+                style="width: 424px; height: 32px"
+                placeholder="请输入题干"
+              />
+            </div>
+          </div>
+          <div class="option" v-for="(o, index) in q.options" :key="index">
+            <div class="mainoptions">
+              <div class="signbox">
+                <div class="sign">
+                  <img
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                </div>
+                <span style="margin-right: 3px">{{ o.title }}{{index+1}}</span>
+              </div>
+              <div class="optionbox">
+                <div class="btnbox">
+                  <a-input
+                    v-model:value="o.opvalue"
+                    style="width: 424px; height: 32px"
+                  />
+                  <button v-if="q.options.length > 2" class="delbtn" @click="delOpt(q.options,index)">
+                    删除
+                  </button>
+                </div>
+                <!-- <a-upload
+                  v-show="!item.imgVal"
+                  class="in uploadBtn"
+                  :show-upload-list="false"
+                  :before-upload="beforeUpload"
+                >
+                  <div class="addimg">+ 上传图片</div>
+                </a-upload> -->
+                <a-button type="link">+ 上传图片</a-button>
+                <!-- <input class="file-upload" type="file" accept="image/*" name="picture"/> -->
+              </div>
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox"></div>
+            <div class="btnbox">
+              <div class="tjxxbtn" @click="addOpt(q.options)">
+                <div class="btntext">添加选项</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="main_btns">
+        <button class="btn1">取消</button>
+        <button class="btn2" @click="createQueTit">确定</button>
+      </div>
+    </div>
+  </a-drawer>
+</template>
+<script>
+import { reactive, toRefs } from "vue";
+import * as api from "../../api/indexVote";
+import { message } from "ant-design-vue";
+export default {
+  name: "CreVote",
+  props: {
+    crevoteVisible: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      inputV1: "",
+      creVote: true,
+      questions: [
+        {
+          stemTit: "题干",
+          inputV: "",
+          options: [
+            {
+              title: "选项",
+              opvalue: "",
+            },
+            {
+              title: "选项",
+              opvalue: "",
+            },
+          ],
+        },
+      ],
+    });
+    const addQue = () => {
+      state.questions.push({
+        stemTit: "题干",
+        inputV: "",
+        options: [
+          {
+            title: "选项",
+            opvalue: "",
+          },
+          {
+            title: "选项",
+            opvalue: "",
+          },
+        ],
+      });
+    }; 
+    const delQue = (value,index)=>{
+      console.log('gyd',value,index);
+      value.splice(value[index],1)
+    }
+    const addOpt = (value) => {
+      console.log(value);
+      value.push({
+        // title: "选项" + (value.length + 1 * 1),
+        title: "选项",
+        opvalue: "",
+      });
+    };
+    const delOpt = (value,index) => {
+      console.log('gys', value,index);
+      // delete value
+      value.splice(value[index],1)
+    }
+    const closeDrawer = () => {
+      ctx.emit("update:crevoteVisible", false);
+    };
+    const afterVisibleChange = (bool) => {
+      console.log("state", bool);
+    };
+
+    //创建题干接口
+    const createQueTit = () => {
+      if (!state.inputV1) {
+        message.destroy();
+        return message.info("请输入投票名称");
+      }
+      for (let i = 0; i < state.questions.length; i++) {
+        if (!state.questions[i].inputV) {
+          message.destroy();
+          return message.info("请输入题干");
+        }
+      }
+      for (let i = 0; i < state.questions.length; i++) {
+        for (let k = 0; k < state.questions[i].options.length; k++) {
+          if (!state.questions[i].options[k].opvalue) {
+            message.destroy();
+            return message.info("请输入选项");
+          }
+        }
+      }
+      // for (let i = 0; i < state.questions.length; i++) {
+      //   for (let k = 0; k < state.questions[i].options.length; k++) {
+      //     // console.log('1111111111111111', state.questions);
+      //     // console.log('2222222222222222', state.questions[i].options);
+
+      //   }
+      // }
+      let obj = {
+        "ballotId": 0,
+        "ballotName": state.inputV1,
+        "createTime": "",
+        "createUser": 0,
+        "updateTime": "",
+        "updateUser": 0,
+        "voteStemDtoList": [
+          {
+            "ballotId": 0,
+            "createTime": "",
+            "createUser": 0,
+            "optionDetailList": [
+              {
+                "createTime": "",
+                "createUser": 0,
+                "optionFlag": "",
+                "optionId": 0,
+                // "optionName": state.questions[i].options[k].opvalue,
+                "optionName": "",
+                "optionOrderNum": "",
+                "optionPictureAddress": "",
+                "stem": "",
+                "updateTime": "",
+                "updateUser": 0,
+                "voteStemId": 0
+              }
+            ],
+            "orderNumber": "",
+            "updateTime": "",
+            "updateUser": 0,
+            "voteStemFlag": "",
+            "voteStemId": 0,
+            // "voteStemName": state.questions[i].inputV,
+            "voteStemName": "",
+          }
+        ]
+      }
+      api
+        .createOptionMessage(obj)
+        .then((res) => {
+          console.log("创建成功", res);
+          // console.log('res.data.data[0].ascriptionId',res.data.data[0].ascriptionId);
+          // console.log('res.data.data[0].voteStemId',res.data.data[0].voteStemId);
+          // console.log('state.questions[0].inputV',state.questions[0].inputV);
+          message.success("创建成功");
+          let objstem = {
+            voteStemName: state.questions[0].inputV,
+            voteStemId: res.data.data.voteStemVoList[0].voteStemId,
+            creVote: true,
+          };
+          ctx.emit("getData", objstem);
+          closeDrawer();
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
+    return {
+      ...toRefs(state),
+      afterVisibleChange,
+      closeDrawer,
+      addQue,
+      delQue,
+      addOpt,
+      delOpt,
+      createQueTit,
+    };
+  },
+};
+</script>
+<style lang="scss">
+.ant-table-striped :deep(.table-striped) td {
+  background-color: #fafafa !important;
+}
+.crevoteDrawer {
+  .drawerMain {
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        margin-left: 24px;
+      }
+    }
+    .contentMain {
+      .box {
+        display: flex;
+        flex: 1;
+        align-items: center;
+        margin-bottom: 30px;
+        .cjtpbtn {
+          cursor: pointer;
+          width: 130px;
+          height: 40px;
+          background: #388be1;
+          border-radius: 8px;
+          border: 0;
+          margin-right: 8px;
+          color: #fff;
+        }
+      }
+      .main_item {
+        display: flex;
+        align-items: center;
+        margin-bottom: 32px;
+        .signbox {
+          width: 120px;
+          display: flex;
+          justify-content: end;
+          align-items: center;
+          margin-right: 5px;
+          .sign {
+            margin-right: 5px;
+          }
+        }
+        .btnbox {
+          display: flex;
+          flex: 1;
+          align-items: center;
+        }
+      }
+      .mainoptions {
+        display: flex;
+        align-items: flex-start;
+        margin-bottom: 32px;
+        .signbox {
+          width: 120px;
+          display: flex;
+          justify-content: end;
+          align-items: center;
+          padding-top: 5px;
+          margin-right: 5px;
+          .sign {
+            margin-right: 5px;
+          }
+        }
+        .optionbox {
+          .btnbox {
+            display: flex;
+            align-items: center;
+          }
+          .delbtn {
+            border: none;
+            color: #4ea6ff;
+            background-color: #fff;
+            cursor: pointer;
+          }
+        }
+      }
+      .queBox {
+        border: 1px solid #e8e8e8;
+        box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+        padding-top: 30px;
+        margin-bottom: 30px;
+        .delBtn {
+          width: 130px;
+          height: 40px;
+          border: 1px solid #4ea6ff;
+          border-radius: 8px;
+          color: #4ea6ff;
+          background-color: #fff;
+          cursor: pointer;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-left: 20px;
+          margin-bottom: 20px;
+          img {
+            margin-right: 10px;
+          }
+        }
+        .main_item {
+          display: flex;
+          align-items: center;
+          margin-bottom: 32px;
+          .signbox {
+            width: 120px;
+            display: flex;
+            justify-content: end;
+            align-items: center;
+            .sign {
+              margin-right: 5px;
+            }
+          }
+          .btnbox {
+            display: flex;
+            flex: 1;
+            align-items: center;
+            .tjxxbtn {
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              cursor: pointer;
+              width: 130px;
+              height: 40px;
+              background: #388be1;
+              border-radius: 8px;
+              border: 0;
+              margin-right: 8px;
+              .btntext {
+                color: #fff;
+              }
+            }
+          }
+        }
+        .main_item2 {
+          display: flex;
+          align-items: flex-start;
+          margin-bottom: 32px;
+          .signbox {
+            width: 120px;
+            display: flex;
+            justify-content: end;
+            align-items: center;
+            .sign {
+              margin-right: 5px;
+            }
+          }
+          .kqszbox {
+            .qdqtbox {
+              margin-left: 56px;
+            }
+            .setbox {
+              display: flex;
+              flex-wrap: wrap;
+              margin-top: 10px;
+              margin-bottom: 24px;
+              .timerbox {
+                margin-top: 6px;
+                margin-right: 32px;
+                display: flex;
+                align-items: center;
+                flex-wrap: nowrap;
+              }
+            }
+          }
+          .btnbox2 {
+            display: flex;
+            flex-direction: column;
+            justify-content: flex-start;
+            .xkbtn {
+              cursor: pointer;
+              width: 130px;
+              height: 40px;
+              background: #388be1;
+              border-radius: 8px;
+              border: 0;
+              margin-right: 16px 8px 32px 0;
+              color: #fff;
+              margin-top: 16px;
+              margin-bottom: 60px;
+            }
+          }
+        }
+      }
+    }
+    .main_btns {
+      height: 72px;
+      width: 100%;
+      bottom: 0;
+      left: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+      .btn1 {
+        width: 100px;
+        height: 40px;
+        border: 1px solid #4ea6ff;
+        border-radius: 8px;
+        color: #4ea6ff;
+        background-color: #fff;
+        cursor: pointer;
+      }
+      .btn2 {
+        cursor: pointer;
+        width: 100px;
+        height: 40px;
+        background: #4ea6ff;
+        border-radius: 8px;
+        border: 0;
+        margin-left: 15px;
+        color: #fff;
+      }
+    }
+  }
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index e20b8b05..d3cc68ef 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -909,7 +909,7 @@ import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
 import AddActive from "../../components/drawers/AddActive.vue";
 import AddEval from "../../components/drawers/AddEval.vue";
 import AddInvist from "../../components/drawers/AddInvist.vue";
-import AddVote from "../../components/vote/AddVote.vue";
+import AddVote from "../../components/drawers/AddVote.vue";
 import AddLive from "../../components/drawers/AddLive.vue";
 import AddRef from "../../components/drawers/AddRef.vue";
 import * as api from "../../api/indexLevel";
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index fa2842b9..293616e0 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -842,7 +842,7 @@ import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
 import AddActive from "../../components/drawers/AddActive.vue";
 import AddEval from "../../components/drawers/AddEval.vue";
 import AddInvist from "../../components/drawers/AddInvist.vue";
-import AddVote from "../../components/vote/AddVote.vue";
+import AddVote from "../../components/drawers/AddVote.vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/indexTaskadd";
 import * as apistage from "../../api/indexStage";
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index 8b9ad42a..1c024efb 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -92,7 +92,7 @@
 </template>
 <script>
 import { reactive, toRefs } from "vue";
-import AddVote from "../../components/vote/AddVote";
+import AddVote from "../../components/drawers/AddVote";
 // import { PlusOutlined, LoadingOutlined } from "@ant-design/icons-vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/index1";